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 /util/mkerr.pl | |
| parent | 2752c8984c3c7ff6078d00944efd1ddb74b94ba4 (diff) | |
| download | openssl-538f38db50e4ead178025689d28bda316b15c242.zip openssl-538f38db50e4ead178025689d28bda316b15c242.tar.gz openssl-538f38db50e4ead178025689d28bda316b15c242.tar.bz2 | |
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 'util/mkerr.pl')
| -rwxr-xr-x | util/mkerr.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/mkerr.pl b/util/mkerr.pl index f1d9b39..08593d0 100755 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -463,7 +463,7 @@ EOF # Declare the load function because the generate C file # includes "fooerr.h" not "foo.h" if ($lib ne "SSL" && $lib ne "ASYNC" - && grep { $lib eq uc $_ } @disablables) { + && (grep { $lib eq uc $_ } @disablables, @disablables_int)) { print OUT <<"EOF"; # include <openssl/opensslconf.h> |