summaryrefslogtreecommitdiff
path: root/src/lib/libssl/src/apps/genrsa.c
diff options
context:
space:
mode:
authormiod <>2014-04-24 21:31:02 +0000
committermiod <>2014-04-24 21:31:02 +0000
commitb2e9d1eed3ec4424b18ce3ee98e78f0030ca2cf3 (patch)
treee53472b5e8d9eec9f62ca322e053d1c8f66dc1cc /src/lib/libssl/src/apps/genrsa.c
parentd436f60f68787eee6620cab3a227f119e7813894 (diff)
downloadopenbsd-b2e9d1eed3ec4424b18ce3ee98e78f0030ca2cf3.tar.gz
openbsd-b2e9d1eed3ec4424b18ce3ee98e78f0030ca2cf3.tar.bz2
openbsd-b2e9d1eed3ec4424b18ce3ee98e78f0030ca2cf3.zip
Try to clean the maze of <openssl/bn.h> defines regarding the BN internals.
The intent of this change is to only keep support for two kind of architectures: - those with 32-bit int and long, and 64-bit long long, where ``long * long -> long long'' multiplication routines are available. - those with 64-bit int and long, and no 128-bit long long type. This gets rid of the SIXTY_FOUR_BIT_LONG, SIXTY_FOUR_BIT (not the same!), THIRTY_TWO_BIT, SIXTEEN_BIT and EIGHT_BIT defines. After this change, the types and defines are as follows: arch: 64bit 32bit rationale BN_LLONG undefined defined defined if l * l -> ll BN_ULLONG undefined u long long result of BN_LONG * BN_LONG BN_ULONG u long u int native register size BN_LONG long int the same, signed BN_BITS 128 64 size of 2*BN_ULONG in bits BN_BYTES 8 4 size of 2*BN_ULONG in bytes BN_BITS2 64 32 BN_BITS / 2 Tested on various 32-bit and 64-bit OpenBSD systems of various endianness.
Diffstat (limited to 'src/lib/libssl/src/apps/genrsa.c')
-rw-r--r--src/lib/libssl/src/apps/genrsa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libssl/src/apps/genrsa.c b/src/lib/libssl/src/apps/genrsa.c
index 68e939ca99..c658828299 100644
--- a/src/lib/libssl/src/apps/genrsa.c
+++ b/src/lib/libssl/src/apps/genrsa.c
@@ -256,7 +256,7 @@ bad:
256 */ 256 */
257 l = 0L; 257 l = 0L;
258 for (i = 0; i < rsa->e->top; i++) { 258 for (i = 0; i < rsa->e->top; i++) {
259#ifndef SIXTY_FOUR_BIT 259#ifndef _LP64
260 l <<= BN_BITS4; 260 l <<= BN_BITS4;
261 l <<= BN_BITS4; 261 l <<= BN_BITS4;
262#endif 262#endif