bn: Remove the BN_SQR_COMBA cpp define

Just like in previous commit, this define does not represent a toggleable
feature, but is entirely dependent on the OPENSSL_SMALL_FOOTPRINT define.

Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
MergeDate: Mon Jan 12 18:44:25 2026
(Merged from https://github.com/openssl/openssl/pull/29204)
This commit is contained in:
Gleb Popov
2026-01-09 17:13:32 +03:00
committed by Tomas Mraz
parent 9c26985326
commit 2dcf5361dd
2 changed files with 4 additions and 5 deletions

View File

@@ -53,7 +53,6 @@
#endif
#ifndef OPENSSL_SMALL_FOOTPRINT
#define BN_SQR_COMBA
#define BN_RECURSION
#endif

View File

@@ -50,14 +50,14 @@ int bn_sqr_fixed_top(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
goto err;
if (al == 4) {
#ifndef BN_SQR_COMBA
#ifdef OPENSSL_SMALL_FOOTPRINT
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
#ifdef OPENSSL_SMALL_FOOTPRINT
BN_ULONG t[16];
bn_sqr_normal(rr->d, a->d, 8, t);
#else
@@ -160,14 +160,14 @@ void 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
#ifdef OPENSSL_SMALL_FOOTPRINT
bn_sqr_normal(r, a, 4, t);
#else
bn_sqr_comba4(r, a);
#endif
return;
} else if (n2 == 8) {
#ifndef BN_SQR_COMBA
#ifdef OPENSSL_SMALL_FOOTPRINT
bn_sqr_normal(r, a, 8, t);
#else
bn_sqr_comba8(r, a);