Skip to content

Implementing PKCS8 and Base64 commands #178

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

Merged
JacobBarthelmeh merged 8 commits into from
May 1, 2025
Merged

Implementing PKCS8 and Base64 commands #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1aad484
pkcs7 input from stdin
lealem47 Apr 17, 2025
cb9f379
Add pkcs8 command
lealem47 Apr 22, 2025
7b77a6f
Add -untrusted option to verify
lealem47 Apr 22, 2025
70f1289
Implement base64 command
lealem47 Apr 22, 2025
4f26c21
Add help prompts
lealem47 Apr 22, 2025
4c4920d
Test coverage
lealem47 Apr 22, 2025
2551c16
Get CI passing
lealem47 Apr 23, 2025
976045c
Review feedback
lealem47 May 1, 2025
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
1 change: 1 addition & 0 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ include tests/dsa/include.am
include tests/pkey/include.am
include tests/dgst/include.am
include tests/rand/include.am
include tests/base64/include.am
include tests/pkcs/include.am
include tests/x509/include.am
include tests/encrypt/include.am
Expand Down
10 changes: 10 additions & 0 deletions src/clu_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@ static const struct option mode_options[] = {
{"dgst", no_argument, 0, WOLFCLU_DGST },
{"verify", no_argument, 0, WOLFCLU_VERIFY },
{"pkcs7", no_argument, 0, WOLFCLU_PKCS7 },
{"pkcs8", no_argument, 0, WOLFCLU_PKCS8 },
{"pkcs12", no_argument, 0, WOLFCLU_PKCS12 },
{"crl", no_argument, 0, WOLFCLU_CRL },
{"s_client", no_argument, 0, WOLFCLU_CLIENT },
{"s_server", no_argument, 0, WOLFCLU_SERVER },
{"rand", no_argument, 0, WOLFCLU_RAND },
{"dsaparam", no_argument, 0, WOLFCLU_DSA },
{"dhparam", no_argument, 0, WOLFCLU_DH },
{"base64", no_argument, 0, WOLFCLU_BASE64 },
{"help", no_argument, 0, WOLFCLU_HELP },
{"h", no_argument, 0, WOLFCLU_HELP },
{"v", no_argument, 0, 'v' },
Expand Down Expand Up @@ -289,6 +291,10 @@ int main(int argc, char** argv)
ret = wolfCLU_PKCS7(argc, argv);
break;

case WOLFCLU_PKCS8:
ret = wolfCLU_PKCS8(argc, argv);
break;

case WOLFCLU_PKCS12:
ret = wolfCLU_PKCS12(argc, argv);
break;
Expand All @@ -313,6 +319,10 @@ int main(int argc, char** argv)
ret = wolfCLU_DhParamSetup(argc, argv);
break;

case WOLFCLU_BASE64:
ret = wolfCLU_Base64Setup(argc, argv);
break;

case WOLFCLU_HELP:
/* only print for -help if no mode has been declared */
WOLFCLU_LOG(WOLFCLU_L0, "Main help menu:");
Expand Down
2 changes: 0 additions & 2 deletions src/hash/clu_hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
#include <wolfclu/clu_log.h>
#include <wolfclu/clu_optargs.h>

#define MAX_STDINSZ 8192

#ifndef WOLFCLU_NO_FILESYSTEM

/*
Expand Down
4 changes: 3 additions & 1 deletion src/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ wolfssl_SOURCES = src/clu_main.c \
src/dh/clu_dh.c \
src/server/server.c \
src/server/clu_server_setup.c \
src/pkcs/clu_pkcs7.c
src/pkcs/clu_pkcs7.c \
src/pkcs/clu_pkcs8.c \
src/tools/clu_base64.c


87 changes: 38 additions & 49 deletions src/pkcs/clu_pkcs7.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ int wolfCLU_PKCS7(int argc, char** argv)
DerBuffer* derObj = NULL;
byte* buf = NULL;
byte* derContent = NULL;
int bufSz;
int bufSz = MAX_STDINSZ;
int derContentSz = 0;
int freePkcs7 = 0;

Expand Down Expand Up @@ -123,65 +123,54 @@ int wolfCLU_PKCS7(int argc, char** argv)
}
}

/* currently only supporting PKCS7 parsing, an input file is expected */
/* currently only supporting PKCS7 parsing, input is expected */
if (ret == WOLFCLU_SUCCESS && bioIn == NULL) {
wolfCLU_LogError("No input file set");
ret = WOLFCLU_FATAL_ERROR;
bioIn = wolfSSL_BIO_new(wolfSSL_BIO_s_file());
wolfSSL_BIO_set_fp(bioIn, stdin, BIO_NOCLOSE);
}

/* read the input bio to a temporary buffer and convert to PKCS7 */
if (ret == WOLFCLU_SUCCESS) {
bufSz = wolfSSL_BIO_get_len(bioIn);
if (bufSz > 0) {
buf = (byte*)XMALLOC(bufSz, HEAP_HINT, DYNAMIC_TYPE_PKCS);
if (buf == NULL) {
buf = (byte*)XMALLOC(bufSz, HEAP_HINT, DYNAMIC_TYPE_PKCS);
if (buf == NULL) {
ret = WOLFCLU_FATAL_ERROR;
}
else {
/* reading the full file into a buffer */
bufSz = wolfSSL_BIO_read(bioIn, buf, bufSz);
freePkcs7 = 1;

if (wc_PKCS7_Init(&pkcs7, HEAP_HINT, INVALID_DEVID)) {
wolfCLU_LogError("Error on pkcs init");
ret = WOLFCLU_FATAL_ERROR;
}
else {
/* reading the full file into a buffer */
if (wolfSSL_BIO_read(bioIn, buf, bufSz) != bufSz) {
ret = WOLFCLU_FATAL_ERROR;
if (ret == WOLFCLU_SUCCESS &&
wc_PKCS7_InitWithCert(&pkcs7, HEAP_HINT, 0)) {
wolfCLU_LogError("Error on pkcs initWithCert");
ret = WOLFCLU_FATAL_ERROR;
}

if (ret == WOLFCLU_SUCCESS && inForm == PEM_FORM) {
if (wc_PemToDer(buf, bufSz, PKCS7_TYPE, &derObj,
HEAP_HINT, NULL, NULL) == 0) {
derContent = derObj->buffer;
derContentSz = derObj->length;

}
else {
freePkcs7 = 1;

if (wc_PKCS7_Init(&pkcs7, HEAP_HINT, INVALID_DEVID)) {
wolfCLU_LogError("Error on pkcs init");
ret = WOLFCLU_FATAL_ERROR;
}
if (ret == WOLFCLU_SUCCESS &&
wc_PKCS7_InitWithCert(&pkcs7, HEAP_HINT, 0)) {
wolfCLU_LogError("Error on pkcs initWithCert");
ret = WOLFCLU_FATAL_ERROR;
}

if (ret == WOLFCLU_SUCCESS && inForm == PEM_FORM) {
if (wc_PemToDer(buf, bufSz, PKCS7_TYPE, &derObj,
HEAP_HINT, NULL, NULL) == 0) {
derContent = derObj->buffer;
derContentSz = derObj->length;

}
else {
ret = WOLFCLU_FATAL_ERROR;
}
}
else if (ret == WOLFCLU_SUCCESS) {
derContent = buf;
derContentSz = bufSz;
}

if (ret == WOLFCLU_SUCCESS && wc_PKCS7_VerifySignedData(
&pkcs7, derContent, derContentSz)) {
wolfCLU_LogError("Error reading pkcs7 file");
ret = WOLFCLU_FATAL_ERROR;
}
ret = WOLFCLU_FATAL_ERROR;
}
}
}
else {
wolfCLU_LogError("Error getting length of pkcs7 file");
ret = WOLFCLU_FATAL_ERROR;
else if (ret == WOLFCLU_SUCCESS) {
derContent = buf;
derContentSz = bufSz;
}

if (ret == WOLFCLU_SUCCESS && wc_PKCS7_VerifySignedData(
&pkcs7, derContent, derContentSz)) {
wolfCLU_LogError("Error reading pkcs7 file");
ret = WOLFCLU_FATAL_ERROR;
}
}
}

Expand Down
Loading
Loading