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

F-1298 F-1302 F-1307 F-1712 F-1713 F-1719 F-1720 F-1721 F-1722 F-2093 F-3466 F-3472 F-3477 F-4131 F-4132 F-4600 F-5612 F-6286 F-6289 F-6536: Fix error handling in crypto and signature examples

pull/597/head
Emma Stensland 2026-07-01 14:29:44 -06:00 committed by Paul Adelsbach
parent f38780093c
commit 8f0f1af04a
21 changed files with 220 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
certgen/csr_cryptocb.c
View File

@ -310,6 +310,8 @@ static int gen_csr(const char* arg1)
#endif
void* keyPtr = NULL;
WC_RNG rng;
int initRng = 0;
int initKey = 0;
Cert req;
byte der[LARGE_TEMP_SZ];
word32 derSz;
@ -342,6 +344,7 @@ static int gen_csr(const char* arg1)
printf("RNG initialization failed: %d\n", ret);
goto exit;
}
initRng = 1;
/* setup test key */
#ifdef HAVE_ECC
@ -394,6 +397,7 @@ static int gen_csr(const char* arg1)
printf("Key initialization failed: %d\n", ret);
goto exit;
}
initKey = 1;
/* decode public key */
#ifdef HAVE_ECC
@ -467,18 +471,19 @@ static int gen_csr(const char* arg1)
exit:
#ifdef HAVE_ECC
if (type == ECC_TYPE)
if (type == ECC_TYPE && initKey)
wc_ecc_free(&ecKeyPub);
#endif
#ifndef NO_RSA
if (type == RSA_TYPE)
if (type == RSA_TYPE && initKey)
wc_FreeRsaKey(&rsaKeyPub);
#endif
#ifdef HAVE_ED25519
if (type == ED25519_TYPE)
if (type == ED25519_TYPE && initKey)
wc_ed25519_free(&edKeyPub);
#endif
wc_FreeRng(&rng);
if (initRng)
wc_FreeRng(&rng);
wolfCrypt_Cleanup();

12
certgen/csr_sign.c
View File

