diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-04-19 15:13:18 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-04-19 16:17:22 +0900 |
| commit | 76f2554a10abdc340b9bbc0782260a411b4d2045 (patch) | |
| tree | 1bb6544f46dd05fe495362b4e764f345066993cb | |
| parent | 235f9329304ab9e75e43dc5a409901fc3b3de9ca (diff) | |
| download | openssl-76f2554a10abdc340b9bbc0782260a411b4d2045.tar.gz | |
Remove unusable X509_STORE_set_verify_{cb_,}func macros
Since X509_STORE was made opaque, they no longer work and should be
removed.
| -rw-r--r-- | doc/crypto/X509_STORE_CTX_set_verify_cb.pod | 2 | ||||
| -rw-r--r-- | doc/crypto/X509_STORE_new.pod | 2 | ||||
| -rw-r--r-- | doc/crypto/X509_STORE_set_verify_cb.pod (renamed from doc/crypto/X509_STORE_set_verify_cb_func.pod) | 12 | ||||
| -rw-r--r-- | include/openssl/x509_vfy.h | 3 |
4 files changed, 5 insertions, 14 deletions
diff --git a/doc/crypto/X509_STORE_CTX_set_verify_cb.pod b/doc/crypto/X509_STORE_CTX_set_verify_cb.pod index e89b8060f7..2c0e189dd4 100644 --- a/doc/crypto/X509_STORE_CTX_set_verify_cb.pod +++ b/doc/crypto/X509_STORE_CTX_set_verify_cb.pod @@ -158,7 +158,7 @@ B<ex_data>. =head1 SEE ALSO L<X509_STORE_CTX_get_error(3)> -L<X509_STORE_set_verify_cb_func(3)> +L<X509_STORE_set_verify_cb(3)> L<X509_STORE_CTX_get_ex_new_index(3)> =cut diff --git a/doc/crypto/X509_STORE_new.pod b/doc/crypto/X509_STORE_new.pod index 37cabb5c55..1f0ec51e07 100644 --- a/doc/crypto/X509_STORE_new.pod +++ b/doc/crypto/X509_STORE_new.pod @@ -31,6 +31,6 @@ X509_STORE_free() does not return values. =head1 SEE ALSO -L<X509_STORE_set_verify_cb_func(3)> +L<X509_STORE_set_verify_cb(3)> =cut diff --git a/doc/crypto/X509_STORE_set_verify_cb_func.pod b/doc/crypto/X509_STORE_set_verify_cb.pod index 67092db538..31c8b735cb 100644 --- a/doc/crypto/X509_STORE_set_verify_cb_func.pod +++ b/doc/crypto/X509_STORE_set_verify_cb.pod @@ -2,7 +2,7 @@ =head1 NAME -X509_STORE_set_verify_cb_func, X509_STORE_set_verify_cb - set verification callback +X509_STORE_set_verify_cb - set verification callback =head1 SYNOPSIS @@ -11,17 +11,11 @@ X509_STORE_set_verify_cb_func, X509_STORE_set_verify_cb - set verification callb void X509_STORE_set_verify_cb(X509_STORE *st, int (*verify_cb)(int ok, X509_STORE_CTX *ctx)); - void X509_STORE_set_verify_cb_func(X509_STORE *st, - int (*verify_cb)(int ok, X509_STORE_CTX *ctx)); - =head1 DESCRIPTION X509_STORE_set_verify_cb() sets the verification callback of B<ctx> to B<verify_cb> overwriting any existing callback. -X509_STORE_set_verify_cb_func() also sets the verification callback but it -is implemented as a macro. - =head1 NOTES The verification callback from an B<X509_STORE> is inherited by @@ -36,8 +30,7 @@ OpenSSL 1.0.0. =head1 RETURN VALUES -X509_STORE_set_verify_cb() and X509_STORE_set_verify_cb_func() do not return -a value. +X509_STORE_set_verify_cb() does not return a value. =head1 SEE ALSO @@ -47,5 +40,6 @@ L<CMS_verify(3)> =head1 HISTORY X509_STORE_set_verify_cb() was added to OpenSSL 1.0.0. +X509_STORE_set_verify_cb_func() macro existed in OpenSSL versions before 1.1.0. =cut diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h index 4bf27e9d76..fa186a09d9 100644 --- a/include/openssl/x509_vfy.h +++ b/include/openssl/x509_vfy.h @@ -104,9 +104,6 @@ DEFINE_STACK_OF(X509_VERIFY_PARAM) int X509_STORE_set_depth(X509_STORE *store, int depth); -# define X509_STORE_set_verify_cb_func(ctx,func) ((ctx)->verify_cb=(func)) -# define X509_STORE_set_verify_func(ctx,func) ((ctx)->verify=(func)) - void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth); # define X509_STORE_CTX_set_app_data(ctx,data) \ |