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

Fix warning unused for unused variable & error handling

Browse source
This commit is contained in:
William Robinet 2023-08-16 14:52:09 +02:00
parent ead8fceb30
commit 6d333f746b
No known key found for this signature in database
GPG key ID: 003FA3DF74C7A949
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
null/null_analyze.c
View file

@ -87,12 +87,16 @@ static int create_null_analyzer(void *handle,
} }
int destroy_null_analyzer(proto_obj **objp) { int destroy_null_analyzer(proto_obj **objp) {
#ifdef DEBUG
null_analyzer *obj; null_analyzer *obj;
#endif
if(!objp || !*objp) if(!objp || !*objp)
return (0); return (0);
#ifdef DEBUG
obj = (null_analyzer *)*objp; obj = (null_analyzer *)*objp;
#endif
DBG((0, "Destroying analyzer for connection %d\n", obj->num)); DBG((0, "Destroying analyzer for connection %d\n", obj->num));
free(*objp); free(*objp);

18
ssl/ssldecode.c
View file

@ -1184,38 +1184,38 @@ int ssl_tls13_generate_keying_material(ssl_obj *ssl, ssl_decoder *d) {
if(hkdf_expand_label(ssl, d, d->SHTS, "key", NULL, ssl->cs->eff_bits / 8, if(hkdf_expand_label(ssl, d, d->SHTS, "key", NULL, ssl->cs->eff_bits / 8,
&s_wk_h)) { &s_wk_h)) {
fprintf(stderr, "s_wk_h hkdf_expand_label failed\n"); fprintf(stderr, "s_wk_h hkdf_expand_label failed\n");
goto abort; ABORT(-1);
} }
if(hkdf_expand_label(ssl, d, d->SHTS, "iv", NULL, 12, &s_iv_h)) { if(hkdf_expand_label(ssl, d, d->SHTS, "iv", NULL, 12, &s_iv_h)) {
fprintf(stderr, "s_iv_h hkdf_expand_label failed\n"); fprintf(stderr, "s_iv_h hkdf_expand_label failed\n");
goto abort; ABORT(-1);
} }
if(hkdf_expand_label(ssl, d, d->CHTS, "key", NULL, ssl->cs->eff_bits / 8, if(hkdf_expand_label(ssl, d, d->CHTS, "key", NULL, ssl->cs->eff_bits / 8,
&c_wk_h)) { &c_wk_h)) {
fprintf(stderr, "c_wk_h hkdf_expand_label failed\n"); fprintf(stderr, "c_wk_h hkdf_expand_label failed\n");
goto abort; ABORT(-1);
} }
if(hkdf_expand_label(ssl, d, d->CHTS, "iv", NULL, 12, &c_iv_h)) { if(hkdf_expand_label(ssl, d, d->CHTS, "iv", NULL, 12, &c_iv_h)) {
fprintf(stderr, "c_iv_h hkdf_expand_label failed\n"); fprintf(stderr, "c_iv_h hkdf_expand_label failed\n");
goto abort; ABORT(-1);
} }
if(hkdf_expand_label(ssl, d, d->STS, "key", NULL, ssl->cs->eff_bits / 8, if(hkdf_expand_label(ssl, d, d->STS, "key", NULL, ssl->cs->eff_bits / 8,
&s_wk)) { &s_wk)) {
fprintf(stderr, "s_wk hkdf_expand_label failed\n"); fprintf(stderr, "s_wk hkdf_expand_label failed\n");
goto abort; ABORT(-1);
} }
if(hkdf_expand_label(ssl, d, d->STS, "iv", NULL, 12, &s_iv)) { if(hkdf_expand_label(ssl, d, d->STS, "iv", NULL, 12, &s_iv)) {
fprintf(stderr, "s_iv hkdf_expand_label failed\n"); fprintf(stderr, "s_iv hkdf_expand_label failed\n");
goto abort; ABORT(-1);
} }
if(hkdf_expand_label(ssl, d, d->CTS, "key", NULL, ssl->cs->eff_bits / 8, if(hkdf_expand_label(ssl, d, d->CTS, "key", NULL, ssl->cs->eff_bits / 8,
&c_wk)) { &c_wk)) {
fprintf(stderr, "c_wk hkdf_expand_label failed\n"); fprintf(stderr, "c_wk hkdf_expand_label failed\n");
goto abort; ABORT(-1);
} }
if(hkdf_expand_label(ssl, d, d->CTS, "iv", NULL, 12, &c_iv)) { if(hkdf_expand_label(ssl, d, d->CTS, "iv", NULL, 12, &c_iv)) {
fprintf(stderr, "c_iv hkdf_expand_label failed\n"); fprintf(stderr, "c_iv hkdf_expand_label failed\n");
goto abort; ABORT(-1);
} }
CRDUMP("Server Handshake Write key", s_wk_h, ssl->cs->eff_bits / 8); CRDUMP("Server Handshake Write key", s_wk_h, ssl->cs->eff_bits / 8);
CRDUMP("Server Handshake IV", s_iv_h, 12); CRDUMP("Server Handshake IV", s_iv_h, 12);
@ -1236,7 +1236,7 @@ int ssl_tls13_generate_keying_material(ssl_obj *ssl, ssl_decoder *d) {
ABORT(r); ABORT(r);
return 0; return 0;
abort: abort:
return r; return _status;
} }
static int ssl_generate_session_hash(ssl_obj *ssl, ssl_decoder *d) { static int ssl_generate_session_hash(ssl_obj *ssl, ssl_decoder *d) {