diff options
author | Matt Caswell <matt@openssl.org> | 2020-09-24 11:56:03 +0200 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2020-10-01 10:25:20 +0200 |
commit | 746f3674896845460946ace7e963e52b547fbf35 (patch) | |
tree | 3524d555baa83495e8b19a0bd279e8a3b42807c9 /doc | |
parent | Run the withlibctx.pl script (diff) | |
download | openssl-746f3674896845460946ace7e963e52b547fbf35.tar.xz openssl-746f3674896845460946ace7e963e52b547fbf35.zip |
Fix some things the rename script didn't quite get right
The previous commit ran an automated rename throughout the codebase.
There are a small number of things it didn't quite get right so we fix
those in this commit.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12970)
Diffstat (limited to 'doc')
-rw-r--r-- | doc/man3/CTLOG_new.pod | 2 | ||||
-rw-r--r-- | doc/man3/EC_KEY_new.pod | 2 | ||||
-rw-r--r-- | doc/man3/EVP_VerifyInit.pod | 2 | ||||
-rw-r--r-- | doc/man3/NCONF_new_ex.pod (renamed from doc/man3/NCONF_new_with_libctx.pod) | 0 | ||||
-rw-r--r-- | doc/man3/PEM_X509_INFO_read_bio_ex.pod (renamed from doc/man3/PEM_X509_INFO_read_bio_with_libctx.pod) | 2 | ||||
-rw-r--r-- | doc/man3/X509_LOOKUP.pod | 2 | ||||
-rw-r--r-- | doc/man3/X509_STORE_add_cert.pod | 2 | ||||
-rw-r--r-- | doc/man3/X509_dup.pod | 2 |
8 files changed, 7 insertions, 7 deletions
diff --git a/doc/man3/CTLOG_new.pod b/doc/man3/CTLOG_new.pod index 227929c5b3..edc4f7d6c3 100644 --- a/doc/man3/CTLOG_new.pod +++ b/doc/man3/CTLOG_new.pod @@ -75,7 +75,7 @@ L<ct(7)> =head1 HISTORY -The functions CTLOG_new_with_libctx() and CTLOG_new_from_base64_ex() +The functions CTLOG_new_ex() and CTLOG_new_from_base64_ex() were added in OpenSSL 3.0. All other functions were added in OpenSSL 1.1.0. =head1 COPYRIGHT diff --git a/doc/man3/EC_KEY_new.pod b/doc/man3/EC_KEY_new.pod index 97b29c60b1..2af07227ea 100644 --- a/doc/man3/EC_KEY_new.pod +++ b/doc/man3/EC_KEY_new.pod @@ -177,7 +177,7 @@ EC_KEY_priv2buf() converts an EC_KEY private key into an allocated buffer. =head1 RETURN VALUES -EC_KEY_new_with_libctx(), EC_KEY_new(), EC_KEY_new_by_curve_name_ex(), +EC_KEY_new_ex(), EC_KEY_new(), EC_KEY_new_by_curve_name_ex(), EC_KEY_new_by_curve_name() and EC_KEY_dup() return a pointer to the newly created EC_KEY object, or NULL on error. diff --git a/doc/man3/EVP_VerifyInit.pod b/doc/man3/EVP_VerifyInit.pod index b505af405d..d98054bedb 100644 --- a/doc/man3/EVP_VerifyInit.pod +++ b/doc/man3/EVP_VerifyInit.pod @@ -49,7 +49,7 @@ implementation of digest I<type>. EVP_VerifyInit_ex() and EVP_VerifyUpdate() return 1 for success and 0 for failure. -EVP_VerifyFinal()_ex() and EVP_VerifyFinal() return 1 for a correct +EVP_VerifyFinal_ex() and EVP_VerifyFinal() return 1 for a correct signature, 0 for failure and -1 if some other error occurred. The error codes can be obtained by L<ERR_get_error(3)>. diff --git a/doc/man3/NCONF_new_with_libctx.pod b/doc/man3/NCONF_new_ex.pod index 2de14b4f4e..2de14b4f4e 100644 --- a/doc/man3/NCONF_new_with_libctx.pod +++ b/doc/man3/NCONF_new_ex.pod diff --git a/doc/man3/PEM_X509_INFO_read_bio_with_libctx.pod b/doc/man3/PEM_X509_INFO_read_bio_ex.pod index 19f57b050a..e8eb00aad0 100644 --- a/doc/man3/PEM_X509_INFO_read_bio_with_libctx.pod +++ b/doc/man3/PEM_X509_INFO_read_bio_ex.pod @@ -37,7 +37,7 @@ fetching algorithms from providers. =head1 RETURN VALUES -PEM_X509_INFO_read_with_libctx() and PEM_X509_INFO_read_bio_ex() return +PEM_X509_INFO_read_ex() and PEM_X509_INFO_read_bio_ex() return a stack of B<X509_INFO> objects or NULL on failure. =head1 SEE ALSO diff --git a/doc/man3/X509_LOOKUP.pod b/doc/man3/X509_LOOKUP.pod index 6f464a1e0a..69d6315ffe 100644 --- a/doc/man3/X509_LOOKUP.pod +++ b/doc/man3/X509_LOOKUP.pod @@ -223,7 +223,7 @@ The functions X509_LOOKUP_by_subject_ex() and X509_LOOKUP_ctrl_ex() were added in OpenSSL 3.0. The macros X509_LOOKUP_load_file_ex(), -X509_LOOKUP_load_store_with_libctx() and 509_LOOKUP_add_store_ex() were +X509_LOOKUP_load_store_ex() and 509_LOOKUP_add_store_ex() were added in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/X509_STORE_add_cert.pod b/doc/man3/X509_STORE_add_cert.pod index 7734d78a7b..5f16ee09b9 100644 --- a/doc/man3/X509_STORE_add_cert.pod +++ b/doc/man3/X509_STORE_add_cert.pod @@ -153,7 +153,7 @@ L<X509_STORE_get0_param(3)> =head1 HISTORY The functions X509_STORE_set_default_paths_ex(), -X509_STORE_load_file_with_libctx(), X509_STORE_load_store_ex() and +X509_STORE_load_file_ex(), X509_STORE_load_store_ex() and X509_STORE_load_locations_ex() were added in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/X509_dup.pod b/doc/man3/X509_dup.pod index 11bf24e735..d3e164a6e0 100644 --- a/doc/man3/X509_dup.pod +++ b/doc/man3/X509_dup.pod @@ -361,7 +361,7 @@ B<I<TYPE>_print_ctx>() returns 1 on success or zero on failure. =head1 HISTORY -The functions PKCS7_new_with_libctx() and CMS_ContentInfo_new_ex() were +The functions PKCS7_new_ex() and CMS_ContentInfo_new_ex() were added in OpenSSL 3.0. =head1 COPYRIGHT |