WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixes for clang-tidy reported defects and misstylings --with-liboqs: 

* readability-named-parameter (style)
* bugprone-sizeof-expression (true bugs)
* clang-analyzer-deadcode.DeadStores (true bugs)
* clang-analyzer-core.NonNullParamChecker (true bug)
* clang-diagnostic-newline-eof (style)
* clang-diagnostic-shorten-64-to-32 (true but benign in practice)

fixes for sanitizer reported defects --with-liboqs: null pointer memcpy()s in TLSX_KeyShare_GenPqcKey() and server_generate_pqc_ciphertext().

fixes for silent crypto-critical failure in wolfSSL_liboqsGetRandomData(): refactor to accommodate oversize numOfBytes, and abort() if wc_RNG_GenerateBlock() returns failure.
pull/7114/head
Daniel Pouzzner 2024-01-04 15:53:04 -06:00
parent 9e468a900b
commit 7f53bcc4d0
11 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tls.c
View File

@ -7722,7 +7722,8 @@ static int TLSX_KeyShare_GenPqcKey(WOLFSSL *ssl, KeyShareEntry* kse)
ret = wc_KyberKey_EncodePrivateKey(kem, privKey, privSz); ret = wc_KyberKey_EncodePrivateKey(kem, privKey, privSz);
} }
if (ret == 0) { if (ret == 0) {
XMEMCPY(pubKey, ecc_kse->pubKey, ecc_kse->pubKeyLen); if (ecc_kse->pubKeyLen > 0)
XMEMCPY(pubKey, ecc_kse->pubKey, ecc_kse->pubKeyLen);
kse->pubKey = pubKey; kse->pubKey = pubKey;
kse->pubKeyLen = ecc_kse->pubKeyLen + pubSz; kse->pubKeyLen = ecc_kse->pubKeyLen + pubSz;
pubKey = NULL; pubKey = NULL;
@ -9010,7 +9011,8 @@ static int server_generate_pqc_ciphertext(WOLFSSL* ssl,
keyShareEntry->keLen = outlen + ssSz; keyShareEntry->keLen = outlen + ssSz;
sharedSecret = NULL; sharedSecret = NULL;
XMEMCPY(ciphertext, ecc_kse->pubKey, ecc_kse->pubKeyLen); if (ecc_kse->pubKeyLen > 0)
XMEMCPY(ciphertext, ecc_kse->pubKey, ecc_kse->pubKeyLen);
keyShareEntry->pubKey = ciphertext; keyShareEntry->pubKey = ciphertext;
keyShareEntry->pubKeyLen = (word32)(ecc_kse->pubKeyLen + ctSz); keyShareEntry->pubKeyLen = (word32)(ecc_kse->pubKeyLen + ctSz);
ciphertext = NULL; ciphertext = NULL;

4
wolfcrypt/benchmark/benchmark.c
View File

@ -12939,7 +12939,9 @@ int wolfcrypt_benchmark_main(int argc, char** argv)
/* Both bench_pq_asym_opt and bench_pq_asym_opt2 are looking for /* Both bench_pq_asym_opt and bench_pq_asym_opt2 are looking for
* -pq, so we need to do a special case for -pq since optMatched * -pq, so we need to do a special case for -pq since optMatched
* was set to 1 just above. */ * was set to 1 just above. */
if (string_matches(argv[1], bench_pq_asym_opt[0].str)) { if ((bench_pq_asym_opt[0].str != NULL) &&
string_matches(argv[1], bench_pq_asym_opt[0].str))
{
bench_pq_asym_algs2 |= bench_pq_asym_opt2[0].val; bench_pq_asym_algs2 |= bench_pq_asym_opt2[0].val;
bench_all = 0; bench_all = 0;
optMatched = 1; optMatched = 1;

4
wolfcrypt/src/dilithium.c
View File

@ -205,7 +205,7 @@ int wc_dilithium_init(dilithium_key* key)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
ForceZero(key, sizeof(key)); ForceZero(key, sizeof(*key));
return 0; return 0;
} }
@ -258,7 +258,7 @@ int wc_dilithium_get_level(dilithium_key* key, byte* level)
void wc_dilithium_free(dilithium_key* key) void wc_dilithium_free(dilithium_key* key)
{ {
if (key != NULL) { if (key != NULL) {
ForceZero(key, sizeof(key)); ForceZero(key, sizeof(*key));
} }
} }

4
wolfcrypt/src/falcon.c
View File

@ -197,7 +197,7 @@ int wc_falcon_init(falcon_key* key)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
ForceZero(key, sizeof(key)); ForceZero(key, sizeof(*key));
return 0; return 0;
} }
@ -250,7 +250,7 @@ int wc_falcon_get_level(falcon_key* key, byte* level)
void wc_falcon_free(falcon_key* key) void wc_falcon_free(falcon_key* key)
{ {
if (key != NULL) { if (key != NULL) {
ForceZero(key, sizeof(key)); ForceZero(key, sizeof(*key));
} }
} }

22
wolfcrypt/src/port/liboqs/liboqs.c
View File

@ -33,6 +33,7 @@ implementations for Post-Quantum cryptography algorithms.
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#include <wolfssl/wolfcrypt/types.h> #include <wolfssl/wolfcrypt/types.h>
#include <wolfssl/wolfcrypt/logging.h>
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/wolfcrypt/port/liboqs/liboqs.h> #include <wolfssl/wolfcrypt/port/liboqs/liboqs.h>
@ -50,9 +51,24 @@ static int liboqs_init = 0;
static void wolfSSL_liboqsGetRandomData(uint8_t* buffer, size_t numOfBytes) static void wolfSSL_liboqsGetRandomData(uint8_t* buffer, size_t numOfBytes)
{ {
int ret = wc_RNG_GenerateBlock(liboqsCurrentRNG, buffer, (word32)numOfBytes); int ret;
if (ret != 0) { word32 numOfBytes_word32;
// ToDo: liboqs exits programm if RNG fails, not sure what to do here
while (numOfBytes > 0) {
numOfBytes_word32 = (word32)numOfBytes;
numOfBytes -= numOfBytes_word32;
ret = wc_RNG_GenerateBlock(liboqsCurrentRNG, buffer,
numOfBytes_word32);
if (ret != 0) {
/* ToDo: liboqs exits programm if RNG fails,
* not sure what to do here
*/
WOLFSSL_MSG_EX(
"wc_RNG_GenerateBlock(..., %u) failed with ret %d "
"in wolfSSL_liboqsGetRandomData().", numOfBytes_word32, ret
);
abort();
}
} }
} }

10
wolfcrypt/src/sphincs.c
View File

@ -243,7 +243,7 @@ int wc_sphincs_init(sphincs_key* key)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
ForceZero(key, sizeof(key)); ForceZero(key, sizeof(*key));
return 0; return 0;
} }
@ -308,7 +308,7 @@ int wc_sphincs_get_level_and_optim(sphincs_key* key, byte* level, byte* optim)
void wc_sphincs_free(sphincs_key* key) void wc_sphincs_free(sphincs_key* key)
{ {
if (key != NULL) { if (key != NULL) {
ForceZero(key, sizeof(key)); ForceZero(key, sizeof(*key));
} }
} }
@ -857,7 +857,7 @@ int wc_Sphincs_PrivateKeyDecode(const byte* input, word32* inOutIdx,
else if ((key->level == 5) && (key->optim == FAST_VARIANT)) { else if ((key->level == 5) && (key->optim == FAST_VARIANT)) {
keytype = SPHINCS_FAST_LEVEL5k; keytype = SPHINCS_FAST_LEVEL5k;
} }
if ((key->level == 1) && (key->optim == SMALL_VARIANT)) { else if ((key->level == 1) && (key->optim == SMALL_VARIANT)) {
keytype = SPHINCS_SMALL_LEVEL1k; keytype = SPHINCS_SMALL_LEVEL1k;
} }
else if ((key->level == 3) && (key->optim == SMALL_VARIANT)) { else if ((key->level == 3) && (key->optim == SMALL_VARIANT)) {
@ -905,7 +905,7 @@ int wc_Sphincs_PublicKeyDecode(const byte* input, word32* inOutIdx,
else if ((key->level == 5) && (key->optim == FAST_VARIANT)) { else if ((key->level == 5) && (key->optim == FAST_VARIANT)) {
keytype = SPHINCS_FAST_LEVEL5k; keytype = SPHINCS_FAST_LEVEL5k;
} }
if ((key->level == 1) && (key->optim == SMALL_VARIANT)) { else if ((key->level == 1) && (key->optim == SMALL_VARIANT)) {
keytype = SPHINCS_SMALL_LEVEL1k; keytype = SPHINCS_SMALL_LEVEL1k;
} }
else if ((key->level == 3) && (key->optim == SMALL_VARIANT)) { else if ((key->level == 3) && (key->optim == SMALL_VARIANT)) {
@ -960,7 +960,7 @@ int wc_Sphincs_PublicKeyToDer(sphincs_key* key, byte* output, word32 inLen,
else if ((key->level == 5) && (key->optim == FAST_VARIANT)) { else if ((key->level == 5) && (key->optim == FAST_VARIANT)) {
keytype = SPHINCS_FAST_LEVEL5k; keytype = SPHINCS_FAST_LEVEL5k;
} }
if ((key->level == 1) && (key->optim == SMALL_VARIANT)) { else if ((key->level == 1) && (key->optim == SMALL_VARIANT)) {
keytype = SPHINCS_SMALL_LEVEL1k; keytype = SPHINCS_SMALL_LEVEL1k;
} }
else if ((key->level == 3) && (key->optim == SMALL_VARIANT)) { else if ((key->level == 3) && (key->optim == SMALL_VARIANT)) {

2
wolfssl/wolfcrypt/dilithium.h
View File

@ -110,7 +110,7 @@ int wc_dilithium_import_private_key(const byte* priv, word32 privSz,
dilithium_key* key); dilithium_key* key);
WOLFSSL_API WOLFSSL_API
int wc_dilithium_export_public(dilithium_key*, byte* out, word32* outLen); int wc_dilithium_export_public(dilithium_key* key, byte* out, word32* outLen);
WOLFSSL_API WOLFSSL_API
int wc_dilithium_export_private_only(dilithium_key* key, byte* out, word32* outLen); int wc_dilithium_export_private_only(dilithium_key* key, byte* out, word32* outLen);
WOLFSSL_API WOLFSSL_API

2
wolfssl/wolfcrypt/falcon.h
View File

@ -105,7 +105,7 @@ int wc_falcon_import_private_key(const byte* priv, word32 privSz,
falcon_key* key); falcon_key* key);
WOLFSSL_API WOLFSSL_API
int wc_falcon_export_public(falcon_key*, byte* out, word32* outLen); int wc_falcon_export_public(falcon_key* key, byte* out, word32* outLen);
WOLFSSL_API WOLFSSL_API
int wc_falcon_export_private_only(falcon_key* key, byte* out, word32* outLen); int wc_falcon_export_private_only(falcon_key* key, byte* out, word32* outLen);
WOLFSSL_API WOLFSSL_API

6
wolfssl/wolfcrypt/kyber.h
View File

@ -49,12 +49,12 @@
/* Size of a polynomial vector based on dimensions. */ /* Size of a polynomial vector based on dimensions. */
#define KYBER_POLY_VEC_SZ(k) (k * KYBER_POLY_SIZE) #define KYBER_POLY_VEC_SZ(k) ((k) * KYBER_POLY_SIZE)
/* Size of a compressed polynomial based on bits per coefficient. */ /* Size of a compressed polynomial based on bits per coefficient. */
#define KYBER_POLY_COMPRESSED_SZ(b) (b * (KYBER_N / 8)) #define KYBER_POLY_COMPRESSED_SZ(b) ((b) * (KYBER_N / 8))
/* Size of a compressed vector polynomial based on dimensions and bits per /* Size of a compressed vector polynomial based on dimensions and bits per
* coefficient. */ * coefficient. */
#define KYBER_POLY_VEC_COMPRESSED_SZ(k, b) (k * (b * (KYBER_N / 8))) #define KYBER_POLY_VEC_COMPRESSED_SZ(k, b) ((k) * ((b) * (KYBER_N / 8)))
/* Kyber-512 parameters */ /* Kyber-512 parameters */

2
wolfssl/wolfcrypt/port/liboqs/liboqs.h
View File

@ -57,4 +57,4 @@ int wolfSSL_liboqsRngMutexUnlock(void);
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* WOLF_CRYPT_LIBOQS_H */ #endif /* WOLF_CRYPT_LIBOQS_H */

2
wolfssl/wolfcrypt/sphincs.h
View File

@ -125,7 +125,7 @@ int wc_sphincs_import_private_key(const byte* priv, word32 privSz,
sphincs_key* key); sphincs_key* key);
WOLFSSL_API WOLFSSL_API
int wc_sphincs_export_public(sphincs_key*, byte* out, word32* outLen); int wc_sphincs_export_public(sphincs_key* key, byte* out, word32* outLen);
WOLFSSL_API WOLFSSL_API
int wc_sphincs_export_private_only(sphincs_key* key, byte* out, word32* outLen); int wc_sphincs_export_private_only(sphincs_key* key, byte* out, word32* outLen);
WOLFSSL_API WOLFSSL_API