From d7f200779c190ba35cfa4dbd2a82587c938cd243 Mon Sep 17 00:00:00 2001 From: Felix Laurie von Massenbach Date: Mon, 26 May 2014 17:19:06 +0100 Subject: Add a new target to Configure for me. --- Configure | 1 + 1 file changed, 1 insertion(+) diff --git a/Configure b/Configure index 791828776d..5a0d5d799a 100755 --- a/Configure +++ b/Configure @@ -180,6 +180,7 @@ my %table=( "debug-ben-darwin64","cc:$gcc_devteam_warn -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:$x86_64_asm:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", "debug-bodo", "gcc:$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", +"debug-erbridge", "gcc:$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", "debug-ulf", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll", "debug-steve64", "gcc:$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "debug-steve32", "gcc:$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -- cgit v1.2.3 From fce0ba5fcd4485bead9157614c9d0061ba7b7da3 Mon Sep 17 00:00:00 2001 From: Felix Laurie von Massenbach Date: Mon, 26 May 2014 17:19:28 +0100 Subject: Strip trailing whitespace from Configure. --- Configure | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Configure b/Configure index 5a0d5d799a..175f8d86a4 100755 --- a/Configure +++ b/Configure @@ -60,7 +60,7 @@ my $usage="Usage: Configure [no- ...] [enable- ...] [experimenta # 386 generate 80386 code # no-sse2 disables IA-32 SSE2 code, above option implies no-sse2 # no- build without specified algorithm (rsa, idea, rc5, ...) -# - + compiler options are passed through +# - + compiler options are passed through # # DEBUG_SAFESTACK use type-safe stacks to enforce type-safety on stack items # provided to stack calls. Generates unique stack functions for @@ -101,7 +101,7 @@ my $usage="Usage: Configure [no- ...] [enable- ...] [experimenta # AES_ASM ASE_[en|de]crypt is implemented in assembler # Minimum warning options... any contributions to OpenSSL should at least get -# past these. +# past these. my $gcc_devteam_warn = "-Wall -pedantic -DPEDANTIC -Wno-long-long -Wsign-compare -Wmissing-prototypes -Wshadow -Wformat -Werror -DCRYPTO_MDEBUG_ALL -DCRYPTO_MDEBUG_ABORT -DREF_CHECK -DOPENSSL_NO_DEPRECATED"; @@ -144,7 +144,7 @@ my $ppc32_asm=$ppc64_asm; my $no_asm=":::::::::::::::void"; # As for $BSDthreads. Idea is to maintain "collective" set of flags, -# which would cover all BSD flavors. -pthread applies to them all, +# which would cover all BSD flavors. -pthread applies to them all, # but is treated differently. OpenBSD expands is as -D_POSIX_THREAD # -lc_r, which is sufficient. FreeBSD 4.x expands it as -lc_r, # which has to be accompanied by explicit -D_THREAD_SAFE and @@ -225,7 +225,7 @@ my %table=( # compiler:-) # "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", - + #### Solaris x86 with Sun C setups "solaris-x86-cc","cc:-fast -xarch=generic -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", @@ -250,7 +250,7 @@ my %table=( "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64", #### "debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### SunOS configs, assuming sparc for the gcc one. #"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:${no_asm}::", @@ -320,7 +320,7 @@ my %table=( "hpux64-ia64-cc","cc:-Ae +DD64 +O3 +Olit=all -z -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:+Z:+DD64 -b:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/hpux64", # GCC builds... "hpux-ia64-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:-fpic:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/hpux32", -"hpux64-ia64-gcc","gcc:-mlp64 -O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:-fpic:-mlp64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/hpux64", +"hpux64-ia64-gcc","gcc:-mlp64 -O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:-fpic:-mlp64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/hpux64", # Legacy HPUX 9.X configs... "hpux-cc", "cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O2 -z::(unknown)::-Wl,+s -ldld:DES_PTR DES_UNROLL DES_RISC1:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -558,7 +558,7 @@ my %table=( # with itself, Applink is never engaged and can as well be omitted. "mingw64", "gcc:-mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE::-D_MT:MINGW64:-lws2_32 -lgdi32 -lcrypt32:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:${x86_64_asm}:mingw64:win32:cygwin-shared:-D_WINDLL:-mno-cygwin:.dll.a", -# UWIN +# UWIN "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32", # Cygwin @@ -637,7 +637,7 @@ my %table=( my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A debug-VC-WIN64I debug-VC-WIN64A VC-NT VC-CE VC-WIN32 debug-VC-WIN32 - BC-32 + BC-32 netware-clib netware-clib-bsdsock netware-libc netware-libc-bsdsock); @@ -837,7 +837,7 @@ PROCESS_ARGS: { $disabled{$1} = "option"; } - } + } } elsif (/^enable-(.+)$/ || /^experimental-(.+)$/) { @@ -1128,7 +1128,7 @@ foreach (sort (keys %disabled)) { $openssl_other_defines .= "#define OPENSSL_NO_$ALGO\n"; print " OPENSSL_NO_$ALGO"; - + if (/^err$/) { $flags .= "-DOPENSSL_NO_ERR "; } elsif (/^asm$/) { $no_asm = 1; } } @@ -1396,7 +1396,7 @@ else # $thread_defines .= "#define $def\n"; # } # } - } + } $lflags="$libs$lflags" if ($libs ne ""); @@ -2015,8 +2015,8 @@ print "RC4_CHUNK is unsigned long long\n" if $rc4_chunk==2; print "MD2 uses u$type[$md2_int]\n" if $md2_int != $def_int; print "IDEA uses u$type[$idea_int]\n" if $idea_int != $def_int; print "RC2 uses u$type[$rc2_int]\n" if $rc2_int != $def_int; -print "BF_PTR used\n" if $bf_ptr == 1; -print "BF_PTR2 used\n" if $bf_ptr == 2; +print "BF_PTR used\n" if $bf_ptr == 1; +print "BF_PTR2 used\n" if $bf_ptr == 2; if($IsMK1MF) { open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h"; @@ -2094,7 +2094,7 @@ BEGIN #if defined(FIPS) VALUE "Comments", "WARNING: TEST VERSION ONLY ***NOT*** FIPS 140-2 VALIDATED.\\0" #endif - // Required: + // Required: VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\\0" #if defined(FIPS) VALUE "FileDescription", "TEST UNVALIDATED FIPS140-2 DLL\\0" @@ -2130,7 +2130,7 @@ END EOF close(OUT); } - + print < Date: Mon, 26 May 2014 19:09:18 +0100 Subject: Remove indentation from the goto targets. --- crypto/bn/bn_prime.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index 339dbec570..06b1a286a5 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -409,7 +409,7 @@ again: maxdelta = size_limit; } delta=0; - loop: +loop: if (is_single_word) { BN_ULONG rnd_word = BN_get_word(rnd); @@ -476,7 +476,8 @@ static int probable_prime_dh(BIGNUM *rnd, int bits, /* we now have a random number 'rand' to test. */ - loop: for (i=1; i Date: Mon, 26 May 2014 19:16:52 +0100 Subject: Remove static from probable_prime_dh. --- crypto/bn/bn_lcl.h | 3 ++ crypto/bn/bn_prime.c | 82 +++++++++++++++++++++++++--------------------------- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h index 90787e576e..40ef22b73f 100644 --- a/crypto/bn/bn_lcl.h +++ b/crypto/bn/bn_lcl.h @@ -534,6 +534,9 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_U BIGNUM *int_bn_mod_inverse(BIGNUM *in, const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx, int *noinv); +int bn_probable_prime_dh(BIGNUM *rnd, int bits, + const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); + #ifdef __cplusplus } #endif diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index 06b1a286a5..ac6ae30fa2 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -129,8 +129,6 @@ static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1, const BIGNUM *a1_odd, int k, BN_CTX *ctx, BN_MONT_CTX *mont); static int probable_prime(BIGNUM *rnd, int bits); -static int probable_prime_dh(BIGNUM *rnd, int bits, - const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); static int probable_prime_dh_safe(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); @@ -198,7 +196,7 @@ loop: } else { - if (!probable_prime_dh(ret,bits,add,rem,ctx)) + if (!bn_probable_prime_dh(ret,bits,add,rem,ctx)) goto err; } } @@ -362,6 +360,45 @@ err: return(ret); } +int bn_probable_prime_dh(BIGNUM *rnd, int bits, + const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx) + { + int i,ret=0; + BIGNUM *t1; + + BN_CTX_start(ctx); + if ((t1 = BN_CTX_get(ctx)) == NULL) goto err; + + if (!BN_rand(rnd,bits,0,1)) goto err; + + /* we need ((rnd-rem) % add) == 0 */ + + if (!BN_mod(t1,rnd,add,ctx)) goto err; + if (!BN_sub(rnd,rnd,t1)) goto err; + if (rem == NULL) + { if (!BN_add_word(rnd,1)) goto err; } + else + { if (!BN_add(rnd,rnd,rem)) goto err; } + + /* we now have a random number 'rand' to test. */ + +loop: + for (i=1; i Date: Mon, 26 May 2014 21:57:25 +0100 Subject: Add speed test for prime trial division. --- apps/speed.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/apps/speed.c b/apps/speed.c index 92324186f4..83bec11ab0 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -191,6 +191,8 @@ #endif #include +#include "../crypto/bn/bn_lcl.h" + #ifndef HAVE_FORK # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE) # define HAVE_FORK 0 @@ -214,6 +216,7 @@ static int usertime=1; static double Time_F(int s); static void print_message(const char *s,long num,int length); +static void prime_print_message(const char *s, long num); static void pkey_print_message(const char *str, const char *str2, long num, int bits, int sec); static void print_result(int alg,int run_no,int count,double time_used); @@ -223,6 +226,7 @@ static int do_multi(int multi); #define ALGOR_NUM 30 #define SIZE_NUM 5 +#define PRIME_NUM 2 #define RSA_NUM 4 #define DSA_NUM 3 @@ -239,6 +243,8 @@ static const char *names[ALGOR_NUM]={ "aes-128 ige","aes-192 ige","aes-256 ige","ghash" }; 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" }; #ifndef OPENSSL_NO_RSA static double rsa_results[RSA_NUM][2]; #endif @@ -492,6 +498,11 @@ int MAIN(int argc, char **argv) #define D_GHASH 29 double d=0.0; long c[ALGOR_NUM][SIZE_NUM]; + +#define D_PRIME_TRIAL_DIVISION 0 +#define D_PRIME_COPRIME 1 + long prime_c[PRIME_NUM]; + #define R_DSA_512 0 #define R_DSA_1024 1 #define R_DSA_2048 2 @@ -605,6 +616,7 @@ int MAIN(int argc, char **argv) long ecdh_c[EC_NUM][2]; #endif + int prime_doit[PRIME_NUM]; int rsa_doit[RSA_NUM]; int dsa_doit[DSA_NUM]; #ifndef OPENSSL_NO_ECDSA @@ -997,6 +1009,9 @@ int MAIN(int argc, char **argv) } 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; + else { BIO_printf(bio_err,"Error: bad option or value\n"); BIO_printf(bio_err,"\n"); @@ -1123,6 +1138,7 @@ int MAIN(int argc, char **argv) !defined(OPENSSL_NO_AES) || !defined(OPENSSL_NO_CAMELLIA) BIO_printf(bio_err,"\n"); #endif + BIO_printf(bio_err,"prime-trial-division prime-coprime\n"); BIO_printf(bio_err,"\n"); BIO_printf(bio_err,"Available options:\n"); @@ -1329,6 +1345,10 @@ int MAIN(int argc, char **argv) c[D_IGE_192_AES][i]=c[D_IGE_192_AES][i-1]*l0/l1; c[D_IGE_256_AES][i]=c[D_IGE_256_AES][i-1]*l0/l1; } + + prime_c[D_PRIME_TRIAL_DIVISION]=count; + prime_c[D_PRIME_COPRIME]=count; + #ifndef OPENSSL_NO_RSA rsa_c[R_RSA_512][0]=count/2000; rsa_c[R_RSA_512][1]=count/400; @@ -1995,6 +2015,33 @@ int MAIN(int argc, char **argv) print_result(D_EVP,j,count,d); } } + + for (j=0; j Date: Mon, 26 May 2014 21:58:55 +0100 Subject: Tidy up speed.c a little. --- apps/speed.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/apps/speed.c b/apps/speed.c index 83bec11ab0..5af95dfc0c 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -986,7 +986,7 @@ int MAIN(int argc, char **argv) else #endif #ifndef OPENSSL_NO_ECDH - if (strcmp(*argv,"ecdhp160") == 0) ecdh_doit[R_EC_P160]=2; + if (strcmp(*argv,"ecdhp160") == 0) ecdh_doit[R_EC_P160]=2; else if (strcmp(*argv,"ecdhp192") == 0) ecdh_doit[R_EC_P192]=2; else if (strcmp(*argv,"ecdhp224") == 0) ecdh_doit[R_EC_P224]=2; else if (strcmp(*argv,"ecdhp256") == 0) ecdh_doit[R_EC_P256]=2; @@ -1010,7 +1010,7 @@ int MAIN(int argc, char **argv) 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; + else if (strcmp(*argv,"prime-coprime") == 0) prime_doit[D_PRIME_COPRIME]=1; else { BIO_printf(bio_err,"Error: bad option or value\n"); @@ -1307,25 +1307,26 @@ int MAIN(int argc, char **argv) c[D_IGE_256_AES][0]=count; c[D_GHASH][0]=count; - for (i=1; i Date: Tue, 27 May 2014 00:33:42 +0100 Subject: Run the prime speed tests for 10 seconds. --- apps/speed.c | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/apps/speed.c b/apps/speed.c index 5af95dfc0c..885784ee1d 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -74,9 +74,10 @@ #ifndef OPENSSL_NO_SPEED #undef SECONDS -#define SECONDS 3 -#define RSA_SECONDS 10 -#define DSA_SECONDS 10 +#define SECONDS 3 +#define PRIME_SECONDS 10 +#define RSA_SECONDS 10 +#define DSA_SECONDS 10 #define ECDSA_SECONDS 10 #define ECDH_SECONDS 10 @@ -220,6 +221,7 @@ static void prime_print_message(const char *s, long num); static void pkey_print_message(const char *str, const char *str2, long num, int bits, int sec); static void print_result(int alg,int run_no,int count,double time_used); +static void prime_print_result(int alg, int count, double time_used); #ifndef NO_FORK static int do_multi(int multi); #endif @@ -2016,32 +2018,28 @@ int MAIN(int argc, char **argv) print_result(D_EVP,j,count,d); } } - - for (j=0; j Date: Tue, 27 May 2014 00:37:03 +0100 Subject: Add a method to generate a prime that is guaranteed not to be divisible by 3 or 5. Possibly some reduction in bias, but no speed gains. --- apps/speed.c | 23 ++++++++++++++ crypto/bn/bn_lcl.h | 2 ++ crypto/bn/bn_prime.c | 84 ++++++++++++++++++++++++++++++++++------------------ 3 files changed, 80 insertions(+), 29 deletions(-) diff --git a/apps/speed.c b/apps/speed.c index 885784ee1d..84d0829ad2 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -2041,6 +2041,29 @@ int MAIN(int argc, char **argv) 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(rnd, 1024, add, NULL, ctx); + + 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); #ifndef OPENSSL_NO_RSA diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h index 40ef22b73f..fc54dcecdc 100644 --- a/crypto/bn/bn_lcl.h +++ b/crypto/bn/bn_lcl.h @@ -536,6 +536,8 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in, int bn_probable_prime_dh(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); +int bn_probable_prime_dh_coprime(BIGNUM *rnd, int bits, + const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); #ifdef __cplusplus } diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index ac6ae30fa2..b303a48726 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -129,9 +129,13 @@ static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1, const BIGNUM *a1_odd, int k, BN_CTX *ctx, BN_MONT_CTX *mont); static int probable_prime(BIGNUM *rnd, int bits); +static int probable_prime_dh(BIGNUM *rnd, const BIGNUM *add, + const BIGNUM *rem, BN_CTX *ctx, int first_prime_index); static int probable_prime_dh_safe(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); +static int prime_offsets[8] = { 7, 11, 13, 17, 19, 23, 29, 31 }; + int BN_GENCB_call(BN_GENCB *cb, int a, int b) { /* No callback means continue */ @@ -363,40 +367,25 @@ err: int bn_probable_prime_dh(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx) { - int i,ret=0; - BIGNUM *t1; + if (!BN_rand(rnd, bits, 0, 1)) return(0); - BN_CTX_start(ctx); - if ((t1 = BN_CTX_get(ctx)) == NULL) goto err; - - if (!BN_rand(rnd,bits,0,1)) goto err; + return(probable_prime_dh(rnd, add, rem, ctx, 1)); + } - /* we need ((rnd-rem) % add) == 0 */ +int bn_probable_prime_dh_coprime(BIGNUM *rnd, int bits, + const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx) + { + BIGNUM *offset_index = BN_new(); - if (!BN_mod(t1,rnd,add,ctx)) goto err; - if (!BN_sub(rnd,rnd,t1)) goto err; - if (rem == NULL) - { if (!BN_add_word(rnd,1)) goto err; } - else - { if (!BN_add(rnd,rnd,rem)) goto err; } + if (!BN_rand(rnd, bits, 0, 1)) return(0); + if (!BN_rand(offset_index, 3, -1, -1)) return(0); - /* we now have a random number 'rand' to test. */ + BN_mul_word(rnd, 30); + BN_add_word(rnd, prime_offsets[BN_get_word(offset_index)]); + + BN_free(offset_index); -loop: - for (i=1; i Date: Tue, 27 May 2014 02:12:59 +0100 Subject: Generate safe primes not divisible by 3, 5 or 7. ~2% speed improvement on trial division. --- apps/speed.c | 8 ++++---- crypto/bn/bn_lcl.h | 2 +- crypto/bn/bn_prime.c | 22 ++++++++++++++++------ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/apps/speed.c b/apps/speed.c index 84d0829ad2..78b79239b2 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ /* ==================================================================== - * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. + * Copyright 2002-2014 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. @@ -2054,7 +2054,7 @@ int MAIN(int argc, char **argv) Time_F(START); for (count=0, run=1; COND(prime_c[D_PRIME_COPRIME]); count++) - bn_probable_prime_dh_coprime(rnd, 1024, add, NULL, ctx); + bn_probable_prime_dh_coprime_safe(rnd, 1024, add, NULL, ctx); d=Time_F(STOP); prime_print_result(D_PRIME_COPRIME, count, d); @@ -2700,9 +2700,9 @@ static void print_result(int alg,int run_no,int count,double time_used) static void prime_print_result(int alg, int count, double time_used) { BIO_printf(bio_err, - mr ? "+R:%d:%s:%f:%f\n" : "%d %s's in %.2fs (%.2fms/run)\n", + mr ? "+R:%d:%s:%f:%f\n" : "%d %s's in %.2fs (%.2f microseconds / run)\n", count, prime_names[alg], time_used, - time_used / ((double)count) * 1000); + time_used / ((double)count) * 1000000); } #ifndef NO_FORK diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h index fc54dcecdc..f0cfaeaaba 100644 --- a/crypto/bn/bn_lcl.h +++ b/crypto/bn/bn_lcl.h @@ -536,7 +536,7 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in, int bn_probable_prime_dh(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); -int bn_probable_prime_dh_coprime(BIGNUM *rnd, int bits, +int bn_probable_prime_dh_coprime_safe(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); #ifdef __cplusplus diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index b303a48726..90f840fdd9 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -134,7 +134,10 @@ static int probable_prime_dh(BIGNUM *rnd, const BIGNUM *add, static int probable_prime_dh_safe(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); -static int prime_offsets[8] = { 7, 11, 13, 17, 19, 23, 29, 31 }; +static int prime_multiplier = 210; +static int prime_offsets[8] = { 23, 47, 59, 83, 107, 143, 167, 179 }; +static int prime_offset_count = 8; +static int prime_offset_count_exponent = 3; int BN_GENCB_call(BN_GENCB *cb, int a, int b) { @@ -372,20 +375,27 @@ int bn_probable_prime_dh(BIGNUM *rnd, int bits, return(probable_prime_dh(rnd, add, rem, ctx, 1)); } -int bn_probable_prime_dh_coprime(BIGNUM *rnd, int bits, +int bn_probable_prime_dh_coprime_safe(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx) { + int i = prime_offset_count; BIGNUM *offset_index = BN_new(); if (!BN_rand(rnd, bits, 0, 1)) return(0); - if (!BN_rand(offset_index, 3, -1, -1)) return(0); + + while (i >= prime_offset_count) + { + if (!BN_rand(offset_index, prime_offset_count_exponent, -1, -1)) + return(0); + i = BN_get_word(offset_index); + } - BN_mul_word(rnd, 30); - BN_add_word(rnd, prime_offsets[BN_get_word(offset_index)]); + BN_mul_word(rnd, prime_multiplier); + BN_add_word(rnd, prime_offsets[i]); BN_free(offset_index); - return(probable_prime_dh(rnd, add, rem, ctx, 3)); + return(probable_prime_dh(rnd, add, rem, ctx, 4)); } static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1, -- cgit v1.2.3 From 8a120852938247f53f0eb793932ef7b13db9f577 Mon Sep 17 00:00:00 2001 From: Felix Laurie von Massenbach Date: Tue, 27 May 2014 02:13:33 +0100 Subject: Add python script to generate the bits needed for the prime generator. --- tools/primes.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 tools/primes.py diff --git a/tools/primes.py b/tools/primes.py new file mode 100644 index 0000000000..c4be13baae --- /dev/null +++ b/tools/primes.py @@ -0,0 +1,21 @@ +primes = [2, 3, 5, 7] +safe = True + +muliplier = 1 +for p in primes: + muliplier *= p + +offsets = [] +for x in range(3, muliplier + 3, 2): + prime = True + for p in primes: + if not x % p or (safe and not ((x - 1) / 2) % p): + prime = False + break + + if prime: + offsets.append(x) + +print(offsets) +print(len(offsets)) +print(muliplier) -- cgit v1.2.3 From 7e965dcc3812ac6ec4d1413c5ea3224be6486c8f Mon Sep 17 00:00:00 2001 From: Felix Laurie von Massenbach Date: Tue, 27 May 2014 12:41:20 +0100 Subject: Remove editor barf on updating copyright. --- apps/speed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/speed.c b/apps/speed.c index 78b79239b2..36e885a594 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -56,7 +56,7 @@ * [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. -- cgit v1.2.3 From 982c42cb20f6a6797ea0ce5c5a8c1a040b170d65 Mon Sep 17 00:00:00 2001 From: Felix Laurie von Massenbach Date: Tue, 27 May 2014 12:55:20 +0100 Subject: Try skipping over the adding and just picking a new random number. Generates a number coprime to 2, 3, 5, 7, 11. Speed: Trial div (add) : trial div (retry) : coprime 1 : 0.42 : 0.84 --- apps/speed.c | 42 ++++++++++++---- crypto/bn/bn_lcl.h | 4 +- crypto/bn/bn_prime.c | 139 ++++++++++++++++++++++++++++++++++++++++----------- tools/primes.py | 6 +-- 4 files changed, 145 insertions(+), 46 deletions(-) diff --git a/apps/speed.c b/apps/speed.c index 36e885a594..eec2fd0999 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -228,7 +228,7 @@ static int do_multi(int multi); #define ALGOR_NUM 30 #define SIZE_NUM 5 -#define PRIME_NUM 2 +#define PRIME_NUM 3 #define RSA_NUM 4 #define DSA_NUM 3 @@ -246,7 +246,7 @@ static const char *names[ALGOR_NUM]={ 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 @@ -501,8 +501,9 @@ int MAIN(int argc, char **argv) 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 @@ -1011,8 +1012,12 @@ int MAIN(int argc, char **argv) } 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 { BIO_printf(bio_err,"Error: bad option or value\n"); @@ -1350,6 +1355,7 @@ int MAIN(int argc, char **argv) } 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 @@ -2039,30 +2045,44 @@ int MAIN(int argc, char **argv) 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++) + bn_probable_prime_dh_retry(rnd, 1024, ctx); + 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); + bn_probable_prime_dh_coprime(rnd, 1024, ctx); 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); diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h index f0cfaeaaba..3de1d4cde1 100644 --- a/crypto/bn/bn_lcl.h +++ b/crypto/bn/bn_lcl.h @@ -536,8 +536,8 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in, int bn_probable_prime_dh(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); -int bn_probable_prime_dh_coprime_safe(BIGNUM *rnd, int bits, - const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); +int bn_probable_prime_dh_retry(BIGNUM *rnd, int bits, BN_CTX *ctx); +int bn_probable_prime_dh_coprime(BIGNUM *rnd, int bits, BN_CTX *ctx); #ifdef __cplusplus } diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index 90f840fdd9..064944c8dd 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -129,15 +129,49 @@ static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1, const BIGNUM *a1_odd, int k, BN_CTX *ctx, BN_MONT_CTX *mont); static int probable_prime(BIGNUM *rnd, int bits); -static int probable_prime_dh(BIGNUM *rnd, const BIGNUM *add, - const BIGNUM *rem, BN_CTX *ctx, int first_prime_index); static int probable_prime_dh_safe(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); -static int prime_multiplier = 210; -static int prime_offsets[8] = { 23, 47, 59, 83, 107, 143, 167, 179 }; -static int prime_offset_count = 8; -static int prime_offset_count_exponent = 3; +static int prime_offsets[480] = { + 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, + 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, + 169, 173, 179, 181, 191, 193, 197, 199, 211, 221, 223, 227, 229, 233, 239, + 241, 247, 251, 257, 263, 269, 271, 277, 281, 283, 289, 293, 299, 307, 311, + 313, 317, 323, 331, 337, 347, 349, 353, 359, 361, 367, 373, 377, 379, 383, + 389, 391, 397, 401, 403, 409, 419, 421, 431, 433, 437, 439, 443, 449, 457, + 461, 463, 467, 479, 481, 487, 491, 493, 499, 503, 509, 521, 523, 527, 529, + 533, 541, 547, 551, 557, 559, 563, 569, 571, 577, 587, 589, 593, 599, 601, + 607, 611, 613, 617, 619, 629, 631, 641, 643, 647, 653, 659, 661, 667, 673, + 677, 683, 689, 691, 697, 701, 703, 709, 713, 719, 727, 731, 733, 739, 743, + 751, 757, 761, 767, 769, 773, 779, 787, 793, 797, 799, 809, 811, 817, 821, + 823, 827, 829, 839, 841, 851, 853, 857, 859, 863, 871, 877, 881, 883, 887, + 893, 899, 901, 907, 911, 919, 923, 929, 937, 941, 943, 947, 949, 953, 961, + 967, 971, 977, 983, 989, 991, 997, 1003, 1007, 1009, 1013, 1019, 1021, 1027, + 1031, 1033, 1037, 1039, 1049, 1051, 1061, 1063, 1069, 1073, 1079, 1081, + 1087, 1091, 1093, 1097, 1103, 1109, 1117, 1121, 1123, 1129, 1139, 1147, + 1151, 1153, 1157, 1159, 1163, 1171, 1181, 1187, 1189, 1193, 1201, 1207, + 1213, 1217, 1219, 1223, 1229, 1231, 1237, 1241, 1247, 1249, 1259, 1261, + 1271, 1273, 1277, 1279, 1283, 1289, 1291, 1297, 1301, 1303, 1307, 1313, + 1319, 1321, 1327, 1333, 1339, 1343, 1349, 1357, 1361, 1363, 1367, 1369, + 1373, 1381, 1387, 1391, 1399, 1403, 1409, 1411, 1417, 1423, 1427, 1429, + 1433, 1439, 1447, 1451, 1453, 1457, 1459, 1469, 1471, 1481, 1483, 1487, + 1489, 1493, 1499, 1501, 1511, 1513, 1517, 1523, 1531, 1537, 1541, 1543, + 1549, 1553, 1559, 1567, 1571, 1577, 1579, 1583, 1591, 1597, 1601, 1607, + 1609, 1613, 1619, 1621, 1627, 1633, 1637, 1643, 1649, 1651, 1657, 1663, + 1667, 1669, 1679, 1681, 1691, 1693, 1697, 1699, 1703, 1709, 1711, 1717, + 1721, 1723, 1733, 1739, 1741, 1747, 1751, 1753, 1759, 1763, 1769, 1777, + 1781, 1783, 1787, 1789, 1801, 1807, 1811, 1817, 1819, 1823, 1829, 1831, + 1843, 1847, 1849, 1853, 1861, 1867, 1871, 1873, 1877, 1879, 1889, 1891, + 1901, 1907, 1909, 1913, 1919, 1921, 1927, 1931, 1933, 1937, 1943, 1949, + 1951, 1957, 1961, 1963, 1973, 1979, 1987, 1993, 1997, 1999, 2003, 2011, + 2017, 2021, 2027, 2029, 2033, 2039, 2041, 2047, 2053, 2059, 2063, 2069, + 2071, 2077, 2081, 2083, 2087, 2089, 2099, 2111, 2113, 2117, 2119, 2129, + 2131, 2137, 2141, 2143, 2147, 2153, 2159, 2161, 2171, 2173, 2179, 2183, + 2197, 2201, 2203, 2207, 2209, 2213, 2221, 2227, 2231, 2237, 2239, 2243, + 2249, 2251, 2257, 2263, 2267, 2269, 2273, 2279, 2281, 2287, 2291, 2293, + 2297, 2309, 2311 }; +static int prime_offset_count = 480; +static int prime_multiplier = 2310; int BN_GENCB_call(BN_GENCB *cb, int a, int b) { @@ -367,35 +401,76 @@ err: return(ret); } -int bn_probable_prime_dh(BIGNUM *rnd, int bits, - const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx) +int bn_probable_prime_dh_retry(BIGNUM *rnd, int bits, BN_CTX *ctx) { - if (!BN_rand(rnd, bits, 0, 1)) return(0); + int i; + BIGNUM *t1; + int ret = 0; - return(probable_prime_dh(rnd, add, rem, ctx, 1)); - } + BN_CTX_start(ctx); + if ((t1 = BN_CTX_get(ctx)) == NULL) goto err; -int bn_probable_prime_dh_coprime_safe(BIGNUM *rnd, int bits, - const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx) - { - int i = prime_offset_count; - BIGNUM *offset_index = BN_new(); +loop: + if (!BN_rand(rnd, bits, 0, 1)) goto err; - if (!BN_rand(rnd, bits, 0, 1)) return(0); - - while (i >= prime_offset_count) + /* we now have a random number 'rand' to test. */ + + for (i = 1; i < NUMPRIMES; i++) { - if (!BN_rand(offset_index, prime_offset_count_exponent, -1, -1)) - return(0); - i = BN_get_word(offset_index); + /* check that rnd is a prime */ + if (BN_mod_word(rnd, (BN_ULONG)primes[i]) <= 1) + { + /*if (!BN_add(rnd, rnd, add)) goto err;*/ + goto loop; + } } + ret=1; - BN_mul_word(rnd, prime_multiplier); - BN_add_word(rnd, prime_offsets[i]); +err: + BN_CTX_end(ctx); + bn_check_top(rnd); + return(ret); + } + +int bn_probable_prime_dh_coprime(BIGNUM *rnd, int bits, BN_CTX *ctx) + { + int i; + BIGNUM *t1; + BIGNUM *offset_index; + BIGNUM *offset_count; + int ret = 0; - BN_free(offset_index); + BN_CTX_start(ctx); + if ((t1 = BN_CTX_get(ctx)) == NULL) goto err; + if ((offset_index = BN_CTX_get(ctx)) == NULL) goto err; + if ((offset_count = BN_CTX_get(ctx)) == NULL) goto err; + + BN_add_word(offset_count, prime_offset_count); + +loop: + if (!BN_rand(rnd, bits, 0, 1)) goto err; + if (!BN_rand_range(offset_index, offset_count)) goto err; + + BN_mul_word(rnd, prime_multiplier); + BN_add_word(rnd, prime_offsets[BN_get_word(offset_index)]); - return(probable_prime_dh(rnd, add, rem, ctx, 4)); + /* we now have a random number 'rand' to test. */ + + /* skip primes 2, 3, 5, 7, 11 */ + for (i = 5; i < NUMPRIMES; i++) + { + /* check that rnd is a prime */ + if (BN_mod_word(rnd, (BN_ULONG)primes[i]) <= 1) + { + goto loop; + } + } + ret=1; + +err: + BN_CTX_end(ctx); + bn_check_top(rnd); + return(ret); } static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1, @@ -490,8 +565,8 @@ loop: return(1); } -static int probable_prime_dh(BIGNUM *rnd, const BIGNUM *add, - const BIGNUM *rem, BN_CTX *ctx, int first_prime_index) +int bn_probable_prime_dh(BIGNUM *rnd, int bits, + const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx) { int i,ret=0; BIGNUM *t1; @@ -499,6 +574,8 @@ static int probable_prime_dh(BIGNUM *rnd, const BIGNUM *add, BN_CTX_start(ctx); if ((t1 = BN_CTX_get(ctx)) == NULL) goto err; + if (!BN_rand(rnd,bits,0,1)) goto err; + /* we need ((rnd-rem) % add) == 0 */ if (!BN_mod(t1,rnd,add,ctx)) goto err; @@ -511,7 +588,7 @@ static int probable_prime_dh(BIGNUM *rnd, const BIGNUM *add, /* we now have a random number 'rand' to test. */ loop: - for (i=first_prime_index; i Date: Tue, 27 May 2014 13:23:21 +0100 Subject: Refactor the first prime index. --- crypto/bn/bn_prime.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index 064944c8dd..117dda955b 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -172,6 +172,7 @@ static int prime_offsets[480] = { 2297, 2309, 2311 }; static int prime_offset_count = 480; static int prime_multiplier = 2310; +static int first_prime_index = 5; int BN_GENCB_call(BN_GENCB *cb, int a, int b) { @@ -420,7 +421,6 @@ loop: /* check that rnd is a prime */ if (BN_mod_word(rnd, (BN_ULONG)primes[i]) <= 1) { - /*if (!BN_add(rnd, rnd, add)) goto err;*/ goto loop; } } @@ -456,8 +456,8 @@ loop: /* we now have a random number 'rand' to test. */ - /* skip primes 2, 3, 5, 7, 11 */ - for (i = 5; i < NUMPRIMES; i++) + /* skip coprimes */ + for (i = first_prime_index; i < NUMPRIMES; i++) { /* check that rnd is a prime */ if (BN_mod_word(rnd, (BN_ULONG)primes[i]) <= 1) -- cgit v1.2.3 From a77889f5609cf49f0c72e1cc414a6c15f7d3cef0 Mon Sep 17 00:00:00 2001 From: Felix Laurie von Massenbach Date: Tue, 27 May 2014 13:38:59 +0100 Subject: Only count successful generations. --- apps/speed.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/speed.c b/apps/speed.c index eec2fd0999..00a7f1906f 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -2037,7 +2037,7 @@ int MAIN(int argc, char **argv) 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); @@ -2057,7 +2057,7 @@ int MAIN(int argc, char **argv) Time_F(START); for (count=0, run=1; COND(prime_c[D_PRIME_TRIAL_DIVISION_RETRY]); count++) - bn_probable_prime_dh_retry(rnd, 1024, ctx); + if (!bn_probable_prime_dh_retry(rnd, 1024, ctx)) count--; d=Time_F(STOP); prime_print_result(D_PRIME_TRIAL_DIVISION_RETRY, count, d); @@ -2076,7 +2076,7 @@ int MAIN(int argc, char **argv) Time_F(START); for (count=0, run=1; COND(prime_c[D_PRIME_COPRIME]); count++) - bn_probable_prime_dh_coprime(rnd, 1024, ctx); + if (!bn_probable_prime_dh_coprime(rnd, 1024, ctx)) count--; d=Time_F(STOP); prime_print_result(D_PRIME_COPRIME, count, d); -- cgit v1.2.3 From 9a3a99748b75d9656467e28de569bd03bf3edd8f Mon Sep 17 00:00:00 2001 From: Felix Laurie von Massenbach Date: Tue, 27 May 2014 13:43:36 +0100 Subject: Remove unused BIGNUMs. --- crypto/bn/bn_prime.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index 117dda955b..093ebee3ad 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -405,12 +405,8 @@ err: int bn_probable_prime_dh_retry(BIGNUM *rnd, int bits, BN_CTX *ctx) { int i; - BIGNUM *t1; int ret = 0; - BN_CTX_start(ctx); - if ((t1 = BN_CTX_get(ctx)) == NULL) goto err; - loop: if (!BN_rand(rnd, bits, 0, 1)) goto err; @@ -427,7 +423,6 @@ loop: ret=1; err: - BN_CTX_end(ctx); bn_check_top(rnd); return(ret); } @@ -435,13 +430,11 @@ err: int bn_probable_prime_dh_coprime(BIGNUM *rnd, int bits, BN_CTX *ctx) { int i; - BIGNUM *t1; BIGNUM *offset_index; BIGNUM *offset_count; int ret = 0; BN_CTX_start(ctx); - if ((t1 = BN_CTX_get(ctx)) == NULL) goto err; if ((offset_index = BN_CTX_get(ctx)) == NULL) goto err; if ((offset_count = BN_CTX_get(ctx)) == NULL) goto err; -- cgit v1.2.3 From 8927c2786d25c90566a2e7eb96b25b2c0a3ae4ab Mon Sep 17 00:00:00 2001 From: Felix Laurie von Massenbach Date: Tue, 27 May 2014 14:48:21 +0100 Subject: Add a test to check we're really generating probable primes. --- crypto/bn/bn_prime.c | 4 ++-- crypto/bn/bntest.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index 093ebee3ad..ff00b903a4 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -458,12 +458,12 @@ loop: goto loop; } } - ret=1; + ret = 1; err: BN_CTX_end(ctx); bn_check_top(rnd); - return(ret); + return ret; } static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1, diff --git a/crypto/bn/bntest.c b/crypto/bn/bntest.c index d22c2d43d6..697d77a370 100644 --- a/crypto/bn/bntest.c +++ b/crypto/bn/bntest.c @@ -87,6 +87,8 @@ #include #include +#include "../crypto/bn/bn_lcl.h" + const int num0 = 100; /* number of tests */ const int num1 = 50; /* additional tests for some functions */ const int num2 = 5; /* number of tests for slow functions */ @@ -121,6 +123,7 @@ int test_gf2m_mod_solve_quad(BIO *bp,BN_CTX *ctx); int test_kron(BIO *bp,BN_CTX *ctx); int test_sqrt(BIO *bp,BN_CTX *ctx); int test_small_prime(BIO *bp,BN_CTX *ctx); +int test_probable_prime_coprime(BIO *bp,BN_CTX *ctx); int rand_neg(void); static int results=0; @@ -270,6 +273,10 @@ int main(int argc, char *argv[]) if (!test_small_prime(out,ctx)) goto err; (void)BIO_flush(out); + message(out,"Probable prime generation with coprimes"); + if (!test_probable_prime_coprime(out,ctx)) goto err; + (void)BIO_flush(out); + #ifndef OPENSSL_NO_EC2M message(out,"BN_GF2m_add"); if (!test_gf2m_add(out)) goto err; @@ -1923,6 +1930,37 @@ err: return ret; } +int test_probable_prime_coprime(BIO *bp, BN_CTX *ctx) + { + int i, j, ret = 0; + BIGNUM r; + BN_ULONG primes[5] = { 2, 3, 5, 7, 11 }; + + BN_init(&r); + + for (i = 0; i < 1000; i++) + { + if (!bn_probable_prime_dh_coprime(&r, 1024, ctx)) goto err; + + for (j = 0; j < 5; j++) + { + if (BN_mod_word(&r, primes[j]) == 0) + { + BIO_printf(bp, "Number generated is not coprime to %ld:\n", primes[j]); + BN_print_fp(stdout, &r); + BIO_printf(bp, "\n"); + goto err; + } + } + } + + ret = 1; + +err: + BN_clear(&r); + return ret; + } + int test_lshift(BIO *bp,BN_CTX *ctx,BIGNUM *a_) { BIGNUM *a,*b,*c,*d; -- cgit v1.2.3 From 5efa13ca7ebb78b5e69ae8a1786a296a26822129 Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Sat, 31 May 2014 18:20:03 +0100 Subject: Add option to run all prime tests. --- apps/speed.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/speed.c b/apps/speed.c index 00a7f1906f..08165651be 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -1018,6 +1018,11 @@ int MAIN(int argc, char **argv) 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"); -- cgit v1.2.3 From 0382950c6c9cfc78b472d620e9d73091ad9fa119 Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Sat, 31 May 2014 18:24:55 +0100 Subject: Zero prime doits. --- apps/speed.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/speed.c b/apps/speed.c index 08165651be..619269bc69 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -700,6 +700,8 @@ int MAIN(int argc, char **argv) for (i=0; i Date: Sat, 31 May 2014 18:26:37 +0100 Subject: Constify and reduce coprime random bits to allow for multiplier. --- crypto/bn/bn_prime.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index ff00b903a4..2439ead417 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -132,7 +132,7 @@ static int probable_prime(BIGNUM *rnd, int bits); static int probable_prime_dh_safe(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); -static int prime_offsets[480] = { +static const int prime_offsets[480] = { 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 169, 173, 179, 181, 191, 193, 197, 199, 211, 221, 223, 227, 229, 233, 239, @@ -170,9 +170,10 @@ static int prime_offsets[480] = { 2197, 2201, 2203, 2207, 2209, 2213, 2221, 2227, 2231, 2237, 2239, 2243, 2249, 2251, 2257, 2263, 2267, 2269, 2273, 2279, 2281, 2287, 2291, 2293, 2297, 2309, 2311 }; -static int prime_offset_count = 480; -static int prime_multiplier = 2310; -static int first_prime_index = 5; +static const int prime_offset_count = 480; +static const int prime_multiplier = 2310; +static const int prime_multiplier_bits = 11; +static const int first_prime_index = 5; int BN_GENCB_call(BN_GENCB *cb, int a, int b) { @@ -433,6 +434,8 @@ int bn_probable_prime_dh_coprime(BIGNUM *rnd, int bits, BN_CTX *ctx) BIGNUM *offset_index; BIGNUM *offset_count; int ret = 0; + + OPENSSL_assert(bits > prime_multiplier_bits); BN_CTX_start(ctx); if ((offset_index = BN_CTX_get(ctx)) == NULL) goto err; @@ -441,7 +444,7 @@ int bn_probable_prime_dh_coprime(BIGNUM *rnd, int bits, BN_CTX *ctx) BN_add_word(offset_count, prime_offset_count); loop: - if (!BN_rand(rnd, bits, 0, 1)) goto err; + if (!BN_rand(rnd, bits - prime_multiplier_bits, 0, 1)) goto err; if (!BN_rand_range(offset_index, offset_count)) goto err; BN_mul_word(rnd, prime_multiplier); -- cgit v1.2.3 From c93233dbfd6fee35fdf8c8a45ae36b9b9bd7ad9b Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Sun, 1 Jun 2014 15:25:50 +0100 Subject: Tidy up, don't exceed the number of requested bits. --- crypto/bn/bn_prime.c | 79 +++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index 2439ead417..2d66b61f04 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -133,46 +133,48 @@ static int probable_prime_dh_safe(BIGNUM *rnd, int bits, const BIGNUM *add, const BIGNUM *rem, BN_CTX *ctx); static const int prime_offsets[480] = { - 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, - 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, - 169, 173, 179, 181, 191, 193, 197, 199, 211, 221, 223, 227, 229, 233, 239, - 241, 247, 251, 257, 263, 269, 271, 277, 281, 283, 289, 293, 299, 307, 311, - 313, 317, 323, 331, 337, 347, 349, 353, 359, 361, 367, 373, 377, 379, 383, - 389, 391, 397, 401, 403, 409, 419, 421, 431, 433, 437, 439, 443, 449, 457, - 461, 463, 467, 479, 481, 487, 491, 493, 499, 503, 509, 521, 523, 527, 529, - 533, 541, 547, 551, 557, 559, 563, 569, 571, 577, 587, 589, 593, 599, 601, - 607, 611, 613, 617, 619, 629, 631, 641, 643, 647, 653, 659, 661, 667, 673, - 677, 683, 689, 691, 697, 701, 703, 709, 713, 719, 727, 731, 733, 739, 743, - 751, 757, 761, 767, 769, 773, 779, 787, 793, 797, 799, 809, 811, 817, 821, - 823, 827, 829, 839, 841, 851, 853, 857, 859, 863, 871, 877, 881, 883, 887, - 893, 899, 901, 907, 911, 919, 923, 929, 937, 941, 943, 947, 949, 953, 961, - 967, 971, 977, 983, 989, 991, 997, 1003, 1007, 1009, 1013, 1019, 1021, 1027, - 1031, 1033, 1037, 1039, 1049, 1051, 1061, 1063, 1069, 1073, 1079, 1081, - 1087, 1091, 1093, 1097, 1103, 1109, 1117, 1121, 1123, 1129, 1139, 1147, - 1151, 1153, 1157, 1159, 1163, 1171, 1181, 1187, 1189, 1193, 1201, 1207, - 1213, 1217, 1219, 1223, 1229, 1231, 1237, 1241, 1247, 1249, 1259, 1261, - 1271, 1273, 1277, 1279, 1283, 1289, 1291, 1297, 1301, 1303, 1307, 1313, - 1319, 1321, 1327, 1333, 1339, 1343, 1349, 1357, 1361, 1363, 1367, 1369, - 1373, 1381, 1387, 1391, 1399, 1403, 1409, 1411, 1417, 1423, 1427, 1429, - 1433, 1439, 1447, 1451, 1453, 1457, 1459, 1469, 1471, 1481, 1483, 1487, - 1489, 1493, 1499, 1501, 1511, 1513, 1517, 1523, 1531, 1537, 1541, 1543, - 1549, 1553, 1559, 1567, 1571, 1577, 1579, 1583, 1591, 1597, 1601, 1607, - 1609, 1613, 1619, 1621, 1627, 1633, 1637, 1643, 1649, 1651, 1657, 1663, - 1667, 1669, 1679, 1681, 1691, 1693, 1697, 1699, 1703, 1709, 1711, 1717, - 1721, 1723, 1733, 1739, 1741, 1747, 1751, 1753, 1759, 1763, 1769, 1777, - 1781, 1783, 1787, 1789, 1801, 1807, 1811, 1817, 1819, 1823, 1829, 1831, - 1843, 1847, 1849, 1853, 1861, 1867, 1871, 1873, 1877, 1879, 1889, 1891, - 1901, 1907, 1909, 1913, 1919, 1921, 1927, 1931, 1933, 1937, 1943, 1949, - 1951, 1957, 1961, 1963, 1973, 1979, 1987, 1993, 1997, 1999, 2003, 2011, - 2017, 2021, 2027, 2029, 2033, 2039, 2041, 2047, 2053, 2059, 2063, 2069, - 2071, 2077, 2081, 2083, 2087, 2089, 2099, 2111, 2113, 2117, 2119, 2129, - 2131, 2137, 2141, 2143, 2147, 2153, 2159, 2161, 2171, 2173, 2179, 2183, - 2197, 2201, 2203, 2207, 2209, 2213, 2221, 2227, 2231, 2237, 2239, 2243, - 2249, 2251, 2257, 2263, 2267, 2269, 2273, 2279, 2281, 2287, 2291, 2293, - 2297, 2309, 2311 }; + 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, + 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, + 167, 169, 173, 179, 181, 191, 193, 197, 199, 211, 221, 223, 227, 229, + 233, 239, 241, 247, 251, 257, 263, 269, 271, 277, 281, 283, 289, 293, + 299, 307, 311, 313, 317, 323, 331, 337, 347, 349, 353, 359, 361, 367, + 373, 377, 379, 383, 389, 391, 397, 401, 403, 409, 419, 421, 431, 433, + 437, 439, 443, 449, 457, 461, 463, 467, 479, 481, 487, 491, 493, 499, + 503, 509, 521, 523, 527, 529, 533, 541, 547, 551, 557, 559, 563, 569, + 571, 577, 587, 589, 593, 599, 601, 607, 611, 613, 617, 619, 629, 631, + 641, 643, 647, 653, 659, 661, 667, 673, 677, 683, 689, 691, 697, 701, + 703, 709, 713, 719, 727, 731, 733, 739, 743, 751, 757, 761, 767, 769, + 773, 779, 787, 793, 797, 799, 809, 811, 817, 821, 823, 827, 829, 839, + 841, 851, 853, 857, 859, 863, 871, 877, 881, 883, 887, 893, 899, 901, + 907, 911, 919, 923, 929, 937, 941, 943, 947, 949, 953, 961, 967, 971, + 977, 983, 989, 991, 997, 1003, 1007, 1009, 1013, 1019, 1021, 1027, 1031, + 1033, 1037, 1039, 1049, 1051, 1061, 1063, 1069, 1073, 1079, 1081, 1087, + 1091, 1093, 1097, 1103, 1109, 1117, 1121, 1123, 1129, 1139, 1147, 1151, + 1153, 1157, 1159, 1163, 1171, 1181, 1187, 1189, 1193, 1201, 1207, 1213, + 1217, 1219, 1223, 1229, 1231, 1237, 1241, 1247, 1249, 1259, 1261, 1271, + 1273, 1277, 1279, 1283, 1289, 1291, 1297, 1301, 1303, 1307, 1313, 1319, + 1321, 1327, 1333, 1339, 1343, 1349, 1357, 1361, 1363, 1367, 1369, 1373, + 1381, 1387, 1391, 1399, 1403, 1409, 1411, 1417, 1423, 1427, 1429, 1433, + 1439, 1447, 1451, 1453, 1457, 1459, 1469, 1471, 1481, 1483, 1487, 1489, + 1493, 1499, 1501, 1511, 1513, 1517, 1523, 1531, 1537, 1541, 1543, 1549, + 1553, 1559, 1567, 1571, 1577, 1579, 1583, 1591, 1597, 1601, 1607, 1609, + 1613, 1619, 1621, 1627, 1633, 1637, 1643, 1649, 1651, 1657, 1663, 1667, + 1669, 1679, 1681, 1691, 1693, 1697, 1699, 1703, 1709, 1711, 1717, 1721, + 1723, 1733, 1739, 1741, 1747, 1751, 1753, 1759, 1763, 1769, 1777, 1781, + 1783, 1787, 1789, 1801, 1807, 1811, 1817, 1819, 1823, 1829, 1831, 1843, + 1847, 1849, 1853, 1861, 1867, 1871, 1873, 1877, 1879, 1889, 1891, 1901, + 1907, 1909, 1913, 1919, 1921, 1927, 1931, 1933, 1937, 1943, 1949, 1951, + 1957, 1961, 1963, 1973, 1979, 1987, 1993, 1997, 1999, 2003, 2011, 2017, + 2021, 2027, 2029, 2033, 2039, 2041, 2047, 2053, 2059, 2063, 2069, 2071, + 2077, 2081, 2083, 2087, 2089, 2099, 2111, 2113, 2117, 2119, 2129, 2131, + 2137, 2141, 2143, 2147, 2153, 2159, 2161, 2171, 2173, 2179, 2183, 2197, + 2201, 2203, 2207, 2209, 2213, 2221, 2227, 2231, 2237, 2239, 2243, 2249, + 2251, 2257, 2263, 2267, 2269, 2273, 2279, 2281, 2287, 2291, 2293, 2297, + 2309, 2311 }; static const int prime_offset_count = 480; static const int prime_multiplier = 2310; -static const int prime_multiplier_bits = 11; +static const int prime_multiplier_bits = 11; /* 2^|prime_multiplier_bits| + <= |prime_multiplier| */ static const int first_prime_index = 5; int BN_GENCB_call(BN_GENCB *cb, int a, int b) @@ -445,6 +447,7 @@ int bn_probable_prime_dh_coprime(BIGNUM *rnd, int bits, BN_CTX *ctx) loop: if (!BN_rand(rnd, bits - prime_multiplier_bits, 0, 1)) goto err; + if (BN_is_bit_set(rnd, bits)) goto loop; if (!BN_rand_range(offset_index, offset_count)) goto err; BN_mul_word(rnd, prime_multiplier); -- cgit v1.2.3 From 5fc3a5fe4912a549d43c097340f6062d8da4ec07 Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Sun, 1 Jun 2014 15:30:01 +0100 Subject: Credit to Felix. Closes #116. --- CHANGES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index a55bdc9e3e..4236f8600e 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,10 @@ Changes between 1.0.2 and 1.1.0 [xx XXX xxxx] + *) Experimental support for a new, fast, unbiased prime candidate generator, + bn_probable_prime_dh_coprime(). Not currently used by any prime generator. + [Felix Laurie von Massenbach ] + *) New output format NSS in the sess_id command line tool. This allows exporting the session id and the master key in NSS keylog format. [Martin Kaiser ] -- cgit v1.2.3