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 /crypto/err/err_all.c | |
| parent | 2752c8984c3c7ff6078d00944efd1ddb74b94ba4 (diff) | |
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 'crypto/err/err_all.c')
| -rw-r--r-- | crypto/err/err_all.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index af44467ee9..a56cf9c47a 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -92,7 +92,7 @@ int err_load_crypto_strings_int(void) # ifndef OPENSSL_NO_CMS ERR_load_CMS_strings() == 0 || # endif -# ifndef OPENSSL_NO_CMP +# ifndef OPENSSL_NO_CRMF ERR_load_CRMF_strings() == 0 || # endif # ifndef OPENSSL_NO_CT |