The branch master has been updated via 6ed12cec7216c3e81b58f5cafa41775e456feaee (commit) from f650ab4738107d01925bd4d9043e18bf27ba2dcd (commit)
- Log ----------------------------------------------------------------- commit 6ed12cec7216c3e81b58f5cafa41775e456feaee Author: Ido Ben-Natan <ido.benna...@gmail.com> Date: Sat Nov 9 15:04:39 2019 +0200 Fix misspelled resumption_label for CHARSET_EBCDIC The resumption_label variable when CHARSET_EBCDIC was enabled, was misspelled. Instead of evaluating to 'res binder' as expected, it evaluated to 'red binder'. CLA: trivial Reviewed-by: Kurt Roeckx <k...@roeckx.be> Reviewed-by: Matthias St. Pierre <matthias.st.pie...@ncp-e.com> (Merged from https://github.com/openssl/openssl/pull/10396) ----------------------------------------------------------------------- Summary of changes: ssl/statem/extensions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c index c529579019..d5f6e1afba 100644 --- a/ssl/statem/extensions.c +++ b/ssl/statem/extensions.c @@ -1446,7 +1446,7 @@ int tls_psk_do_binder(SSL *s, const EVP_MD *md, const unsigned char *msgstart, unsigned char finishedkey[EVP_MAX_MD_SIZE], tmpbinder[EVP_MAX_MD_SIZE]; unsigned char *early_secret; #ifdef CHARSET_EBCDIC - static const unsigned char resumption_label[] = { 0x72, 0x65, 0x64, 0x20, 0x62, 0x69, 0x6E, 0x64, 0x65, 0x72, 0x00 }; + static const unsigned char resumption_label[] = { 0x72, 0x65, 0x73, 0x20, 0x62, 0x69, 0x6E, 0x64, 0x65, 0x72, 0x00 }; static const unsigned char external_label[] = { 0x65, 0x78, 0x74, 0x20, 0x62, 0x69, 0x6E, 0x64, 0x65, 0x72, 0x00 }; #else static const unsigned char resumption_label[] = "res binder";