[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  580731aff3fc9855ea93ea734bd924febea027c3 (commit)
      from  923b1857decf4440b13b82f2aa7cf1189327d1a3 (commit)


- Log -----------------------------------------------------------------
commit 580731aff3fc9855ea93ea734bd924febea027c3
Author: Pauli <paul.dale at oracle.com>
Date:   Tue Mar 22 09:16:36 2016 +1000

    RT4458: Fix #ifndef line for GOST
    
    Reviewed-by: Richard Levitte <levitte 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 e6cf309..ef65050 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -2496,7 +2496,7 @@ static SSL_CIPHER ssl3_ciphers[] =
 
 #endif /* OPENSSL_NO_CAMELLIA */
 
-#ifndef OPENSL_NO_GOST
+#ifndef OPENSSL_NO_GOST
     {
      1,
      "GOST2001-GOST89-GOST89",
@@ -2556,7 +2556,7 @@ static SSL_CIPHER ssl3_ciphers[] =
      SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_STREAM_MAC,
      0,
      0},
-#endif /* OPENSL_NO_GOST */
+#endif /* OPENSSL_NO_GOST */
 
 #ifndef OPENSSL_NO_IDEA
     {