diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-12-12 19:28:31 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-12-12 19:28:31 -0500 |
| commit | 5320c071935ac7b52ed30ba66492da9549ad1c05 (patch) | |
| tree | a5c857c54196803714bbfb76e832871da3771267 /ssl/statem | |
| parent | 9e8b6f042749ded556380227c9f2db7ffad9a3aa (diff) | |
Revert "Allow ChaCha20-Poly1305 in DTLS"
This reverts commit 777f482d993322d69025014bf1b99c270c978fc0.
Author credit missing. Reverting this and re-committing with
an Author line.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl/statem')
| -rw-r--r-- | ssl/statem/statem_dtls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c index 258c6fc077..5194c7308e 100644 --- a/ssl/statem/statem_dtls.c +++ b/ssl/statem/statem_dtls.c @@ -235,8 +235,8 @@ int dtls1_do_write(SSL *s, int type) if (s->write_hash) { if (s->enc_write_ctx - && (EVP_CIPHER_CTX_flags(s->enc_write_ctx) & - EVP_CIPH_FLAG_AEAD_CIPHER) != 0) + && ((EVP_CIPHER_CTX_mode(s->enc_write_ctx) == EVP_CIPH_GCM_MODE) || + (EVP_CIPHER_CTX_mode(s->enc_write_ctx) == EVP_CIPH_CCM_MODE))) mac_size = 0; else mac_size = EVP_MD_CTX_size(s->write_hash); |