adulau/ssldump
1
0
Fork 0
mirror of https://github.com/adulau/ssldump.git synced 2024-11-25 02:47:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

added fix for AES256 GCM decryption

Browse source
This commit is contained in:
mathewmarcus 2018-07-04 14:26:20 -05:00
parent c46019cc62
commit 4a8b677de0
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ssl/ssl_rec.c
View file

@ -219,8 +219,13 @@ int ssl_decode_rec_data(ssl,d,ct,version,in,inl,out,outl)
NULL, NULL,
d->write_key->data, d->write_key->data,
aead_nonce); aead_nonce);
/*
Then tag is always 16 bytes, as per:
https://tools.ietf.org/html/rfc5116#section-5.2
*/
EVP_CIPHER_CTX_ctrl(d->evp,EVP_CTRL_GCM_SET_TAG,16,in+(inl-16)); EVP_CIPHER_CTX_ctrl(d->evp,EVP_CTRL_GCM_SET_TAG,16,in+(inl-16));
inl-=d->cs->eff_bits/8; inl-=16;
fmt_seq(d->seq,aead_tag); fmt_seq(d->seq,aead_tag);
d->seq++; d->seq++;

5
ssl/ssldecode.c
View file

@ -742,7 +742,8 @@ static int tls12_prf(ssl,secret,usage,rnd1,rnd2,out)
memcpy(ptr,rnd2->data,rnd2->len); ptr+=rnd2->len; memcpy(ptr,rnd2->data,rnd2->len); ptr+=rnd2->len;
/* Earlier versions of openssl didn't have SHA256 of course... */ /* Earlier versions of openssl didn't have SHA256 of course... */
dgi = MAX(DIG_SHA256, ssl->cs->dig)-0x40; dgi = MAX(DIG_SHA256, ssl->cs->dig);
dgi-=0x40;
if ((md=EVP_get_digestbyname(digests[dgi])) == NULL) { if ((md=EVP_get_digestbyname(digests[dgi])) == NULL) {
DBG((0,"Cannot get EVP for digest %s, openssl library current?", DBG((0,"Cannot get EVP for digest %s, openssl library current?",
digests[dgi])); digests[dgi]));
@ -1086,7 +1087,7 @@ static int ssl_read_key_log_file(d)
if(snprintf(label_data+(i*2),3,"%02x",d->client_random->data[i])!=2) if(snprintf(label_data+(i*2),3,"%02x",d->client_random->data[i])!=2)
ABORT(r); ABORT(r);
if(strncmp(line+14,label_data,64)) if(STRNICMP(line+14,label_data,64))
continue; continue;
if(r=r_data_alloc(&d->MS,48)) if(r=r_data_alloc(&d->MS,48))