Switch deprecation method for OSSL_STORE

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13460)

1 files changed, 54 insertions, 50 deletions

diff --git a/include/openssl/store.h b/include/openssl/store.h
index 8be9f71bf3..ae0aaa26d1 100644
--- a/include/openssl/store.h
+++ b/include/openssl/store.h
@@ -68,10 +68,12 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
  * determine which loader is used), except for common commands (see below).
  * Each command takes different arguments.
  */
-DEPRECATEDIN_3_0(int OSSL_STORE_ctrl(OSSL_STORE_CTX *ctx, int cmd,
-                                     ... /* args */))
-DEPRECATEDIN_3_0(int OSSL_STORE_vctrl(OSSL_STORE_CTX *ctx, int cmd,
-                                      va_list args))
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+OSSL_DEPRECATEDIN_3_0 int OSSL_STORE_ctrl(OSSL_STORE_CTX *ctx, int cmd,
+                                          ... /* args */);
+OSSL_DEPRECATEDIN_3_0 int OSSL_STORE_vctrl(OSSL_STORE_CTX *ctx, int cmd,
+                                           va_list args);
+# endif
 
 # ifndef OPENSSL_NO_DEPRECATED_3_0
 
@@ -305,57 +307,59 @@ typedef int (*OSSL_STORE_error_fn)(OSSL_STORE_LOADER_CTX *ctx);
 typedef int (*OSSL_STORE_close_fn)(OSSL_STORE_LOADER_CTX *ctx);
 
 # endif
