From 4674aaf4f2217540690489fee22edefe4a463293 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 15 Jul 2019 15:03:44 +0200 Subject: [PATCH] In documentation, consistently refer to OpenSSL 3.0 3.0.0 is a habit from pre-3.0 OpenSSL, which doesn't make sense with the new version scheme. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/9376) --- doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod | 2 +- doc/internal/man3/OSSL_METHOD_STORE.pod | 2 +- doc/man1/verify.pod | 2 +- doc/man3/ASYNC_WAIT_CTX_new.pod | 2 +- doc/man3/BIO_ctrl.pod | 2 +- doc/man3/CRYPTO_get_ex_new_index.pod | 2 +- doc/man3/EVP_KDF_CTX.pod | 2 +- doc/man3/EVP_MAC.pod | 2 +- doc/man3/EVP_PKEY_supports_digest_nid.pod | 2 +- doc/man3/OPENSSL_CTX.pod | 2 +- doc/man3/OSSL_PARAM_int.pod | 2 +- doc/man3/OSSL_trace_enabled.pod | 2 +- doc/man3/OSSL_trace_get_category_num.pod | 2 +- doc/man3/OSSL_trace_set_channel.pod | 2 +- doc/man3/OpenSSL_version.pod | 2 +- doc/man3/RAND_DRBG_generate.pod | 2 +- doc/man3/RAND_DRBG_reseed.pod | 2 +- doc/man3/SRP_VBASE_new.pod | 2 +- doc/man3/SRP_user_pwd_new.pod | 2 +- doc/man3/SSL_CTX_set_cipher_list.pod | 4 ++-- doc/man3/SSL_CTX_set_mode.pod | 2 +- doc/man3/SSL_CTX_set_options.pod | 2 +- doc/man3/SSL_set_async_callback.pod | 2 +- doc/man3/SSL_write.pod | 2 +- doc/man7/EVP_KDF_PBKDF2.pod | 2 +- doc/man7/EVP_KDF_SS.pod | 2 +- doc/man7/EVP_KDF_X942.pod | 2 +- doc/man7/EVP_KDF_X963.pod | 2 +- doc/man7/EVP_MAC_BLAKE2.pod | 2 +- doc/man7/openssl_user_macros.pod.in | 2 +- 30 files changed, 31 insertions(+), 31 deletions(-) diff --git a/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod b/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod index db2ad36b40..b36084dc46 100644 --- a/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod +++ b/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod @@ -108,7 +108,7 @@ ossl_sa_TYPE_free_leaves() do not return values. =head1 HISTORY -This functionality was added to OpenSSL 3.0.0. +This functionality was added to OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/internal/man3/OSSL_METHOD_STORE.pod b/doc/internal/man3/OSSL_METHOD_STORE.pod index f95d397cf3..abe7ebe317 100644 --- a/doc/internal/man3/OSSL_METHOD_STORE.pod +++ b/doc/internal/man3/OSSL_METHOD_STORE.pod @@ -103,7 +103,7 @@ ossl_method_store_free() and ossl_method_store_cleanup() do not return values. =head1 HISTORY -This functionality was added to OpenSSL 3.0.0. +This functionality was added to OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man1/verify.pod b/doc/man1/verify.pod index 10fd848622..e0c6906e24 100644 --- a/doc/man1/verify.pod +++ b/doc/man1/verify.pod @@ -779,7 +779,7 @@ The B<-show_chain> option was added in OpenSSL 1.1.0. The B<-issuer_checks> option is deprecated as of OpenSSL 1.1.0 and is silently ignored. -The B<-sm2-id> and B<-sm2-hex-id> options were added in OpenSSL 3.0.0. +The B<-sm2-id> and B<-sm2-hex-id> options were added in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/ASYNC_WAIT_CTX_new.pod b/doc/man3/ASYNC_WAIT_CTX_new.pod index 9076be8171..9c3fd713dc 100644 --- a/doc/man3/ASYNC_WAIT_CTX_new.pod +++ b/doc/man3/ASYNC_WAIT_CTX_new.pod @@ -195,7 +195,7 @@ were added in OpenSSL 1.1.0. ASYNC_WAIT_CTX_set_callback(), ASYNC_WAIT_CTX_get_callback(), ASYNC_WAIT_CTX_set_status(), and ASYNC_WAIT_CTX_get_status() -were added in OpenSSL 3.0.0. +were added in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/BIO_ctrl.pod b/doc/man3/BIO_ctrl.pod index f51593fb6e..c8e3386375 100644 --- a/doc/man3/BIO_ctrl.pod +++ b/doc/man3/BIO_ctrl.pod @@ -141,7 +141,7 @@ the case of BIO_seek() on a file BIO for a successful operation. =head1 HISTORY The BIO_get_ktls_send() and BIO_get_ktls_recv() functions were added in -OpenSSL 3.0.0. +OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/CRYPTO_get_ex_new_index.pod b/doc/man3/CRYPTO_get_ex_new_index.pod index f37d532b98..b0321b0933 100644 --- a/doc/man3/CRYPTO_get_ex_new_index.pod +++ b/doc/man3/CRYPTO_get_ex_new_index.pod @@ -162,7 +162,7 @@ dup_func() should return 0 for failure and 1 for success. =head1 HISTORY -CRYPTO_alloc_ex_data() was added in OpenSSL 3.0.0. +CRYPTO_alloc_ex_data() was added in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/EVP_KDF_CTX.pod b/doc/man3/EVP_KDF_CTX.pod index 3899361065..e65becf462 100644 --- a/doc/man3/EVP_KDF_CTX.pod +++ b/doc/man3/EVP_KDF_CTX.pod @@ -282,7 +282,7 @@ L =head1 HISTORY -This functionality was added to OpenSSL 3.0.0. +This functionality was added to OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/EVP_MAC.pod b/doc/man3/EVP_MAC.pod index 01ad6ed522..2c6687945c 100644 --- a/doc/man3/EVP_MAC.pod +++ b/doc/man3/EVP_MAC.pod @@ -358,7 +358,7 @@ L =head1 HISTORY -These functions were added in OpenSSL 3.0.0. +These functions were added in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/EVP_PKEY_supports_digest_nid.pod b/doc/man3/EVP_PKEY_supports_digest_nid.pod index 0dfc1163b4..b3f51346ca 100644 --- a/doc/man3/EVP_PKEY_supports_digest_nid.pod +++ b/doc/man3/EVP_PKEY_supports_digest_nid.pod @@ -39,7 +39,7 @@ L, =head1 HISTORY -The EVP_PKEY_supports_digest_nid() function was added in OpenSSL 3.0.0. +The EVP_PKEY_supports_digest_nid() function was added in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/OPENSSL_CTX.pod b/doc/man3/OPENSSL_CTX.pod index 1893c923a3..d574a374d6 100644 --- a/doc/man3/OPENSSL_CTX.pod +++ b/doc/man3/OPENSSL_CTX.pod @@ -38,7 +38,7 @@ OPENSSL_CTX_free() doesn't return any value. =head1 HISTORY OPENSSL_CTX, OPENSSL_CTX_new() and OPENSSL_CTX_free() -were added in OpenSSL 3.0.0. +were added in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/OSSL_PARAM_int.pod b/doc/man3/OSSL_PARAM_int.pod index 3aa6141f0c..0640bcf0ca 100644 --- a/doc/man3/OSSL_PARAM_int.pod +++ b/doc/man3/OSSL_PARAM_int.pod @@ -312,7 +312,7 @@ L, L =head1 HISTORY -These APIs were introduced in OpenSSL 3.0.0. +These APIs were introduced in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/OSSL_trace_enabled.pod b/doc/man3/OSSL_trace_enabled.pod index 958e8b063b..2ced3d412f 100644 --- a/doc/man3/OSSL_trace_enabled.pod +++ b/doc/man3/OSSL_trace_enabled.pod @@ -278,7 +278,7 @@ otherwise C. =head1 HISTORY -The OpenSSL Tracing API was added ino OpenSSL 3.0.0. +The OpenSSL Tracing API was added ino OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/OSSL_trace_get_category_num.pod b/doc/man3/OSSL_trace_get_category_num.pod index 886d0f155c..5ab05a3a5c 100644 --- a/doc/man3/OSSL_trace_get_category_num.pod +++ b/doc/man3/OSSL_trace_get_category_num.pod @@ -30,7 +30,7 @@ C is a recognised category number, otherwise NULL. =head1 HISTORY -The OpenSSL Tracing API was added ino OpenSSL 3.0.0. +The OpenSSL Tracing API was added ino OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/OSSL_trace_set_channel.pod b/doc/man3/OSSL_trace_set_channel.pod index cb349674c4..9c03218a21 100644 --- a/doc/man3/OSSL_trace_set_channel.pod +++ b/doc/man3/OSSL_trace_set_channel.pod @@ -297,7 +297,7 @@ functions described here are inoperational, i.e. will do nothing. OSSL_trace_set_channel(), OSSL_trace_set_prefix(), OSSL_trace_set_suffix(), and OSSL_trace_set_callback() were all added -in OpenSSL 3.0.0. +in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/OpenSSL_version.pod b/doc/man3/OpenSSL_version.pod index c1ced6434d..9b8ecd2d2c 100644 --- a/doc/man3/OpenSSL_version.pod +++ b/doc/man3/OpenSSL_version.pod @@ -219,7 +219,7 @@ L =head1 HISTORY -The macros and functions described here were added in OpenSSL 3.0.0, +The macros and functions described here were added in OpenSSL 3.0, with the exception of the L ones. =head1 COPYRIGHT diff --git a/doc/man3/RAND_DRBG_generate.pod b/doc/man3/RAND_DRBG_generate.pod index e0778ea224..def98a9680 100644 --- a/doc/man3/RAND_DRBG_generate.pod +++ b/doc/man3/RAND_DRBG_generate.pod @@ -76,7 +76,7 @@ L The RAND_DRBG functions were added in OpenSSL 1.1.1. -Prediction resistance is supported from OpenSSL 3.0.0. +Prediction resistance is supported from OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/RAND_DRBG_reseed.pod b/doc/man3/RAND_DRBG_reseed.pod index 40375603f7..b73f35fb66 100644 --- a/doc/man3/RAND_DRBG_reseed.pod +++ b/doc/man3/RAND_DRBG_reseed.pod @@ -104,7 +104,7 @@ L The RAND_DRBG functions were added in OpenSSL 1.1.1. -Prediction resistance is supported from OpenSSL 3.0.0. +Prediction resistance is supported from OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/SRP_VBASE_new.pod b/doc/man3/SRP_VBASE_new.pod index d780cf24cc..0a7b117c0d 100644 --- a/doc/man3/SRP_VBASE_new.pod +++ b/doc/man3/SRP_VBASE_new.pod @@ -83,7 +83,7 @@ L =head1 HISTORY -The SRP_VBASE_add0_user() function was added in OpenSSL 3.0.0. +The SRP_VBASE_add0_user() function was added in OpenSSL 3.0. All other functions were added in OpenSSL 1.0.1. diff --git a/doc/man3/SRP_user_pwd_new.pod b/doc/man3/SRP_user_pwd_new.pod index b1799d173b..9d9e11d98e 100644 --- a/doc/man3/SRP_user_pwd_new.pod +++ b/doc/man3/SRP_user_pwd_new.pod @@ -56,7 +56,7 @@ L =head1 HISTORY -These functions were made public in OpenSSL 3.0.0. +These functions were made public in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/SSL_CTX_set_cipher_list.pod b/doc/man3/SSL_CTX_set_cipher_list.pod index 1852405421..c602ac0df7 100644 --- a/doc/man3/SSL_CTX_set_cipher_list.pod +++ b/doc/man3/SSL_CTX_set_cipher_list.pod @@ -96,7 +96,7 @@ and the handshake will fail. OSSL_default_cipher_list() and OSSL_default_ciphersuites() replace SSL_DEFAULT_CIPHER_LIST and TLS_DEFAULT_CIPHERSUITES, respectively. The -cipher list defines are deprecated as of 3.0.0. +cipher list defines are deprecated as of 3.0. =head1 RETURN VALUES @@ -115,7 +115,7 @@ L =head1 HISTORY -OSSL_default_cipher_list() and OSSL_default_ciphersites() are new in 3.0.0. +OSSL_default_cipher_list() and OSSL_default_ciphersites() are new in 3.0. =head1 COPYRIGHT diff --git a/doc/man3/SSL_CTX_set_mode.pod b/doc/man3/SSL_CTX_set_mode.pod index a4997c9622..f1f6c7a5c8 100644 --- a/doc/man3/SSL_CTX_set_mode.pod +++ b/doc/man3/SSL_CTX_set_mode.pod @@ -150,7 +150,7 @@ L, L =head1 HISTORY SSL_MODE_ASYNC was added in OpenSSL 1.1.0. -SSL_MODE_NO_KTLS_TX was added in OpenSSL 3.0.0. +SSL_MODE_NO_KTLS_TX was added in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/SSL_CTX_set_options.pod b/doc/man3/SSL_CTX_set_options.pod index 7626bd338b..32abd2fc01 100644 --- a/doc/man3/SSL_CTX_set_options.pod +++ b/doc/man3/SSL_CTX_set_options.pod @@ -374,7 +374,7 @@ OpenSSL 0.9.8m. The B and B options were added in OpenSSL 1.1.1. -The B option was added in OpenSSL 3.0.0. +The B option was added in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/SSL_set_async_callback.pod b/doc/man3/SSL_set_async_callback.pod index 5e7f61eaf1..24cf02c120 100644 --- a/doc/man3/SSL_set_async_callback.pod +++ b/doc/man3/SSL_set_async_callback.pod @@ -82,7 +82,7 @@ SSL_get_async_status() return 1 on success or 0 on error. SSL_CTX_set_async_callback(), SSL_CTX_set_async_callback_arg(), SSL_set_async_callback(), SSL_set_async_callback_arg() and -SSL_get_async_status() were first added to OpenSSL 3.0.0. +SSL_get_async_status() were first added to OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man3/SSL_write.pod b/doc/man3/SSL_write.pod index a1ceb20250..04cc46b27a 100644 --- a/doc/man3/SSL_write.pod +++ b/doc/man3/SSL_write.pod @@ -141,7 +141,7 @@ L, L =head1 HISTORY The SSL_write_ex() function was added in OpenSSL 1.1.1. -The SSL_sendfile() function was added in OpenSSL 3.0.0. +The SSL_sendfile() function was added in OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man7/EVP_KDF_PBKDF2.pod b/doc/man7/EVP_KDF_PBKDF2.pod index c3d3f275f8..e914f3713c 100644 --- a/doc/man7/EVP_KDF_PBKDF2.pod +++ b/doc/man7/EVP_KDF_PBKDF2.pod @@ -93,7 +93,7 @@ L =head1 HISTORY -This functionality was added to OpenSSL 3.0.0. +This functionality was added to OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man7/EVP_KDF_SS.pod b/doc/man7/EVP_KDF_SS.pod index b3de26a464..958089d24a 100644 --- a/doc/man7/EVP_KDF_SS.pod +++ b/doc/man7/EVP_KDF_SS.pod @@ -211,7 +211,7 @@ L =head1 HISTORY -This functionality was added to OpenSSL 3.0.0. +This functionality was added to OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man7/EVP_KDF_X942.pod b/doc/man7/EVP_KDF_X942.pod index 306ab2e48e..df93e861f9 100644 --- a/doc/man7/EVP_KDF_X942.pod +++ b/doc/man7/EVP_KDF_X942.pod @@ -136,7 +136,7 @@ L =head1 HISTORY -This functionality was added to OpenSSL 3.0.0. +This functionality was added to OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man7/EVP_KDF_X963.pod b/doc/man7/EVP_KDF_X963.pod index eaea6da23c..77b878f6ba 100644 --- a/doc/man7/EVP_KDF_X963.pod +++ b/doc/man7/EVP_KDF_X963.pod @@ -122,7 +122,7 @@ L =head1 HISTORY -This functionality was added to OpenSSL 3.0.0. +This functionality was added to OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man7/EVP_MAC_BLAKE2.pod b/doc/man7/EVP_MAC_BLAKE2.pod index 58b4f99373..2fc8051475 100644 --- a/doc/man7/EVP_MAC_BLAKE2.pod +++ b/doc/man7/EVP_MAC_BLAKE2.pod @@ -100,7 +100,7 @@ L, L =head1 HISTORY -The macros and functions described here were added to OpenSSL 3.0.0. +The macros and functions described here were added to OpenSSL 3.0. =head1 COPYRIGHT diff --git a/doc/man7/openssl_user_macros.pod.in b/doc/man7/openssl_user_macros.pod.in index 17c2d2e1bb..7a2387c37b 100644 --- a/doc/man7/openssl_user_macros.pod.in +++ b/doc/man7/openssl_user_macros.pod.in @@ -60,7 +60,7 @@ However, it is recommended to start using the second form instead: =item C This form is a simple number that represents the major version number -and is supported for version 3.0.0 and up. For extra convenience, +and is supported for version 3.0 and up. For extra convenience, these numbers are also available: =over 4 -- 2.25.1