tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jni/native/build tcnative.m4
Date Wed, 08 Jun 2005 07:56:24 GMT
mturk       2005/06/08 00:56:24

  Modified:    jni/native/build tcnative.m4
  Log:
  Fix detecting OpenSSL version. Refuse to build for < 0.9.7a versions.
  
  Revision  Changes    Path
  1.8       +4 -6      jakarta-tomcat-connectors/jni/native/build/tcnative.m4
  
  Index: tcnative.m4
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/build/tcnative.m4,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- tcnative.m4	6 Jun 2005 16:15:20 -0000	1.7
  +++ tcnative.m4	8 Jun 2005 07:56:24 -0000	1.8
  @@ -237,21 +237,19 @@
     if test "x$tcn_ssltk_type" = "x"; then
       AC_MSG_CHECKING(for OpenSSL version)
       dnl First check for manditory headers
  -    AC_CHECK_HEADERS([openssl/opensslv.h openssl/ssl.h], [tcn_ssltk_type="openssl"], [])
  +    AC_CHECK_HEADERS([openssl/opensslv.h], [tcn_ssltk_type="openssl"], [])
       if test "$tcn_ssltk_type" = "openssl"; then
         dnl so it's OpenSSL - test for a good version
         AC_TRY_COMPILE([#include <openssl/opensslv.h>],[
   #if !defined(OPENSSL_VERSION_NUMBER)
     #error "Missing openssl version"
   #endif
  -#if  (OPENSSL_VERSION_NUMBER < 0x0090702f))
  +#if  (OPENSSL_VERSION_NUMBER < 0x0090701f)
     #error "Unsuported openssl version " OPENSSL_VERSION_TEXT
   #endif],
         [AC_MSG_RESULT(OK)],
  -      [dnl Replace this with OPENSSL_VERSION_TEXT from opensslv.h?
  -       AC_MSG_RESULT([not encouraging])
  -       echo "WARNING: OpenSSL version may contain security vulnerabilities!"
  -       echo "         Ensure the latest security patches have been applied!"
  +      [dnl Unsuported OpenSSL version
  +         AC_MSG_ERROR([Unsupported OpenSSL version. Use 0.9.7a or higher version])
         ])
         dnl Look for additional, possibly missing headers
         AC_CHECK_HEADERS(openssl/engine.h)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message