@ -180,11 +180,19 @@ static int do_csrsign(int argc, char** argv)
printf("Successfully read %d bytes from %s\n\n", pemSz, csrPemFile);
ret = wc_CertPemToDer(pemBuf, pemSz, derBuf, LARGE_TEMP_SZ, CERTREQ_TYPE);
if (ret >= 0) {
if (ret == ASN_NO_PEM_HEADER) {
memcpy(derBuf, pemBuf, pemSz);
memset(pemBuf, 0, LARGE_TEMP_SZ);
derSz = pemSz;
ret = 0;
printf("CSR Cert file detected as DER\n\n");
} else if (ret >= 0) {
derSz = ret;
ret = 0;
printf("Converted CSR Cert PEM to DER %d bytes\n", derSz);
} else {
goto exit;
}
printf("Converted CSR Cert PEM to DER %d bytes\n", derSz);
#ifdef HAVE_DECODEDCERT
/* Code for parsing a CSR to a DecodedCert struct */

2
certgen/custom_ext.c
View File

@ -133,7 +133,7 @@ static int do_certgen(int argc, char** argv)
if (ret != 0) goto exit;
initNewKey = 1;
wc_MakeRsaKey(&newKey, 2048, WC_RSA_EXPONENT, &rng);
ret = wc_MakeRsaKey(&newKey, 2048, WC_RSA_EXPONENT, &rng);
if (ret != 0) goto exit;
printf("Successfully created new RSA key\n\n");

12
crypto/aes/aesgcm-file-encrypt.c
View File

@ -466,9 +466,17 @@ int decrypt_file_AesGCM(const char *in_file, const char *out_file,
}
if (ret == 0) {
/* The tag param is used to compare to the
/* The tag param is used to compare to the
calculated tag during decryption */
ret = wc_AesGcmDecryptFinal(&gcm, tag, AESGCM_TAG_SIZE);
if (ret != 0) {
/* Authentication failed. The unauthenticated plaintext
* written above must not be left readable on disk, so
* remove the partially written output file. */
fprintf(stderr,
"Authentication failed, removing unverified output file\n");
unlink(out_file);
}
}
exit:
if (aes_initialized) {
@ -768,6 +776,8 @@ int decrypt_file(const char *in_file, const char *out_file, const char *key_str)
if (ret == WOLFSSL_SUCCESS &&
(memcmp(tag_enc, tag_dec, AESGCM_TAG_SIZE) != 0)) {
perror("TAG didn't match\n");
/* Authentication failed, unauthenticated plaintext was
* already written to out_file above; remove it. */
ret = AES_GCM_AUTH_E;
goto exit;
}

16
crypto/ascon/ascon-file-encrypt.c
View File

@ -31,6 +31,10 @@
#include <wolfssl/wolfcrypt/random.h>
#include <wolfssl/wolfcrypt/pwdbased.h>
#ifndef HAVE_ASCON
#error "Please build wolfSSL with the --enable-ascon option"
#endif
#define ASCON_AEAD128_RATE 16
#define SALT_SIZE 8
#define AD_SIZE 32
@ -353,6 +357,12 @@ int AsconDecrypt(wc_AsconCtx* ctx)
/* Start decrypting ciphertext */
ctx->inFileLength -= FILE_HEADER_SIZE;
/* The plaintext written here is unauthenticated until
* DecryptFinal() verifies the tag below. It is written out
* incrementally to keep memory bounded to BLOCK_SIZE; if
* authentication fails, the caller's MemFree() removes the
* output file so the unverified plaintext is never left
* behind on disk. */
for (j = 0; j <= ctx->inFileLength; j += BLOCK_SIZE) {
if (chunk_read > ctx->inFileLength - j) {
chunk_read = ctx->inFileLength - j;
@ -369,15 +379,13 @@ int AsconDecrypt(wc_AsconCtx* ctx)
return ERROR;
}
/* write plaintext to output file */
if (fwrite(ctx->plainText, 1, chunk_read, ctx->outFile) != chunk_read) {
if (fwrite(ctx->plainText, 1, chunk_read, ctx->outFile) != (size_t)chunk_read) {
printf("ERROR: Failed to write the appropriate amount\n");
return ERROR;
}
}
/* Finalize decryption and verify tag */
/* Finalize decryption and verify tag. */
if (wc_AsconAEAD128_DecryptFinal(ctx->ascon, tag) != SUCCESS) {
printf("Decrypt final failed.\n");
return ERROR;

1
hash/sha256-hash.c
View File

@ -72,6 +72,7 @@ int main(int argc, char** argv)
if (ret != 0) {
printf("Failed to initialize sha structure\n");
fclose(inputStream);
return ret;
}
/* Loop reading a block at a time, finishing with any excess */

1
hash/sha3-256-hash.c
View File

@ -72,6 +72,7 @@ int main(int argc, char** argv)
if (ret != 0) {
printf("Failed to initialize sha structure\n");
fclose(inputStream);
return ret;
}
/* Loop reading a block at a time, finishing with any excess */

1
hash/sha512-hash.c
View File

@ -72,6 +72,7 @@ int main(int argc, char** argv)
if (ret != 0) {
printf("Failed to initialize sha structure\n");
fclose(inputStream);
return ret;
}
/* Loop reading a block at a time, finishing with any excess */

29
pk/ecc/ecc_keys.c
View File

@ -51,12 +51,24 @@ int main()
FILE* derFile;
size_t sz;
wc_InitRng(&rng);
wc_ecc_init(&key);
ret = wc_InitRng(&rng);
if (ret != 0) {
printf("error %d initializing rng\n", ret);
return ret;
}
ret = wc_ecc_init(&key);
if (ret != 0) {
printf("error %d initializing ecc key\n", ret);
wc_FreeRng(&rng);
return ret;
}
ret = wc_ecc_make_key_ex(&rng, ECC_CURVE_SZ, &key, ECC_CURVE_ID);
if (ret != 0) {
printf("error %d making ecc key\n", ret);
wc_ecc_free(&key);
wc_FreeRng(&rng);
return ret;
}
@ -64,6 +76,8 @@ int main()
ret = wc_EccKeyToDer(&key, der, sizeof(der));
if (ret < 0) {
printf("error %d in ecc to der\n", ret);
wc_ecc_free(&key);
wc_FreeRng(&rng);
return ret;
}
sz = ret;
@ -72,6 +86,8 @@ int main()
derFile = fopen("ecc-key.der", "w");
if (!derFile) {
printf("error loading file\n");
wc_ecc_free(&key);
wc_FreeRng(&rng);
return -1;
}
@ -84,6 +100,7 @@ int main()
derFile = fopen("ecc-key.der", "rb");
if (!derFile) {
printf("error reading from file\n");
wc_FreeRng(&rng);
return -1;
}
sz = fread(buf, 1, sizeof(buf), derFile);
@ -95,6 +112,8 @@ int main()
idx = 0;
if (wc_EccPrivateKeyDecode(buf, &idx, &key, (word32)sz) != 0) {
printf("error decoding private key\n");
wc_ecc_free(&key);
wc_FreeRng(&rng);
return -1;
}
wc_ecc_free(&key);
@ -113,6 +132,8 @@ int main()
ret = wc_ecc_make_key_ex(&rng, ECC_CURVE_SZ, &key, ECC_CURVE_ID);
if (ret != 0) {
printf("error %d making ecc key\n", ret);
wc_ecc_free(&key);
wc_FreeRng(&rng);
return ret;
}
@ -121,6 +142,8 @@ int main()
sz = sizeof(buf);
if (wc_ecc_export_x963(&key, buf, (word32*)&sz) != 0) {
printf("error exporting public ecc key\n");
wc_ecc_free(&key);
wc_FreeRng(&rng);
return -1;
}
@ -128,6 +151,8 @@ int main()
derFile = fopen("ecc-public.x963", "w"); /* reused the derFile pointer */
if (!derFile) {
printf("error loading file\n");
wc_ecc_free(&key);
wc_FreeRng(&rng);
return -1;
}
fwrite(buf, 1, sz, derFile);

29
pk/ed25519/ed25519_keys.c
View File

@ -88,8 +88,18 @@ int main()
word32 idx;
size_t sz;
wc_InitRng(&rng);
wc_ed25519_init(&key);
ret = wc_InitRng(&rng);
if (ret != 0) {
printf("error %d initializing rng\n", ret);
return ret;
}
ret = wc_ed25519_init(&key);
if (ret != 0) {
printf("error %d initializing ed25519 key\n", ret);
wc_FreeRng(&rng);
return ret;
}
/*
* Make a private Ed25510 key
@ -99,6 +109,8 @@ int main()
ret = wc_ed25519_make_key(&rng, ED25519_KEY_SIZE, &key);
if (ret != 0) {
printf("error %d making Ed25519 key\n", ret);
wc_ed25519_free(&key);
wc_FreeRng(&rng);
return ret;
}
@ -110,6 +122,8 @@ int main()
ret = wc_Ed25519KeyToDer(&key, der, sizeof(der));
if (ret < 0) {
printf("error %d in Ed25519 to der\n", ret);
wc_ed25519_free(&key);
wc_FreeRng(&rng);
return ret;
}
sz = ret;
@ -117,6 +131,8 @@ int main()
/* write private key to file */
ret = write_file("private key", privFile, der, sz);
if (ret < 0) {
wc_ed25519_free(&key);
wc_FreeRng(&rng);
return ret;
}
@ -130,6 +146,7 @@ int main()
sz = sizeof(buf);
ret = read_file("private key", privFile, buf, &sz);
if (ret < 0) {
wc_FreeRng(&rng);
return ret;
}
@ -141,6 +158,8 @@ int main()
ret = wc_Ed25519PrivateKeyDecode(buf, &idx, &key, (word32)sz);
if (ret != 0) {
printf("error decoding private key\n");
wc_ed25519_free(&key);
wc_FreeRng(&rng);
return ret;
}
@ -162,6 +181,8 @@ int main()
ret = wc_ed25519_make_key(&rng, ED25519_KEY_SIZE, &key);
if (ret != 0) {
printf("error %d making Ed25519 key\n", ret);
wc_ed25519_free(&key);
wc_FreeRng(&rng);
return ret;
}
@ -175,12 +196,16 @@ int main()
ret = wc_ed25519_export_public(&key, buf, (word32*)&sz);
if (ret != 0) {
printf("error exporting public Ed25519 key\n");
wc_ed25519_free(&key);
wc_FreeRng(&rng);
return ret;
}
/* write public key to file */
ret = write_file("public key", pubFile, buf, sz);
if (ret < 0) {
wc_ed25519_free(&key);
wc_FreeRng(&rng);
return ret;
}

29
pk/ed448/ed448_keys.c
View File

@ -88,8 +88,18 @@ int main()
word32 idx;
size_t sz;
wc_InitRng(&rng);
wc_ed448_init(&key);
ret = wc_InitRng(&rng);
if (ret != 0) {
printf("error %d initializing rng\n", ret);
return ret;
}
ret = wc_ed448_init(&key);
if (ret != 0) {
printf("error %d initializing ed448 key\n", ret);
wc_FreeRng(&rng);
return ret;
}
/*
* Make a private Ed25510 key
@ -99,6 +109,8 @@ int main()
ret = wc_ed448_make_key(&rng, ED448_KEY_SIZE, &key);
if (ret != 0) {
printf("error %d making Ed448 key\n", ret);
wc_ed448_free(&key);
wc_FreeRng(&rng);
return ret;
}
@ -110,6 +122,8 @@ int main()
ret = wc_Ed448KeyToDer(&key, der, sizeof(der));
if (ret < 0) {
printf("error %d in Ed448 to der\n", ret);
wc_ed448_free(&key);
wc_FreeRng(&rng);
return ret;
}
sz = ret;
@ -117,6 +131,8 @@ int main()
/* write private key to file */
ret = write_file("private key", privFile, der, sz);
if (ret < 0) {
wc_ed448_free(&key);
wc_FreeRng(&rng);
return ret;
}
@ -130,6 +146,7 @@ int main()
sz = sizeof(buf);
ret = read_file("private key", privFile, buf, &sz);
if (ret < 0) {
wc_FreeRng(&rng);
return ret;
}
@ -141,6 +158,8 @@ int main()
ret = wc_Ed448PrivateKeyDecode(buf, &idx, &key, (word32)sz);
if (ret != 0) {
printf("error decoding private key\n");
wc_ed448_free(&key);
wc_FreeRng(&rng);
return ret;
}
@ -162,6 +181,8 @@ int main()
ret = wc_ed448_make_key(&rng, ED448_KEY_SIZE, &key);
if (ret != 0) {
printf("error %d making Ed448 key\n", ret);
wc_ed448_free(&key);
wc_FreeRng(&rng);
return ret;
}
@ -175,12 +196,16 @@ int main()
ret = wc_ed448_export_public(&key, buf, (word32*)&sz);
if (ret != 0) {
printf("error exporting public Ed448 key\n");
wc_ed448_free(&key);
wc_FreeRng(&rng);
return ret;
}
/* write public key to file */
ret = write_file("public key", pubFile, buf, sz);
if (ret < 0) {
wc_ed448_free(&key);
wc_FreeRng(&rng);
return ret;
}

2
pk/rsa-pss/rsa-pss.c
View File

@ -116,7 +116,7 @@ static int read_file(const char* filename, unsigned char* data, int* sz)
*sz = fileSz;
err = 0;
load_end:
fclose(f);
if (f != NULL) fclose(f);
return err;
}

12
pkcs11/pkcs11_rsa.c
View File

@ -260,15 +260,15 @@ static int rsa_sign_verify(int devId)
if (ret == 0) {
fprintf(stderr, "Verifying\n");
ret = wc_RsaSSL_Verify(sig, sigSz, pt, (int)ptSz, &pub);
if (ret < 0)
if (ret < 0) {
fprintf(stderr, "Failed to verify: %d\n", ret);
if (XMEMCMP(hash, pt, ret) != 0) {
fprintf(stderr, "Failed to verify\n");
} else if (ret != (int)hashSz || XMEMCMP(hash, pt, ret) != 0) {
fprintf(stderr, "Failed to verify: hash mismatch\n");
ret = -1;
} else {
ret = 0;
}
wc_FreeRsaKey(&pub);
ret = 0;
}
}

18
pkcs11/pkcs11_test.c
View File

@ -284,13 +284,23 @@ int get_public_key(RsaKey* key, Pkcs11Token* token, CK_SESSION_HANDLE session,
modSz = template[0].ulValueLen;
expSz = template[1].ulValueLen;
mod = (unsigned char *)malloc(modSz);
template[0].pValue = mod;
exp = (CK_BYTE_PTR) malloc(expSz);
template[1].pValue = exp;
if (mod == NULL || exp == NULL) {
ret = MEMORY_E;
}
else {
template[0].pValue = mod;
template[1].pValue = exp;
rv = token->func->C_GetAttributeValue(session, pubKey, template, 2);
rv = token->func->C_GetAttributeValue(session, pubKey, template, 2);
if (rv != CKR_OK)
ret = -1;
}
}
if (rv == CKR_OK)
else
ret = -1;
if (rv == CKR_OK && ret == 0)
ret = wc_RsaPublicKeyDecodeRaw(mod, modSz, exp, expSz, key);
if (exp != NULL)

38
pkcs7/pkcs7-verify.c
View File

@ -48,6 +48,16 @@ int main(int argc, char** argv)
wolfSSL_Debugging_ON();
#endif
/* PKCS_Init captures/saves this, so make sure
* isDynamic = 0 since it is on the stack. Set this before any
* code path that can reach the exit label and call wc_PKCS7_Free(). */
pkcs7.isDynamic = 0;
/* Init before any code path that can reach the exit label and call
* wc_PKCS7_Free(), so the struct is always fully zeroed first. */
rc = wc_PKCS7_Init(&pkcs7, NULL, INVALID_DEVID);
if (rc != 0) goto exit;
/* load PKCS7 */
derFile = fopen(pkcs7SignedPem, "rb");
if (derFile) {
@ -72,14 +82,12 @@ int main(int argc, char** argv)
}
rc = 0;
}
/* PKCS_Init captures/saves this, so make sure
* isDynamic = 0 since it is on the stack */
pkcs7.isDynamic = 0;
else {
rc = -1;
goto exit;
}
/* Test verify */
rc = wc_PKCS7_Init(&pkcs7, NULL, INVALID_DEVID);
if (rc != 0) goto exit;
rc = wc_PKCS7_InitWithCert(&pkcs7, NULL, 0);
if (rc != 0) goto exit;
@ -112,10 +120,22 @@ int main(int argc, char** argv)
/* load PKCS7 */
derFile = fopen(pkcs7SignedDer, "rb");
if (derFile) {
int derFileSz;
fseek(derFile, 0, SEEK_END);
fileSz = (int)ftell(derFile);
derFileSz = (int)ftell(derFile);
rewind(derFile);
if (derFileSz > (int)fileSz) {
XFREE(fileBuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
fileBuf = (byte*)XMALLOC(derFileSz, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (fileBuf == NULL) {
rc = MEMORY_E;
fclose(derFile);
goto exit;
}
}
fileSz = derFileSz;
rc = (int)fread(fileBuf, 1, fileSz, derFile);
fclose(derFile);
@ -126,6 +146,10 @@ int main(int argc, char** argv)
}
rc = 0;
}
else {
rc = -1;
goto exit;
}
/* Verify DER output matches expected output */
if (fileSz != derSz || memcmp(fileBuf, derBuf, derSz) != 0) {

5
pkcs7/signedData-stream.c
View File

@ -335,6 +335,11 @@ int main(int argc, char** argv)
{
FILE* f = fopen(encodedFile, "rb");
if (f == NULL) {
printf("error opening file %s\n", encodedFile);
ret = -1;
goto out;
}
encryptedSz = fread(encrypted, 1, encryptedSz, f);
fclose(f);
}

1
pq/stateful_hash_sig/lms_example.c
View File

@ -345,6 +345,7 @@ do_lms_example(int levels,
sig = malloc(sigSz);
if (sig == NULL) {
fprintf(stderr, "error: malloc(%d) failed\n", sigSz);
ret = MEMORY_E;
goto exit_lms_example;
}

2
pq/stateful_hash_sig/xmss_example.c
View File

@ -286,6 +286,7 @@ do_xmss_example(const char * params,
read_buf = malloc(privSz);
if (read_buf == NULL) {
fprintf(stderr, "error: malloc read_buf failed\n");
ret = MEMORY_E;
goto exit_xmss_example;
}
@ -309,6 +310,7 @@ do_xmss_example(const char * params,
sig = malloc(sigSz);
if (sig == NULL) {
fprintf(stderr, "error: malloc(%d) failed\n", sigSz);
ret = MEMORY_E;
goto exit_xmss_example;
}

13
signature/signature.c
View File

@ -66,10 +66,19 @@ int ecc_sign_verify_test(enum wc_HashType hash_type, enum wc_SignatureType sig_t
word32 eccPubKeyLen, eccPrivKeyLen;
/* Init */
wc_InitRng(&rng);
ret = wc_InitRng(&rng);
if (ret != 0) {
printf("ECC RNG Init failed! %d\n", ret);
return EXIT_FAILURE;
}
/* Generate key */
wc_ecc_init(&eccKey);
ret = wc_ecc_init(&eccKey);
if (ret != 0) {
printf("ECC Key Init failed! %d\n", ret);
wc_FreeRng(&rng);
return EXIT_FAILURE;
}
ret = wc_ecc_make_key_ex(&rng, 32, &eccKey, ECC_CURVE_DEF);
if(ret != 0) {
printf("ECC Make Key Failed! %d\n", ret);

13
signature/sigtest/eccsiglentest.c
View File

@ -78,10 +78,19 @@ int ecc_sign_verify_test(enum wc_HashType hash_type,
#endif
/* Init */
wc_InitRng(&rng);
ret = wc_InitRng(&rng);
if (ret != 0) {
printf("ECC RNG Init Failed! %d\n", ret);
return ret;
}
/* Generate key */
wc_ecc_init(&eccKey);
ret = wc_ecc_init(&eccKey);
if (ret != 0) {
printf("ECC Key Init Failed! %d\n", ret);
wc_FreeRng(&rng);
return ret;
}
ret = wc_ecc_make_key_ex(&rng, keySz, &eccKey, curveId);
if(ret != 0) {

13
signature/sigtest/wolfsigtest.c
View File

@ -140,10 +140,19 @@ int main(int argc, char** argv)
print_buf("Digest Input Data:", Digest_given, DATA_BLOCK_LEN);
/* Init */
wc_InitRng(&rng);
ret = wc_InitRng(&rng);
if (ret != 0) {
printf("error %d initializing rng\n", ret);
return ret;
}
/* Init Rsa Key */
wc_InitRsaKey(&rsakey, NULL);
ret = wc_InitRsaKey(&rsakey, NULL);
if (ret != 0) {
printf("error %d initializing rsa key\n", ret);
wc_FreeRng(&rng);
return ret;
}
XMEMSET(DER_buf, 0, sizeof(DER_buf));