svn commit: r1805877 - in /tomcat/native/trunk/native: config.nice.openssl include/ssl_private.h src/ssl.c src/sslcontext.c

[markt]

Author: markt
Date: Wed Aug 23 10:55:53 2017
New Revision: 1805877

URL: http://svn.apache.org/viewvc?rev=1805877&view=rev
Log:
Partial fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=58434
Fix remaining errors when building with libressl. Warnings still to be fixed.
Note: This is not yet working with libressl

Added:
    tomcat/native/trunk/native/config.nice.openssl   (with props)
Modified:
    tomcat/native/trunk/native/include/ssl_private.h
    tomcat/native/trunk/native/src/ssl.c
    tomcat/native/trunk/native/src/sslcontext.c

Added: tomcat/native/trunk/native/config.nice.openssl
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/config.nice.openssl?rev=1805877&view=auto
==============================================================================
--- tomcat/native/trunk/native/config.nice.openssl (added)
+++ tomcat/native/trunk/native/config.nice.openssl Wed Aug 23 10:55:53 2017
@@ -0,0 +1,9 @@
+#! /bin/sh
+#
+# Created by configure
+
+"./configure" \
+"--with-apr=/usr/bin/apr-config" \
+"--with-ssl=/usr/lib/x86_64-linux-gnu" \
+"--prefix=/home/mark/libs/tomcat-native-1.2.x" \
+"$@"

Propchange: tomcat/native/trunk/native/config.nice.openssl
------------------------------------------------------------------------------
    svn:executable = *

Modified: tomcat/native/trunk/native/include/ssl_private.h
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/ssl_private.h?rev=1805877&r1=1805876&r2=1805877&view=diff
==============================================================================
--- tomcat/native/trunk/native/include/ssl_private.h (original)
+++ tomcat/native/trunk/native/include/ssl_private.h Wed Aug 23 10:55:53 2017
@@ -209,7 +209,7 @@
 #endif /* !defined(OPENSSL_NO_TLSEXT) && defined(SSL_set_tlsext_host_name) */
 
 /* OpenSSL 1.0.2 compatibility */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 #define OpenSSL_version                  SSLeay_version
 #define OpenSSL_version_num              SSLeay
 #define OPENSSL_VERSION                  SSLEAY_VERSION
@@ -234,7 +234,7 @@
 #define TLS_method                       SSLv23_method
 #define TLS_client_method                SSLv23_client_method
 #define TLS_server_method                SSLv23_server_method
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || 
defined(LIBRESSL_VERSION_NUMBER) */
 
 #define MAX_ALPN_NPN_PROTO_SIZE 65535
 #define SSL_SELECTOR_FAILURE_CHOOSE_MY_LAST_PROTOCOL            1

Modified: tomcat/native/trunk/native/src/ssl.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1805877&r1=1805876&r2=1805877&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Wed Aug 23 10:55:53 2017
@@ -201,7 +201,7 @@ static const jint supported_ssl_opts = 0
 #endif
      | 0;
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 /* OpenSSL Pre-1.1.0 compatibility */
 /* Taken from OpenSSL 1.1.0 snapshot 20160410 */
 int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)

Modified: tomcat/native/trunk/native/src/sslcontext.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1805877&r1=1805876&r2=1805877&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Wed Aug 23 10:55:53 2017
@@ -503,7 +503,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
     const char *name;
     int i;
     jstring c_name;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
     SSL *ssl;
 #endif
 
@@ -516,7 +516,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
 
     /* Before OpenSSL 1.1.0, get_ciphers() was only available
      * on an SSL, not for an SSL_CTX. */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
     ssl = SSL_new(c->ctx);
     if (ssl == NULL) {
         tcn_ThrowException(e, "could not create temporary ssl from ssl 
context");
@@ -530,7 +530,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
     len = sk_SSL_CIPHER_num(sk);
 
     if (len <= 0) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
         SSL_free(ssl);
 #endif
         return NULL;
@@ -545,7 +545,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLCont
         c_name = (*e)->NewStringUTF(e, name);
         (*e)->SetObjectArrayElement(e, array, i, c_name);
     }
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
     SSL_free(ssl);
 #endif
     return array;
@@ -1678,7 +1678,7 @@ TCN_IMPLEMENT_CALL(void, SSLContext, set
 }
 
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 
 /*
  * Adapted from OpenSSL:



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