diff options
| author | Matt Caswell <matt@openssl.org> | 2017-02-16 17:04:40 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-02-17 10:28:01 +0000 |
| commit | 4fbfe86ae3c5a829ea1a259330921bd5549223a5 (patch) | |
| tree | 69226d11aa9b0c0f4043033eb45a6a51afc2d4fb /doc | |
| parent | 9b92f161708e31de87cf8df0d58e3f99bd7d1724 (diff) | |
| download | openssl-4fbfe86ae3c5a829ea1a259330921bd5549223a5.tar.gz | |
Don't use an enum in the return type for a public API function
We use an int instead. That means SSL_key_update() also should use an int.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2609)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man3/SSL_key_update.pod | 13 | ||||
| -rw-r--r-- | doc/man7/ssl.pod | 4 |
2 files changed, 4 insertions, 13 deletions
diff --git a/doc/man3/SSL_key_update.pod b/doc/man3/SSL_key_update.pod index 3aab0d6dc0..5b62234350 100644 --- a/doc/man3/SSL_key_update.pod +++ b/doc/man3/SSL_key_update.pod @@ -13,17 +13,8 @@ SSL_renegotiate_pending #include <openssl/ssl.h> - /* TLSv1.3 KeyUpdate message types */ - typedef enum { - /* -1 used so that this is an invalid value for the on-the-wire protocol */ - SSL_KEY_UPDATE_NONE = -1, - /* Values as defined for the on-the-wire protocol */ - SSL_KEY_UPDATE_NOT_REQUESTED = 0, - SSL_KEY_UPDATE_REQUESTED = 1 - } SSL_KEY_UPDATE; - - int SSL_key_update(SSL *s, SSL_KEY_UPDATE updatetype); - SSL_KEY_UPDATE SSL_get_key_update_type(SSL *s); + int SSL_key_update(SSL *s, int updatetype); + int SSL_get_key_update_type(SSL *s); int SSL_renegotiate(SSL *s); int SSL_renegotiate_abbreviated(SSL *s); diff --git a/doc/man7/ssl.pod b/doc/man7/ssl.pod index b15ae7c3b6..5812bc8052 100644 --- a/doc/man7/ssl.pod +++ b/doc/man7/ssl.pod @@ -552,7 +552,7 @@ fresh handle for each connection. =item void (*B<SSL_get_info_callback>(const SSL *ssl);)() -=item SSL_KEY_UPDATE B<SSL_get_key_update_type>(SSL *s); +=item int B<SSL_get_key_update_type>(SSL *s); =item STACK *B<SSL_get_peer_cert_chain>(const SSL *ssl); @@ -602,7 +602,7 @@ fresh handle for each connection. =item int B<SSL_is_init_finished>(SSL *ssl); -=item int B<SSL_key_update>(SSL *s, SSL_KEY_UPDATE updatetype); +=item int B<SSL_key_update>(SSL *s, int updatetype); =item STACK *B<SSL_load_client_CA_file>(const char *file); |