Commit db0f35dd authored by Todd Short's avatar Todd Short Committed by Matt Caswell
Browse files

Fix #2400 Add NO_RENEGOTIATE option 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3432)
parent 270d65fa

apps/apps.h

+4 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate, 
        OPT_S_ONRESUMP, OPT_S_NOLEGACYCONN, OPT_S_STRICT, OPT_S_SIGALGS, \

        OPT_S_CLIENTSIGALGS, OPT_S_GROUPS, OPT_S_CURVES, OPT_S_NAMEDCURVE, \

        OPT_S_CIPHER, OPT_S_DHPARAM, OPT_S_RECORD_PADDING, OPT_S_DEBUGBROKE, \

        OPT_S_COMP, OPT_S__LAST

        OPT_S_COMP, OPT_S_NO_RENEGOTIATION, OPT_S__LAST



# define OPT_S_OPTIONS \

        {"no_ssl3", OPT_S_NOSSL3, '-',"Just disable SSLv3" }, \
@@ -231,6 +231,8 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate, 
        {"serverpref", OPT_S_SERVERPREF, '-', "Use server's cipher preferences"}, \

        {"legacy_renegotiation", OPT_S_LEGACYRENEG, '-', \

            "Enable use of legacy renegotiation (dangerous)"}, \

        {"no_renegotiation", OPT_S_NO_RENEGOTIATION, '-', \

            "Disable all renegotiation."}, \

        {"legacy_server_connect", OPT_S_LEGACYCONN, '-', \

            "Allow initial connection to servers that don't support RI"}, \

        {"no_resumption_on_reneg", OPT_S_ONRESUMP, '-', \
@@ -284,6 +286,7 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate, 
        case OPT_S_CIPHER: \

        case OPT_S_DHPARAM: \

        case OPT_S_RECORD_PADDING: \

        case OPT_S_NO_RENEGOTIATION: \

        case OPT_S_DEBUGBROKE



#define IS_NO_PROT_FLAG(o) \

apps/s_server.c

+3 −0
Original line number Diff line number Diff line
@@ -2785,6 +2785,9 @@ static void print_connection_info(SSL *con) 
        BIO_printf(bio_s_out, "Reused session-id\n");

    BIO_printf(bio_s_out, "Secure Renegotiation IS%s supported\n",

               SSL_get_secure_renegotiation_support(con) ? "" : " NOT");

    if ((SSL_get_options(con) & SSL_OP_NO_RENEGOTIATION))

        BIO_printf(bio_s_out, "Renegotiation is DISABLED\n");



    if (keymatexportlabel != NULL) {

        BIO_printf(bio_s_out, "Keying material exporter:\n");

        BIO_printf(bio_s_out, "    Label: '%s'\n", keymatexportlabel);

doc/man3/SSL_CONF_cmd.pod

+10 −0
Original line number Diff line number Diff line
@@ -125,6 +125,11 @@ Attempts to pad TLS 1.3 records so that they are a multiple of B<value> in 
length on send. A B<value> of 0 or 1 turns off padding. Otherwise, the

B<value> must be >1 or <=16384.



=item B<-no_renegotiation>



Disables all attempts at renegotiation in TLSv1.2 and earlier, same as setting

B<SSL_OP_NO_RENEGOTIATION>.



=item B<-min_protocol>, B<-max_protocol>



Sets the minimum and maximum supported protocol.
@@ -257,6 +262,11 @@ Attempts to pad TLS 1.3 records so that they are a multiple of B<value> in 
length on send. A B<value> of 0 or 1 turns off padding. Otherwise, the

B<value> must be >1 or <=16384.



=item B<NoRenegotiation>



Disables all attempts at renegotiation in TLSv1.2 and earlier, same as setting

B<SSL_OP_NO_RENEGOTIATION>.



=item B<SignatureAlgorithms>



This sets the supported signature algorithms for TLS v1.2. For clients this

doc/man3/SSL_CTX_set_options.pod

+5 −0
Original line number Diff line number Diff line
@@ -170,6 +170,11 @@ RFC7366 Encrypt-then-MAC option on TLS and DTLS connection. 
If this option is set, Encrypt-then-MAC is disabled. Clients will not

propose, and servers will not accept the extension.



=item SSL_OP_NO_RENEGOTIATION



Disable all renegotiation in TLSv1.2 and earlier. Do not send HelloRequest

messages, and ignore renegotiation requests via ClientHello.



=back



The following options no longer have any effect but their identifiers are

include/openssl/ssl.h

+4 −0
Original line number Diff line number Diff line
@@ -370,6 +370,9 @@ typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx); 
        SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2|SSL_OP_NO_TLSv1_3)

# define SSL_OP_NO_DTLS_MASK (SSL_OP_NO_DTLSv1|SSL_OP_NO_DTLSv1_2)



/* Disallow all renegotiation */

# define SSL_OP_NO_RENEGOTIATION                         0x40000000U



/*

 * Make server add server-hello extension from early version of cryptopro

 * draft, when GOST ciphersuite is negotiated. Required for interoperability
@@ -2386,6 +2389,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_SSL_READ_EX                                434

# define SSL_F_SSL_READ_INTERNAL                          523

# define SSL_F_SSL_RENEGOTIATE                            516

# define SSL_F_SSL_RENEGOTIATE_ABBREVIATED                546

# define SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT                320

# define SSL_F_SSL_SCAN_SERVERHELLO_TLSEXT                321

# define SSL_F_SSL_SESSION_DUP                            348