You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2016/02/12 12:29:36 UTC
svn commit: r1729998 - in /httpd/httpd/trunk/modules/ssl:
ssl_engine_kernel.c ssl_private.h
Author: rjung
Date: Fri Feb 12 11:29:36 2016
New Revision: 1729998
URL: http://svn.apache.org/viewvc?rev=1729998&view=rev
Log:
Support for OpenSSL 1.1.0:
- fix copy&paste typos
(wrong version number in "#if").
Modified:
httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
httpd/httpd/trunk/modules/ssl/ssl_private.h
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c?rev=1729998&r1=1729997&r2=1729998&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c Fri Feb 12 11:29:36 2016
@@ -2148,7 +2148,7 @@ void ssl_callback_Info(const SSL *ssl, i
}
#endif
}
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
else if ((where & SSL_CB_HANDSHAKE_START) && scr->reneg_state == RENEG_ALLOW) {
scr->reneg_state = RENEG_STARTED;
}
Modified: httpd/httpd/trunk/modules/ssl/ssl_private.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=1729998&r1=1729997&r2=1729998&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_private.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_private.h Fri Feb 12 11:29:36 2016
@@ -448,7 +448,7 @@ typedef struct {
* renegotiation should be rejected */
RENEG_ALLOW, /* A server-initiated renegotiation is taking
* place (as dictated by configuration) */
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
RENEG_STARTED, /* A renegotiation has started after RENEG_ALLOW */
RENEG_DONE, /* A renegotiation has finished after RENEG_STARTED */
RENEG_ALERT, /* A renegotiation has finished with an SSL Alert */