Fix ALPN/OpenSSL. Bug 2815

Broken-by: c4b4086235

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 1a29ae50bbaaeb91503f903dbb25eaae10e1d925..811d123622d8e0339a921bc993e02ef844fcd62e 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -25,6 +25,9 @@ JH/05 Bug 2819: speed up command-line messages being read in.  Previously a
       time check was being done for every character; replace that with one
       per buffer.
 
+JH/06 Bug 2815: Fix ALPN sent by server under OpenSSL.  Previously the string
+      sent was prefixed with a length byte.
+
 
 Exim version 4.95
 -----------------

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index fddad9edc018b2a72f2729a1a0d58e6332784fb4..590d271f7bc3c10f4ce4ccd34395ba932fb0e928 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -2182,7 +2182,7 @@ if (  inlen > 1           /* at least one name */
   for (uschar * name; name = string_nextinlist(&list, &sep, NULL, 0); )
     if (Ustrncmp(in+1, name, in[0]) == 0)
       {
-      *out = in;                       /* we checked for exactly one, so can just point to it */
+      *out = in+1;                     /* we checked for exactly one, so can just point to it */
       *outlen = inlen;
       return SSL_TLSEXT_ERR_OK;                /* use ALPN */
       }