81 lines
2.4 KiB
Diff
81 lines
2.4 KiB
Diff
--- openssl-compat.h.orig
|
|
+++ openssl-compat.h
|
|
@@ -1,7 +1,7 @@
|
|
#ifndef OPENSSL_COMPAT_H
|
|
#define OPENSSL_COMPAT_H
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
|
|
|
static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
|
|
{
|
|
@@ -30,6 +30,6 @@ static inline BIO_METHOD *BIO_meth_new(i
|
|
|
|
#define TLS_method SSLv23_method
|
|
|
|
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
|
|
+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) */
|
|
|
|
#endif /* OPENSSL_COMPAT_H */
|
|
--- sample/https-client.c.orig
|
|
+++ sample/https-client.c
|
|
@@ -312,7 +312,7 @@ main(int argc, char **argv)
|
|
}
|
|
uri[sizeof(uri) - 1] = '\0';
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
|
// Initialize OpenSSL
|
|
SSL_library_init();
|
|
ERR_load_crypto_strings();
|
|
@@ -480,7 +480,7 @@ cleanup:
|
|
SSL_CTX_free(ssl_ctx);
|
|
if (type == HTTP && ssl)
|
|
SSL_free(ssl);
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
|
EVP_cleanup();
|
|
ERR_free_strings();
|
|
|
|
@@ -492,7 +492,7 @@ cleanup:
|
|
CRYPTO_cleanup_all_ex_data();
|
|
|
|
sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
|
|
-#endif /*OPENSSL_VERSION_NUMBER < 0x10100000L */
|
|
+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) */
|
|
|
|
#ifdef _WIN32
|
|
WSACleanup();
|
|
--- sample/le-proxy.c.orig
|
|
+++ sample/le-proxy.c
|
|
@@ -259,7 +259,7 @@ main(int argc, char **argv)
|
|
|
|
if (use_ssl) {
|
|
int r;
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
|
SSL_library_init();
|
|
ERR_load_crypto_strings();
|
|
SSL_load_error_strings();
|
|
--- sample/openssl_hostname_validation.c.orig
|
|
+++ sample/openssl_hostname_validation.c
|
|
@@ -48,7 +48,7 @@ SOFTWARE.
|
|
|
|
#define HOSTNAME_MAX_SIZE 255
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
|
#define ASN1_STRING_get0_data ASN1_STRING_data
|
|
#endif
|
|
|
|
--- test/regress_ssl.c.orig
|
|
+++ test/regress_ssl.c
|
|
@@ -186,7 +186,7 @@ get_ssl_ctx(void)
|
|
void
|
|
init_ssl(void)
|
|
{
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
|
SSL_library_init();
|
|
ERR_load_crypto_strings();
|
|
SSL_load_error_strings();
|