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

new command line option -stdname to ciphers utility

Browse Source
This commit is contained in:
Dr. Stephen Henson 2012-11-16 00:35:46 +00:00
parent 8ab92fc646
commit 51b9115b6d
3 changed files with 24 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 ret=1,i;
int verbose=0,Verbose=0; int verbose=0,Verbose=0;
#ifndef OPENSSL_NO_SSL_TRACE
int stdname = 0;
#endif
const char **pp; const char **pp;
const char *p; const char *p;
int badops=0; int badops=0;
@ -126,6 +129,10 @@ int MAIN(int argc, char **argv)
verbose=1; verbose=1;
else if (strcmp(*argv,"-V") == 0) else if (strcmp(*argv,"-V") == 0)
verbose=Verbose=1; verbose=Verbose=1;
#ifndef OPENSSL_NO_SSL_TRACE
else if (strcmp(*argv,"-stdname") == 0)
stdname=verbose=1;
#endif
#ifndef OPENSSL_NO_SSL2 #ifndef OPENSSL_NO_SSL2
else if (strcmp(*argv,"-ssl2") == 0) else if (strcmp(*argv,"-ssl2") == 0)
meth=SSLv2_client_method(); meth=SSLv2_client_method();
@ -209,7 +216,15 @@ int MAIN(int argc, char **argv)
else else
BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); /* whatever */ 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)); BIO_puts(STDout,SSL_CIPHER_description(c,buf,sizeof buf));
} }
} }

1
ssl/ssl.h
View File

@ -2269,6 +2269,7 @@ int SSL_is_server(SSL *s);
#ifndef OPENSSL_NO_SSL_TRACE #ifndef OPENSSL_NO_SSL_TRACE
void SSL_trace(int write_p, int version, int content_type, void SSL_trace(int write_p, int version, int content_type,
const void *buf, size_t len, SSL *ssl, void *arg); const void *buf, size_t len, SSL *ssl, void *arg);
const char *SSL_CIPHER_standard_name(const SSL_CIPHER *c);
#endif #endif
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */

7
ssl/t1_trce.c
View File

@ -1203,6 +1203,13 @@ static int ssl_print_heartbeat(BIO *bio, int indent,
return 1; return 1;
} }
const char *SSL_CIPHER_standard_name(const SSL_CIPHER *c)
{
if (c->algorithm_ssl & SSL_SSLV2)
return NULL;
return ssl_trace_str(c->id & 0xFFFF, ssl_ciphers_tbl);
}
void SSL_trace(int write_p, int version, int content_type, void SSL_trace(int write_p, int version, int content_type,
const void *buf, size_t msglen, SSL *ssl, void *arg) const void *buf, size_t msglen, SSL *ssl, void *arg)
{ {