Commit 3adc41dd authored by Rich Salz's avatar Rich Salz
Browse files

Rename "verify_cb" to SSL_verify_cb 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2151)
parent 121677b4

doc/man3/SSL_CTX_set_verify.pod

+4 −4
Original line number Diff line number Diff line
@@ -4,19 +4,19 @@ 


SSL_CTX_set_verify, SSL_set_verify,

SSL_CTX_set_verify_depth, SSL_set_verify_depth,

verify_cb

SSL_verify_cb

- set peer certificate verification parameters



=head1 SYNOPSIS



 #include <openssl/ssl.h>



 void SSL_CTX_set_verify(SSL_CTX *ctx, int mode, verify_cb verify_callback);

 void SSL_set_verify(SSL *s, int mode, verify_cb verify_callback);

 void SSL_CTX_set_verify(SSL_CTX *ctx, int mode, SSL_verify_cb verify_callback);

 void SSL_set_verify(SSL *s, int mode, SSL_verify_cb verify_callback);

 void SSL_CTX_set_verify_depth(SSL_CTX *ctx, int depth);

 void SSL_set_verify_depth(SSL *s, int depth);



 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);



=head1 DESCRIPTION

include/openssl/ssl.h

+5 −5
Original line number Diff line number Diff line
@@ -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
@@ -1363,8 +1363,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
@@ -1463,8 +1463,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 *),