finalize the evp.h bugfix (#46)

diff --git a/print-esp.c b/print-esp.c
index 0bb5cdd16ec12fdf149d44d6d8d5e71bce811430..5e8f282cc1f1c5d4dcb24eaa63a5bfd8248cddd1 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -36,6 +36,10 @@ static const char rcsid[] _U_ =
 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 

+/* Any code in this file that depends on HAVE_LIBCRYPTO depends on
+ * HAVE_OPENSSL_EVP_H too. Undefining the former when the latter isn't defined
+ * is the simplest way of handling the dependency.
+ */

 #ifdef HAVE_LIBCRYPTO
 #ifdef HAVE_OPENSSL_EVP_H
 #include <openssl/evp.h>
 #ifdef HAVE_LIBCRYPTO
 #ifdef HAVE_OPENSSL_EVP_H
 #include <openssl/evp.h>

diff --git a/print-isakmp.c b/print-isakmp.c
index 4f96afe38115032fc2b753261e055c5d2d1c1db1..ee82f5b75b3648ba150acb73d34385db67b6bbf6 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -38,6 +38,13 @@ static const char rcsid[] _U_ =
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

+/* The functions from print-esp.c used in this file are only defined when both
+ * OpenSSL and evp.h are detected. Employ the same preprocessor device here.
+ */
+#ifndef HAVE_OPENSSL_EVP_H
+#undef HAVE_LIBCRYPTO
+#endif
+

 #include <tcpdump-stdinc.h>
 
 #include <string.h>
 #include <tcpdump-stdinc.h>
 
 #include <string.h>