Skip to content

Fix wolfCLU Fenrir #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aidangarske wants to merge 4 commits into
base: main
Choose a base branch
from
+525 −196
Open

Fix wolfCLU Fenrir #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1184f1
Fix F-570, F-572, F-573, F-574, F-575, F-645, F-646, F-647, F-648, F-…
aidangarske Apr 2, 2026
6590906
address copilot, fenrir, and internal review
aidangarske Apr 3, 2026
5fc6fcd
Fix copilot, fenrir, internal review
aidangarske Apr 3, 2026
4ea3511
Test and fix skoll finding
aidangarske Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/benchmark/clu_bench_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ int wolfCLU_benchSetup(int argc, char** argv)
}

ret = wolfCLU_checkForArg("-time", 5, argc, argv);
if (ret > 0) {
if (ret > 0 && ret + 1 < argc) {
/* time for each test in seconds */
time = XATOI(argv[ret+1]);
if (time < 1 || time > 10) {
Expand Down
68 changes: 50 additions & 18 deletions src/certgen/clu_certgen_ed25519.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,32 +62,42 @@ int make_self_signed_ed25519_certificate(char* keyPath, char* certOut)
}
if (XFSEEK(keyFile, 0, SEEK_SET) != 0 || (int)XFREAD(keyBuf, 1, keyFileSz, keyFile) != keyFileSz) {
XFCLOSE(keyFile);
wolfCLU_ForceZero(keyBuf, keyFileSz);
XFREE(keyBuf, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
return WOLFCLU_FAILURE;
}
XFCLOSE(keyFile);

int keyInit = 0, rngInit = 0;

ret = wc_ed25519_init(&key);
if (ret != 0) {
wolfCLU_LogError("Failed to initialize ed25519 key\nRET: %d", ret);
wolfCLU_ForceZero(keyBuf, keyFileSz);
XFREE(keyBuf, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
return ret;
}
keyInit = 1;

ret = wc_InitRng(&rng);
if (ret != 0) {
wolfCLU_LogError("Failed to initialize rng.\nRET: %d", ret);
wolfCLU_ForceZero(keyBuf, keyFileSz);
XFREE(keyBuf, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_ed25519_free(&key);
return ret;
}
rngInit = 1;

ret = wc_ed25519_import_private_key(keyBuf,
ED25519_KEY_SIZE,
keyBuf + ED25519_KEY_SIZE,
ED25519_KEY_SIZE, &key);
wolfCLU_ForceZero(keyBuf, keyFileSz);
XFREE(keyBuf, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (ret != 0 ) {
wolfCLU_LogError("Failed to decode private key.\nRET: %d", ret);
return ret;
goto cleanup;
}

wc_InitCert(&newCert);
Expand All @@ -102,36 +112,44 @@ int make_self_signed_ed25519_certificate(char* keyPath, char* certOut)

WOLFCLU_LOG(WOLFCLU_L0, "Enter your countries 2 digit code (ex: United States -> US): ");
if (XFGETS(country,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
country[CTC_NAME_SIZE-1] = '\0';
WOLFCLU_LOG(WOLFCLU_L0, "Enter the name of the province you are located at: ");
if (XFGETS(province,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "Enter the name of the city you are located at: ");
if (XFGETS(city,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "Enter the name of your orginization: ");
if (XFGETS(org,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "Enter the name of your unit: ");
if (XFGETS(unit,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "Enter the common name of your domain: ");
if (XFGETS(commonName,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "Enter your email address: ");
if (XFGETS(email,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "Enter the number of days this certificate should be valid: ");
if (XFGETS(daysValid,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}

XSTRNCPY(newCert.subject.country, country, CTC_NAME_SIZE);
Expand All @@ -148,22 +166,23 @@ int make_self_signed_ed25519_certificate(char* keyPath, char* certOut)
certBuf = (byte*)XMALLOC(FOURK_SZ, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (certBuf == NULL) {
wolfCLU_LogError("Failed to initialize buffer to stort certificate.");
return -1;
ret = MEMORY_E;
goto cleanup;
}
XMEMSET(certBuf, 0, FOURK_SZ);

ret = wc_MakeCert_ex(&newCert, certBuf, FOURK_SZ, ED25519_TYPE, &key, &rng);
if (ret < 0) {
wolfCLU_LogError("Failed to make certificate.");
return ret;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "MakeCert returned %d", ret);

ret = wc_SignCert_ex(newCert.bodySz, newCert.sigType, certBuf, FOURK_SZ,
ED25519_TYPE, &key, &rng);
if (ret < 0) {
wolfCLU_LogError("Failed to sign certificate.");
return ret;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "SignCert returned %d", ret);

Expand All @@ -175,7 +194,8 @@ int make_self_signed_ed25519_certificate(char* keyPath, char* certOut)
file = XFOPEN(certOut, "wb");
if (!file) {
wolfCLU_LogError("failed to open file: %s", certOut);
return -1;
ret = WOLFCLU_FATAL_ERROR;
goto cleanup;
}

ret = (int)XFWRITE(certBuf, 1, certBufSz, file);
Expand All @@ -191,30 +211,42 @@ int make_self_signed_ed25519_certificate(char* keyPath, char* certOut)
pemBuf = (byte*)XMALLOC(FOURK_SZ, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (pemBuf == NULL) {
wolfCLU_LogError("Failed to initialize pem buffer.");
return -1;
ret = MEMORY_E;
goto cleanup;
}
XMEMSET(pemBuf, 0, FOURK_SZ);

pemBufSz = wc_DerToPem(certBuf, certBufSz, pemBuf, FOURK_SZ, CERT_TYPE);
if (pemBufSz < 0) {
wolfCLU_LogError("Failed to convert from der to pem.");
return -1;
ret = pemBufSz;
goto cleanup;
}

WOLFCLU_LOG(WOLFCLU_L0, "Resulting pem buffer is %d bytes", pemBufSz);

pemFile = XFOPEN(certOut, "wb");
if (!pemFile) {
wolfCLU_LogError("failed to open file: %s", certOut);
return -1;
ret = WOLFCLU_FATAL_ERROR;
goto cleanup;
}
XFWRITE(pemBuf, 1, pemBufSz, pemFile);
XFCLOSE(pemFile);
WOLFCLU_LOG(WOLFCLU_L0, "Successfully converted the der to pem. Result is in: %s\n",
certOut);
ret = WOLFCLU_SUCCESS;

free_things_ed25519(&pemBuf, &certBuf, NULL, &key, NULL, &rng);
return 1;
cleanup:
if (pemBuf != NULL)
XFREE(pemBuf, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (certBuf != NULL)
XFREE(certBuf, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (keyInit)
wc_ed25519_free(&key);
if (rngInit)
wc_FreeRng(&rng);
return ret;
}

void free_things_ed25519(byte** a, byte** b, byte** c, ed25519_key* d, ed25519_key* e,
Expand Down
77 changes: 55 additions & 22 deletions src/certgen/clu_certgen_rsa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ int make_self_signed_rsa_certificate(char* keyPath, char* certOut, int oid)
{
int ret = 0;
word32 index = 0;
int keyInit = 0, rngInit = 0;

Cert newCert;
RsaKey key;
Expand All @@ -42,10 +43,10 @@ int make_self_signed_rsa_certificate(char* keyPath, char* certOut, int oid)
XFILE file;
XFILE pemFile;
byte* keyBuf;
int certBufSz;
byte* certBuf;
int certBufSz = 0;
byte* certBuf = NULL;
int pemBufSz;
byte* pemBuf;
byte* pemBuf = NULL;

keyFile = XFOPEN(keyPath, "rb");
if (keyFile == NULL) {
Expand All @@ -62,29 +63,37 @@ int make_self_signed_rsa_certificate(char* keyPath, char* certOut, int oid)
}
if (XFSEEK(keyFile, 0, SEEK_SET) != 0 || (int)XFREAD(keyBuf, 1, keyFileSz, keyFile) != keyFileSz) {
XFCLOSE(keyFile);
wolfCLU_ForceZero(keyBuf, keyFileSz);
XFREE(keyBuf, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
return WOLFCLU_FAILURE;
}
XFCLOSE(keyFile);

ret = wc_InitRsaKey(&key, NULL);
if (ret != 0) {
wolfCLU_LogError("Failed to initialize RsaKey\nRET: %d", ret);
wolfCLU_ForceZero(keyBuf, keyFileSz);
XFREE(keyBuf, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
return ret;
}
keyInit = 1;

ret = wc_InitRng(&rng);
if (ret != 0) {
wolfCLU_LogError("Failed to initialize rng.\nRET: %d", ret);
wolfCLU_ForceZero(keyBuf, keyFileSz);
XFREE(keyBuf, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_FreeRsaKey(&key);
return ret;
}
rngInit = 1;

ret = wc_RsaPrivateKeyDecode(keyBuf, &index, &key, keyFileSz);
wolfCLU_ForceZero(keyBuf, keyFileSz);
XFREE(keyBuf, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (ret != 0 ) {
wolfCLU_LogError("Failed to decode private key.\nRET: %d", ret);
return ret;
goto cleanup;
}

wc_InitCert(&newCert);
Expand All @@ -99,36 +108,44 @@ int make_self_signed_rsa_certificate(char* keyPath, char* certOut, int oid)

WOLFCLU_LOG(WOLFCLU_L0, "Enter your countries 2 digit code (ex: United States -> US): ");
if (XFGETS(country,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
country[CTC_NAME_SIZE-1] = '\0';
WOLFCLU_LOG(WOLFCLU_L0, "Enter the name of the province you are located at: ");
if (XFGETS(province,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "Enter the name of the city you are located at: ");
if (XFGETS(city,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "Enter the name of your orginization: ");
if (XFGETS(org,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "Enter the name of your unit: ");
if (XFGETS(unit,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "Enter the common name of your domain: ");
if (XFGETS(commonName,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "Enter your email address: ");
if (XFGETS(email,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "Enter the number of days this certificate should be valid: ");
if (XFGETS(daysValid,CTC_NAME_SIZE, stdin) == NULL) {
return WOLFCLU_FAILURE;
ret = WOLFCLU_FAILURE;
goto cleanup;
}

XSTRNCPY(newCert.subject.country, country, CTC_NAME_SIZE);
Expand Down Expand Up @@ -162,22 +179,23 @@ int make_self_signed_rsa_certificate(char* keyPath, char* certOut, int oid)
certBuf = (byte*) XMALLOC(FOURK_SZ, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (certBuf == NULL) {
wolfCLU_LogError("Failed to initialize buffer to stort certificate.");
return -1;
ret = -1;
goto cleanup;
}
XMEMSET(certBuf, 0, FOURK_SZ);

ret = wc_MakeCert(&newCert, certBuf, FOURK_SZ, &key, NULL, &rng);
if (ret < 0) {
wolfCLU_LogError("Failed to make certificate.");
return ret;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "MakeCert returned %d", ret);

ret = wc_SignCert(newCert.bodySz, newCert.sigType, certBuf, FOURK_SZ, &key,
ret = wc_SignCert(newCert.bodySz, newCert.sigType, certBuf, FOURK_SZ, &key,
NULL, &rng);
if (ret < 0) {
wolfCLU_LogError("Failed to sign certificate.");
return ret;
goto cleanup;
}
WOLFCLU_LOG(WOLFCLU_L0, "SignCert returned %d", ret);

Expand All @@ -189,7 +207,8 @@ int make_self_signed_rsa_certificate(char* keyPath, char* certOut, int oid)
file = XFOPEN(certOut, "wb");
if (!file) {
wolfCLU_LogError("failed to open file: %s", certOut);
return -1;
ret = -1;
goto cleanup;
}

ret = (int)XFWRITE(certBuf, 1, certBufSz, file);
Expand All @@ -205,30 +224,44 @@ int make_self_signed_rsa_certificate(char* keyPath, char* certOut, int oid)
pemBuf = (byte*)XMALLOC(FOURK_SZ, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (pemBuf == NULL) {
wolfCLU_LogError("Failed to initialize pem buffer.");
return -1;
ret = -1;
goto cleanup;
}
XMEMSET(pemBuf, 0, FOURK_SZ);

pemBufSz = wc_DerToPem(certBuf, certBufSz, pemBuf, FOURK_SZ, CERT_TYPE);
if (pemBufSz < 0) {
wolfCLU_LogError("Failed to convert from der to pem.");
return -1;
ret = -1;
goto cleanup;
}

WOLFCLU_LOG(WOLFCLU_L0, "Resulting pem buffer is %d bytes", pemBufSz);

pemFile = XFOPEN(certOut, "wb");
if (!pemFile) {
wolfCLU_LogError("failed to open file: %s", certOut);
return -1;
ret = -1;
goto cleanup;
}
XFWRITE(pemBuf, 1, pemBufSz, pemFile);
XFCLOSE(pemFile);
WOLFCLU_LOG(WOLFCLU_L0, "Successfully converted the der to pem. Result is in: %s\n",
certOut);

free_things_rsa(&pemBuf, &certBuf, NULL, &key, NULL, &rng);
return 1;
ret = 1;

cleanup:
if (pemBuf != NULL)
XFREE(pemBuf, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (certBuf != NULL)
XFREE(certBuf, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (keyInit)
wc_FreeRsaKey(&key);
if (rngInit)
wc_FreeRng(&rng);

return ret;
}

void free_things_rsa(byte** a, byte** b, byte** c, RsaKey* d, RsaKey* e,
Expand Down
Loading
Loading