Attachment 190610 Details for Bug 225885 – svn diff for mail/cclient

svn diff for mail/cclient

patch-mail_cclient-openssl-devel.txt (text/plain), 2.32 KB, created by Bernard Spil on 2018-02-14 11:46:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2018-02-14 11:46:54 UTC

Size: 2.32 KB

patch

obsolete

>Index: mail/cclient/Makefile
>===================================================================
>--- mail/cclient/Makefile	(revision 461775)
>+++ mail/cclient/Makefile	(working copy)
>@@ -26,8 +26,6 @@
> SSL_AND_PLAINTEXT_DESC=	Allow plain text passwords and SSL
> MBX_DEFAULT_DESC=	Use MBX as default mailbox format
> 
>-BROKEN_SSL=	openssl-devel
>-
> ALL_TARGET=	bsf
> MAKE_JOBS_UNSAFE=	yes
> USE_LDCONFIG=	yes
>Index: mail/cclient/files/patch-src_osdep_unix_ssl__unix.c
>===================================================================
>--- mail/cclient/files/patch-src_osdep_unix_ssl__unix.c	(nonexistent)
>+++ mail/cclient/files/patch-src_osdep_unix_ssl__unix.c	(working copy)
>@@ -0,0 +1,26 @@
>+--- src/osdep/unix/ssl_unix.c.orig	2011-07-23 00:20:10 UTC
>++++ src/osdep/unix/ssl_unix.c
>+@@ -270,9 +270,9 @@ static char *ssl_start_work (SSLSTREAM *
>+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
>+ 				host))) {
>+ 				/* application callback */
>+-    if (scq) return (*scq) (err,host,cert ? cert->name : "???") ? NIL : "";
>++    if (scq) return (*scq) (err,host,cert ? X509_get_subject_name(cert) : "???") ? NIL : "";
>+ 				/* error message to return via mm_log() */
>+-    sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
>++    sprintf (tmp,"*%.128s: %.255s",err,cert ? X509_get_subject_name(cert) : "???");
>+     return ssl_last_error = cpystr (tmp);
>+   }
>+   return NIL;
>+@@ -322,9 +322,9 @@ static char *ssl_validate_cert (X509 *ce
>+ 				/* make sure have a certificate */
>+   if (!cert) ret = "No certificate from server";
>+ 				/* and that it has a name */
>+-  else if (!cert->name) ret = "No name in certificate";
>++  else if (!X509_get_subject_name(cert)) ret = "No name in certificate";
>+ 				/* locate CN */
>+-  else if (s = strstr (cert->name,"/CN=")) {
>++  else if (s = strstr (X509_get_subject_name(cert),"/CN=")) {
>+     if (t = strchr (s += 4,'/')) *t = '\0';
>+ 				/* host name matches pattern? */
>+     ret = ssl_compare_hostnames (host,s) ? NIL :
>
>Property changes on: mail/cclient/files/patch-src_osdep_unix_ssl__unix.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View

Attachments on bug 225885: 190610