diff options
Diffstat (limited to 'lib/gnutls_kx.c')
| -rw-r--r-- | lib/gnutls_kx.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/gnutls_kx.c b/lib/gnutls_kx.c index dbb28b10d2..0a2337c5b3 100644 --- a/lib/gnutls_kx.c +++ b/lib/gnutls_kx.c @@ -41,18 +41,20 @@ */ #define MASTER_SECRET "master secret" -static int generate_normal_master( gnutls_session session); +static int generate_normal_master( gnutls_session session, int); -int _gnutls_generate_master( gnutls_session session) { +int _gnutls_generate_master( gnutls_session session, int keep_premaster) +{ if (session->internals.resumed==RESUME_FALSE) - return generate_normal_master(session); + return generate_normal_master(session, keep_premaster); return 0; } /* here we generate the TLS Master secret. */ #define PREMASTER session->key->key -static int generate_normal_master( gnutls_session session) { +static int generate_normal_master( gnutls_session session, int keep_premaster) +{ int ret = 0; opaque random[2*TLS_RANDOM_SIZE]; char buf[64]; @@ -77,7 +79,8 @@ char buf[64]; random, 2*TLS_RANDOM_SIZE, TLS_MASTER_SIZE, session->security_parameters.master_secret); } - _gnutls_free_datum(&PREMASTER); + + if (!keep_premaster) _gnutls_free_datum(&PREMASTER); if (ret<0) return ret; |