diff options
| author |   miod <miod@openbsd.org> | 2014-07-11 15:01:49 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-07-11 15:01:49 +0000 |
| commit | 22863e6eb5322150d13198cd3c6551a5ea8cdbe1 (patch) | |
| tree | b6c55285d174478f6af7a7a12874d0e4fab0b470 | |
| parent | Also make these files parsable by pod2man.. (diff) | |
| download | wireguard-openbsd-22863e6eb5322150d13198cd3c6551a5ea8cdbe1.tar.xz wireguard-openbsd-22863e6eb5322150d13198cd3c6551a5ea8cdbe1.zip | |
Apparently better fix for OpenSSL PR #3397 (Joyent bug #7704), from OpenSSL
trunk
| -rw-r--r-- | lib/libcrypto/bn/bn_exp.c | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/bn/bn_exp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libcrypto/bn/bn_exp.c b/lib/libcrypto/bn/bn_exp.c index 09e32396fb7..1aa5503daec 100644 --- a/lib/libcrypto/bn/bn_exp.c +++ b/lib/libcrypto/bn/bn_exp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_exp.c,v 1.18 2014/07/11 08:44:47 jsing Exp $ */ +/* $OpenBSD: bn_exp.c,v 1.19 2014/07/11 15:01:49 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -670,7 +670,7 @@ BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, /* Dedicated window==4 case improves 512-bit RSA sign by ~15%, but as * 512-bit RSA is hardly relevant, we omit it to spare size... */ - if (window == 5) { + if (window == 5 && top > 1) { void bn_mul_mont_gather5(BN_ULONG *rp, const BN_ULONG *ap, const void *table, const BN_ULONG *np, const BN_ULONG *n0, int num, int power); diff --git a/lib/libssl/src/crypto/bn/bn_exp.c b/lib/libssl/src/crypto/bn/bn_exp.c index 09e32396fb7..1aa5503daec 100644 --- a/lib/libssl/src/crypto/bn/bn_exp.c +++ b/lib/libssl/src/crypto/bn/bn_exp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_exp.c,v 1.18 2014/07/11 08:44:47 jsing Exp $ */ +/* $OpenBSD: bn_exp.c,v 1.19 2014/07/11 15:01:49 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -670,7 +670,7 @@ BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, /* Dedicated window==4 case improves 512-bit RSA sign by ~15%, but as * 512-bit RSA is hardly relevant, we omit it to spare size... */ - if (window == 5) { + if (window == 5 && top > 1) { void bn_mul_mont_gather5(BN_ULONG *rp, const BN_ULONG *ap, const void *table, const BN_ULONG *np, const BN_ULONG *n0, int num, int power); |