From 916817bc8afa0e9b3e24aef1eabfc56b21e38417 Mon Sep 17 00:00:00 2001 From: gojimmypi Date: Thu, 28 Dec 2023 15:31:13 -0800 Subject: [PATCH 1/2] Gate GetOpenSshKeyRsa with WOLFSSH_NO_RSA --- src/internal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/internal.c b/src/internal.c index 7e9727cf6..5ce1c4a67 100644 --- a/src/internal.c +++ b/src/internal.c @@ -1073,7 +1073,7 @@ static INLINE int CalcRsaInverses(RsaKey* key) return ret; } - +#ifndef WOLFSSH_NO_RSA /* * Utility for GetOpenSshKey() to read in RSA keys. */ @@ -1105,7 +1105,7 @@ static int GetOpenSshKeyRsa(RsaKey* key, return ret; } - +#endif /* * Utility for GetOpenSshKey() to read in ECDSA keys. From c33dbf14930e98e20c877d753c9746860152a8f9 Mon Sep 17 00:00:00 2001 From: gojimmypi Date: Fri, 29 Dec 2023 09:44:00 -0800 Subject: [PATCH 2/2] Gate CalcRsaInverses on WOLFSSH_NO_RSA; Gate GetOpenSshKeyEcc on WOLFSSH_NO_ECDSA and WOLFSSH_NO_ECC --- src/internal.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/internal.c b/src/internal.c index 5ce1c4a67..987e670b0 100644 --- a/src/internal.c +++ b/src/internal.c @@ -1048,6 +1048,7 @@ static INLINE int GetMpintToMp(mp_int* mp, } +#ifndef WOLFSSH_NO_RSA /* * For the given RSA key, calculate p^-1 and q^-1. wolfCrypt's RSA * code expects them, but the OpenSSH format key doesn't store them. @@ -1073,7 +1074,6 @@ static INLINE int CalcRsaInverses(RsaKey* key) return ret; } -#ifndef WOLFSSH_NO_RSA /* * Utility for GetOpenSshKey() to read in RSA keys. */ @@ -1107,6 +1107,8 @@ static int GetOpenSshKeyRsa(RsaKey* key, } #endif + +#if !defined(WOLFSSH_NO_ECDSA) && !defined(WOLFSSH_NO_ECC) /* * Utility for GetOpenSshKey() to read in ECDSA keys. */ @@ -1134,7 +1136,7 @@ static int GetOpenSshKeyEcc(ecc_key* key, return ret; } - +#endif /* * Decodes an OpenSSH format key. @@ -1218,7 +1220,7 @@ static int GetOpenSshKey(WS_KeySignature *key, str, strSz, &subIdx); break; #endif - #ifndef WOLFSSH_NO_ECDSA + #if !defined(WOLFSSH_NO_ECDSA) && !defined(WOLFSSH_NO_ECC) case ID_ECDSA_SHA2_NISTP256: ret = GetOpenSshKeyEcc(&key->ks.ecc.key, str, strSz, &subIdx);