diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2021-10-16 00:24:07 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2021-10-16 00:24:07 +0100 |
| commit | 32b11385ddced7eafe68c60eebbb2c81979ce35f (patch) | |
| tree | 92f1b2625ec3b611f741d19e46d3c0b388727e22 | |
| parent | 1843f70b733127fcba3321d9d69359e05905f8cc (diff) | |
Fix ALPN/OpenSSL. Bug 2815
Broken-by: c4b4086235
| -rw-r--r-- | doc/doc-txt/ChangeLog | 3 | ||||
| -rw-r--r-- | src/src/tls-openssl.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 1a29ae50b..811d12362 100644 --- 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 fddad9edc..590d271f7 100644 --- 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 */ } |