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 /ssl | |
| 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 'ssl')
| -rw-r--r-- | ssl/ssl_lib.c | 4 | ||||
| -rw-r--r-- | ssl/ssl_locl.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index cb5e0cfbc9..e8274a1c05 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1718,7 +1718,7 @@ int SSL_shutdown(SSL *s) } } -int SSL_key_update(SSL *s, SSL_KEY_UPDATE updatetype) +int SSL_key_update(SSL *s, int updatetype) { /* * TODO(TLS1.3): How will applications know whether TLSv1.3+ has been @@ -1746,7 +1746,7 @@ int SSL_key_update(SSL *s, SSL_KEY_UPDATE updatetype) return 1; } -SSL_KEY_UPDATE SSL_get_key_update_type(SSL *s) +int SSL_get_key_update_type(SSL *s) { return s->key_update; } diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 991766f05b..70a47a8f54 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1177,7 +1177,7 @@ struct ssl_st { */ int renegotiate; /* If sending a KeyUpdate is pending */ - SSL_KEY_UPDATE key_update; + int key_update; # ifndef OPENSSL_NO_SRP /* ctx for SRP authentication */ SRP_CTX srp_ctx; |