[openssl-commits] [openssl] OpenSSL_1_0_1-stable update
Richard Levitte
levitte at openssl.org
Tue Jun 16 11:14:36 UTC 2015
The branch OpenSSL_1_0_1-stable has been updated
via 347fc5d8cd2cf14f943a15f8ff8ba2698211e503 (commit)
via a5d8c1c291293105f1c4b0336c0569d25b2b468d (commit)
from 902795b2f19c8ed91aa13ad471526b0c3f5c674b (commit)
- Log -----------------------------------------------------------------
commit 347fc5d8cd2cf14f943a15f8ff8ba2698211e503
Author: Richard Levitte <levitte at openssl.org>
Date: Mon Jun 15 09:59:25 2015 +0200
Make preprocessor error into real preprocessor error
Reviewed-by: Kurt Roeckx <kurt at openssl.org>
(cherry picked from commit b4f0d1a4a89b964dba80036a6348ca0a1913c526)
commit a5d8c1c291293105f1c4b0336c0569d25b2b468d
Author: Richard Levitte <levitte at openssl.org>
Date: Sat Jun 13 13:13:55 2015 +0200
Remove one extraneous parenthesis
Reviewed-by: Kurt Roeckx <kurt at openssl.org>
(cherry picked from commit 30cf91784bfde82622f79d87d17d20ce73329532)
-----------------------------------------------------------------------
Summary of changes:
crypto/bio/bio.h | 2 +-
crypto/opensslconf.h.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index be9cd0e..d583cc1 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -290,7 +290,7 @@ void BIO_clear_flags(BIO *b, int flags);
* BIO_CB_RETURN flag indicates if it is after the call
*/
# define BIO_CB_RETURN 0x80
-# define BIO_CB_return(a) ((a)|BIO_CB_RETURN))
+# define BIO_CB_return(a) ((a)|BIO_CB_RETURN)
# define BIO_cb_pre(a) (!((a)&BIO_CB_RETURN))
# define BIO_cb_post(a) ((a)&BIO_CB_RETURN)
diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in
index 97e3745..814309b 100644
--- a/crypto/opensslconf.h.in
+++ b/crypto/opensslconf.h.in
@@ -101,7 +101,7 @@
#endif
#if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
#endif
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
More information about the openssl-commits
mailing list