[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  fbaf30d087a2db2b4e22279e819d481fca21ac5c (commit)
      from  d244dd559d0e6e594e4a0f911e49509e8a7b158b (commit)


- Log -----------------------------------------------------------------
commit fbaf30d087a2db2b4e22279e819d481fca21ac5c
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon May 2 15:20:41 2016 +0200

    ssl/record/rec_layer_s3.c: fix typo from previous commit.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index 12df578..f250fa0 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -125,7 +125,7 @@
 #if     defined(OPENSSL_SMALL_FOOTPRINT) || \
         !(      defined(AES_ASM) &&     ( \
                 defined(__x86_64)       || defined(__x86_64__)  || \
-                defined(_M_AMD64)       || defined(_M_X64)      )
+                defined(_M_AMD64)       || defined(_M_X64)      ) \
         )
 # undef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
 # define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0