diff options
| author | Matt Caswell <matt@openssl.org> | 2017-02-09 15:05:46 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-02-17 10:28:00 +0000 |
| commit | 53d1d07d303f8f482600aafe7bd983a9ee70936d (patch) | |
| tree | 8c1e0f0bea40cda543cf7f2f839ddd1f812d93da | |
| parent | 9412b3ad3411a2106e87f0570e5f021af071ab8b (diff) | |
| download | openssl-53d1d07d303f8f482600aafe7bd983a9ee70936d.tar.gz | |
Add a SSL_get_key_update_type() function
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2609)
| -rw-r--r-- | include/openssl/ssl.h | 1 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 5 | ||||
| -rw-r--r-- | util/libssl.num | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index ba98a9f237..4456de19c8 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1663,6 +1663,7 @@ __owur STACK_OF(SSL_CIPHER) *SSL_get1_supported_ciphers(SSL *s); __owur int SSL_do_handshake(SSL *s); int SSL_key_update(SSL *s, SSL_KEY_UPDATE updatetype); +SSL_KEY_UPDATE SSL_get_key_update_type(SSL *s); int SSL_renegotiate(SSL *s); int SSL_renegotiate_abbreviated(SSL *s); __owur int SSL_renegotiate_pending(SSL *s); diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 0ca04bd96e..927d70a6a6 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1743,6 +1743,11 @@ int SSL_key_update(SSL *s, SSL_KEY_UPDATE updatetype) return 1; } +SSL_KEY_UPDATE SSL_get_key_update_type(SSL *s) +{ + return s->key_update; +} + int SSL_renegotiate(SSL *s) { if (SSL_IS_TLS13(s)) { diff --git a/util/libssl.num b/util/libssl.num index d137c93e3d..32b5f76549 100644 --- a/util/libssl.num +++ b/util/libssl.num @@ -414,3 +414,4 @@ SSL_CTX_set_keylog_callback 414 1_1_1 EXIST::FUNCTION: SSL_CTX_get_keylog_callback 415 1_1_1 EXIST::FUNCTION: SSL_get_peer_signature_type_nid 416 1_1_1 EXIST::FUNCTION: SSL_key_update 417 1_1_1 EXIST::FUNCTION: +SSL_get_key_update_type 418 1_1_1 EXIST::FUNCTION: |