[openssl] OpenSSL_1_1_1-stable update
patrick.steuer at de.ibm.com
patrick.steuer at de.ibm.com
Fri Nov 1 15:02:06 UTC 2019
The branch OpenSSL_1_1_1-stable has been updated
via ef0be09e045a934e2bb07337218fc336f7f722d7 (commit)
from c38761171f428d80cd7906b12a0cdac6d1285a7d (commit)
- Log -----------------------------------------------------------------
commit ef0be09e045a934e2bb07337218fc336f7f722d7
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)
(cherry picked from commit 351ba5bd27645d5b5a2bc643b2709bd30bcdf09c)
-----------------------------------------------------------------------
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 391fee8869..5f05720e97 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 9e537ed15b..b0087bea81 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