diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-05-08 05:28:47 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-05-20 16:19:00 +0200 |
| commit | 538f38db50e4ead178025689d28bda316b15c242 (patch) | |
| tree | d9c8eee9b87cdcc59409d1ed212cce46c2bd0388 /include | |
| parent | Revert "ppc assembly pack: always increment CTR IV as quadword" (diff) | |
| download | openssl-538f38db50e4ead178025689d28bda316b15c242.tar.xz openssl-538f38db50e4ead178025689d28bda316b15c242.zip | |
Clear CRMF vs CMP confusion
In the development of the CRMF sub-system, there seems to have been
some confusion as to what configuration option should be used.
'no-crmf' was added, but the C macro guards were using OPENSSL_NO_CMP
rather than OPENSSL_NO_CRMF...
In fact, we want 'no-cmp', but since the CRMF code is part of CMP, we
need 'no-crmf' to depend on 'no-cmp'. We do this by making 'crmf' a
silent "option" that get affected by 'cmp' by way of %disable_cascades.
This allows options to be "aliases" for a set of other ones, silent or
not.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8897)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/crmf.h | 4 | ||||
| -rw-r--r-- | include/openssl/crmferr.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/openssl/crmf.h b/include/openssl/crmf.h index a265223fe5..737a49d2a6 100644 --- a/include/openssl/crmf.h +++ b/include/openssl/crmf.h @@ -16,7 +16,7 @@ # include <openssl/opensslconf.h> -# ifndef OPENSSL_NO_CMP +# ifndef OPENSSL_NO_CRMF # include <openssl/opensslv.h> # include <openssl/safestack.h> # include <openssl/crmferr.h> @@ -133,5 +133,5 @@ X509 *OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert(OSSL_CRMF_ENCRYPTEDVALUE *ecert, # ifdef __cplusplus } # endif -# endif /* !defined OPENSSL_NO_CMP */ +# endif /* !defined OPENSSL_NO_CRMF */ #endif /* !defined OSSL_HEADER_CRMF_H */ diff --git a/include/openssl/crmferr.h b/include/openssl/crmferr.h index 06f90fb36f..1a8b199d8e 100644 --- a/include/openssl/crmferr.h +++ b/include/openssl/crmferr.h @@ -13,7 +13,7 @@ # include <openssl/opensslconf.h> -# ifndef OPENSSL_NO_CMP +# ifndef OPENSSL_NO_CRMF # ifdef __cplusplus extern "C" |