diff options
| author | Adam Langley <agl@chromium.org> | 2014-06-20 23:00:00 +0400 |
|---|---|---|
| committer | Adam Langley <agl@chromium.org> | 2014-06-21 00:17:34 +0400 |
| commit | c9fb37504f1c48e37578ee7033f35e3bd236cf67 (patch) | |
| tree | 0c7b381959830f22bf6e143e36a21a431b88deed /ssl/s3_enc.c | |
| parent | fd772a5aebeeaafb591903d509b187d7d41c5d69 (diff) | |
SSL AEAD support.
This change allows AEADs to be used in ssl/ to implement SSL/TLS
ciphersuites.
Diffstat (limited to 'ssl/s3_enc.c')
| -rw-r--r-- | ssl/s3_enc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index ee54dfd1..5fde29d9 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -371,7 +371,13 @@ int ssl3_setup_key_block(SSL *s) if (s->s3->tmp.key_block_length != 0) return(1); - if (!ssl_cipher_get_evp(s->session,&c,&hash,NULL,NULL,&comp)) + if (!ssl_cipher_get_comp(s->session, &comp)) + { + OPENSSL_PUT_ERROR(SSL, ssl3_setup_key_block, SSL_R_CIPHER_OR_HASH_UNAVAILABLE); + return(0); + } + + if (!ssl_cipher_get_evp(s->session,&c,&hash,NULL,NULL)) { OPENSSL_PUT_ERROR(SSL, ssl3_setup_key_block, SSL_R_CIPHER_OR_HASH_UNAVAILABLE); return(0); |