[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  3e166c136ed161cd0edb83ba15121582c6913692 (commit)
       via  5320c071935ac7b52ed30ba66492da9549ad1c05 (commit)
      from  9e8b6f042749ded556380227c9f2db7ffad9a3aa (commit)


- Log -----------------------------------------------------------------
commit 3e166c136ed161cd0edb83ba15121582c6913692
Author: tjmao <tjmao at github.com>
Date:   Fri Dec 11 14:48:09 2015 -0500

    Allow ChaCha20-Poly1305 in DTLS
    
    GCM and CCM are modes of operation for block ciphers only. ChaCha20-Poly1305
    operates in neither of them but it is AEAD. This change also enables future
    AEAD ciphers to be available for use with DTLS.
    
    Signed-off-by: Rich Salz <rsalz at akamai.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>

commit 5320c071935ac7b52ed30ba66492da9549ad1c05
Author: Rich Salz <rsalz at openssl.org>
Date:   Sat Dec 12 19:28:31 2015 -0500

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes: