diff options
| author | Matt Caswell <matt@openssl.org> | 2015-10-05 10:18:06 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-10-30 08:39:46 +0000 |
| commit | 35bf6e05371de3aebd83dc630125a108ec4a5e70 (patch) | |
| tree | c71f645eea7babdf30f1eecdf30a2e286ac02769 /include | |
| parent | a455d0f6fff7bdac2b991715e7bf5b000e2274af (diff) | |
Change HANDSHAKE_STATE to OSSL_HANDSHAKE_STATE
Rename the enum HANDSHAKE_STATE to OSSL_HANDSHAKE_STATE to ensure there are
no namespace clashes, and convert it into a typedef.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index de858f6006..8570f33653 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -933,7 +933,7 @@ extern "C" { * TLS_ST_BEFORE = No handshake has been initiated yet * TLS_ST_OK = A handshake has been successfully completed */ -enum HANDSHAKE_STATE { +typedef enum { TLS_ST_BEFORE, TLS_ST_OK, DTLS_ST_CR_HELLO_VERIFY_REQUEST, @@ -971,7 +971,7 @@ enum HANDSHAKE_STATE { TLS_ST_SW_CERT_STATUS, TLS_ST_SW_CHANGE, TLS_ST_SW_FINISHED -}; +} OSSL_HANDSHAKE_STATE; /* * Most of the following state values are no longer used and are defined to be @@ -1700,8 +1700,8 @@ void SSL_set_info_callback(SSL *ssl, void (*cb) (const SSL *ssl, int type, int val)); void (*SSL_get_info_callback(const SSL *ssl)) (const SSL *ssl, int type, int val); -__owur enum HANDSHAKE_STATE SSL_state(const SSL *ssl); -void SSL_set_state(SSL *ssl, enum HANDSHAKE_STATE state); +__owur OSSL_HANDSHAKE_STATE SSL_state(const SSL *ssl); +void SSL_set_state(SSL *ssl, OSSL_HANDSHAKE_STATE state); void SSL_set_verify_result(SSL *ssl, long v); __owur long SSL_get_verify_result(const SSL *ssl); |