diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-18 17:22:18 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-30 10:18:21 +0000 |
| commit | 0247086d9a0713e18a0f16949039a40fdb63ff7e (patch) | |
| tree | a982e645ef60d1b9b4198e3411a9504b0b7bf7b7 /ssl/s3_lib.c | |
| parent | 1053a6e2281d81cd5d04d2d90da2c4905c9c3561 (diff) | |
Implement server side of PSK extension construction
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 3 |
1 files changed, 3 insertions, 0 deletions
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 */ |