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/bn/bn_lcl.h | |
| parent | a44a208442ecf8f576c9e364f8b46b6661c7d2de (diff) | |
| download | openssl-78c830785ca0f422502db9b201127ef1d9fe3966.tar.gz | |
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/bn/bn_lcl.h')
| -rw-r--r-- | crypto/bn/bn_lcl.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h index 0f3205c0ca..4af8bfb9a3 100644 --- a/crypto/bn/bn_lcl.h +++ b/crypto/bn/bn_lcl.h @@ -111,7 +111,17 @@ #ifndef HEADER_BN_LCL_H # define HEADER_BN_LCL_H -# include "internal/bn_conf.h" +/* + * The EDK2 build doesn't use bn_conf.h; it sets THIRTY_TWO_BIT or + * SIXTY_FOUR_BIT in its own environment since it doesn't re-run our + * Configure script and needs to support both 32-bit and 64-bit. + */ +# include <openssl/opensslconf.h> + +# if !defined(OPENSSL_SYS_UEFI) +# include "internal/bn_conf.h" +# endif + # include "internal/bn_int.h" #ifdef __cplusplus |