Commit bd1a74f8 authored by Matt Caswell's avatar Matt Caswell
Browse files

Correct the Extended Master Secret string for EBCDIC 



The macro TLS_MD_MASTER_SECRET_CONST is supposed to hold the ascii string
"extended master secret". On EBCDIC machines it actually contained the
value "extecded master secret"

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9430)

(cherry picked from commit c1a3f16f735057b45df1803d58f40e4e17b233e5)
parent f2bb79a7

CHANGES

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,13 @@ 














 Changes between 1.1.1c and 1.1.1d [xx XXX xxxx]



























  *) Correct the extended master secret constant on EBCDIC systems. Without this













     fix TLS connections between an EBCDIC system and a non-EBCDIC system that













     negotiate EMS will fail. Unfortunately this also means that TLS connections













     between EBCDIC systems with this fix, and EBCDIC systems without this













     fix will fail if they negotiate EMS.













     [Matt Caswell]



























  *) Use Windows installation paths in the mingw builds





























     Mingw isn't a POSIX environment per se, which means that Windows

































include/openssl/tls1.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -1222,7 +1222,7 @@ __owur int SSL_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain)













/*















 * extended master secret















 */













#  define TLS_MD_EXTENDED_MASTER_SECRET_CONST    "\x65\x78\x74\x65\x63\x64\x65\x64\x20\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"













#  define TLS_MD_EXTENDED_MASTER_SECRET_CONST    "\x65\x78\x74\x65\x6e\x64\x65\x64\x20\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"















# endif































/* TLS Session Ticket extension struct */