1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85
|
--- a/ck_ssl.c
+++ b/ck_ssl.c
@@ -1529,82 +1529,6 @@
debug(F110,"OpenSSL Library",SSLeay_version(SSLEAY_CFLAGS),0);
debug(F110,"OpenSSL Library",SSLeay_version(SSLEAY_PLATFORM),0);
- /* The following test is suggested by Richard Levitte */
- /* if (((OPENSSL_VERSION_NUMBER ^ SSLeay()) & 0xffffff0f) */
- /* Modified by Adam Friedlander for OpenSSL >= 1.0.0 */
- if (OPENSSL_VERSION_NUMBER > SSLeay()
- || ((OPENSSL_VERSION_NUMBER ^ SSLeay()) & COMPAT_VERSION_MASK)
-#ifdef OS2
-/* DG 2024-08-05: Not sure what the point of this was. Presumably the goal was
- * to prevent updated OpenSSL libraries from being used, though why you'd
- * want to do that I'm not sure. Might have been to do with how Kermit 95s
- * SSH code was built way back in the early 2000s I guess. Today Kermit 95s
- * use of OpenSSL is largely the same as how C-Kermit uses it on other
- * platforms so I don't see any reason to treat it differently here.
- || ckstrcmp(OPENSSL_VERSION_TEXT,(char *)SSLeay_version(SSLEAY_VERSION),-1,1)
-*/
-#endif /* OS2 */
- ) {
- ssl_installed = 0;
- debug(F111,"OpenSSL Version does not match. Built with",
- SSLeay_version(SSLEAY_VERSION),SSLEAY_VERSION_NUMBER);
- printf("?OpenSSL libraries do not match required version:\r\n");
- printf(" . C-Kermit built with %s\r\n",OPENSSL_VERSION_TEXT);
- printf(" . Version found %s\r\n",SSLeay_version(SSLEAY_VERSION));
-#ifdef OPENSSL_100
- printf(" OpenSSL versions 1.0.0 or newer must be the same\r\n");
- printf(" major and minor version number, and Kermit may not\r\n");
- printf(" be used with a version of OpenSSL older than the one\r\n");
- printf(" supplied at compile time.\r\n");
-#else
- printf(" OpenSSL versions prior to 1.0.0 must be the same.\r\n");
-#endif /* OPENSSL_100 */
-
- s = "R";
-#ifdef SOLARIS
- printf(" Set CD_LIBRARY_PATH for %s.\r\n",OPENSSL_VERSION_TEXT);
- s = " Or r";
-#endif /* SOLARIS */
-
-#ifdef HPUX
- printf(" Set SHLIB_PATH for %s.\r\n",OPENSSL_VERSION_TEXT);
- s = " Or r";
-#endif /* HPUX */
-
-#ifdef AIX
- printf(" Set LIBPATH for %s.\r\n",OPENSSL_VERSION_TEXT);
- s = " Or r";
-#endif /* AIX */
-
-#ifdef LINUX
- printf(" Set LD_LIBRARY_PATH for %s.\r\n",OPENSSL_VERSION_TEXT);
- s = " Or r";
-#endif /* LINUX */
-
- printf(" %sebuild C-Kermit from source on this computer to make \
-versions agree.\r\n",s);
-
-#ifdef KTARGET
- {
- char * s;
- s = KTARGET;
- if (!s) s = "";
- if (!*s) s = "(unknown)";
- printf(" C-Kermit makefile target: %s\r\n",s);
- }
-#endif /* KTARGET */
- printf(" Or if that is what you did then try to find out why\r\n");
- printf(" the program loader (image activator) is choosing a\r\n");
- printf(" different OpenSSL library than the one specified in \
-the build.\r\n\r\n");
- printf(" All SSL/TLS features disabled.\r\n\r\n");
- bleep(BP_FAIL);
-#ifdef SSLDLL
- ck_ssl_unloaddll();
- ck_crypto_unloaddll();
-#endif /* SSLDLL */
- return;
- }
#endif /* OS2ONLY */
/* init things so we will get meaningful error messages
|