Commit a5816a5a authored by Matt Caswell's avatar Matt Caswell
Browse files

Implement session id TLSv1.3 middlebox compatibility mode 



Clients will send a "fake" session id and servers must echo it back.

Reviewed-by: default avatarBen Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4701)
parent 88050dd1

apps/apps.h

+5 −3
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate, 
        OPT_S_STRICT, OPT_S_SIGALGS, OPT_S_CLIENTSIGALGS, OPT_S_GROUPS, \

        OPT_S_CURVES, OPT_S_NAMEDCURVE, OPT_S_CIPHER, \

        OPT_S_RECORD_PADDING, OPT_S_DEBUGBROKE, OPT_S_COMP, \

        OPT_S_NO_RENEGOTIATION, OPT_S__LAST

        OPT_S_NO_RENEGOTIATION, OPT_S_NO_MIDDLEBOX, OPT_S__LAST



# define OPT_S_OPTIONS \

        {"no_ssl3", OPT_S_NOSSL3, '-',"Just disable SSLv3" }, \
@@ -253,7 +253,8 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate, 
        {"record_padding", OPT_S_RECORD_PADDING, 's', \

            "Block size to pad TLS 1.3 records to."}, \

        {"debug_broken_protocol", OPT_S_DEBUGBROKE, '-', \

            "Perform all sorts of protocol violations for testing purposes"}

            "Perform all sorts of protocol violations for testing purposes"}, \

        {"no_middlebox", OPT_S_NO_MIDDLEBOX, '-', "Disable TLSv1.3 middlebox compat mode" }





# define OPT_S_CASES \
@@ -283,7 +284,8 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate, 
        case OPT_S_CIPHER: \

        case OPT_S_RECORD_PADDING: \

        case OPT_S_NO_RENEGOTIATION: \

        case OPT_S_DEBUGBROKE

        case OPT_S_DEBUGBROKE: \

        case OPT_S_NO_MIDDLEBOX



#define IS_NO_PROT_FLAG(o) \

 (o == OPT_S_NOSSL3 || o == OPT_S_NOTLS1 || o == OPT_S_NOTLS1_1 \

crypto/err/openssl.txt

+1 −0
Original line number Diff line number Diff line
@@ -2463,6 +2463,7 @@ SSL_R_INVALID_MAX_EARLY_DATA:174:invalid max early data 
SSL_R_INVALID_NULL_CMD_NAME:385:invalid null cmd name

SSL_R_INVALID_SEQUENCE_NUMBER:402:invalid sequence number

SSL_R_INVALID_SERVERINFO_DATA:388:invalid serverinfo data

SSL_R_INVALID_SESSION_ID:232:invalid session id

SSL_R_INVALID_SRP_USERNAME:357:invalid srp username

SSL_R_INVALID_STATUS_RESPONSE:328:invalid status response

SSL_R_INVALID_TICKET_KEYS_LENGTH:325:invalid ticket keys length

include/openssl/ssl.h

+8 −0
Original line number Diff line number Diff line
@@ -338,9 +338,17 @@ typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx); 
# define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION        0x00040000U

/* Disable encrypt-then-mac */

# define SSL_OP_NO_ENCRYPT_THEN_MAC                      0x00080000U



/*

 * Enable TLSv1.3 Compatibility mode. This is on by default. A future version

 * of OpenSSL may have this disabled by default.

 */

# define SSL_OP_ENABLE_MIDDLEBOX_COMPAT                  0x00100000U



/* Prioritize Chacha20Poly1305 when client does.

 * Modifies SSL_OP_CIPHER_SERVER_PREFERENCE */

# define SSL_OP_PRIORITIZE_CHACHA                        0x00200000U



/*

 * Set on servers to choose the cipher according to the server's preferences

 */

include/openssl/sslerr.h

+1 −0
Original line number Diff line number Diff line
@@ -543,6 +543,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_R_INVALID_NULL_CMD_NAME                      385

# define SSL_R_INVALID_SEQUENCE_NUMBER                    402

# define SSL_R_INVALID_SERVERINFO_DATA                    388

# define SSL_R_INVALID_SESSION_ID                         232

# define SSL_R_INVALID_SRP_USERNAME                       357

# define SSL_R_INVALID_STATUS_RESPONSE                    328

# define SSL_R_INVALID_TICKET_KEYS_LENGTH                 325

ssl/ssl_conf.c

+5 −1
Original line number Diff line number Diff line
@@ -369,7 +369,8 @@ static int cmd_Options(SSL_CONF_CTX *cctx, const char *value) 
        SSL_FLAG_TBL_INV("EncryptThenMac", SSL_OP_NO_ENCRYPT_THEN_MAC),

        SSL_FLAG_TBL("NoRenegotiation", SSL_OP_NO_RENEGOTIATION),

        SSL_FLAG_TBL("AllowNoDHEKEX", SSL_OP_ALLOW_NO_DHE_KEX),

        SSL_FLAG_TBL("PrioritizeChaCha", SSL_OP_PRIORITIZE_CHACHA)

        SSL_FLAG_TBL("PrioritizeChaCha", SSL_OP_PRIORITIZE_CHACHA),

        SSL_FLAG_TBL("MiddleboxCompat", SSL_OP_ENABLE_MIDDLEBOX_COMPAT)

    };

    if (value == NULL)

        return -3;
@@ -591,6 +592,7 @@ static const ssl_conf_cmd_tbl ssl_conf_cmds[] = { 
    SSL_CONF_CMD_SWITCH("allow_no_dhe_kex", 0),

    SSL_CONF_CMD_SWITCH("prioritize_chacha", SSL_CONF_FLAG_SERVER),

    SSL_CONF_CMD_SWITCH("strict", 0),

    SSL_CONF_CMD_SWITCH("no_middlebox", SSL_CONF_FLAG_CLIENT),

    SSL_CONF_CMD_STRING(SignatureAlgorithms, "sigalgs", 0),

    SSL_CONF_CMD_STRING(ClientSignatureAlgorithms, "client_sigalgs", 0),

    SSL_CONF_CMD_STRING(Curves, "curves", 0),
@@ -665,6 +667,8 @@ static const ssl_switch_tbl ssl_cmd_switches[] = { 
    /* chacha reprioritization */

    {SSL_OP_PRIORITIZE_CHACHA, 0},

    {SSL_CERT_FLAG_TLS_STRICT, SSL_TFLAG_CERT}, /* strict */

    /* no_middlebox */

    {SSL_OP_ENABLE_MIDDLEBOX_COMPAT, SSL_TFLAG_INV},

};



static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd)