tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Fix BN_is_prime_* calls in SSH, the API returns -1 on 

error.

Found thanks to BoringSSL's commit 53409ee3d7595ed37da472bc73b010cd2c8a5ffd
by David Benjamin.

ok djm, dtucker

OpenBSD-Commit-ID: 1ee832be3c44b1337f76b8562ec6d203f3b072f8
This commit is contained in:
tb@openbsd.org 2019-01-20 02:01:59 +00:00 committed by Damien Miller
parent ec4776bb01
commit a36b0b14a1
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
moduli.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: moduli.c,v 1.32 2017/12/08 03:45:52 deraadt Exp $ */ /* $OpenBSD: moduli.c,v 1.33 2019/01/20 02:01:59 tb Exp $ */
/* /*
* Copyright 1994 Phil Karn <karn@qualcomm.com> * Copyright 1994 Phil Karn <karn@qualcomm.com>
* Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@ -582,7 +582,7 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted,
u_int32_t generator_known, in_tests, in_tries, in_type, in_size; u_int32_t generator_known, in_tests, in_tries, in_type, in_size;
unsigned long last_processed = 0, end_lineno; unsigned long last_processed = 0, end_lineno;
time_t time_start, time_stop; time_t time_start, time_stop;
int res; int res, is_prime;
if (trials < TRIAL_MINIMUM) { if (trials < TRIAL_MINIMUM) {
error("Minimum primality trials is %d", TRIAL_MINIMUM); error("Minimum primality trials is %d", TRIAL_MINIMUM);
@ -753,7 +753,10 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted,
* that p is also prime. A single pass will weed out the * that p is also prime. A single pass will weed out the
* vast majority of composite q's. * vast majority of composite q's.
*/ */
if (BN_is_prime_ex(q, 1, ctx, NULL) <= 0) { is_prime = BN_is_prime_ex(q, 1, ctx, NULL);
if (is_prime < 0)
fatal("BN_is_prime_ex failed");
if (is_prime == 0) {
debug("%10u: q failed first possible prime test", debug("%10u: q failed first possible prime test",
count_in); count_in);
continue; continue;
@ -766,14 +769,20 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted,
* will show up on the first Rabin-Miller iteration so it * will show up on the first Rabin-Miller iteration so it
* doesn't hurt to specify a high iteration count. * doesn't hurt to specify a high iteration count.
*/ */
if (!BN_is_prime_ex(p, trials, ctx, NULL)) { is_prime = BN_is_prime_ex(p, trials, ctx, NULL);
if (is_prime < 0)
fatal("BN_is_prime_ex failed");
if (is_prime == 0) {
debug("%10u: p is not prime", count_in); debug("%10u: p is not prime", count_in);
continue; continue;
} }
debug("%10u: p is almost certainly prime", count_in); debug("%10u: p is almost certainly prime", count_in);
/* recheck q more rigorously */ /* recheck q more rigorously */
if (!BN_is_prime_ex(q, trials - 1, ctx, NULL)) { is_prime = BN_is_prime_ex(q, trials - 1, ctx, NULL);
if (is_prime < 0)
fatal("BN_is_prime_ex failed");
if (is_prime == 0) {
debug("%10u: q is not prime", count_in); debug("%10u: q is not prime", count_in);
continue; continue;
} }