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

Repair ssl_key_log_file handling

Browse source 
Set ssl_key_log_file to null in ssl_decode_ctx_create if no
file name was supplied.

Only seek ssl_key_log_file in ssl_read_key_log_file if it
is non null.

Repair order of fseek parameters.
This commit is contained in:
Ulrik Haugen 2019-05-22 12:51:17 +02:00
parent 3a96262c3a
commit d3a18bfb2d
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ssl/ssldecode.c
View file

@ -172,10 +172,14 @@ int ssl_decode_ctx_create(dp,keyfile,pass,keylogfile)
if(r_assoc_create(&d->session_cache)) if(r_assoc_create(&d->session_cache))
ABORT(R_NO_MEMORY); ABORT(R_NO_MEMORY);
if(keylogfile && !(d->ssl_key_log_file=fopen(keylogfile, "r"))){ if (keylogfile) {
if(!(d->ssl_key_log_file=fopen(keylogfile, "r"))){
fprintf(stderr,"Failed to open ssl key log file"); fprintf(stderr,"Failed to open ssl key log file");
ABORT(R_INTERNAL); ABORT(R_INTERNAL);
} }
} else {
d->ssl_key_log_file = NULL;
}
X509V3_add_standard_extensions(); X509V3_add_standard_extensions();
@ -1106,7 +1110,8 @@ static int ssl_read_key_log_file(d)
} }
_status=0; _status=0;
abort: abort:
fseek(d->ctx->ssl_key_log_file, SEEK_SET, 0); if (d->ctx->ssl_key_log_file != NULL)
fseek(d->ctx->ssl_key_log_file, 0, SEEK_SET);
return(_status); return(_status);
} }
#endif #endif