diff options
| -rw-r--r-- | apps/speed.c | 7 | ||||
| -rw-r--r-- | crypto/bn/bntest.c | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/apps/speed.c b/apps/speed.c index 85786f1ca7..c99c7863c5 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -505,8 +505,9 @@ int MAIN(int argc, char **argv) #define D_PRIME_TRIAL_DIVISION 0 #define D_PRIME_TRIAL_DIVISION_RETRY 1 #define D_PRIME_COPRIME 2 +#ifndef OPENSSL_SYS_WIN32 long prime_c[PRIME_NUM]; - +#endif #define R_DSA_512 0 #define R_DSA_1024 1 #define R_DSA_2048 2 @@ -2089,7 +2090,7 @@ int MAIN(int argc, char **argv) print_result(D_EVP,j,count,d); } } - +#ifndef OPENSSL_SYS_WIN32 if (prime_doit[D_PRIME_TRIAL_DIVISION]) { BIGNUM *rnd = BN_new(); @@ -2149,7 +2150,7 @@ int MAIN(int argc, char **argv) BN_CTX_free(ctx); BN_free(rnd); } - +#endif RAND_pseudo_bytes(buf,36); #ifndef OPENSSL_NO_RSA for (j=0; j<RSA_NUM; j++) diff --git a/crypto/bn/bntest.c b/crypto/bn/bntest.c index 697d77a370..6e18a69363 100644 --- a/crypto/bn/bntest.c +++ b/crypto/bn/bntest.c @@ -273,8 +273,12 @@ int main(int argc, char *argv[]) if (!test_small_prime(out,ctx)) goto err; (void)BIO_flush(out); +#ifdef OPENSSL_SYS_WIN32 + message(out,"Probable prime generation with coprimes disabled"); +#else message(out,"Probable prime generation with coprimes"); if (!test_probable_prime_coprime(out,ctx)) goto err; +#endif (void)BIO_flush(out); #ifndef OPENSSL_NO_EC2M @@ -1929,7 +1933,7 @@ err: BN_clear(&r); return ret; } - +#ifndef OPENSSL_SYS_WIN32 int test_probable_prime_coprime(BIO *bp, BN_CTX *ctx) { int i, j, ret = 0; @@ -1960,7 +1964,7 @@ err: BN_clear(&r); return ret; } - +#endif int test_lshift(BIO *bp,BN_CTX *ctx,BIGNUM *a_) { BIGNUM *a,*b,*c,*d; |