diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2016-02-20 14:40:48 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-23 13:18:23 -0500 |
| commit | 78c830785ca0f422502db9b201127ef1d9fe3966 (patch) | |
| tree | 5a2c5305488e5ca9a462deb608200cc637d5dccc /crypto/include | |
| parent | a44a208442ecf8f576c9e364f8b46b6661c7d2de (diff) | |
RT4339: Fix handling of <internal/bn_conf.h>
The entire contents of <internal/bn_conf.h> are unwanted in the UEFI
build because we have to do it differently there. To support building
for both 32-bit and 64-bit platforms without re-running the OpenSSL
Configure script, the EDK2 environment defines THIRTY_TWO_BIT or
SIXTY_FOUR_BIT for itself according to the target platform.
The current setup is broken, though. It checks for OPENSSL_SYS_UEFI but
before it's actually defined, since opensslconf.h hasn't yet been
included.
Let's fix that by including opensslconf.h. And also let's move the
bn_conf.h doesn't even need to *exist* in the UEFI build environment.
This is also GH PR736.
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/include')
| -rw-r--r-- | crypto/include/internal/bn_conf.h.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/include/internal/bn_conf.h.in b/crypto/include/internal/bn_conf.h.in index 5ebd55d522..e25a435726 100644 --- a/crypto/include/internal/bn_conf.h.in +++ b/crypto/include/internal/bn_conf.h.in @@ -56,7 +56,11 @@ #ifndef HEADER_BN_CONF_H # define HEADER_BN_CONF_H -# if !defined(OPENSSL_SYS_UEFI) +/* + * The contents of this file are not used in the UEFI build, as + * both 32-bit and 64-bit builds are supported from a single run + * of the Configure script. + */ /* Should we define BN_DIV2W here? */ @@ -64,6 +68,5 @@ {- $config{b64l} ? "#define" : "#undef" -} SIXTY_FOUR_BIT_LONG {- $config{b64} ? "#define" : "#undef" -} SIXTY_FOUR_BIT {- $config{b32} ? "#define" : "#undef" -} THIRTY_TWO_BIT -# endif #endif |