Commit 7eba4e62 authored by Viktor Dukhovni's avatar Viktor Dukhovni
Browse files

Restore NUMPRIMES as a numeric literal 



This fixes clang compilation problem with size_t NUMPRIMES and int
loop counters.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 3538c7da

Makefile.in

+3 −3
Original line number Diff line number Diff line
@@ -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

crypto/bn/bn_prime.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

crypto/bn/bn_prime.h

+4 −1
Original line number Diff line number Diff line
@@ -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,

crypto/bn/bn_prime.pl

+2 −1
Original line number Diff line number Diff line
@@ -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];