diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-30 19:36:51 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-30 22:58:53 +0000 |
| commit | c8ab3a46530029739272e14acbfc91a5feb291a7 (patch) | |
| tree | 7582b7d4acc55f5a0172b3a8ba95eb7157f468bd /ssl/s3_lib.c | |
| parent | 787ebcafcd82daf5809ef308f8b6d6bbec17b354 (diff) | |
| download | openssl-c8ab3a46530029739272e14acbfc91a5feb291a7.tar.gz | |
Make sure we free and cleanse the pms value in all code paths
Otherwise we get a memory leak.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2326)
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index c4d43526bd..936a301363 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -4118,10 +4118,8 @@ int ssl_derive(SSL *s, EVP_PKEY *privkey, EVP_PKEY *pubkey, int gensecret) rv = rv && tls13_generate_handshake_secret(s, pms, pmslen); } else { - /* Generate master secret and discard premaster */ - rv = ssl_generate_master_secret(s, pms, pmslen, 1); + rv = ssl_generate_master_secret(s, pms, pmslen, 0); } - pms = NULL; } else { /* Save premaster secret */ s->s3->tmp.pms = pms; |