projects
/
haproxy-2.5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b3201a3
)
BUILD: ssl: make BoringSSL use its own version numbers
author
Ilya Shipitsin
<chipitsine@gmail.com>
Sun, 18 Oct 2020 03:55:39 +0000
(08:55 +0500)
committer
William Lallemand
<wlallemand@haproxy.org>
Mon, 19 Oct 2020 09:34:37 +0000
(11:34 +0200)
BoringSSL is a fork of OpenSSL 1.1.0, however in
49e9f67d8b7cbeb3953b5548ad1009d15947a523
it has changed version to 1.1.1.
Should fix issue #895.
This must be backported to 2.2, 2.1, 2.0, 1.8
include/haproxy/openssl-compat.h
patch
|
blob
|
history
diff --git
a/include/haproxy/openssl-compat.h
b/include/haproxy/openssl-compat.h
index
acdc9c5
..
d9affa2
100644
(file)
--- a/
include/haproxy/openssl-compat.h
+++ b/
include/haproxy/openssl-compat.h
@@
-31,6
+31,12
@@
* extra features with ORs and not with AND NOT.
*/
#define HA_OPENSSL_VERSION_NUMBER 0x1000107fL
+#elif defined(OPENSSL_IS_BORINGSSL)
+/*
+ * in 49e9f67d8b7cbeb3953b5548ad1009d15947a523 BoringSSL has changed its version to 1.1.1
+ * Let's switch it back to 1.1.0
+ */
+#define HA_OPENSSL_VERSION_NUMBER 0x1010007f
#else /* this is for a real OpenSSL or a truly compatible derivative */
#define HA_OPENSSL_VERSION_NUMBER OPENSSL_VERSION_NUMBER
#endif