adulau/ssldump
1
0
Fork 0
mirror of https://github.com/adulau/ssldump.git synced 2024-11-22 09:27:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

use sslkeylogfile to get MS if possible

Browse source
This commit is contained in:
mathewmarcus 2018-07-04 12:14:55 -05:00
parent 4ef8eb376a
commit f788c3a67a
1 changed files with 37 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ssl/ssldecode.c
View file

@ -549,6 +549,14 @@ int ssl_process_client_key_exchange(ssl,d,msg,len)
int i; int i;
EVP_PKEY *pk; EVP_PKEY *pk;
/* Remove the master secret if it was there
to force keying material regeneration in
case we're renegotiating */
r_data_destroy(&d->MS);
if(!d->ctx->ssl_key_log_file ||
ssl_read_key_log_file(d) ||
!d->MS){
if(ssl->cs->kex!=KEX_RSA) if(ssl->cs->kex!=KEX_RSA)
return(-1); return(-1);
@ -574,11 +582,7 @@ int ssl_process_client_key_exchange(ssl,d,msg,len)
d->PMS->len=48; d->PMS->len=48;
CRDUMPD("PMS",d->PMS); CRDUMPD("PMS",d->PMS);
}
/* Remove the master secret if it was there
to force keying material regeneration in
case we're renegotiating */
r_data_destroy(&d->MS);
switch(ssl->version){ switch(ssl->version){
case SSLV3_VERSION: case SSLV3_VERSION:
@ -883,7 +887,8 @@ static int ssl_generate_keying_material(ssl,d)
/* Compute the key block. First figure out how much data /* Compute the key block. First figure out how much data
we need*/ we need*/
needed=ssl->cs->dig_len*2; /* Ideally find a cleaner way to check for AEAD cipher */
needed=(ssl->cs->enc!=0x3b && ssl->cs->enc!=0x3c)?ssl->cs->dig_len*2:0;
needed+=ssl->cs->bits / 4; needed+=ssl->cs->bits / 4;
if(ssl->cs->block>1) needed+=ssl->cs->block*2; if(ssl->cs->block>1) needed+=ssl->cs->block*2;
@ -895,8 +900,11 @@ static int ssl_generate_keying_material(ssl,d)
ABORT(r); ABORT(r);
ptr=key_block->data; ptr=key_block->data;
/* Ideally find a cleaner way to check for AEAD cipher */
if(ssl->cs->enc!=0x3b && ssl->cs->enc!=0x3c){
c_mk=ptr; ptr+=ssl->cs->dig_len; c_mk=ptr; ptr+=ssl->cs->dig_len;
s_mk=ptr; ptr+=ssl->cs->dig_len; s_mk=ptr; ptr+=ssl->cs->dig_len;
}
c_wk=ptr; ptr+=ssl->cs->eff_bits/8; c_wk=ptr; ptr+=ssl->cs->eff_bits/8;
s_wk=ptr; ptr+=ssl->cs->eff_bits/8; s_wk=ptr; ptr+=ssl->cs->eff_bits/8;