- (djm) autoconf hacking:

   - Add OpenSSL sanity check: verify that header version matches version
     reported by library

diff --git a/ChangeLog b/ChangeLog
index 8e3aef7994c865e2519bc9a05b66b5a1b3923f7c..01d2da4915951680fd37d120b20497da830694fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
      the ssh-rand-helper program. You can force the use of ssh-rand-helper
      using the --with-rand-helper configure argument
    - Simplify and clean up ssh-rand-helper configuration
+   - Add OpenSSL sanity check: verify that header version matches version
+     reported by library
  - (djm) Fix some bugs I introduced into ssh-rand-helper yesterday
 
 20020121

diff --git a/configure.ac b/configure.ac
index d69158e469bb12e52a4d4ca3b71af628c65ebb32..f9ffa2b6b0fae892def1d0455520c194c4e86f40 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -812,6 +812,23 @@ else
        fi
 fi
 
+# Sanity check OpenSSL headers
+AC_MSG_CHECKING([whether OpenSSL's headers match the library])
+AC_TRY_RUN(
+       [
+#include <string.h>
+#include <openssl/opensslv.h>
+int main(void) { return(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
+       ],
+       [
+               AC_MSG_RESULT(yes)
+       ],
+       [
+               AC_MSG_RESULT(no)
+               AC_MSG_ERROR(Your OpenSSL headers do not match your library)
+       ]
+)
+
 # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the 
 # version in OpenSSL. Skip this for PAM
 if test "x$PAM_MSG" = "xno" -a "x$check_for_libcrypt_later" = "x1"; then