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 /ssl | |
parent | 8ab92fc646763364b0a9fb6b17f9759c56ccad77 (diff) | |
download | openssl-51b9115b6dcaf94718de3c8b4d97b00f8cd63cd5.tar.gz |
new command line option -stdname to ciphers utility
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/ssl.h | 1 | ||||
-rw-r--r-- | ssl/t1_trce.c | 7 |
2 files changed, 8 insertions, 0 deletions
@@ -2269,6 +2269,7 @@ int SSL_is_server(SSL *s); #ifndef OPENSSL_NO_SSL_TRACE void SSL_trace(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg); +const char *SSL_CIPHER_standard_name(const SSL_CIPHER *c); #endif /* BEGIN ERROR CODES */ diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index 3571aaacae..2c8a2e4486 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -1203,6 +1203,13 @@ static int ssl_print_heartbeat(BIO *bio, int indent, 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, const void *buf, size_t msglen, SSL *ssl, void *arg) { |