diff options
author | Paul Yang <yang.yang@baishancloud.com> | 2017-08-23 00:37:10 +0800 |
---|---|---|
committer | Benjamin Kaduk <kaduk@mit.edu> | 2017-08-30 14:01:13 -0500 |
commit | 50966bfa119d129c4b2bc405b6ade1c6a21b84f2 (patch) | |
tree | d36649684cf1ff69c6fb264ef7daf50c46aaf620 /include | |
parent | 22d1a340b644d5d833157de1c0c2d1f0d7690529 (diff) |
Introduce SSL_CIPHER_get_protocol_id
The returned ID matches with what IANA specifies (or goes on the
wire anyway, IANA notwithstanding).
Doc is added.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4107)
Diffstat (limited to 'include')
-rw-r--r-- | include/openssl/ssl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 218dbdf0e6..237c086bae 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1441,6 +1441,7 @@ __owur const char *SSL_CIPHER_get_name(const SSL_CIPHER *c); __owur const char *SSL_CIPHER_standard_name(const SSL_CIPHER *c); __owur const char *OPENSSL_cipher_name(const char *rfc_name); __owur uint32_t SSL_CIPHER_get_id(const SSL_CIPHER *c); +__owur uint16_t SSL_CIPHER_get_protocol_id(const SSL_CIPHER *c); __owur int SSL_CIPHER_get_kx_nid(const SSL_CIPHER *c); __owur int SSL_CIPHER_get_auth_nid(const SSL_CIPHER *c); __owur const EVP_MD *SSL_CIPHER_get_handshake_digest(const SSL_CIPHER *c); |