Attachment #183200 for bug #219774

View | Details | Raw Unified | Return to bug 219774
Collapse All | Expand All

Lines 1-7 Link Here

(-)squid-devel/Makefile (-1 / +1 lines)
1	# $FreeBSD: head/www/squid-devel/Makefile 441494 2017-05-22 22:29:17Z linimon $	1	# $FreeBSD: head/www/squid-devel/Makefile 441494 2017-05-22 22:29:17Z linimon $
2		2
3	PORTNAME= squid	3	PORTNAME= squid
4	PORTVERSION= 4.0.19	4	PORTVERSION= 4.0.20
5	CATEGORIES= www ipv6	5	CATEGORIES= www ipv6
6	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \	6	MASTER_SITES= http://www.squid-cache.org/Versions/v4/ \
7	http://www2.us.squid-cache.org/Versions/v4/ \	7	http://www2.us.squid-cache.org/Versions/v4/ \

Lines 1-3 Link Here

(-)squid-devel/distinfo (-2 / +2 lines)
1	TIMESTAMP = 1467941699	1	TIMESTAMP = 1467941699
2	SHA256 (squid4.0/squid-4.0.19.tar.xz) = 355a7f816afd8b9b5d0d785e9c80c28a7e4c6edb8832ac865ad267d5e3360050	2	SHA256 (squid4.0/squid-4.0.20.tar.xz) = 31e5c368fe033e575dfcb309dc3425879e6eb42855a0a6dc08653b7d4d22ebaa
3	SIZE (squid4.0/squid-4.0.19.tar.xz) = 2414764	3	SIZE (squid4.0/squid-4.0.20.tar.xz) = 2425936




