[openssl] master update

patrick.steuer at de.ibm.com patrick.steuer at de.ibm.com
Fri Nov 1 14:58:51 UTC 2019


The branch master has been updated
       via  351ba5bd27645d5b5a2bc643b2709bd30bcdf09c (commit)
      from  6624e1f7b6a397948561e9cc2774f0c8af1d2c79 (commit)


- Log -----------------------------------------------------------------
commit 351ba5bd27645d5b5a2bc643b2709bd30bcdf09c
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Thu Oct 31 14:17:31 2019 +0100

    md4/md5: macros should not include the line following them
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10311)

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

Summary of changes:
 crypto/md4/md4_local.h | 2 +-
 crypto/md5/md5_local.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/md4/md4_local.h b/crypto/md4/md4_local.h
index 58c23e1ad6..66aa5e4038 100644
--- a/crypto/md4/md4_local.h
+++ b/crypto/md4/md4_local.h
@@ -53,7 +53,7 @@ void md4_block_data_order(MD4_CTX *c, const void *p, size_t num);
 
 #define R1(a,b,c,d,k,s,t) { \
         a+=((k)+(t)+G((b),(c),(d))); \
-        a=ROTATE(a,s); };\
+        a=ROTATE(a,s); };
 
 #define R2(a,b,c,d,k,s,t) { \
         a+=((k)+(t)+H((b),(c),(d))); \
diff --git a/crypto/md5/md5_local.h b/crypto/md5/md5_local.h
index 8571e4848e..629fccdc04 100644
--- a/crypto/md5/md5_local.h
+++ b/crypto/md5/md5_local.h
@@ -62,7 +62,7 @@ void md5_block_data_order(MD5_CTX *c, const void *p, size_t num);
 #define R0(a,b,c,d,k,s,t) { \
         a+=((k)+(t)+F((b),(c),(d))); \
         a=ROTATE(a,s); \
-        a+=b; };\
+        a+=b; };
 
 #define R1(a,b,c,d,k,s,t) { \
         a+=((k)+(t)+G((b),(c),(d))); \


More information about the openssl-commits mailing list