Attachment #174204 for bug #211148

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= recursor	4	PORTNAME= recursor
5	PORTVERSION= 4.0.1	5	PORTVERSION= 4.0.2
6	CATEGORIES= dns ipv6	6	CATEGORIES= dns ipv6
7	MASTER_SITES= http://downloads.powerdns.com/releases/	7	MASTER_SITES= http://downloads.powerdns.com/releases/
8	PKGNAMEPREFIX= powerdns-	8	PKGNAMEPREFIX= powerdns-

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1470038617	1	TIMESTAMP = 1472487319
2	SHA256 (pdns-recursor-4.0.1.tar.bz2) = 472db541307c8ca83a846d260ecfc854fd8e879c1bb2ce5683a8df5d21e860b0	2	SHA256 (pdns-recursor-4.0.2.tar.bz2) = d0c46bf47a3f9b3100043319ef9cdec83eba2c35f0a268d704d5c3a3facfea41
3	SIZE (pdns-recursor-4.0.1.tar.bz2) = 1035584	3	SIZE (pdns-recursor-4.0.2.tar.bz2) = 1045767




--- dns_random.cc.orig	2016-07-29 14:32:32 UTC
+++ dns_random.cc
@@ -2,7 +2,7 @@
 #include "config.h"
 #endif
 #include <openssl/aes.h>
-#if OPENSSL_VERSION_NUMBER > 0x1000100fL
+#if OPENSSL_VERSION_NUMBER > 0x1000100fL && !defined LIBRESSL_VERSION_NUMBER
 // Older OpenSSL does not have CRYPTO_ctr128_encrypt. Before 1.1.0 the header
 // file did not have the necessary extern "C" wrapper. In 1.1.0, AES_ctr128_encrypt
 // was removed.
@@ -53,7 +53,7 @@ unsigned int dns_random(unsigned int n)
   if(!g_initialized)
     abort();
   uint32_t out;
-#if OPENSSL_VERSION_NUMBER > 0x1000100fL
+#if OPENSSL_VERSION_NUMBER > 0x1000100fL && !defined LIBRESSL_VERSION_NUMBER
   CRYPTO_ctr128_encrypt((const unsigned char*)&g_in, (unsigned char*) &out, sizeof(g_in), &aes_key, g_counter, g_stream, &g_offset, (block128_f) AES_encrypt);
 #else
   AES_ctr128_encrypt((const unsigned char*)&g_in, (unsigned char*) &out, sizeof(g_in), &aes_key, g_counter, g_stream, &g_offset);
--- opensslsigners.cc.orig	2016-07-29 14:32:32 UTC
+++ opensslsigners.cc
@@ -12,7 +12,7 @@
 #include "opensslsigners.hh"
 #include "dnssecinfra.hh"
 
-#if OPENSSL_VERSION_NUMBER < 0x1010000fL
+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || defined LIBRESSL_VERSION_NUMBER)
 /* OpenSSL < 1.1.0 needs support for threading/locking in the calling application. */
 static pthread_mutex_t *openssllocks;
 

Return to bug 211148

Lines 1-31 Link Here

(-)files/patch-libressl (-31 lines)
1	--- dns_random.cc.orig 2016-07-29 14:32:32 UTC
2	+++ dns_random.cc
3	@@ -2,7 +2,7 @@
4	#include "config.h"
5	#endif
6	#include <openssl/aes.h>
7	-#if OPENSSL_VERSION_NUMBER > 0x1000100fL
8	+#if OPENSSL_VERSION_NUMBER > 0x1000100fL && !defined LIBRESSL_VERSION_NUMBER
9	// Older OpenSSL does not have CRYPTO_ctr128_encrypt. Before 1.1.0 the header
10	// file did not have the necessary extern "C" wrapper. In 1.1.0, AES_ctr128_encrypt
11	// was removed.
12	@@ -53,7 +53,7 @@ unsigned int dns_random(unsigned int n)
13	if(!g_initialized)
14	abort();
15	uint32_t out;
16	-#if OPENSSL_VERSION_NUMBER > 0x1000100fL
17	+#if OPENSSL_VERSION_NUMBER > 0x1000100fL && !defined LIBRESSL_VERSION_NUMBER
18	CRYPTO_ctr128_encrypt((const unsigned char)&g_in, (unsigned char) &out, sizeof(g_in), &aes_key, g_counter, g_stream, &g_offset, (block128_f) AES_encrypt);
19	#else
20	AES_ctr128_encrypt((const unsigned char)&g_in, (unsigned char) &out, sizeof(g_in), &aes_key, g_counter, g_stream, &g_offset);
21	--- opensslsigners.cc.orig 2016-07-29 14:32:32 UTC
22	+++ opensslsigners.cc
23	@@ -12,7 +12,7 @@
24	#include "opensslsigners.hh"
25	#include "dnssecinfra.hh"
26
27	-#if OPENSSL_VERSION_NUMBER < 0x1010000fL
28	+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL \|\| defined LIBRESSL_VERSION_NUMBER)
29	/* OpenSSL < 1.1.0 needs support for threading/locking in the calling application. */
30	static pthread_mutex_t *openssllocks;
31