* [including the GNU Public Licence.]
*/
/* ====================================================================
- * Copyright 2002-2014 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
*
* Portions of the attached software ("Contribution") are developed by
* SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
#define ALGOR_NUM 30
#define SIZE_NUM 5
-#define PRIME_NUM 2
-#define RSA_NUM 4
+#define PRIME_NUM 3
+#define RSA_NUM 7
#define DSA_NUM 3
#define EC_NUM 16
static double results[ALGOR_NUM][SIZE_NUM];
static int lengths[SIZE_NUM]={16,64,256,1024,8*1024};
static const char *prime_names[PRIME_NUM]={
- "prime trial division", "prime coprime" };
+ "prime trial division", "prime trial division retry", "prime coprime" };
#ifndef OPENSSL_NO_RSA
static double rsa_results[RSA_NUM][2];
#endif
double d=0.0;
long c[ALGOR_NUM][SIZE_NUM];
-#define D_PRIME_TRIAL_DIVISION 0
-#define D_PRIME_COPRIME 1
+#define D_PRIME_TRIAL_DIVISION 0
+#define D_PRIME_TRIAL_DIVISION_RETRY 1
+#define D_PRIME_COPRIME 2
long prime_c[PRIME_NUM];
#define R_DSA_512 0
#define R_RSA_512 0
#define R_RSA_1024 1
#define R_RSA_2048 2
-#define R_RSA_4096 3
+#define R_RSA_3072 3
+#define R_RSA_4096 4
+#define R_RSA_7680 5
+#define R_RSA_15360 6
#define R_EC_P160 0
#define R_EC_P192 1
#ifndef OPENSSL_NO_RSA
RSA *rsa_key[RSA_NUM];
long rsa_c[RSA_NUM][2];
- static unsigned int rsa_bits[RSA_NUM]={512,1024,2048,4096};
+ static unsigned int rsa_bits[RSA_NUM]={512,1024,2048,3072,4096,7680,15360};
static unsigned char *rsa_data[RSA_NUM]=
- {test512,test1024,test2048,test4096};
+ {test512,test1024,test2048,test3072,test4096,test7680,test15360};
static int rsa_data_length[RSA_NUM]={
sizeof(test512),sizeof(test1024),
- sizeof(test2048),sizeof(test4096)};
+ sizeof(test2048),sizeof(test3072),
+ sizeof(test4096),sizeof(test7680),
+ sizeof(test15360)};
#endif
#ifndef OPENSSL_NO_DSA
DSA *dsa_key[DSA_NUM];
for (i=0; i<EC_NUM; i++)
ecdh_doit[i]=0;
#endif
+ for (i=0; i<PRIME_NUM; i++)
+ prime_doit[i]=0;
j=0;
else if (strcmp(*argv,"rsa512") == 0) rsa_doit[R_RSA_512]=2;
else if (strcmp(*argv,"rsa1024") == 0) rsa_doit[R_RSA_1024]=2;
else if (strcmp(*argv,"rsa2048") == 0) rsa_doit[R_RSA_2048]=2;
+ else if (strcmp(*argv,"rsa3072") == 0) rsa_doit[R_RSA_3072]=2;
else if (strcmp(*argv,"rsa4096") == 0) rsa_doit[R_RSA_4096]=2;
+ else if (strcmp(*argv,"rsa7680") == 0) rsa_doit[R_RSA_7680]=2;
+ else if (strcmp(*argv,"rsa15360") == 0) rsa_doit[R_RSA_15360]=2;
else
#ifndef OPENSSL_NO_RC2
if (strcmp(*argv,"rc2-cbc") == 0) doit[D_CBC_RC2]=1;
rsa_doit[R_RSA_512]=1;
rsa_doit[R_RSA_1024]=1;
rsa_doit[R_RSA_2048]=1;
+ rsa_doit[R_RSA_3072]=1;
rsa_doit[R_RSA_4096]=1;
+ rsa_doit[R_RSA_7680]=1;
+ rsa_doit[R_RSA_15360]=1;
}
else
#endif
}
else
#endif
- if (strcmp(*argv,"prime-trial-division") == 0) prime_doit[D_PRIME_TRIAL_DIVISION]=1;
- else if (strcmp(*argv,"prime-coprime") == 0) prime_doit[D_PRIME_COPRIME]=1;
+ if (strcmp(*argv,"prime-trial-division") == 0)
+ prime_doit[D_PRIME_TRIAL_DIVISION] = 1;
+ else if (strcmp(*argv,"prime-trial-division-retry") == 0)
+ prime_doit[D_PRIME_TRIAL_DIVISION_RETRY] = 1;
+ else if (strcmp(*argv,"prime-coprime") == 0)
+ prime_doit[D_PRIME_COPRIME] = 1;
+ else if (strcmp(*argv,"prime") == 0)
+ {
+ for (i=0; i < PRIME_NUM; i++)
+ prime_doit[i]=1;
+ }
else
{
BIO_printf(bio_err,"Error: bad option or value\n");
BIO_printf(bio_err,"\n");
#ifndef OPENSSL_NO_RSA
- BIO_printf(bio_err,"rsa512 rsa1024 rsa2048 rsa4096\n");
+ BIO_printf(bio_err,"rsa512 rsa1024 rsa2048 rsa3072 rsa4096\n");
+ BIO_printf(bio_err,"rsa7680 rsa15360\n");
#endif
#ifndef OPENSSL_NO_DSA
}
prime_c[D_PRIME_TRIAL_DIVISION]=count;
+ prime_c[D_PRIME_TRIAL_DIVISION_RETRY]=count;
prime_c[D_PRIME_COPRIME]=count;
#ifndef OPENSSL_NO_RSA
Time_F(START);
for (count=0, run=1; COND(prime_c[D_PRIME_TRIAL_DIVISION]); count++)
- bn_probable_prime_dh(rnd, 1024, add, NULL, ctx);
+ if (!bn_probable_prime_dh(rnd, 1024, add, NULL, ctx)) count--;
d=Time_F(STOP);
prime_print_result(D_PRIME_TRIAL_DIVISION, count, d);
BN_CTX_free(ctx);
BN_free(add);
BN_free(rnd);
+ }
+
+ if (prime_doit[D_PRIME_TRIAL_DIVISION_RETRY])
+ {
+ BIGNUM *rnd = BN_new();
+ BN_CTX *ctx = BN_CTX_new();
+
+ prime_print_message(prime_names[D_PRIME_TRIAL_DIVISION_RETRY],
+ prime_c[D_PRIME_TRIAL_DIVISION_RETRY]);
+
+ Time_F(START);
+ for (count=0, run=1; COND(prime_c[D_PRIME_TRIAL_DIVISION_RETRY]); count++)
+ if (!bn_probable_prime_dh_retry(rnd, 1024, ctx)) count--;
+
+ d=Time_F(STOP);
+ prime_print_result(D_PRIME_TRIAL_DIVISION_RETRY, count, d);
+ BN_CTX_free(ctx);
+ BN_free(rnd);
}
if (prime_doit[D_PRIME_COPRIME])
{
BIGNUM *rnd = BN_new();
- BIGNUM *add = BN_new();
BN_CTX *ctx = BN_CTX_new();
- BN_set_word(add, 2);
prime_print_message(prime_names[D_PRIME_COPRIME],
prime_c[D_PRIME_COPRIME]);
Time_F(START);
for (count=0, run=1; COND(prime_c[D_PRIME_COPRIME]); count++)
- bn_probable_prime_dh_coprime_safe(rnd, 1024, add, NULL, ctx);
+ if (!bn_probable_prime_dh_coprime(rnd, 1024, ctx)) count--;
d=Time_F(STOP);
prime_print_result(D_PRIME_COPRIME, count, d);
BN_CTX_free(ctx);
- BN_free(add);
BN_free(rnd);
-
}
RAND_pseudo_bytes(buf,36);