diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-07-04 08:51:44 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-07-04 08:51:44 +0000 |
| commit | fd6a72fa1c4bf2e2cb85be6cedfa4212fe81d155 (patch) | |
| tree | 69e91a09e450fe9fad08548ab5a6862e0efe3414 /crypto/bn | |
| parent | ccffdb3fdcc1d4d623dd80b3c990ef9580d321f1 (diff) | |
crypto/bn/*.h: move PTR_SIZE_INT to private header [from HEAD].
Diffstat (limited to 'crypto/bn')
| -rw-r--r-- | crypto/bn/bn.h | 18 | ||||
| -rw-r--r-- | crypto/bn/bn_lcl.h | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h index f34248ec4f..5897d2b314 100644 --- a/crypto/bn/bn.h +++ b/crypto/bn/bn.h @@ -253,24 +253,6 @@ extern "C" { #define BN_HEX_FMT2 "%08X" #endif -/* 2011-02-22 SMS. - * In various places, a size_t variable or a type cast to size_t was - * used to perform integer-only operations on pointers. This failed on - * VMS with 64-bit pointers (CC /POINTER_SIZE = 64) because size_t is - * still only 32 bits. What's needed in these cases is an integer type - * with the same size as a pointer, which size_t is not certain to be. - * The only fix here is VMS-specific. - */ -#if defined(OPENSSL_SYS_VMS) -# if __INITIAL_POINTER_SIZE == 64 -# define PTR_SIZE_INT long long -# else /* __INITIAL_POINTER_SIZE == 64 */ -# define PTR_SIZE_INT int -# endif /* __INITIAL_POINTER_SIZE == 64 [else] */ -#else /* defined(OPENSSL_SYS_VMS) */ -# define PTR_SIZE_INT size_t -#endif /* defined(OPENSSL_SYS_VMS) [else] */ - #define BN_DEFAULT_BITS 1280 #define BN_FLG_MALLOCED 0x01 diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h index eecfd8cc99..04e09ee679 100644 --- a/crypto/bn/bn_lcl.h +++ b/crypto/bn/bn_lcl.h @@ -210,6 +210,24 @@ extern "C" { #define BN_MUL_LOW_RECURSIVE_SIZE_NORMAL (32) /* 32 */ #define BN_MONT_CTX_SET_SIZE_WORD (64) /* 32 */ +/* 2011-02-22 SMS. + * In various places, a size_t variable or a type cast to size_t was + * used to perform integer-only operations on pointers. This failed on + * VMS with 64-bit pointers (CC /POINTER_SIZE = 64) because size_t is + * still only 32 bits. What's needed in these cases is an integer type + * with the same size as a pointer, which size_t is not certain to be. + * The only fix here is VMS-specific. + */ +#if defined(OPENSSL_SYS_VMS) +# if __INITIAL_POINTER_SIZE == 64 +# define PTR_SIZE_INT long long +# else /* __INITIAL_POINTER_SIZE == 64 */ +# define PTR_SIZE_INT int +# endif /* __INITIAL_POINTER_SIZE == 64 [else] */ +#elif !defined(PTR_SIZE_INT) /* defined(OPENSSL_SYS_VMS) */ +# define PTR_SIZE_INT size_t +#endif /* defined(OPENSSL_SYS_VMS) [else] */ + #if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC) /* * BN_UMULT_HIGH section. |