svn commit: r1877795 - in /httpd/httpd/trunk/modules/ssl: ssl_engine_kernel.c ssl_private.h ssl_util_ssl.c

[yl...@apache.org]

Author: ylavic
Date: Fri May 15 21:14:36 2020
New Revision: 1877795

URL: http://svn.apache.org/viewvc?rev=1877795&view=rev
Log:
mod_ssl: follow up to r1877397: fix SSL_OP_NO_RENEGOT*I*ATION typo.

Should work better now :)

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
    httpd/httpd/trunk/modules/ssl/ssl_private.h
    httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c

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=1877795&r1=1877794&r2=1877795&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c Fri May 15 21:14:36 2020
@@ -2264,7 +2264,7 @@ static void log_tracing_state(const SSL
 /*
  * This callback function is executed while OpenSSL processes the SSL
  * handshake and does SSL record layer stuff.  It's used to trap
- * client-initiated renegotiations (where SSL_OP_NO_RENEGOTATION is
+ * client-initiated renegotiations (where SSL_OP_NO_RENEGOTIATION is
  * not available), and for dumping everything to the log.
  */
 void ssl_callback_Info(const SSL *ssl, int where, int rc)
@@ -2277,12 +2277,12 @@ void ssl_callback_Info(const SSL *ssl, i
         return;
     }
 
-#ifndef SSL_OP_NO_RENEGOTATION
+#ifndef SSL_OP_NO_RENEGOTIATION
     /* With OpenSSL < 1.1.1 (implying TLS v1.2 or earlier), this
      * callback is used to block client-initiated renegotiation.  With
      * TLSv1.3 it is unnecessary since renegotiation is forbidden at
      * protocol level.  Otherwise (TLSv1.2 with OpenSSL >=1.1.1),
-     * SSL_OP_NO_RENEGOTATION is used to block renegotiation. */
+     * SSL_OP_NO_RENEGOTIATION is used to block renegotiation. */
     {
         SSLConnRec *sslconn;
 

Modified: httpd/httpd/trunk/modules/ssl/ssl_private.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=1877795&r1=1877794&r2=1877795&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_private.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_private.h Fri May 15 21:14:36 2020
@@ -546,10 +546,10 @@ typedef struct {
         NON_SSL_SET_ERROR_MSG  /* Need to set the error message */
     } non_ssl_request;
 
-#ifndef SSL_OP_NO_RENEGOTATION
+#ifndef SSL_OP_NO_RENEGOTIATION
     /* For OpenSSL < 1.1.1, track the handshake/renegotiation state
      * for the connection to block client-initiated renegotiations.
-     * For OpenSSL >=1.1.1, the SSL_OP_NO_RENEGOTATION flag is used in
+     * For OpenSSL >=1.1.1, the SSL_OP_NO_RENEGOTIATION flag is used in
      * the SSL * options state with equivalent effect. */
     modssl_reneg_state reneg_state;
 #endif

Modified: httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c?rev=1877795&r1=1877794&r2=1877795&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c Fri May 15 21:14:36 2020
@@ -514,13 +514,13 @@ char *modssl_SSL_SESSION_id2sz(IDCONST u
 
 void modssl_set_reneg_state(SSLConnRec *sslconn, modssl_reneg_state state)
 {
-#ifdef SSL_OP_NO_RENEGOTATION
+#ifdef SSL_OP_NO_RENEGOTIATION
     switch (state) {
     case RENEG_ALLOW:
-        SSL_clear_options(sslconn->ssl, SSL_OP_NO_RENEGOTATION);
+        SSL_clear_options(sslconn->ssl, SSL_OP_NO_RENEGOTIATION);
         break;
     default:
-        SSL_set_options(sslconn->ssl, SSL_OP_NO_RENEGOTATION);
+        SSL_set_options(sslconn->ssl, SSL_OP_NO_RENEGOTIATION);
         break;
     }
 #else