Un-delete still documented X509_STORE_CTX_set_verify

It should not have been removed.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 070afd1d2bd0475198f5ff8b3816a8cba34d3f46..9fbef116be2c2d46f0948110bb4a336b7c12ce82 100644 (file)
--- 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 040fa59efeabb63f1855fe2aea822d77afcd9ef2..bf587a3bd919f92325f8b42153b79f32e906792b 100644 (file)
--- 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 a5c9b4ad83fe21bdfa49a6dd9fbfb098eec63e12..cab8005eeea0ac42d9bb203c7225c66ed0da346d 100644 (file)
--- 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 c176346cf94ea04f60cb290719209b6192946a9e..8f19a3a95163662832118f660dfc4798c0a480c4 100644 (file)
--- 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: