generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new command line option -stdname to ciphers utility

Browse Source 
(cherry picked from commit 51b9115b6dcaf94718de3c8b4d97b00f8cd63cd5)
This commit is contained in:
Dr. Stephen Henson 2012-11-16 00:35:46 +00:00
parent 8c33e40d2e
commit aaaa18392d
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/ciphers.c
View File

@ -85,6 +85,9 @@ int MAIN(int argc, char **argv)
{
int ret=1,i;
int verbose=0,Verbose=0;
#ifndef OPENSSL_NO_SSL_TRACE
int stdname = 0;
#endif
const char **pp;
const char *p;
int badops=0;
@ -126,6 +129,10 @@ int MAIN(int argc, char **argv)
verbose=1;
else if (strcmp(*argv,"-V") == 0)
verbose=Verbose=1;
#ifndef OPENSSL_NO_SSL_TRACE
else if (strcmp(*argv,"-stdname") == 0)
stdname=verbose=1;
#endif
#ifndef OPENSSL_NO_SSL2
else if (strcmp(*argv,"-ssl2") == 0)
meth=SSLv2_client_method();
@ -209,7 +216,15 @@ int MAIN(int argc, char **argv)
else
BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); /* whatever */
}
#ifndef OPENSSL_NO_SSL_TRACE
if (stdname)
{
const char *nm = SSL_CIPHER_standard_name(c);
if (nm == NULL)
nm = "UNKNOWN";
BIO_printf(STDout, "%s - ", nm);
}
#endif
BIO_puts(STDout,SSL_CIPHER_description(c,buf,sizeof buf));
}
}