]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Use better description of macros purpose in engine.h
authorMilan Broz <gmazyland@gmail.com>
Tue, 2 Dec 2025 11:37:54 +0000 (12:37 +0100)
committerNeil Horman <nhorman@openssl.org>
Thu, 4 Dec 2025 12:32:18 +0000 (07:32 -0500)
Resolves: https://github.com/openssl/project/issues/1735

Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29305)

include/openssl/engine.h

index 63a4e6b0cbba5bc702697b8a88451f99ada53369..a544f39aa0512c932b45358c0e994870bad49213 100644 (file)
 # include <openssl/opensslconf.h>
 
 /*
- * There is no OPENSSL_NO_NO_ENGINE, Engines are permanently disabled
- * and OPENSSL_NO_ENGINE must be defined
+ * Engine support is gone. Definitions here are provided for the source code
+ * compatibility only. They are meant to keep compilation working for legacy
+ * projects that, for whatever reason, cannot remove/disable old legacy code.
  *
- * This header now generates compatible definitions according
- * to OPENSSL_ENGINE_STUBS define.
- * Note we have to use compile-time message to warn only if API is really used.
- * To avoid complicated macros we kind-of abuse existing OSSL_DEPRACATED macros.
+ * We deliberately keep the OPENSSL_NO_ENGINE macro around as it is supplied
+ * when the build is configured with the `no-engine` option. OpenSSL 4.0 keeps
+ * the `no-engine` option around.
+ *
+ * Note, we have to use a compile-time message to warn only if the API is really
+ * used. To avoid complex macros, we kind of abuse the existing OSSL_DEPRECATED
+ * macros.
  */
+
 # ifdef OPENSSL_ENGINE_STUBS
 #  define ENGINE_INFO_MSG \
     " API symbol is replaced with stub to avoid linker error."