From 0247086d9a0713e18a0f16949039a40fdb63ff7e Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 18 Jan 2017 17:22:18 +0000 Subject: Implement server side of PSK extension construction Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2259) --- ssl/s3_lib.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ssl/s3_lib.c') diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 6c74bd169d..35684f4790 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -4113,6 +4113,9 @@ int ssl_derive(SSL *s, EVP_PKEY *privkey, EVP_PKEY *pubkey, int gensecret) rv = tls13_generate_secret(s, ssl_handshake_md(s), NULL, NULL, 0, (unsigned char *)&s->early_secret); + else + rv = 1; + rv = rv && tls13_generate_handshake_secret(s, pms, pmslen); } else { /* Generate master secret and discard premaster */ -- cgit v1.2.3