diff options
| author |   doug <doug@openbsd.org> | 2016-03-04 16:06:38 +0000 |
|---|---|---|
| committer | doug <doug@openbsd.org> | 2016-03-04 16:06:38 +0000 |
| commit | 5533ec768fc336bac0b28e55ca614de7e8081491 (patch) | |
| tree | 6715fdfce14168004c73b225daca700fddfc3800 /lib/libssl/src | |
| parent | Set root device to sd0a, instead of wd0a. Virtio devices show up (diff) | |
| download | wireguard-openbsd-5533ec768fc336bac0b28e55ca614de7e8081491.tar.xz wireguard-openbsd-5533ec768fc336bac0b28e55ca614de7e8081491.zip | |
Revert bn_expand until there's consensus on a fix.
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/crypto/bn/bn.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/lib/libssl/src/crypto/bn/bn.h b/lib/libssl/src/crypto/bn/bn.h index 5efccd180b7..7d11a049d0f 100644 --- a/lib/libssl/src/crypto/bn/bn.h +++ b/lib/libssl/src/crypto/bn/bn.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bn.h,v 1.29 2016/03/02 06:16:11 doug Exp $ */ +/* $OpenBSD: bn.h,v 1.30 2016/03/04 16:06:38 doug Exp $ */ /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -125,7 +125,6 @@ #ifndef HEADER_BN_H #define HEADER_BN_H -#include <limits.h> #include <stdio.h> #include <stdlib.h> @@ -620,20 +619,10 @@ const BIGNUM *BN_get0_nist_prime_521(void); /* library internal functions */ +#define bn_expand(a,bits) ((((((bits+BN_BITS2-1))/BN_BITS2)) <= (a)->dmax)?\ + (a):bn_expand2((a),(bits+BN_BITS2-1)/BN_BITS2)) #define bn_wexpand(a,words) (((words) <= (a)->dmax)?(a):bn_expand2((a),(words))) BIGNUM *bn_expand2(BIGNUM *a, int words); - -static inline BIGNUM *bn_expand(BIGNUM *a, int bits) -{ - if (bits > (INT_MAX - BN_BITS2 + 1)) - return (NULL); - - if (((bits + BN_BITS2 - 1) / BN_BITS2) <= a->dmax) - return (a); - - return bn_expand2(a, (bits + BN_BITS2 - 1) / BN_BITS2); -} - #ifndef OPENSSL_NO_DEPRECATED BIGNUM *bn_dup_expand(const BIGNUM *a, int words); /* unused */ #endif |