OpenSSL 0.9.5 merge

*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs

1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c
index 356c476a99..a8f29f1e65 100644
--- a/src/lib/libcrypto/cryptlib.c
+++ b/src/lib/libcrypto/cryptlib.c
@@ -92,7 +92,9 @@ static const char* lock_names[CRYPTO_NUM_LOCKS] =
         "getservbyname",
         "readdir",
         "RSA_blinding",
-#if CRYPTO_NUM_LOCKS != 24
+        "dh",
+        "debug_malloc2",
+#if CRYPTO_NUM_LOCKS != 26
 # error "Inconsistency between crypto.h and cryptlib.c"
 #endif
         };
@@ -181,7 +183,7 @@ unsigned long CRYPTO_thread_id(void)
                 ret=(unsigned long)GetCurrentTask();
 #elif defined(WIN32)
                 ret=(unsigned long)GetCurrentThreadId();
-#elif defined(MSDOS)
+#elif defined(GETPID_IS_MEANINGLESS)
                 ret=1L;
 #else
                 ret=(unsigned long)getpid();