mirror of
https://git.freebsd.org/ports.git
synced 2025-06-24 14:10:30 -04:00
ffb5710ba5
- Bugfix update to 2.4.27 - Fix build with LibreSSL [1] - Add brotli compression option - Add pkg-message for 10.3 base-ssl users - HTTP/2 is production ready, default enable - warn users of 10.3 for mod_http2/OpenSSL 1.0.1 [1] https://bz.apache.org/bugzilla/show_bug.cgi?id=61184 PR: 220160 [1] Reported by: Markus Kohlmeyer <rootservice@gmail.com> Reviewed by: ohauer (hat) Approved by: ohauer (hat) Differential Revision: https://reviews.freebsd.org/D11285
55 lines
1.9 KiB
C
55 lines
1.9 KiB
C
--- modules/ssl/ssl_private.h.orig 2017-04-03 11:39:20 UTC
|
|
+++ modules/ssl/ssl_private.h
|
|
@@ -123,6 +123,16 @@
|
|
#define MODSSL_SSL_METHOD_CONST
|
|
#endif
|
|
|
|
+#if defined(LIBRESSL_VERSION_NUMBER)
|
|
+/* Missing from LibreSSL */
|
|
+#define SSL_CTRL_SET_MIN_PROTO_VERSION 123
|
|
+#define SSL_CTRL_SET_MAX_PROTO_VERSION 124
|
|
+#define SSL_CTX_set_min_proto_version(ctx, version) \
|
|
+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL)
|
|
+#define SSL_CTX_set_max_proto_version(ctx, version) \
|
|
+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
|
|
+#endif
|
|
+
|
|
#if defined(OPENSSL_FIPS)
|
|
#define HAVE_FIPS
|
|
#endif
|
|
@@ -136,7 +146,7 @@
|
|
#endif
|
|
|
|
/* session id constness */
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
#define IDCONST
|
|
#else
|
|
#define IDCONST const
|
|
@@ -199,7 +209,7 @@
|
|
|
|
#endif /* !defined(OPENSSL_NO_TLSEXT) && defined(SSL_set_tlsext_host_name) */
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
#define BN_get_rfc2409_prime_768 get_rfc2409_prime_768
|
|
#define BN_get_rfc2409_prime_1024 get_rfc2409_prime_1024
|
|
#define BN_get_rfc3526_prime_1536 get_rfc3526_prime_1536
|
|
@@ -219,7 +229,7 @@ void init_bio_methods(void);
|
|
void free_bio_methods(void);
|
|
#endif
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10002000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
#define X509_STORE_CTX_get0_store(x) (x->ctx)
|
|
#endif
|
|
|
|
@@ -934,7 +944,7 @@ char *ssl_util_readfilter(server_
|
|
const char * const *);
|
|
BOOL ssl_util_path_check(ssl_pathcheck_t, const char *, apr_pool_t *);
|
|
#if APR_HAS_THREADS
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
void ssl_util_thread_setup(apr_pool_t *);
|
|
#endif
|
|
void ssl_util_thread_id_setup(apr_pool_t *);
|