X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Ftls13_enc.c;h=db8de1d1ca29c64d966364d5efd00eacb860e7ff;hp=3d8562bbf9fd8e19ffbddd485e96e881c1f9bc63;hb=c117af6765928f3fc61585b01f5d722162914d80;hpb=57389a3261075cc1266218742434aa749cf3733e diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index 3d8562bbf9..db8de1d1ca 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c @@ -56,6 +56,7 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret, || !WPACKET_sub_memcpy_u8(&pkt, hash, (hash == NULL) ? 0 : hashlen) || !WPACKET_get_total_written(&pkt, &hkdflabellen) || !WPACKET_finish(&pkt)) { + EVP_PKEY_CTX_free(pctx); WPACKET_cleanup(&pkt); return 0; } @@ -77,26 +78,26 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret, * Given a |secret| generate a |key| of length |keylen| bytes. Returns 1 on * success 0 on failure. */ -int tls13_derive_key(SSL *s, const unsigned char *secret, unsigned char *key, - size_t keylen) +int tls13_derive_key(SSL *s, const EVP_MD *md, const unsigned char *secret, + unsigned char *key, size_t keylen) { static const unsigned char keylabel[] = "key"; - return tls13_hkdf_expand(s, ssl_handshake_md(s), secret, keylabel, - sizeof(keylabel) - 1, NULL, key, keylen); + return tls13_hkdf_expand(s, md, secret, keylabel, sizeof(keylabel) - 1, + NULL, key, keylen); } /* * Given a |secret| generate an |iv| of length |ivlen| bytes. Returns 1 on * success 0 on failure. */ -int tls13_derive_iv(SSL *s, const unsigned char *secret, unsigned char *iv, - size_t ivlen) +int tls13_derive_iv(SSL *s, const EVP_MD *md, const unsigned char *secret, + unsigned char *iv, size_t ivlen) { static const unsigned char ivlabel[] = "iv"; - return tls13_hkdf_expand(s, ssl_handshake_md(s), secret, ivlabel, - sizeof(ivlabel) - 1, NULL, iv, ivlen); + return tls13_hkdf_expand(s, md, secret, ivlabel, sizeof(ivlabel) - 1, + NULL, iv, ivlen); } int tls13_derive_finishedkey(SSL *s, const EVP_MD *md, @@ -242,7 +243,8 @@ int tls13_setup_key_block(SSL *s) return 1; } -static int derive_secret_key_and_iv(SSL *s, int write, +static int derive_secret_key_and_iv(SSL *s, int send, const EVP_MD *md, + const EVP_CIPHER *ciph, const unsigned char *insecret, const unsigned char *hash, const unsigned char *label, @@ -251,9 +253,7 @@ static int derive_secret_key_and_iv(SSL *s, int write, { unsigned char key[EVP_MAX_KEY_LENGTH]; size_t ivlen, keylen, taglen; - const EVP_MD *md = ssl_handshake_md(s); size_t hashlen = EVP_MD_size(md); - const EVP_CIPHER *ciph = s->s3->tmp.new_sym_enc; if (!tls13_hkdf_expand(s, md, insecret, label, labellen, hash, secret, hashlen)) { @@ -264,9 +264,16 @@ static int derive_secret_key_and_iv(SSL *s, int write, /* TODO(size_t): convert me */ keylen = EVP_CIPHER_key_length(ciph); if (EVP_CIPHER_mode(ciph) == EVP_CIPH_CCM_MODE) { + uint32_t algenc; + ivlen = EVP_CCM_TLS_IV_LEN; - if (s->s3->tmp.new_cipher->algorithm_enc - & (SSL_AES128CCM8 | SSL_AES256CCM8)) + if (s->s3->tmp.new_cipher == NULL) { + /* We've not selected a cipher yet - we must be doing early data */ + algenc = s->session->cipher->algorithm_enc; + } else { + algenc = s->s3->tmp.new_cipher->algorithm_enc; + } + if (algenc & (SSL_AES128CCM8 | SSL_AES256CCM8)) taglen = EVP_CCM8_TLS_TAG_LEN; else taglen = EVP_CCM_TLS_TAG_LEN; @@ -275,13 +282,13 @@ static int derive_secret_key_and_iv(SSL *s, int write, taglen = 0; } - if (!tls13_derive_key(s, secret, key, keylen) - || !tls13_derive_iv(s, secret, iv, ivlen)) { + if (!tls13_derive_key(s, md, secret, key, keylen) + || !tls13_derive_iv(s, md, secret, iv, ivlen)) { SSLerr(SSL_F_DERIVE_SECRET_KEY_AND_IV, ERR_R_INTERNAL_ERROR); goto err; } - if (EVP_CipherInit_ex(ciph_ctx, ciph, NULL, NULL, NULL, write) <= 0 + if (EVP_CipherInit_ex(ciph_ctx, ciph, NULL, NULL, NULL, send) <= 0 || !EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_AEAD_SET_IVLEN, ivlen, NULL) || (taglen != 0 && !EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_AEAD_SET_TAG, taglen, NULL)) @@ -292,7 +299,7 @@ static int derive_secret_key_and_iv(SSL *s, int write, #ifdef OPENSSL_SSL_TRACE_CRYPTO if (s->msg_callback) { - int wh = write ? TLS1_RT_CRYPTO_WRITE : 0; + int wh = send ? TLS1_RT_CRYPTO_WRITE : 0; if (ciph->key_len) s->msg_callback(2, s->version, wh | TLS1_RT_CRYPTO_KEY, @@ -312,6 +319,8 @@ static int derive_secret_key_and_iv(SSL *s, int write, int tls13_change_cipher_state(SSL *s, int which) { + static const unsigned char client_early_traffic[] = + "client early traffic secret"; static const unsigned char client_handshake_traffic[] = "client handshake traffic secret"; static const unsigned char client_application_traffic[] = @@ -334,6 +343,8 @@ int tls13_change_cipher_state(SSL *s, int which) const unsigned char *label; size_t labellen, hashlen = 0; int ret = 0; + const EVP_MD *md; + const EVP_CIPHER *cipher; if (which & SSL3_CC_READ) { if (s->enc_read_ctx != NULL) { @@ -367,13 +378,67 @@ int tls13_change_cipher_state(SSL *s, int which) if (((which & SSL3_CC_CLIENT) && (which & SSL3_CC_WRITE)) || ((which & SSL3_CC_SERVER) && (which & SSL3_CC_READ))) { - if (which & SSL3_CC_HANDSHAKE) { + if (which & SSL3_CC_EARLY) { + EVP_MD_CTX *mdctx = NULL; + long handlen; + void *hdata; + unsigned int hashlenui; + const SSL_CIPHER *sslcipher = SSL_SESSION_get0_cipher(s->session); + + insecret = s->early_secret; + label = client_early_traffic; + labellen = sizeof(client_early_traffic) - 1; + log_label = CLIENT_EARLY_LABEL; + + handlen = BIO_get_mem_data(s->s3->handshake_buffer, &hdata); + if (handlen <= 0) { + SSLerr(SSL_F_TLS13_CHANGE_CIPHER_STATE, + SSL_R_BAD_HANDSHAKE_LENGTH); + goto err; + } + if (sslcipher == NULL) { + SSLerr(SSL_F_TLS13_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR); + goto err; + } + + /* + * We need to calculate the handshake digest using the digest from + * the session. We haven't yet selected our ciphersuite so we can't + * use ssl_handshake_md(). + */ + mdctx = EVP_MD_CTX_new(); + if (mdctx == NULL) { + SSLerr(SSL_F_TLS13_CHANGE_CIPHER_STATE, ERR_R_MALLOC_FAILURE); + goto err; + } + cipher = EVP_get_cipherbynid(SSL_CIPHER_get_cipher_nid(sslcipher)); + md = ssl_md(sslcipher->algorithm2); + if (md == NULL || !EVP_DigestInit_ex(mdctx, md, NULL) + || !EVP_DigestUpdate(mdctx, hdata, handlen) + || !EVP_DigestFinal_ex(mdctx, hashval, &hashlenui)) { + SSLerr(SSL_F_TLS13_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR); + EVP_MD_CTX_free(mdctx); + goto err; + } + hashlen = hashlenui; + EVP_MD_CTX_free(mdctx); + } else if (which & SSL3_CC_HANDSHAKE) { insecret = s->handshake_secret; finsecret = s->client_finished_secret; finsecretlen = EVP_MD_size(ssl_handshake_md(s)); label = client_handshake_traffic; labellen = sizeof(client_handshake_traffic) - 1; log_label = CLIENT_HANDSHAKE_LABEL; + /* + * The hanshake hash used for the server read handshake traffic + * secret is the same as the hash for the server write handshake + * traffic secret. However, if we processed early data then we delay + * changing the server read cipher state until later, and the + * handshake hashes have moved on. Therefore we use the value saved + * earlier when we did the server write change cipher state. + */ + if (s->server) + hash = s->handshake_traffic_hash; } else { insecret = s->master_secret; label = client_application_traffic; @@ -388,6 +453,7 @@ int tls13_change_cipher_state(SSL *s, int which) hash = s->server_finished_hash; } } else { + /* Early data never applies to client-read/server-write */ if (which & SSL3_CC_HANDSHAKE) { insecret = s->handshake_secret; finsecret = s->server_finished_secret; @@ -403,10 +469,14 @@ int tls13_change_cipher_state(SSL *s, int which) } } - if (!ssl3_digest_cached_records(s, 1) - || !ssl_handshake_hash(s, hashval, sizeof(hashval), &hashlen)) { - SSLerr(SSL_F_TLS13_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR); - goto err; + if (!(which & SSL3_CC_EARLY)) { + md = ssl_handshake_md(s); + cipher = s->s3->tmp.new_sym_enc; + if (!ssl3_digest_cached_records(s, 1) + || !ssl_handshake_hash(s, hashval, sizeof(hashval), &hashlen)) { + SSLerr(SSL_F_TLS13_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR); + goto err; + } } /* @@ -416,6 +486,9 @@ int tls13_change_cipher_state(SSL *s, int which) if (label == server_application_traffic) memcpy(s->server_finished_hash, hashval, hashlen); + if (s->server && label == server_handshake_traffic) + memcpy(s->handshake_traffic_hash, hashval, hashlen); + if (label == client_application_traffic) { /* * We also create the resumption master secret, but this time use the @@ -431,8 +504,9 @@ int tls13_change_cipher_state(SSL *s, int which) s->session->master_key_length = hashlen; } - if (!derive_secret_key_and_iv(s, which & SSL3_CC_WRITE, insecret, hash, - label, labellen, secret, iv, ciph_ctx)) { + if (!derive_secret_key_and_iv(s, which & SSL3_CC_WRITE, md, cipher, + insecret, hash, label, labellen, secret, iv, + ciph_ctx)) { goto err; } @@ -459,7 +533,7 @@ int tls13_change_cipher_state(SSL *s, int which) return ret; } -int tls13_update_key(SSL *s, int write) +int tls13_update_key(SSL *s, int send) { static const unsigned char application_traffic[] = "application traffic secret"; @@ -470,12 +544,12 @@ int tls13_update_key(SSL *s, int write) EVP_CIPHER_CTX *ciph_ctx; int ret = 0; - if (s->server == write) + if (s->server == send) insecret = s->server_app_traffic_secret; else insecret = s->client_app_traffic_secret; - if (write) { + if (send) { iv = s->write_iv; ciph_ctx = s->enc_write_ctx; RECORD_LAYER_reset_write_sequence(&s->rlayer); @@ -485,7 +559,9 @@ int tls13_update_key(SSL *s, int write) RECORD_LAYER_reset_read_sequence(&s->rlayer); } - if (!derive_secret_key_and_iv(s, write, insecret, NULL, application_traffic, + if (!derive_secret_key_and_iv(s, send, ssl_handshake_md(s), + s->s3->tmp.new_sym_enc, insecret, NULL, + application_traffic, sizeof(application_traffic) - 1, secret, iv, ciph_ctx)) goto err; @@ -500,7 +576,7 @@ int tls13_update_key(SSL *s, int write) int tls13_alert_code(int code) { - if (code == SSL_AD_MISSING_EXTENSION) + if (code == SSL_AD_MISSING_EXTENSION || code == SSL_AD_END_OF_EARLY_DATA) return code; return tls1_alert_code(code);