View | Details | Raw Unified | Return to bug 232132 | Differences between
and this patch

Collapse All | Expand All

(-)mail/imapfilter/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	imapfilter
4
PORTNAME=	imapfilter
5
PORTVERSION=	2.6.11
5
PORTVERSION=	2.6.11
6
PORTREVISION=	1
6
PORTREVISION=	2
7
DISTVERSIONPREFIX=	v
7
DISTVERSIONPREFIX=	v
8
CATEGORIES=	mail
8
CATEGORIES=	mail
9
9
(-)mail/imapfilter/files/patch-src_auth.c (-3 / +3 lines)
Lines 1-4 Link Here
1
--- src/auth.c.orig	2017-11-19 09:38:24 UTC
1
--- src/auth.c.orig	2018-10-11 01:11:21 UTC
2
+++ src/auth.c
2
+++ src/auth.c
3
@@ -20,7 +20,7 @@ auth_cram_md5(const char *user, const char *pass, unsi
3
@@ -20,7 +20,7 @@ auth_cram_md5(const char *user, const char *pass, unsi
4
 	unsigned char *resp, *buf, *out;
4
 	unsigned char *resp, *buf, *out;
Lines 5-11 Link Here
5
 	unsigned char md[EVP_MAX_MD_SIZE], mdhex[EVP_MAX_MD_SIZE * 2 + 1];
5
 	unsigned char md[EVP_MAX_MD_SIZE], mdhex[EVP_MAX_MD_SIZE * 2 + 1];
6
 	unsigned int mdlen;
6
 	unsigned int mdlen;
7
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
7
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
8
+#ifdef HAVE_OPAQUE_STRUCTS && !defined(LIBRESSL_VERSION_NUMBER)
8
+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
9
 	HMAC_CTX *ctx;
9
 	HMAC_CTX *ctx;
10
 #else
10
 #else
11
 	HMAC_CTX ctx;
11
 	HMAC_CTX ctx;
Lines 14-20 Link Here
14
 	EVP_DecodeBlock(resp, chal, strlen((char *)(chal)));
14
 	EVP_DecodeBlock(resp, chal, strlen((char *)(chal)));
15
 
15
 
16
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
16
-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)
17
+#ifdef HAVE_OPAQUE_STRUCTS && !defined(LIBRESSL_VERSION_NUMBER)
17
+#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
18
 	ctx = HMAC_CTX_new();
18
 	ctx = HMAC_CTX_new();
19
 	HMAC_Init_ex(ctx, (const unsigned char *)pass, strlen(pass),
19
 	HMAC_Init_ex(ctx, (const unsigned char *)pass, strlen(pass),
20
 	    EVP_md5(), NULL);
20
 	    EVP_md5(), NULL);

Return to bug 232132