diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-01-08 12:50:52 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-01-09 16:19:27 -0500 |
| commit | 3dca6ca0df0facedabcc5d9733b304e507f796db (patch) | |
| tree | c44c338d291c2133e0cfad7d1cfe48d2b82ff91f /include | |
| parent | 0d3020caefb93653b6cbbe0533f77c46e625f269 (diff) | |
Rename "verify_cb" to SSL_verify_cb
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2151)
(cherry picked from commit 3adc41dd22080c4161d8a2af98d7b29fdbb11915)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 3283d987b8..8d75d53eca 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -263,7 +263,7 @@ typedef int (*custom_ext_parse_cb) (SSL *s, unsigned int ext_type, size_t inlen, int *al, void *parse_arg); /* Typedef for verification callback */ -typedef int (*verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx); +typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx); /* Allow initial connection to servers that don't support RI */ # define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004U @@ -1345,8 +1345,8 @@ __owur int SSL_set_cipher_list(SSL *s, const char *str); void SSL_set_read_ahead(SSL *s, int yes); __owur int SSL_get_verify_mode(const SSL *s); __owur int SSL_get_verify_depth(const SSL *s); -__owur verify_cb SSL_get_verify_callback(const SSL *s); -void SSL_set_verify(SSL *s, int mode, verify_cb callback); +__owur SSL_verify_cb SSL_get_verify_callback(const SSL *s); +void SSL_set_verify(SSL *s, int mode, SSL_verify_cb callback); void SSL_set_verify_depth(SSL *s, int depth); void SSL_set_cert_cb(SSL *s, int (*cb) (SSL *ssl, void *arg), void *arg); # ifndef OPENSSL_NO_RSA @@ -1445,8 +1445,8 @@ __owur STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s); __owur int SSL_CTX_get_verify_mode(const SSL_CTX *ctx); __owur int SSL_CTX_get_verify_depth(const SSL_CTX *ctx); -__owur verify_cb SSL_CTX_get_verify_callback(const SSL_CTX *ctx); -void SSL_CTX_set_verify(SSL_CTX *ctx, int mode, verify_cb callback); +__owur SSL_verify_cb SSL_CTX_get_verify_callback(const SSL_CTX *ctx); +void SSL_CTX_set_verify(SSL_CTX *ctx, int mode, SSL_verify_cb callback); void SSL_CTX_set_verify_depth(SSL_CTX *ctx, int depth); void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx, int (*cb) (X509_STORE_CTX *, void *), |