diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/bn/bn_prime.h | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/bn/bn_prime.h')
| -rw-r--r-- | src/lib/libcrypto/bn/bn_prime.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/bn/bn_prime.h b/src/lib/libcrypto/bn/bn_prime.h index b7cf9a9bfe..51d2194feb 100644 --- a/src/lib/libcrypto/bn/bn_prime.h +++ b/src/lib/libcrypto/bn/bn_prime.h | |||
| @@ -58,10 +58,12 @@ | |||
| 58 | 58 | ||
| 59 | #ifndef EIGHT_BIT | 59 | #ifndef EIGHT_BIT |
| 60 | #define NUMPRIMES 2048 | 60 | #define NUMPRIMES 2048 |
| 61 | typedef unsigned short prime_t; | ||
| 61 | #else | 62 | #else |
| 62 | #define NUMPRIMES 54 | 63 | #define NUMPRIMES 54 |
| 64 | typedef unsigned char prime_t; | ||
| 63 | #endif | 65 | #endif |
| 64 | static const unsigned int primes[NUMPRIMES]= | 66 | static const prime_t primes[NUMPRIMES]= |
| 65 | { | 67 | { |
| 66 | 2, 3, 5, 7, 11, 13, 17, 19, | 68 | 2, 3, 5, 7, 11, 13, 17, 19, |
| 67 | 23, 29, 31, 37, 41, 43, 47, 53, | 69 | 23, 29, 31, 37, 41, 43, 47, 53, |