From: Tomas Mraz <tomas@openssl.org>
Date: Wed, 6 Apr 2022 14:20:47 +0000 (+0200)
Subject: Correct doubled OSSL_OSSL when documenting OSSL_FUNC_.._fn
X-Git-Tag: openssl-3.2.0-alpha1~2463
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13b47155ba425ffd0683e1bff30f746c96a19049;p=thirdparty%2Fopenssl.git

Correct doubled OSSL_OSSL when documenting OSSL_FUNC_.._fn

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17554)
---

diff --git a/doc/man7/provider-cipher.pod b/doc/man7/provider-cipher.pod
index b4a87a3282b..b5bbb1b91d0 100644
--- a/doc/man7/provider-cipher.pod
+++ b/doc/man7/provider-cipher.pod
@@ -74,8 +74,8 @@ function pointer from an B<OSSL_DISPATCH> element named
 B<OSSL_FUNC_{name}>.
 For example, the "function" OSSL_FUNC_cipher_newctx() has these:
 
- typedef void *(OSSL_OSSL_FUNC_cipher_newctx_fn)(void *provctx);
- static ossl_inline OSSL_OSSL_FUNC_cipher_newctx_fn
+ typedef void *(OSSL_FUNC_cipher_newctx_fn)(void *provctx);
+ static ossl_inline OSSL_FUNC_cipher_newctx_fn
      OSSL_FUNC_cipher_newctx(const OSSL_DISPATCH *opf);
 
 B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as
diff --git a/doc/man7/provider-digest.pod b/doc/man7/provider-digest.pod
index 5f44df97e7b..4c90561e316 100644
--- a/doc/man7/provider-digest.pod
+++ b/doc/man7/provider-digest.pod
@@ -66,8 +66,8 @@ function pointer from an B<OSSL_DISPATCH> element named
 B<OSSL_FUNC_{name}>.
 For example, the "function" OSSL_FUNC_digest_newctx() has these:
 
- typedef void *(OSSL_OSSL_FUNC_digest_newctx_fn)(void *provctx);
- static ossl_inline OSSL_OSSL_FUNC_digest_newctx_fn
+ typedef void *(OSSL_FUNC_digest_newctx_fn)(void *provctx);
+ static ossl_inline OSSL_FUNC_digest_newctx_fn
      OSSL_FUNC_digest_newctx(const OSSL_DISPATCH *opf);
 
 B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as
diff --git a/doc/man7/provider-kdf.pod b/doc/man7/provider-kdf.pod
index f17946215d2..58337bf3db1 100644
--- a/doc/man7/provider-kdf.pod
+++ b/doc/man7/provider-kdf.pod
@@ -58,8 +58,8 @@ function pointer from an B<OSSL_DISPATCH> element named
 B<OSSL_FUNC_{name}>.
 For example, the "function" OSSL_FUNC_kdf_newctx() has these:
 
- typedef void *(OSSL_OSSL_FUNC_kdf_newctx_fn)(void *provctx);
- static ossl_inline OSSL_OSSL_FUNC_kdf_newctx_fn
+ typedef void *(OSSL_FUNC_kdf_newctx_fn)(void *provctx);
+ static ossl_inline OSSL_FUNC_kdf_newctx_fn
      OSSL_FUNC_kdf_newctx(const OSSL_DISPATCH *opf);
 
 B<OSSL_DISPATCH> array entries are identified by numbers that are provided as
diff --git a/doc/man7/provider-mac.pod b/doc/man7/provider-mac.pod
index 7ebe72f07dc..5a1659121eb 100644
--- a/doc/man7/provider-mac.pod
+++ b/doc/man7/provider-mac.pod
@@ -59,8 +59,8 @@ function pointer from an B<OSSL_DISPATCH> element named
 B<OSSL_FUNC_{name}>.
 For example, the "function" OSSL_FUNC_mac_newctx() has these:
 
- typedef void *(OSSL_OSSL_FUNC_mac_newctx_fn)(void *provctx);
- static ossl_inline OSSL_OSSL_FUNC_mac_newctx_fn
+ typedef void *(OSSL_FUNC_mac_newctx_fn)(void *provctx);
+ static ossl_inline OSSL_FUNC_mac_newctx_fn
      OSSL_FUNC_mac_newctx(const OSSL_DISPATCH *opf);
 
 B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as
diff --git a/doc/man7/provider-storemgmt.pod b/doc/man7/provider-storemgmt.pod
index 0da07a11dc2..d38e8e53d70 100644
--- a/doc/man7/provider-storemgmt.pod
+++ b/doc/man7/provider-storemgmt.pod
@@ -52,12 +52,12 @@ provider_query_operation() function
 All these "functions" have a corresponding function type definition named
 B<OSSL_FUNC_{name}_fn>, and a helper function to retrieve the function pointer
 from a B<OSSL_DISPATCH> element named B<OSSL_get_{name}>.
-For example, the "function" OSSL_FUNC_store_load() has these:
+For example, the "function" OSSL_FUNC_store_attach() has these:
 
- typedef void *(OSSL_OSSL_FUNC_store_load_fn)(void *provctx,
-                                              const OSSL_PARAM params[]);
- static ossl_inline OSSL_OSSL_FUNC_store_load_fn
-     OSSL_OSSL_FUNC_store_load(const OSSL_DISPATCH *opf);
+ typedef void *(OSSL_FUNC_store_attach_fn)(void *provctx,
+                                           OSSL_CORE_BIO * bio);
+ static ossl_inline OSSL_FUNC_store_attach_fn
+     OSSL_FUNC_store_attach(const OSSL_DISPATCH *opf);
 
 B<OSSL_DISPATCH> arrays are indexed by numbers that are provided as macros
 in L<openssl-core_dispatch.h(7)>, as follows: