[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  8957728772824c1efd1c5e479d8b60fe6f88e6f5 (commit)
      from  0e76014e584ba78ef1d6ecb4572391ef61c4fb51 (commit)


- Log -----------------------------------------------------------------
commit 8957728772824c1efd1c5e479d8b60fe6f88e6f5
Author: Dmitry Belyavsky <beldmit at gmail.com>
Date:   Tue Jan 19 11:36:43 2016 +0000

    Fix GOST2012-NULL-GOST12
    
    Fix a typo in the definition of the GOST2012-NULL-GOST12 ciphersuite.
    
    RT#4213
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 ssl/s3_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 54b8eba..4b2f196 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3284,7 +3284,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
      SSL_GOST12_256,
      SSL_TLSV1,
      SSL_STRONG_NONE,
-     SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256,
+     SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_STREAM_MAC,
      0,
      0},
 #endif