Commit 5320c071 authored by Rich Salz's avatar Rich Salz
Browse files

Revert "Allow ChaCha20-Poly1305 in DTLS" 

This reverts commit 777f482d.
Author credit missing.  Reverting this and re-committing with
an Author line.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 9e8b6f04

ssl/statem/statem_dtls.c

+2 −2
Changes for ssl/statem/statem_dtls.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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);