File netqmail-1.06-tls-openssl110.patch of Package netqmail

Overview Repositories Revisions Requests Users Attributes Meta

File netqmail-1.06-tls-openssl110.patch of Package netqmail (Revision 4be2680f2448f539bfefae6aef638c28)

Currently displaying revision 4be2680f2448f539bfefae6aef638c28 , Show latest

--- netqmail-1.06/qmail-smtpd.c.orig	2019-01-12 16:51:32.077790633 +0100
+++ netqmail-1.06/qmail-smtpd.c	2019-01-12 16:52:35.777138383 +0100
@@ -882,7 +882,7 @@
     subj = X509_get_subject_name(peercert);
     n = X509_NAME_get_index_by_NID(subj, NID_pkcs9_emailAddress, -1);
     if (n >= 0) {
-      const ASN1_STRING *s = X509_NAME_get_entry(subj, n)->value;
+      const ASN1_STRING *s = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(subj, n));
       if (s) { email.len = s->length; email.s = s->data; }
     }
 
--- netqmail-1.06/qmail-remote.c.orig	2019-01-12 14:36:39.232507059 +0100
+++ netqmail-1.06/qmail-remote.c	2019-01-12 14:39:39.102694141 +0100
@@ -280,13 +280,18 @@
   }
 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#define SSL_ST_BEFORE	TLS_ST_BEFORE
+#define	SSL_ST_OK	TLS_ST_OK
+#endif
+
 void quit(prepend,append)
 char *prepend;
 char *append;
 {
 #ifdef TLS
   /* shouldn't talk to the client unless in an appropriate state */
-  int state = ssl ? ssl->state : SSL_ST_BEFORE;
+  int state = ssl ? SSL_get_state(ssl) : SSL_ST_BEFORE;
   if (state & SSL_ST_OK || (!smtps && state & SSL_ST_BEFORE))
 #endif
   substdio_putsflush(&smtpto,"QUIT\r\n");
@@ -533,7 +538,7 @@
       X509_NAME *subj = X509_get_subject_name(peercert);
       i = X509_NAME_get_index_by_NID(subj, NID_commonName, -1);
       if (i >= 0) {
-        const ASN1_STRING *s = X509_NAME_get_entry(subj, i)->value;
+        const ASN1_STRING *s = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(subj, i));
         if (s) { peer.len = s->length; peer.s = s->data; }
       }
       if (peer.len <= 0) {
--- netqmail-1.06/ssl_timeoutio.c.orig	2019-01-12 16:46:18.864995258 +0100
+++ netqmail-1.06/ssl_timeoutio.c	2019-01-12 16:50:55.710163019 +0100
@@ -68,19 +68,6 @@
   return r;
 }
 
-int ssl_timeoutrehandshake(int t, int rfd, int wfd, SSL *ssl)
-{
-  int r;
-
-  SSL_renegotiate(ssl);
-  r = ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0);
-  if (r <= 0 || ssl->type == SSL_ST_CONNECT) return r;
-
-  /* this is for the server only */
-  ssl->state = SSL_ST_ACCEPT;
-  return ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0);
-}
-
 int ssl_timeoutread(int t, int rfd, int wfd, SSL *ssl, char *buf, int len)
 {
   if (!buf) return 0;
--- netqmail-1.06/ssl_timeoutio.h.orig	2019-01-12 16:54:33.391934067 +0100
+++ netqmail-1.06/ssl_timeoutio.h	2019-01-12 16:54:40.935856821 +0100
@@ -10,7 +10,6 @@
 
 int ssl_timeoutconn(int t, int rfd, int wfd, SSL *ssl);
 int ssl_timeoutaccept(int t, int rfd, int wfd, SSL *ssl);
-int ssl_timeoutrehandshake(int t, int rfd, int wfd, SSL *ssl);
 
 int ssl_timeoutread(int t, int rfd, int wfd, SSL *ssl, char *buf, int len);
 int ssl_timeoutwrite(int t, int rfd, int wfd, SSL *ssl, char *buf, int len);

Places

File netqmail-1.06-tls-openssl110.patch of Package netqmail (Revision 4be2680f2448f539bfefae6aef638c28)

Places