adulau/ssldump
1
0
Fork 0
mirror of https://github.com/adulau/ssldump.git synced 2024-12-22 16:05:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

code cleanup

Browse source
This commit is contained in:
mathewmarcus 2018-06-24 23:43:19 -05:00
parent 4765bb22d1
commit 7589ee5eb0
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ssl/ssl.enums.c
View file

@ -231,7 +231,6 @@ static int decode_HandshakeType_ClientHello(ssl,dir,seg,data)
}
}
/* TODO: add code to print Extensions */
SSL_DECODE_UINT16(ssl,"extensions len",0,data,&exlen);
if (exlen) {
explain(ssl , "extensions\n");
@ -292,7 +291,6 @@ static int decode_HandshakeType_ServerHello(ssl,dir,seg,data)
SSL_DECODE_ENUM(ssl,"compressionMethod",1,compression_method_decoder,P_HL,data,0);
P_(P_HL) printf("\n");
/* TODO: add code to print Extensions */
SSL_DECODE_UINT16(ssl,"extensions len",0,data,&exlen);
if (exlen) {
explain(ssl , "extensions\n");

6
ssl/ssldecode.c
View file

@ -114,7 +114,7 @@ static int ssl3_generate_export_iv PROTO_LIST((ssl_obj *ssl,
static int ssl_generate_keying_material PROTO_LIST((ssl_obj *ssl,
ssl_decoder *d));
static int ssl_generate_session_hash PROTO_LIST((ssl_obj *ssl,
ssl_decoder *d));
ssl_decoder *d));
#endif
static int ssl_create_session_lookup_key PROTO_LIST((ssl_obj *ssl,
@ -858,7 +858,9 @@ static int ssl_generate_keying_material(ssl,d)
ABORT(r);
if (ssl->extensions->extended_master_secret) {
ssl_generate_session_hash(ssl,d);
if(r=ssl_generate_session_hash(ssl,d))
ABORT(r);
temp.len=0;
if(r=PRF(ssl,d->PMS,"extended master secret",d->session_hash,&temp,
d->MS))

2
ssl/ssldecode.h
View file

@ -67,7 +67,7 @@ int ssl_process_client_key_exchange PROTO_LIST((struct ssl_obj_ *,
int ssl_process_change_cipher_spec PROTO_LIST((ssl_obj *ssl,
ssl_decoder *d,int direction));
int ssl_update_handshake_messages PROTO_LIST((ssl_obj *ssl,
Data *data));
Data *data));
int ssl_decode_record PROTO_LIST((ssl_obj *ssl,ssl_decoder *dec,int direction,
int ct,int version,Data *d));