Commit 4a7b3a7b authored by Viktor Dukhovni's avatar Viktor Dukhovni Committed by Matt Caswell
Browse files

Un-delete still documented X509_STORE_CTX_set_verify 



It should not have been removed.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 3188c950

crypto/x509/x509_vfy.c

+6 −0
Original line number Diff line number Diff line
@@ -2440,6 +2440,12 @@ X509_STORE_CTX_verify_cb X509_STORE_CTX_get_verify_cb(X509_STORE_CTX *ctx) 
    return ctx->verify_cb;

}



void X509_STORE_CTX_set_verify(X509_STORE_CTX *ctx,

                               X509_STORE_CTX_verify_fn verify)

{

    ctx->verify = verify;

}



X509_STORE_CTX_verify_fn X509_STORE_CTX_get_verify(X509_STORE_CTX *ctx)

{

    return ctx->verify;

doc/crypto/X509_STORE_CTX_new.pod

+3 −3
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ X509_STORE_CTX_get_verify - X509_STORE_CTX initialisation 


 int X509_STORE_CTX_get_num_untrusted(X509_STORE_CTX *ctx);



 typedef int (*X509_STORE_CTX_verify)(X509_STORE_CTX *);

 X509_STORE_CTX_verify X509_STORE_CTX_get_verify(X509_STORE_CTX *ctx);

 void X509_STORE_CTX_set_verify(X509_STORE_CTX *ctx, X509_STORE_CTX_verify verify);

 typedef int (*X509_STORE_CTX_verify_fn)(X509_STORE_CTX *);

 X509_STORE_CTX_verify_fn X509_STORE_CTX_get_verify(X509_STORE_CTX *ctx);

 void X509_STORE_CTX_set_verify(X509_STORE_CTX *ctx, X509_STORE_CTX_verify_fn verify);



 void X509_STORE_set_verify(X509_STORE *ctx, X509_STORE_CTX_verify verify);

include/openssl/x509_vfy.h

+2 −0
Original line number Diff line number Diff line
@@ -276,6 +276,8 @@ X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *ctx); 
void X509_STORE_set_verify(X509_STORE *ctx, X509_STORE_CTX_verify_fn verify);

#define X509_STORE_set_verify_func(ctx, func) \

            X509_STORE_set_verify((ctx),(func))

void X509_STORE_CTX_set_verify(X509_STORE_CTX *ctx,

                               X509_STORE_CTX_verify_fn verify);

X509_STORE_CTX_verify_fn X509_STORE_get_verify(X509_STORE *ctx);

void X509_STORE_set_verify_cb(X509_STORE *ctx,

                              X509_STORE_CTX_verify_cb verify_cb);

util/libcrypto.num

+1 −1
Original line number Diff line number Diff line
@@ -4123,7 +4123,7 @@ X509_OBJECT_get0_X509 4073 1_1_0 EXIST::FUNCTION: 
X509_STORE_CTX_get0_untrusted           4074	1_1_0	EXIST::FUNCTION:

X509_STORE_CTX_set_error_depth          4075	1_1_0	EXIST::FUNCTION:

X509_STORE_CTX_get0_cert                4076	1_1_0	EXIST::FUNCTION:

X509_STORE_CTX_set_verify               4077	1_1_0	NOEXIST::FUNCTION:

X509_STORE_CTX_set_verify               4077	1_1_0	EXIST::FUNCTION:

X509_STORE_CTX_set_current_cert         4078	1_1_0	EXIST::FUNCTION:

X509_STORE_CTX_get_verify               4079	1_1_0	EXIST::FUNCTION:

X509_STORE_CTX_get_verify_cb            4080	1_1_0	EXIST::FUNCTION: