diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2023-01-20 17:34:53 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2023-01-20 17:34:53 +0000 |
| commit | 99d0516610d4684c99bf23aa4d879ec6d62f6e18 (patch) | |
| tree | db7fc7c1de190125f59888be7d16db91a5d7c2a7 | |
| parent | 6112cb5d1bbc8d3d5844b36073340d4a6efe2744 (diff) | |
Remove various #ifndef BN_SQR_COMBA.
bn_sqr_comba{4,8}() is now always available.
ok tb@
| -rw-r--r-- | lib/libcrypto/bn/bn_sqr.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/lib/libcrypto/bn/bn_sqr.c b/lib/libcrypto/bn/bn_sqr.c index 02b87556d41..c017887bebf 100644 --- a/lib/libcrypto/bn/bn_sqr.c +++ b/lib/libcrypto/bn/bn_sqr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_sqr.c,v 1.19 2023/01/20 17:31:52 jsing Exp $ */ +/* $OpenBSD: bn_sqr.c,v 1.20 2023/01/20 17:34:52 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -232,18 +232,10 @@ bn_sqr_recursive(BN_ULONG *r, const BN_ULONG *a, int n2, BN_ULONG *t) BN_ULONG ln, lo, *p; if (n2 == 4) { -#ifndef BN_SQR_COMBA - bn_sqr_normal(r, a, 4, t); -#else bn_sqr_comba4(r, a); -#endif return; } else if (n2 == 8) { -#ifndef BN_SQR_COMBA - bn_sqr_normal(r, a, 8, t); -#else bn_sqr_comba8(r, a); -#endif return; } if (n2 < BN_SQR_RECURSIVE_SIZE_NORMAL) { @@ -333,19 +325,9 @@ BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx) goto err; if (al == 4) { -#ifndef BN_SQR_COMBA - BN_ULONG t[8]; - bn_sqr_normal(rr->d, a->d, 4, t); -#else bn_sqr_comba4(rr->d, a->d); -#endif } else if (al == 8) { -#ifndef BN_SQR_COMBA - BN_ULONG t[16]; - bn_sqr_normal(rr->d, a->d, 8, t); -#else bn_sqr_comba8(rr->d, a->d); -#endif } else { #if defined(BN_RECURSION) if (al < BN_SQR_RECURSIVE_SIZE_NORMAL) { |