Commit 53d1d07d authored by Matt Caswell's avatar Matt Caswell
Browse files

Add a SSL_get_key_update_type() function 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2609)
parent 9412b3ad

include/openssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

ssl/ssl_lib.c

+5 −0
Original line number Diff line number Diff line
@@ -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)) {

util/libssl.num

+1 −0
Original line number Diff line number Diff line
@@ -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: