You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
103 lines
3.5 KiB
103 lines
3.5 KiB
8 years ago
|
--- src/posttls-finger/posttls-finger.c.orig 2016-08-27 20:27:50 UTC
|
||
|
+++ src/posttls-finger/posttls-finger.c
|
||
|
@@ -1511,7 +1511,8 @@ static int finger(STATE *state)
|
||
|
return (0);
|
||
|
}
|
||
|
|
||
|
-#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
+#if defined(USE_TLS) && \
|
||
|
+ ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
|
||
|
|
||
|
/* ssl_cleanup - free memory allocated in the OpenSSL library */
|
||
|
|
||
|
@@ -1958,7 +1959,8 @@ int main(int argc, char *argv[])
|
||
|
cleanup(&state);
|
||
|
|
||
|
/* OpenSSL 1.1.0 and later (de)initialization is implicit */
|
||
|
-#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
+#if defined(USE_TLS) && \
|
||
|
+ ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
|
||
|
ssl_cleanup();
|
||
|
#endif
|
||
|
|
||
|
--- src/tls/tls_client.c.orig 2016-08-27 20:27:50 UTC
|
||
|
+++ src/tls/tls_client.c
|
||
|
@@ -299,7 +299,7 @@ TLS_APPL_STATE *tls_client_init(const TL
|
||
|
*/
|
||
|
tls_check_version();
|
||
|
|
||
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
||
|
/*
|
||
|
* Initialize the OpenSSL library by the book! To start with, we must
|
||
|
@@ -441,7 +441,7 @@ TLS_APPL_STATE *tls_client_init(const TL
|
||
|
/*
|
||
|
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
|
||
|
*/
|
||
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
||
|
/*
|
||
|
* According to the OpenSSL documentation, temporary RSA key is needed
|
||
|
--- src/tls/tls_dane.c.orig 2016-08-27 20:27:50 UTC
|
||
|
+++ src/tls/tls_dane.c
|
||
|
@@ -2163,7 +2163,7 @@ static SSL_CTX *ctx_init(const char *CAf
|
||
|
tls_param_init();
|
||
|
tls_check_version();
|
||
|
|
||
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
SSL_load_error_strings();
|
||
|
SSL_library_init();
|
||
|
#endif
|
||
|
--- src/tls/tls_rsa.c.orig 2016-01-03 14:49:51 UTC
|
||
|
+++ src/tls/tls_rsa.c
|
||
|
@@ -57,7 +57,7 @@
|
||
|
/*
|
||
|
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
|
||
|
*/
|
||
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
||
|
/* tls_tmp_rsa_cb - call-back to generate ephemeral RSA key */
|
||
|
|
||
|
@@ -109,7 +109,7 @@ int main(int unused_argc, char *cons
|
||
|
/*
|
||
|
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
|
||
|
*/
|
||
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
RSA *rsa;
|
||
|
|
||
|
msg_vstream_init(argv[0], VSTREAM_ERR);
|
||
|
--- src/tls/tls_server.c.orig 2016-08-27 20:27:50 UTC
|
||
|
+++ src/tls/tls_server.c
|
||
|
@@ -174,7 +174,7 @@ static const char server_session_id_cont
|
||
|
#endif /* OPENSSL_VERSION_NUMBER */
|
||
|
|
||
|
/* OpenSSL 1.1.0 bitrot */
|
||
|
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||
|
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||
|
typedef const unsigned char *session_id_t;
|
||
|
|
||
|
#else
|
||
|
@@ -377,7 +377,7 @@ TLS_APPL_STATE *tls_server_init(const TL
|
||
|
*/
|
||
|
tls_check_version();
|
||
|
|
||
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
||
|
/*
|
||
|
* Initialize the OpenSSL library by the book! To start with, we must
|
||
|
@@ -588,7 +588,7 @@ TLS_APPL_STATE *tls_server_init(const TL
|
||
|
/*
|
||
|
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
|
||
|
*/
|
||
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
||
|
/*
|
||
|
* According to OpenSSL documentation, a temporary RSA key is needed when
|