]> The Tcpdump Group git mirrors - tcpdump/commitdiff
Don't use OpenSSL_add_all_algorithms() in OpenSSL 1.1.0 or later.
authorGuy Harris <[email protected]>
Wed, 18 Jan 2017 00:25:00 +0000 (16:25 -0800)
committerGuy Harris <[email protected]>
Wed, 18 Jan 2017 00:25:00 +0000 (16:25 -0800)
Should fix GitHub issue #539.

print-esp.c

index 7fbaa1b0de1fc0023485829c3a5f2c1cf8554981..375075a3e53419c9ba3a927deff56c01048ef0b9 100644 (file)
@@ -532,8 +532,14 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line,
 USES_APPLE_DEPRECATED_API
 static void esp_init(netdissect_options *ndo _U_)
 {
-
+       /*
+        * 0.9.6 doesn't appear to define OPENSSL_API_COMPAT, so
+        * we check whether it's undefined or it's less than the
+        * value for 1.1.0.
+        */
+#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L
        OpenSSL_add_all_algorithms();
+#endif
        EVP_add_cipher_alias(SN_des_ede3_cbc, "3des");
 }
 USES_APPLE_RST