diff options
| author | Paul Yang <yang.yang@baishancloud.com> | 2017-06-30 03:06:19 +0800 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-07-21 07:20:14 +1000 |
| commit | bbb4ceb86eb6ea0300f744443c36fb6e980fff9d (patch) | |
| tree | 57079deada8128837e38a4bd37f7bf9119f016a2 /ssl/t1_trce.c | |
| parent | b8a437ffa09bbf22c04a55015a6d2743cd0b7529 (diff) | |
| download | openssl-new-bbb4ceb86eb6ea0300f744443c36fb6e980fff9d.tar.gz | |
Support converting cipher name to RFC name and vice versa
Fixes: issue #3747
make SSL_CIPHER_standard_name globally available and introduce a new
function OPENSSL_cipher_name.
A new option '-convert' is also added to 'openssl ciphers' app.
Documentation and test cases are added.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/3859)
Diffstat (limited to 'ssl/t1_trce.c')
| -rw-r--r-- | ssl/t1_trce.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index ce98581a41..803df27a42 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2012-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -1470,11 +1470,6 @@ static int ssl_print_handshake(BIO *bio, SSL *ssl, int server, return 1; } -const char *SSL_CIPHER_standard_name(const SSL_CIPHER *c) -{ - 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) { |