generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PSK premaster secret derivation.

Browse Source 
Move PSK premaster secret algorithm to ssl_generate_master secret so
existing key exchange code can be used and modified slightly to add
the PSK wrapping structure.

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson
2015-06-28 16:58:00 +01:00
parent 85269210ff
commit 8a0a12e5bf
1 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
ssl/s3_lib.c
View File

@@ -4259,13 +4259,52 @@ int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, int len)
int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen, int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen,
int free_pms) int free_pms)
{ {
s->session->master_key_length = #ifndef OPENSSL_NO_PSK
s->method->ssl3_enc->generate_master_secret(s, s->session->master_key, unsigned long alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
pms, pmslen); if (alg_k & SSL_PSK) {
if (free_pms) unsigned char *pskpms, *t;
OPENSSL_clear_free(pms, pmslen); size_t psklen = s->s3->tmp.psklen;
else size_t pskpmslen;
OPENSSL_cleanse(pms, pmslen);
/* create PSK premaster_secret */
/* For plain PSK "other_secret" is psklen zeroes */
if (alg_k & SSL_kPSK)
pmslen = psklen;
pskpmslen = 4 + pmslen + psklen;
pskpms = OPENSSL_malloc(pskpmslen);
if (pskpms == NULL)
return 0;
t = pskpms;
s2n(pmslen, t);
if (alg_k & SSL_kPSK)
memset(t, 0, pmslen);
else
memcpy(t, pms, pmslen);
t += pmslen;
s2n(psklen, t);
memcpy(t, s->s3->tmp.psk, psklen);
OPENSSL_clear_free(s->s3->tmp.psk, psklen);
s->s3->tmp.psk = NULL;
s->session->master_key_length =
s->method->ssl3_enc->generate_master_secret(s,
s->session->master_key,
pskpms, pskpmslen);
OPENSSL_clear_free(pskpms, pskpmslen);
} else
#endif
s->session->master_key_length =
s->method->ssl3_enc->generate_master_secret(s,
s->session->master_key,
pms, pmslen);
if (pms) {
if (free_pms)
OPENSSL_clear_free(pms, pmslen);
else
OPENSSL_cleanse(pms, pmslen);
}
if (s->server == 0) if (s->server == 0)
s->s3->tmp.pms = NULL; s->s3->tmp.pms = NULL;
return s->session->master_key_length >= 0; return s->session->master_key_length >= 0;