Attachment 198028 Details for Bug 232134 – Fix openssl

[patch] Fix openssl

pop3proxy (text/plain), 4.65 KB, created by Nathan on 2018-10-11 04:49:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-10-11 04:49:04 UTC

Size: 4.65 KB

patch

obsolete

>Index: mail/pop3proxy/Makefile
>===================================================================
>--- mail/pop3proxy/Makefile	(revision 481687)
>+++ mail/pop3proxy/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	pop3proxy
> PORTVERSION=	1.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	mail
> MASTER_SITES=	http://people.freebsd.org/~mbr/distfiles/
> EXTRACT_SUFX=	.tgz
>Index: mail/pop3proxy/files/patch-configure.in
>===================================================================
>--- mail/pop3proxy/files/patch-configure.in	(revision 481687)
>+++ mail/pop3proxy/files/patch-configure.in	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.in.orig
>+--- configure.in.orig	2004-04-21 13:28:02 UTC
> +++ configure.in
>-@@ -15,10 +15,10 @@
>+@@ -15,10 +15,10 @@ AC_CANONICAL_SYSTEM()
>  
>  dnl Check for BSD sockets
>  AC_CHECK_FUNC(connect, ,
>Index: mail/pop3proxy/files/patch-src_imapcommon.c
>===================================================================
>--- mail/pop3proxy/files/patch-src_imapcommon.c	(revision 481687)
>+++ mail/pop3proxy/files/patch-src_imapcommon.c	(working copy)
>@@ -1,10 +1,103 @@
>---- src/imapcommon.c.orig
>+--- src/imapcommon.c.orig	2005-02-01 15:21:28 UTC
> +++ src/imapcommon.c
> @@ -121,6 +121,7 @@
>  #include <errno.h>
>  
>  #include <openssl/evp.h>
>-+#include <openssl/md5.h>
>++#include <openssl/opensslv.h>
>  
>  #include <pthread.h>
>  #include <sys/types.h>
>+@@ -143,7 +144,7 @@ extern pthread_mutex_t trace;
>+ extern IMAPCounter_Struct *IMAPCount;
>+ extern ProxyConfig_Struct PC_Struct;
>+ 
>+-#if HAVE_LIBSSL
>++#if HAVE_LIBCRYPTO
>+ #if USE_IMAP
>+ extern SSL_CTX *tls_ctx;
>+ 
>+@@ -186,7 +187,7 @@ static const char *SSLerrmessage( void )
>+     return errbuf;
>+ }
>+ #endif  /* USE_IMAP */
>+-#endif	/* HAVE_LIBSSL */
>++#endif	/* HAVE_LIBCRYPTO */
>+ 
>+ 
>+ /*++
>+@@ -294,18 +295,27 @@ extern ICD_Struct *Get_Server_conn( char *Username, 
>+     ITD_Struct Server;
>+     int rc;
>+     unsigned int Expiration;
>+-
>++#if OPENSSL_VERSION_NUMBER > 0x1010000fL
>++    EVP_MD_CTX *mdctx;
>++    mdctx = EVP_MD_CTX_new(); 
>++#else
>+     EVP_MD_CTX mdctx;
>++#endif
>+     int md_len;
>+ 
>+     Expiration = PC_Struct.cache_expiration_time;
>+     memset( &Server, 0, sizeof Server );
>+     
>+     /* need to md5 the passwd regardless, so do that now */
>++#if OPENSSL_VERSION_NUMBER < 0x1010000fL
>+     EVP_DigestInit(&mdctx, EVP_md5());
>+     EVP_DigestUpdate(&mdctx, Password, strlen(Password));
>+     EVP_DigestFinal(&mdctx, md5pw, &md_len);
>+-    
>++#else
>++    EVP_DigestInit(mdctx, EVP_md5());
>++    EVP_DigestUpdate(mdctx, Password, strlen(Password));
>++    EVP_DigestFinal(mdctx, md5pw, &md_len);
>++#endif
>+     /* see if we have a reusable connection available */
>+     ICC_Active = NULL;
>+     HashIndex = Hash( Username, HASH_TABLE_SIZE );
>+@@ -441,7 +451,7 @@ extern ICD_Struct *Get_Server_conn( char *Username, 
>+     /*
>+      * Do STARTTLS if necessary.
>+      */
>+-#if HAVE_LIBSSL
>++#if HAVE_LIBCRYPTO
>+ #if USE_IMAP
>+     if ( PC_Struct.login_disabled )
>+     {
>+@@ -540,7 +550,7 @@ extern ICD_Struct *Get_Server_conn( char *Username, 
>+ 	/* XXX Should we grab the session id for later reuse? */
>+     }
>+ #endif /* USE_IMAP */
>+-#endif /* HAVE_LIBSSL */
>++#endif /* HAVE_LIBCRYPTO */
>+ 
>+ 
>+     /*
>+@@ -671,7 +681,7 @@ extern ICD_Struct *Get_Server_conn( char *Username, 
>+     }
>+     
>+   fail:
>+-#if HAVE_LIBSSL
>++#if HAVE_LIBCRYPTO
>+ #if USE_IMAP
>+     if ( Server.conn->tls )
>+     {
>+@@ -819,7 +829,7 @@ extern char *memtok( char *Begin, char *End, char **La
>+  */
>+ extern int IMAP_Write( ICD_Struct *ICD, const void *buf, int count )
>+ {
>+-#if HAVE_LIBSSL
>++#if HAVE_LIBCRYPTO
>+ #if USE_IMAP
>+     if ( ICD->tls )
>+ 	return SSL_write( ICD->tls, buf, count );
>+@@ -853,7 +863,7 @@ extern int IMAP_Read( ICD_Struct *ICD, void *buf, int 
>+     char *fn = "IMAP_Read()";
>+ 
>+ 
>+-#if HAVE_LIBSSL
>++#if HAVE_LIBCRYPTO
>+ #if USE_IMAP
>+     if ( ICD->tls )
>+ 	return SSL_read( ICD->tls, buf, count );
>Index: mail/pop3proxy/files/patch-ssl
>===================================================================
>--- mail/pop3proxy/files/patch-ssl	(revision 481687)
>+++ mail/pop3proxy/files/patch-ssl	(nonexistent)
>@@ -1,10 +0,0 @@
>---- include/pop3proxy.h	Tue Apr 20 23:55:23 2004
>-+++ include/pop3proxy.h	Sun Dec 10 11:28:42 2006
>-@@ -107,6 +107,7 @@
>- 
>- #if HAVE_LIBSSL
>- #include <openssl/ssl.h>
>-+#include <openssl/md5.h>
>- #include <openssl/rand.h>
>- #include <limits.h>
>- #endif
>
>Property changes on: mail/pop3proxy/files/patch-ssl
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 232134: 197984 | 198028 | 200241