diff options
author | Matt Caswell <matt@openssl.org> | 2015-02-26 11:54:58 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-02-27 15:26:06 +0000 |
commit | d58a852fbd3c7ae2d71949c090a474235b69d693 (patch) | |
tree | a3a96fc0c59355f5bf986582e24b4f925e5b2c2f | |
parent | 323a7e76e61d977ff9f00a8cff396033a6dc37d2 (diff) | |
download | openssl-new-d58a852fbd3c7ae2d71949c090a474235b69d693.tar.gz |
Fixed missing return value checks.
Added various missing return value checks in tls1_change_cipher_state.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Conflicts:
ssl/t1_enc.c
-rw-r--r-- | ssl/t1_enc.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 741dc0b6b4..0d70116a13 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -551,15 +551,24 @@ int tls1_change_cipher_state(SSL *s, int which) #endif /* KSSL_DEBUG */ if (EVP_CIPHER_mode(c) == EVP_CIPH_GCM_MODE) { - EVP_CipherInit_ex(dd, c, NULL, key, NULL, (which & SSL3_CC_WRITE)); - EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_GCM_SET_IV_FIXED, k, iv); - } else - EVP_CipherInit_ex(dd, c, NULL, key, iv, (which & SSL3_CC_WRITE)); - + if (!EVP_CipherInit_ex(dd, c, NULL, key, NULL, (which & SSL3_CC_WRITE)) + || !EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_GCM_SET_IV_FIXED, k, iv)) { + SSLerr(SSL_F_TLS1_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR); + goto err2; + } + } else { + if (!EVP_CipherInit_ex(dd, c, NULL, key, iv, (which & SSL3_CC_WRITE))) { + SSLerr(SSL_F_TLS1_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR); + goto err2; + } + } /* Needed for "composite" AEADs, such as RC4-HMAC-MD5 */ - if ((EVP_CIPHER_flags(c) & EVP_CIPH_FLAG_AEAD_CIPHER) && *mac_secret_size) - EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_AEAD_SET_MAC_KEY, - *mac_secret_size, mac_secret); + if ((EVP_CIPHER_flags(c) & EVP_CIPH_FLAG_AEAD_CIPHER) && *mac_secret_size + && !EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_AEAD_SET_MAC_KEY, + *mac_secret_size, mac_secret)) { + SSLerr(SSL_F_TLS1_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR); + goto err2; + } #ifdef TLS_DEBUG printf("which = %04X\nkey=", which); |