From 7589ee5eb02284591dab19f47fdd89748b6622eb Mon Sep 17 00:00:00 2001 From: mathewmarcus Date: Sun, 24 Jun 2018 23:43:19 -0500 Subject: [PATCH] code cleanup --- ssl/ssl.enums.c | 2 -- ssl/ssldecode.c | 6 ++++-- ssl/ssldecode.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ssl/ssl.enums.c b/ssl/ssl.enums.c index 20f4e54..78cf07d 100644 --- a/ssl/ssl.enums.c +++ b/ssl/ssl.enums.c @@ -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"); diff --git a/ssl/ssldecode.c b/ssl/ssldecode.c index 3139a79..ff094ff 100644 --- a/ssl/ssldecode.c +++ b/ssl/ssldecode.c @@ -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)) diff --git a/ssl/ssldecode.h b/ssl/ssldecode.h index 88c7291..3ef9226 100644 --- a/ssl/ssldecode.h +++ b/ssl/ssldecode.h @@ -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));