Commit 9fae484c authored by Rainer Jung's avatar Rainer Jung
Browse files

Support for OpenSSL 1.1.0: 

- fix copy&paste typos
  (wrong version number in "#if").

Backport r1729998 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@1755832 13f79535-47bb-0310-9956-ffa450edef68
parent df47f551

modules/ssl/ssl_engine_kernel.c

+1 −1
Original line number Diff line number Diff line
@@ -2150,7 +2150,7 @@ void ssl_callback_Info(const SSL *ssl, int where, int rc) 
        }

#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;

    }

modules/ssl/ssl_private.h

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,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 */