-
-DEPRECATEDIN_3_0(OSSL_STORE_LOADER *OSSL_STORE_LOADER_new
-                 (ENGINE *e, const char *scheme))
-DEPRECATEDIN_3_0(int OSSL_STORE_LOADER_set_open
-                 (OSSL_STORE_LOADER *loader,
-                  OSSL_STORE_open_fn open_function))
-DEPRECATEDIN_3_0(int OSSL_STORE_LOADER_set_open_ex
-                 (OSSL_STORE_LOADER *loader,
-                  OSSL_STORE_open_ex_fn open_ex_function))
-DEPRECATEDIN_3_0(int OSSL_STORE_LOADER_set_attach
-                 (OSSL_STORE_LOADER *loader,
-                  OSSL_STORE_attach_fn attach_function))
-DEPRECATEDIN_3_0(int OSSL_STORE_LOADER_set_ctrl
-                 (OSSL_STORE_LOADER *loader,
-                  OSSL_STORE_ctrl_fn ctrl_function))
-DEPRECATEDIN_3_0(int OSSL_STORE_LOADER_set_expect
-                 (OSSL_STORE_LOADER *loader,
-                  OSSL_STORE_expect_fn expect_function))
-DEPRECATEDIN_3_0(int OSSL_STORE_LOADER_set_find
-                 (OSSL_STORE_LOADER *loader,
-                  OSSL_STORE_find_fn find_function))
-DEPRECATEDIN_3_0(int OSSL_STORE_LOADER_set_load
-                 (OSSL_STORE_LOADER *loader,
-                  OSSL_STORE_load_fn load_function))
-DEPRECATEDIN_3_0(int OSSL_STORE_LOADER_set_eof
-                 (OSSL_STORE_LOADER *loader,
-                  OSSL_STORE_eof_fn eof_function))
-DEPRECATEDIN_3_0(int OSSL_STORE_LOADER_set_error
-                 (OSSL_STORE_LOADER *loader,
-                  OSSL_STORE_error_fn error_function))
-DEPRECATEDIN_3_0(int OSSL_STORE_LOADER_set_close
-                 (OSSL_STORE_LOADER *loader,
-                  OSSL_STORE_close_fn close_function))
-
-DEPRECATEDIN_3_0(const ENGINE *OSSL_STORE_LOADER_get0_engine
-                 (const OSSL_STORE_LOADER *loader))
-DEPRECATEDIN_3_0(const char * OSSL_STORE_LOADER_get0_scheme
-                 (const OSSL_STORE_LOADER *loader))
-
-DEPRECATEDIN_3_0(int OSSL_STORE_register_loader(OSSL_STORE_LOADER *loader))
-DEPRECATEDIN_3_0(OSSL_STORE_LOADER *OSSL_STORE_unregister_loader
-                 (const char *scheme))
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+OSSL_DEPRECATEDIN_3_0
+OSSL_STORE_LOADER *OSSL_STORE_LOADER_new(ENGINE *e, const char *scheme);
+OSSL_DEPRECATEDIN_3_0
+int OSSL_STORE_LOADER_set_open(OSSL_STORE_LOADER *loader,
+                               OSSL_STORE_open_fn open_function);
+OSSL_DEPRECATEDIN_3_0
+int OSSL_STORE_LOADER_set_open_ex(OSSL_STORE_LOADER *loader,
+                                  OSSL_STORE_open_ex_fn open_ex_function);
+OSSL_DEPRECATEDIN_3_0
+int OSSL_STORE_LOADER_set_attach(OSSL_STORE_LOADER *loader,
+                                 OSSL_STORE_attach_fn attach_function);
+OSSL_DEPRECATEDIN_3_0
+int OSSL_STORE_LOADER_set_ctrl(OSSL_STORE_LOADER *loader,
+                               OSSL_STORE_ctrl_fn ctrl_function);
+OSSL_DEPRECATEDIN_3_0
+int OSSL_STORE_LOADER_set_expect(OSSL_STORE_LOADER *loader,
+                                 OSSL_STORE_expect_fn expect_function);
+OSSL_DEPRECATEDIN_3_0
+int OSSL_STORE_LOADER_set_find(OSSL_STORE_LOADER *loader,
+                               OSSL_STORE_find_fn find_function);
+OSSL_DEPRECATEDIN_3_0
+int OSSL_STORE_LOADER_set_load(OSSL_STORE_LOADER *loader,
+                               OSSL_STORE_load_fn load_function);
+OSSL_DEPRECATEDIN_3_0
+int OSSL_STORE_LOADER_set_eof(OSSL_STORE_LOADER *loader,
+                              OSSL_STORE_eof_fn eof_function);
+OSSL_DEPRECATEDIN_3_0
+int OSSL_STORE_LOADER_set_error(OSSL_STORE_LOADER *loader,
+                                OSSL_STORE_error_fn error_function);
+OSSL_DEPRECATEDIN_3_0
+int OSSL_STORE_LOADER_set_close(OSSL_STORE_LOADER *loader,
+                                OSSL_STORE_close_fn close_function);
+OSSL_DEPRECATEDIN_3_0
+const ENGINE *OSSL_STORE_LOADER_get0_engine(const OSSL_STORE_LOADER *loader);
+OSSL_DEPRECATEDIN_3_0
+const char * OSSL_STORE_LOADER_get0_scheme(const OSSL_STORE_LOADER *loader);
+OSSL_DEPRECATEDIN_3_0
+int OSSL_STORE_register_loader(OSSL_STORE_LOADER *loader);
+OSSL_DEPRECATEDIN_3_0
+OSSL_STORE_LOADER *OSSL_STORE_unregister_loader(const char *scheme);
+# endif
 
 /*-
  *  Functions to list STORE loaders
  *  -------------------------------
  */
-DEPRECATEDIN_3_0(int OSSL_STORE_do_all_loaders
-                 (void (*do_function)(const OSSL_STORE_LOADER *loader,
-                                      void *do_arg),
-                  void *do_arg))
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+OSSL_DEPRECATEDIN_3_0
+int OSSL_STORE_do_all_loaders(void (*do_function)(const OSSL_STORE_LOADER *loader,
+                                                  void *do_arg),
+                              void *do_arg);
+# endif
 
 # ifdef  __cplusplus
 }