diff options
| author | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-01-28 00:10:11 -0500 |
|---|---|---|
| committer | Viktor Dukhovni <openssl-users@dukhovni.org> | 2016-01-28 06:36:55 -0500 |
| commit | 7eba4e62077484aebec010157424287f1963c88f (patch) | |
| tree | 5583d5933d0084b49ffd896414ee884e6320ef41 | |
| parent | 3538c7da3d53dca70be5f507376299843046d2b7 (diff) | |
| download | openssl-7eba4e62077484aebec010157424287f1963c88f.tar.gz | |
Restore NUMPRIMES as a numeric literal
This fixes clang compilation problem with size_t NUMPRIMES and int
loop counters.
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | crypto/bn/bn_prime.c | 2 | ||||
| -rw-r--r-- | crypto/bn/bn_prime.h | 5 | ||||
| -rw-r--r-- | crypto/bn/bn_prime.pl | 3 |
4 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 629141de97..80d5f175d0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -442,9 +442,9 @@ depend: update: generate errors ordinals depend generate: - (cd apps && $(MAKE) generate) - (cd crypto/bn && $(MAKE) generate) - (cd crypto/objects && $(MAKE) generate) + (cd apps && PERL='${PERL}' $(MAKE) generate) + (cd crypto/bn && PERL='${PERL}' $(MAKE) generate) + (cd crypto/objects && PERL='${PERL}' $(MAKE) generate) errors: $(PERL) util/ck_errf.pl -strict */*.c */*/*.c diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index 8d1294fcfc..a5887d96a8 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -121,8 +121,6 @@ */ #include "bn_prime.h" -#define NUMPRIMES OSSL_NELEM(primes) - static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1, const BIGNUM *a1_odd, int k, BN_CTX *ctx, BN_MONT_CTX *mont); diff --git a/crypto/bn/bn_prime.h b/crypto/bn/bn_prime.h index d1fbcd1021..6f6949cd7a 100644 --- a/crypto/bn/bn_prime.h +++ b/crypto/bn/bn_prime.h @@ -57,7 +57,10 @@ */ typedef unsigned short prime_t; -static const prime_t primes[] = { +# define NUMPRIMES 2048 + +static const prime_t primes[2048] = { + 2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, diff --git a/crypto/bn/bn_prime.pl b/crypto/bn/bn_prime.pl index add6ffb9d0..3a5f064faa 100644 --- a/crypto/bn/bn_prime.pl +++ b/crypto/bn/bn_prime.pl @@ -76,8 +76,9 @@ loop: while ($#primes < $num-1) { } print "typedef unsigned short prime_t;\n"; +printf "# define NUMPRIMES %d\n\n", $num; -print "static const prime_t primes[] = {"; +printf "static const prime_t primes[%d] = {\n", $num; for (my $i = 0; $i <= $#primes; $i++) { printf "\n " if ($i % 8) == 0; printf "%4d, ", $primes[$i]; |