|
Line 0
Link Here
|
|
|
1 |
https://github.com/h2o/h2o/issues/1706 |
| 2 |
|
| 3 |
--- include/h2o/openssl_backport.h.orig 2017-12-15 03:08:00 UTC |
| 4 |
+++ include/h2o/openssl_backport.h |
| 5 |
@@ -25,7 +25,7 @@ |
| 6 |
#include <stdlib.h> |
| 7 |
|
| 8 |
/* backports for OpenSSL 1.0.2 */ |
| 9 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 10 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
| 11 |
|
| 12 |
#define BIO_get_data(bio) ((bio)->ptr) |
| 13 |
#define BIO_set_data(bio, p) ((bio)->ptr = (p)) |
| 14 |
@@ -57,7 +57,7 @@ static inline BIO_METHOD *BIO_meth_new(i |
| 15 |
#endif |
| 16 |
|
| 17 |
/* backports for OpenSSL 1.0.1 and LibreSSL */ |
| 18 |
-#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) |
| 19 |
+#if OPENSSL_VERSION_NUMBER < 0x10002000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
| 20 |
|
| 21 |
#define SSL_is_server(ssl) ((ssl)->server) |
| 22 |
|
| 23 |
--- deps/neverbleed/neverbleed.c.orig 2017-12-15 03:08:00 UTC |
| 24 |
+++ deps/neverbleed/neverbleed.c |
| 25 |
@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *bu |
| 26 |
return 0; |
| 27 |
} |
| 28 |
|
| 29 |
-#if !OPENSSL_1_1_API |
| 30 |
+#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
| 31 |
|
| 32 |
static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) |
| 33 |
{ |
| 34 |
--- deps/picotls/lib/openssl.c.orig 2017-12-15 03:08:00 UTC |
| 35 |
+++ deps/picotls/lib/openssl.c |
| 36 |
@@ -35,13 +35,16 @@ |
| 37 |
#include "picotls.h" |
| 38 |
#include "picotls/openssl.h" |
| 39 |
|
| 40 |
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) |
| 41 |
-#define OPENSSL_1_0_API 1 |
| 42 |
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L |
| 43 |
+#define OPENSSL_1_1_API 1 |
| 44 |
+#elif defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL |
| 45 |
+#define OPENSSL_1_1_API 1 |
| 46 |
#else |
| 47 |
#define OPENSSL_1_0_API 0 |
| 48 |
+#define OPENSSL_1_1_API 0 |
| 49 |
#endif |
| 50 |
|
| 51 |
-#if OPENSSL_1_0_API |
| 52 |
+#if !OPENSSL_1_1_API |
| 53 |
|
| 54 |
#define EVP_PKEY_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_EVP_PKEY) |
| 55 |
#define X509_STORE_up_ref(p) CRYPTO_add(&(p)->references, 1, CRYPTO_LOCK_X509_STORE) |