add l option for SSLKEYLOGFILE

This commit is contained in:
mathewmarcus 2018-07-02 10:36:54 -05:00
parent 9f5d85eec0
commit 170158a65b
3 changed files with 9 additions and 2 deletions

View file

@ -104,7 +104,7 @@ int err_exit(str,num)
int usage() int usage()
{ {
fprintf(stderr,"Usage: ssldump [-r dumpfile] [-i interface] \n"); fprintf(stderr,"Usage: ssldump [-r dumpfile] [-i interface] [-l sslkeylogfile] \n");
fprintf(stderr," [-k keyfile] [-p password] [-vtaTnsAxVNde]\n"); fprintf(stderr," [-k keyfile] [-p password] [-vtaTnsAxVNde]\n");
fprintf(stderr," [filter]\n"); fprintf(stderr," [filter]\n");
exit(0); exit(0);
@ -293,7 +293,7 @@ int main(argc,argv)
signal(SIGINT,sig_handler); signal(SIGINT,sig_handler);
while((c=getopt(argc,argv,"vr:F:f:S:yTt:ai:k:p:nsAxXhHVNdqem:P"))!=EOF){ while((c=getopt(argc,argv,"vr:F:f:S:yTt:ai:k:l:p:nsAxXhHVNdqem:P"))!=EOF){
switch(c){ switch(c){
case 'v': case 'v':
print_version(); print_version();
@ -326,6 +326,9 @@ int main(argc,argv)
case 'k': case 'k':
SSL_keyfile=strdup(optarg); SSL_keyfile=strdup(optarg);
break; break;
case 'l':
SSL_keylogfile=strdup(optarg);
break;
case 'p': case 'p':
SSL_password=strdup(optarg); SSL_password=strdup(optarg);
break; break;
@ -465,6 +468,8 @@ int main(argc,argv)
free(interface_name); free(interface_name);
if(SSL_keyfile) if(SSL_keyfile)
free(SSL_keyfile); free(SSL_keyfile);
if(SSL_keylogfile)
free(SSL_keylogfile);
if(SSL_password) if(SSL_password)
free(SSL_password); free(SSL_password);

View file

@ -77,6 +77,7 @@ static int print_ssl_record PROTO_LIST((ssl_obj *obj,int direction,
segment *q,UCHAR *data,int len)); segment *q,UCHAR *data,int len));
char *SSL_keyfile=0; char *SSL_keyfile=0;
char *SSL_password=0; char *SSL_password=0;
char *SSL_keylogfile=0;
#define NEGATE 0x800000 #define NEGATE 0x800000

View file

@ -82,6 +82,7 @@ extern proto_mod ssl_mod;
extern UINT4 SSL_print_flags; extern UINT4 SSL_print_flags;
extern char *SSL_keyfile; extern char *SSL_keyfile;
extern char *SSL_password; extern char *SSL_password;
extern char *SSL_keylogfile;
#endif #endif