diff options
| author | Rich Salz <rsalz@akamai.com> | 2020-03-05 12:50:31 -0500 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-04-16 13:52:22 +0200 |
| commit | 705536e2b5c4167dbda2e0046d83f9e0f4a65514 (patch) | |
| tree | 5b76e00908f3d8c5dcbb75f094a4c06d989e97d5 /crypto/asn1/n_pkey.c | |
| parent | 7165593ce5a07a6860d4d408ad640ee707172936 (diff) | |
Use build.info, not ifdef for crypto modules
Don't wrap conditionally-compiled files in global ifndef tests.
Instead, test if the feature is disabled and, if so, do not
compile it.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11263)
Diffstat (limited to 'crypto/asn1/n_pkey.c')
| -rw-r--r-- | crypto/asn1/n_pkey.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c index 71f78f7b26..88dabd265d 100644 --- a/crypto/asn1/n_pkey.c +++ b/crypto/asn1/n_pkey.c @@ -8,24 +8,19 @@ */ #include "openssl/opensslconf.h" -#ifdef OPENSSL_NO_RSA -NON_EMPTY_TRANSLATION_UNIT -#else -# include "internal/cryptlib.h" -# include <stdio.h> -# include <openssl/rsa.h> -# include <openssl/objects.h> -# include <openssl/asn1t.h> -# include <openssl/evp.h> -# include <openssl/x509.h> +#include "internal/cryptlib.h" +#include <stdio.h> +#include <openssl/rsa.h> +#include <openssl/objects.h> +#include <openssl/asn1t.h> +#include <openssl/evp.h> +#include <openssl/x509.h> -# ifndef OPENSSL_NO_RC4 - -# define ASN1_BROKEN_SEQUENCE(tname) \ +#define ASN1_BROKEN_SEQUENCE(tname) \ static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_BROKEN, 0, 0, 0, 0}; \ ASN1_SEQUENCE(tname) -# define static_ASN1_BROKEN_SEQUENCE_END(stname) \ +#define static_ASN1_BROKEN_SEQUENCE_END(stname) \ static_ASN1_SEQUENCE_END_ref(stname, stname) typedef struct netscape_pkey_st { @@ -62,7 +57,3 @@ ASN1_SEQUENCE(NETSCAPE_PKEY) = { DECLARE_ASN1_FUNCTIONS(NETSCAPE_PKEY) DECLARE_ASN1_ENCODE_FUNCTIONS_name(NETSCAPE_PKEY, NETSCAPE_PKEY) IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_PKEY) - -# endif /* OPENSSL_NO_RC4 */ - -#endif |