[3.8] bpo-43788: Generate version specific _ssl_data.h (pythonGH-25300)

Signed-off-by: Christian Heimes <[email protected]> Automerge-Triggered-By: GH:tiran. (cherry picked from commit 150af75) Co-authored-by: Christian Heimes <[email protected]>
tiran · Apr 9, 2021 · 90addd3 · 90addd3
1 parent a28398e
commit 90addd3
Show file tree

Hide file tree

Showing 7 changed files with 15,092 additions and 83 deletions.
diff --git a/Misc/NEWS.d/next/Library/2021-04-09-12-08-01.bpo-43788.YsvInM.rst b/Misc/NEWS.d/next/Library/2021-04-09-12-08-01.bpo-43788.YsvInM.rst
@@ -0,0 +1,4 @@
+The header files for :mod:`ssl` error codes are now OpenSSL
+version-specific. Exceptions will now show correct reason and library
+codes. The ``make_ssl_data.py`` script has been rewritten to use OpenSSL's
+text file with error codes.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -137,7 +137,13 @@ static void _PySSLFixErrno(void) {
 #endif
 
 /* Include generated data (error codes) */
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+#include "_ssl_data_300.h"
+#elif (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER)
+#include "_ssl_data_111.h"
+#else
 #include "_ssl_data.h"
+#endif
 
 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
 #  define OPENSSL_VERSION_1_1 1