[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  fa49924659f21454fba3d70b4f60ce76ee6059f8 (commit)
      from  ce24d2ed232a095349886aecc8cb959d5dda8342 (commit)


- Log -----------------------------------------------------------------
commit fa49924659f21454fba3d70b4f60ce76ee6059f8
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Wed Nov 18 15:54:31 2015 +0000

    Make GOST ciphersuites require TLSv1
    
    PR#4141
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

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

Summary of changes:
 ssl/s3_lib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 95cc56a..d5e593a 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -1153,7 +1153,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
      SSL_aGOST01,
      SSL_eGOST2814789CNT,
      SSL_GOST89MAC,
-     SSL_SSLV3,
+     SSL_TLSV1,
      SSL_NOT_EXP | SSL_HIGH,
      SSL_HANDSHAKE_MAC_GOST94 | TLS1_PRF_GOST94 | TLS1_STREAM_MAC,
      256,
@@ -1167,7 +1167,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
      SSL_aGOST01,
      SSL_eNULL,
      SSL_GOST94,
-     SSL_SSLV3,
+     SSL_TLSV1,
      SSL_NOT_DEFAULT | SSL_NOT_EXP | SSL_STRONG_NONE,
      SSL_HANDSHAKE_MAC_GOST94 | TLS1_PRF_GOST94,
      0,