Back out the removal of OPT_X_TLS and OPT_X_TLS_CTX options

droideck · web-flow · commit b3d6a8c2a646 · 2022-09-01T11:32:03.000-07:00
Closes #480
diff --git a/Doc/reference/ldap.rst b/Doc/reference/ldap.rst
@@ -409,6 +409,10 @@ TLS options
 
    get/set allowed cipher suites
 
+.. py:data:: OPT_X_TLS_CTX
+
+   get address of internal memory address of TLS context (**DO NOT USE**)
+
 .. py:data:: OPT_X_TLS_PEERCERT
 
    Get peer's certificate as binary ASN.1 data structure (DER)
@@ -472,6 +476,12 @@ TLS options
 
    get/set path to /dev/urandom (**DO NOT USE**)
 
+.. py:data:: OPT_X_TLS
+
+   .. deprecated:: 3.3.0
+      The option is deprecated in OpenLDAP and should no longer be used. It
+      will be removed in the future.
+
 .. note::
 
    OpenLDAP supports several TLS/SSL libraries. OpenSSL is the most common
diff --git a/Lib/ldap/constants.py b/Lib/ldap/constants.py
@@ -267,6 +267,8 @@ class Str(Constant):
 
     Int('OPT_DEFBASE', optional=True),
 
+    TLSInt('OPT_X_TLS', optional=True),
+    TLSInt('OPT_X_TLS_CTX'),
     TLSInt('OPT_X_TLS_CACERTFILE'),
     TLSInt('OPT_X_TLS_CACERTDIR'),
     TLSInt('OPT_X_TLS_CERTFILE'),
diff --git a/Modules/constants_generated.h b/Modules/constants_generated.h
@@ -202,6 +202,12 @@ add_int(OPT_DEFBASE);
 
 
 #if HAVE_TLS
+
+#if defined(LDAP_OPT_X_TLS)
+add_int(OPT_X_TLS);
+#endif
+
+add_int(OPT_X_TLS_CTX);
 add_int(OPT_X_TLS_CACERTFILE);
 add_int(OPT_X_TLS_CACERTDIR);
 add_int(OPT_X_TLS_CERTFILE);
