diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index 924fe77b64..d2a8011294 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -2264,7 +2264,7 @@ static void log_tracing_state(const SSL *ssl, conn_rec *c, /* * 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, int where, int rc) 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; diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index e7df7b4d88..8723207d21 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -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 diff --git a/modules/ssl/ssl_util_ssl.c b/modules/ssl/ssl_util_ssl.c index ef18f5e1f5..2209ef44b2 100644 --- a/modules/ssl/ssl_util_ssl.c +++ b/modules/ssl/ssl_util_ssl.c @@ -514,13 +514,13 @@ char *modssl_SSL_SESSION_id2sz(IDCONST unsigned char *id, int idlen, 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