From 919684d5ae59bf02d1e5cfc7c6b5e87ec414844e Mon Sep 17 00:00:00 2001 From: mathewmarcus Date: Wed, 20 Jun 2018 08:27:53 -0500 Subject: [PATCH] rename functions --- ssl/ssl.enums.c | 128 ++++++------------------------------------------ ssl/ssldecode.c | 2 +- 2 files changed, 17 insertions(+), 113 deletions(-) diff --git a/ssl/ssl.enums.c b/ssl/ssl.enums.c index 1d2897f..3913c35 100644 --- a/ssl/ssl.enums.c +++ b/ssl/ssl.enums.c @@ -184,7 +184,7 @@ static int decode_HandshakeType_ClientHello(ssl,dir,seg,data) extern decoder extension_decoder[]; printf("\n"); - ssl_update_session_hash(ssl,data); + ssl_update_handshake_messages(ssl,data); SSL_DECODE_UINT8(ssl,0,0,data,&vj); SSL_DECODE_UINT8(ssl,0,0,data,&vn); @@ -263,7 +263,7 @@ static int decode_HandshakeType_ServerHello(ssl,dir,seg,data) extern decoder extension_decoder[]; printf("\n"); - ssl_update_session_hash(ssl,data); + ssl_update_handshake_messages(ssl,data); SSL_DECODE_UINT8(ssl,0,0,data,&vj); SSL_DECODE_UINT8(ssl,0,0,data,&vn); @@ -324,7 +324,7 @@ static int decode_HandshakeType_Certificate(ssl,dir,seg,data) int r; printf("\n"); - ssl_update_session_hash(ssl,data); + ssl_update_handshake_messages(ssl,data); SSL_DECODE_UINT24(ssl,"certificates len",0,data,&len); while(len){ @@ -348,7 +348,7 @@ static int decode_HandshakeType_ServerKeyExchange(ssl,dir,seg,data) int r; printf("\n"); - ssl_update_session_hash(ssl,data); + ssl_update_handshake_messages(ssl,data); if(ssl->cs){ P_(P_ND){ explain(ssl,"params\n"); @@ -386,7 +386,7 @@ static int decode_HandshakeType_CertificateRequest(ssl,dir,seg,data) int r; printf("\n"); - ssl_update_session_hash(ssl,data); + ssl_update_handshake_messages(ssl,data); SSL_DECODE_UINT8(ssl,"certificate_types len",0,data,&len); for(;len;len--){ SSL_DECODE_ENUM(ssl,"certificate_types",1, @@ -418,7 +418,7 @@ static int decode_HandshakeType_ServerHelloDone(ssl,dir,seg,data) printf("\n"); - ssl_update_session_hash(ssl,data); + ssl_update_handshake_messages(ssl,data); return(0); } @@ -432,7 +432,7 @@ static int decode_HandshakeType_CertificateVerify(ssl,dir,seg,data) int r; printf("\n"); - ssl_update_session_hash(ssl,data); + ssl_update_handshake_messages(ssl,data); SSL_DECODE_OPAQUE_ARRAY(ssl,"Signature",-(1<<15-1),P_HL,data,0); return(0); @@ -449,7 +449,7 @@ static int decode_HandshakeType_ClientKeyExchange(ssl,dir,seg,data) Data pms; printf("\n"); - ssl_update_session_hash(ssl,data); + ssl_update_handshake_messages(ssl,data); if(ssl->cs){ switch(ssl->cs->kex){ @@ -2461,90 +2461,6 @@ static int decode_extension_server_name(ssl,dir,seg,data) data->data+=l; return(0); } -static int decode_extension_max_fragment_length(ssl,dir,seg,data) - ssl_obj *ssl; - int dir; - segment *seg; - Data *data; - { - int l,r; - SSL_DECODE_UINT16(ssl,"extension length",0,data,&l); - data->len-=l; - data->data+=l; - return(0); - } -static int decode_extension_client_certificate_url(ssl,dir,seg,data) - ssl_obj *ssl; - int dir; - segment *seg; - Data *data; - { - int l,r; - SSL_DECODE_UINT16(ssl,"extension length",0,data,&l); - data->len-=l; - data->data+=l; - return(0); - } -static int decode_extension_trusted_ca_keys(ssl,dir,seg,data) - ssl_obj *ssl; - int dir; - segment *seg; - Data *data; - { - int l,r; - SSL_DECODE_UINT16(ssl,"extension length",0,data,&l); - data->len-=l; - data->data+=l; - return(0); - } -static int decode_extension_truncated_hmac(ssl,dir,seg,data) - ssl_obj *ssl; - int dir; - segment *seg; - Data *data; - { - int l,r; - SSL_DECODE_UINT16(ssl,"extension length",0,data,&l); - data->len-=l; - data->data+=l; - return(0); - } -static int decode_extension_status_request(ssl,dir,seg,data) - ssl_obj *ssl; - int dir; - segment *seg; - Data *data; - { - int l,r; - SSL_DECODE_UINT16(ssl,"extension length",0,data,&l); - data->len-=l; - data->data+=l; - return(0); - } -static int decode_extension_signature_algorithms(ssl,dir,seg,data) - ssl_obj *ssl; - int dir; - segment *seg; - Data *data; - { - int l,r; - SSL_DECODE_UINT16(ssl,"extension length",0,data,&l); - data->len-=l; - data->data+=l; - return(0); - } -static int decode_extension_application_layer_protocol_negotiation(ssl,dir,seg,data) - ssl_obj *ssl; - int dir; - segment *seg; - Data *data; - { - int l,r; - SSL_DECODE_UINT16(ssl,"extension length",0,data,&l); - data->len-=l; - data->data+=l; - return(0); - } static int decode_extension_encrypt_then_mac(ssl,dir,seg,data) ssl_obj *ssl; int dir; @@ -2569,18 +2485,6 @@ static int decode_extension_extended_master_secret(ssl,dir,seg,data) data->data+=l; return(0); } -static int decode_extension_next_protocol_negotiation(ssl,dir,seg,data) - ssl_obj *ssl; - int dir; - segment *seg; - Data *data; - { - int l,r; - SSL_DECODE_UINT16(ssl,"extension length",0,data,&l); - data->len-=l; - data->data+=l; - return(0); - } static int decode_extension(ssl,dir,seg,data) ssl_obj *ssl; int dir; @@ -2604,37 +2508,37 @@ decoder extension_decoder[] = { { 1, "max_fragment_length", - decode_extension_max_fragment_length + decode_extension }, { 2, "client_certificate_url", - decode_extension_client_certificate_url + decode_extension }, { 3, "trusted_ca_keys", - decode_extension_trusted_ca_keys + decode_extension }, { 4, "truncated_hmac", - decode_extension_truncated_hmac + decode_extension }, { 5, "status_request", - decode_extension_status_request + decode_extension }, { 13, "signature_algorithms", - decode_extension_signature_algorithms + decode_extension }, { 16, "application_layer_protocol_negotiation", - decode_extension_application_layer_protocol_negotiation + decode_extension }, { 22, @@ -2649,7 +2553,7 @@ decoder extension_decoder[] = { { 13172, "next_protocol_negotiation", - decode_extension_next_protocol_negotiation + decode_extension }, {-1} diff --git a/ssl/ssldecode.c b/ssl/ssldecode.c index ba25c71..08f96a6 100644 --- a/ssl/ssldecode.c +++ b/ssl/ssldecode.c @@ -568,7 +568,7 @@ int ssl_process_client_key_exchange(ssl,d,msg,len) -int ssl_update_session_hash(ssl,data) +int ssl_update_handshake_messages(ssl,data) ssl_obj *ssl; Data *data; {