diff options
| author | TBK <tbk@jjtc.dk> | 2018-01-28 16:43:00 +0100 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2018-02-05 19:23:16 +0000 |
| commit | 6f2652eb1a793606f009e0af18793dc24bba890b (patch) | |
| tree | fbeb14243274d58d88957fba7c28200161355dd2 /main/libressl/starttls-ldap.patch | |
| parent | 07bf8cf73e19a5dbcaed489bb53306f90529ccc8 (diff) | |
| download | aports-6f2652eb1a793606f009e0af18793dc24bba890b.tar.bz2 aports-6f2652eb1a793606f009e0af18793dc24bba890b.tar.xz | |
main/libressl: upgrade to 2.6.4; modernize
Diffstat (limited to 'main/libressl/starttls-ldap.patch')
| -rw-r--r-- | main/libressl/starttls-ldap.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/libressl/starttls-ldap.patch b/main/libressl/starttls-ldap.patch index 94cf3d01f7..3ee44d87fd 100644 --- a/main/libressl/starttls-ldap.patch +++ b/main/libressl/starttls-ldap.patch @@ -1,5 +1,5 @@ ---- libressl-2.5.5/apps/openssl/s_client.c -+++ libressl-2.5.5.ldap/apps/openssl/s_client.c +--- a/apps/openssl/s_client.c ++++ b/apps/openssl/s_client.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ @@ -26,7 +26,7 @@ BIO_printf(bio_err, " are supported.\n"); BIO_printf(bio_err, " -xmpphost host - connect to this virtual host on the xmpp server\n"); BIO_printf(bio_err, " -sess_out arg - file to write SSL session to\n"); -@@ -315,7 +316,8 @@ +@@ -284,7 +285,8 @@ PROTO_POP3, PROTO_IMAP, PROTO_FTP, @@ -36,7 +36,7 @@ }; int -@@ -575,6 +577,8 @@ +@@ -543,6 +545,8 @@ starttls_proto = PROTO_FTP; else if (strcmp(*argv, "xmpp") == 0) starttls_proto = PROTO_XMPP; @@ -45,7 +45,7 @@ else goto bad; } -@@ -978,6 +982,72 @@ +@@ -934,6 +938,72 @@ if (!strstr(sbuf, "<proceed")) goto shut; mbuf[0] = 0; @@ -118,7 +118,7 @@ } else if (proxy != NULL) { BIO_printf(sbio, "CONNECT %s HTTP/1.0\r\n\r\n", connect); mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ); -@@ -1499,3 +1569,86 @@ +@@ -1437,3 +1507,86 @@ return 1; } |