diff options
| author | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-08-24 14:53:09 -0400 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-08-24 20:30:45 +0100 |
| commit | 4a7b3a7b4d01ce1208bc4465a4e7bd5be9401ad0 (patch) | |
| tree | 24b7fbb14795e8794c44ed16cd35016ce2be4f9a | |
| parent | 3188c9509e1775f15ffd42ccfffd0e6ea1929923 (diff) | |
| download | openssl-4a7b3a7b4d01ce1208bc4465a4e7bd5be9401ad0.tar.gz | |
Un-delete still documented X509_STORE_CTX_set_verify
It should not have been removed.
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | crypto/x509/x509_vfy.c | 6 | ||||
| -rw-r--r-- | doc/crypto/X509_STORE_CTX_new.pod | 6 | ||||
| -rw-r--r-- | include/openssl/x509_vfy.h | 2 | ||||
| -rw-r--r-- | util/libcrypto.num | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 070afd1d2b..9fbef116be 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -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; diff --git a/doc/crypto/X509_STORE_CTX_new.pod b/doc/crypto/X509_STORE_CTX_new.pod index 040fa59efe..bf587a3bd9 100644 --- a/doc/crypto/X509_STORE_CTX_new.pod +++ b/doc/crypto/X509_STORE_CTX_new.pod @@ -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); diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h index a5c9b4ad83..cab8005eee 100644 --- a/include/openssl/x509_vfy.h +++ b/include/openssl/x509_vfy.h @@ -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); diff --git a/util/libcrypto.num b/util/libcrypto.num index c176346cf9..8f19a3a951 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -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: |