--- src/ssl/bio.cc.orig	2017-02-05 21:15:41 UTC
+++ src/ssl/bio.cc
@@ -43,7 +43,7 @@ static int squid_bio_destroy(BIO *data);
 /* SSL callbacks */
 static void squid_ssl_info(const SSL *ssl, int where, int ret);
 
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
 /// Initialization structure for the BIO table with
 /// Squid-specific methods and BIO method wrappers.
 static BIO_METHOD SquidMethods = {
@@ -65,7 +65,7 @@ static BIO_METHOD *SquidMethods = NULL;
 BIO *
 Ssl::Bio::Create(const int fd, Ssl::Bio::Type type)
 {
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
     BIO_METHOD *useMethod = &SquidMethods;
 #else
     if (!SquidMethods) {
@@ -562,7 +562,7 @@ Ssl::ServerBio::resumingSession()
 static int
 squid_bio_create(BIO *bi)
 {
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
     bi->init = 0; // set when we store Bio object and socket fd (BIO_C_SET_FD)
     bi->num = 0;
     bi->flags = 0;
@@ -706,7 +706,7 @@ applyTlsDetailsToSSL(SSL *ssl, Security:
             cbytes[0] = (cipherId >> 8) & 0xFF;
             cbytes[1] = cipherId & 0xFF;
             cbytes[2] = 0;
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
             const SSL_METHOD *method = SSLv23_method();
             const SSL_CIPHER *c = method->get_cipher_by_char(cbytes);
 #else

Lines 1-11 Link Here

(-)squid-devel/files/patch-src_ssl_bio.h (-11 lines)
1	--- src/ssl/bio.h.orig 2017-02-05 21:15:41 UTC
2	+++ src/ssl/bio.h
3	@@ -205,7 +205,7 @@ private:
4	void
5	applyTlsDetailsToSSL(SSL *ssl, Security::TlsDetails::Pointer const &details, Ssl::BumpMode bumpMode);
6
7	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
8	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
9	// OpenSSL v1.0 bio compatibility functions
10	inline void BIO_get_data(BIO table) { return table->ptr; }
11	inline void BIO_set_data(BIO table, void data) { table->ptr = data; }

Lines 1-11 Link Here

(-)squid-devel/files/patch-src_ssl_gadgets.cc (-11 lines)
1	--- src/ssl/gadgets.cc.orig 2017-02-05 21:15:41 UTC
2	+++ src/ssl/gadgets.cc
3	@@ -387,7 +387,7 @@ mimicExtensions(Security::CertPointer &
4	DecipherOnly
5	};
6
7	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
8	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
9	const int mimicAlgo = OBJ_obj2nid(mimicCert.get()->cert_info->key->algor->algorithm);
10	const bool rsaPkey = (mimicAlgo == NID_rsaEncryption);
11	#else




--- src/ssl/support.cc.orig	2017-02-12 21:14:36 UTC
+++ src/ssl/support.cc
@@ -235,7 +235,7 @@ bool Ssl::checkX509ServerValidity(X509 *
     return matchX509CommonNames(cert, (void *)server, check_domain);
 }
 
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
 static inline X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx)
 {
     return ctx->cert;
@@ -379,7 +379,7 @@ ssl_verify_cb(int ok, X509_STORE_CTX * c
 }
 
 // "dup" function for SSL_get_ex_new_index("cert_err_check")
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
 static int
 ssl_dupAclChecklist(CRYPTO_EX_DATA *, const CRYPTO_EX_DATA *, void *,
                     int, long, void *)
@@ -1116,7 +1116,7 @@ hasAuthorityInfoAccessCaIssuers(X509 *ce
             if (ad->location->type == GEN_URI) {
                 xstrncpy(uri,
                          reinterpret_cast<const char *>(
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
                              ASN1_STRING_data(ad->location->d.uniformResourceIdentifier)
 #else
                              ASN1_STRING_get0_data(ad->location->d.uniformResourceIdentifier)
@@ -1291,7 +1291,7 @@ untrustedToStoreCtx_cb(X509_STORE_CTX *c
     // OpenSSL already maintains ctx->untrusted but we cannot modify
     // internal OpenSSL list directly. We have to give OpenSSL our own
     // list, but it must include certificates on the OpenSSL ctx->untrusted
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
     STACK_OF(X509) *oldUntrusted = ctx->untrusted;
 #else
     STACK_OF(X509) *oldUntrusted = X509_STORE_CTX_get0_untrusted(ctx);
@@ -1310,7 +1310,7 @@ untrustedToStoreCtx_cb(X509_STORE_CTX *c
 
     X509_STORE_CTX_set_chain(ctx, sk); // No locking/unlocking, just sets ctx->untrusted
     int ret = X509_verify_cert(ctx);
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
     X509_STORE_CTX_set_chain(ctx, oldUntrusted); // Set back the old untrusted list
 #else
     X509_STORE_CTX_set0_untrusted(ctx, oldUntrusted);
@@ -1535,7 +1535,7 @@ remove_session_cb(SSL_CTX *, SSL_SESSION
 }
 
 static SSL_SESSION *
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
 get_session_cb(SSL *, unsigned char *sessionID, int len, int *copy)
 #else
 get_session_cb(SSL *, const unsigned char *sessionID, int len, int *copy)

Return to bug 219774

Lines 1-38 Link Here

(-)squid-devel/files/patch-src_ssl_bio.cc (-38 lines)
1	--- src/ssl/bio.cc.orig 2017-02-05 21:15:41 UTC
2	+++ src/ssl/bio.cc
3	@@ -43,7 +43,7 @@ static int squid_bio_destroy(BIO *data);
4	/* SSL callbacks */
5	static void squid_ssl_info(const SSL *ssl, int where, int ret);
6
7	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
8	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
9	/// Initialization structure for the BIO table with
10	/// Squid-specific methods and BIO method wrappers.
11	static BIO_METHOD SquidMethods = {
12	@@ -65,7 +65,7 @@ static BIO_METHOD *SquidMethods = NULL;
13	BIO *
14	Ssl::Bio::Create(const int fd, Ssl::Bio::Type type)
15	{
16	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
17	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
18	BIO_METHOD *useMethod = &SquidMethods;
19	#else
20	if (!SquidMethods) {
21	@@ -562,7 +562,7 @@ Ssl::ServerBio::resumingSession()
22	static int
23	squid_bio_create(BIO *bi)
24	{
25	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
26	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
27	bi->init = 0; // set when we store Bio object and socket fd (BIO_C_SET_FD)
28	bi->num = 0;
29	bi->flags = 0;
30	@@ -706,7 +706,7 @@ applyTlsDetailsToSSL(SSL *ssl, Security:
31	cbytes[0] = (cipherId >> 8) & 0xFF;
32	cbytes[1] = cipherId & 0xFF;
33	cbytes[2] = 0;
34	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
35	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
36	const SSL_METHOD *method = SSLv23_method();
37	const SSL_CIPHER *c = method->get_cipher_by_char(cbytes);
38	#else

Lines 1-56 Link Here

(-)squid-devel/files/patch-src_ssl_support.cc (-56 lines)
1	--- src/ssl/support.cc.orig 2017-02-12 21:14:36 UTC
2	+++ src/ssl/support.cc
3	@@ -235,7 +235,7 @@ bool Ssl::checkX509ServerValidity(X509 *
4	return matchX509CommonNames(cert, (void *)server, check_domain);
5	}
6
7	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
8	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
9	static inline X509 X509_STORE_CTX_get0_cert(X509_STORE_CTX ctx)
10	{
11	return ctx->cert;
12	@@ -379,7 +379,7 @@ ssl_verify_cb(int ok, X509_STORE_CTX * c
13	}
14
15	// "dup" function for SSL_get_ex_new_index("cert_err_check")
16	-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
17	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
18	static int
19	ssl_dupAclChecklist(CRYPTO_EX_DATA , const CRYPTO_EX_DATA , void *,
20	int, long, void *)
21	@@ -1116,7 +1116,7 @@ hasAuthorityInfoAccessCaIssuers(X509 *ce
22	if (ad->location->type == GEN_URI) {
23	xstrncpy(uri,
24	reinterpret_cast<const char *>(
25	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
26	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
27	ASN1_STRING_data(ad->location->d.uniformResourceIdentifier)
28	#else
29	ASN1_STRING_get0_data(ad->location->d.uniformResourceIdentifier)
30	@@ -1291,7 +1291,7 @@ untrustedToStoreCtx_cb(X509_STORE_CTX *c
31	// OpenSSL already maintains ctx->untrusted but we cannot modify
32	// internal OpenSSL list directly. We have to give OpenSSL our own
33	// list, but it must include certificates on the OpenSSL ctx->untrusted
34	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
35	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
36	STACK_OF(X509) *oldUntrusted = ctx->untrusted;
37	#else
38	STACK_OF(X509) *oldUntrusted = X509_STORE_CTX_get0_untrusted(ctx);
39	@@ -1310,7 +1310,7 @@ untrustedToStoreCtx_cb(X509_STORE_CTX *c
40
41	X509_STORE_CTX_set_chain(ctx, sk); // No locking/unlocking, just sets ctx->untrusted
42	int ret = X509_verify_cert(ctx);
43	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
44	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
45	X509_STORE_CTX_set_chain(ctx, oldUntrusted); // Set back the old untrusted list
46	#else
47	X509_STORE_CTX_set0_untrusted(ctx, oldUntrusted);
48	@@ -1535,7 +1535,7 @@ remove_session_cb(SSL_CTX *, SSL_SESSION
49	}
50
51	static SSL_SESSION *
52	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
53	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
54	get_session_cb(SSL , unsigned char sessionID, int len, int *copy)
55	#else
56	get_session_cb(SSL , const unsigned char sessionID, int len, int *copy)