diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-11-16 00:35:46 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-11-16 00:35:46 +0000 |
| commit | 51b9115b6dcaf94718de3c8b4d97b00f8cd63cd5 (patch) | |
| tree | a4973cacb8a14c977bb39f0f89093052026d7c91 /apps/ciphers.c | |
| parent | 8ab92fc646763364b0a9fb6b17f9759c56ccad77 (diff) | |
new command line option -stdname to ciphers utility
Diffstat (limited to 'apps/ciphers.c')
| -rw-r--r-- | apps/ciphers.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/apps/ciphers.c b/apps/ciphers.c index 5f2b739700..c9abf1a05a 100644 --- a/apps/ciphers.c +++ b/apps/ciphers.c @@ -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)); } } |