Skip to content
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

Allows wolfclu to verify a cert chain of more than 2 certs. #159

Closed
wants to merge 1 commit into from
Closed

Allows wolfclu to verify a cert chain of more than 2 certs. #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 12 additions & 26 deletions src/sign-verify/clu_x509_verify.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ int wolfCLU_x509Verify(int argc, char** argv)
int option;
char* caCert = NULL;
char* verifyCert = NULL;
WOLFSSL_X509_STORE* store = NULL;
WOLFSSL_X509_LOOKUP* lookup = NULL;
WOLFSSL_CERT_MANAGER* cm = NULL;

/* last parameter is the certificate to verify */
if (XSTRNCMP("-h", argv[argc-1], 2) == 0) {
Expand Down Expand Up @@ -117,13 +116,6 @@ int wolfCLU_x509Verify(int argc, char** argv)
}
}

if (ret == WOLFCLU_SUCCESS) {
store = wolfSSL_X509_STORE_new();
if (store == NULL) {
ret = WOLFCLU_FATAL_ERROR;
}
}

if (ret == WOLFCLU_SUCCESS) {
if (inForm != PEM_FORM) {
wolfCLU_LogError("Only handling PEM CA files");
Expand All @@ -132,22 +124,18 @@ int wolfCLU_x509Verify(int argc, char** argv)
}

if (ret == WOLFCLU_SUCCESS) {
lookup = wolfSSL_X509_STORE_add_lookup(store,
wolfSSL_X509_LOOKUP_file());
if (lookup == NULL) {
wolfCLU_LogError("Failed to setup lookup");
cm = wolfSSL_CertManagerNew();
if (cm == NULL) {
ret = WOLFCLU_FATAL_ERROR;
}
}

/* Confirm CA file is root CA unless partialChain enabled */
if (ret == WOLFCLU_SUCCESS){
if (!partialChain && caCert != NULL){
if (ret == WOLFCLU_SUCCESS) {
if (!partialChain && caCert != NULL) {
int error;

error = wolfSSL_CertManagerVerify(store->cm, caCert,
WOLFSSL_FILETYPE_PEM);

error = wolfSSL_CertManagerVerify(cm, caCert, WOLFSSL_FILETYPE_PEM);
if (error != ASN_SELF_SIGNED_E) {
wolfCLU_LogError("CA file is not root CA");
ret = WOLFCLU_FATAL_ERROR;
Expand All @@ -168,8 +156,7 @@ int wolfCLU_x509Verify(int argc, char** argv)
}

if (ret == WOLFCLU_SUCCESS && caCert != NULL) {
if (wolfSSL_X509_LOOKUP_load_file(lookup, caCert, X509_FILETYPE_PEM)
!= WOLFSSL_SUCCESS) {
if (wolfSSL_CertManagerLoadCA(cm, caCert, NULL) != WOLFSSL_SUCCESS) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the biggest change right? Is calling wolfSSL_X509_LOOKUP_load_file incorrect i.e. does it behave different then X509_LOOKUP_load_file() would if called in the same manner?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Note that I have not root caused the problem. I just noticed that if there is no lookup, (only use certmanager directly) then for some reason, certmanager will go through all the certificates in the verifyCert file. I do not know why using the store makes a difference and IMHO I think it should not make a difference so maybe the root cause is somewhere else?

wolfCLU_LogError("Failed to load CA file");
ret = WOLFCLU_FATAL_ERROR;
}
Expand All @@ -179,14 +166,14 @@ int wolfCLU_x509Verify(int argc, char** argv)
#ifdef HAVE_CRL
if (ret == WOLFCLU_SUCCESS) {
if (crlCheck) {
if (wolfSSL_CertManagerEnableCRL(store->cm, WOLFSSL_CRL_CHECKALL)
if (wolfSSL_CertManagerEnableCRL(cm, WOLFSSL_CRL_CHECKALL)
!= WOLFSSL_SUCCESS) {
wolfCLU_LogError("Failed to enable CRL use");
ret = WOLFCLU_FATAL_ERROR;
}
}
else {
if (wolfSSL_CertManagerDisableCRL(store->cm) != WOLFSSL_SUCCESS) {
if (wolfSSL_CertManagerDisableCRL(cm) != WOLFSSL_SUCCESS) {
wolfCLU_LogError("Failed to disable CRL use");
ret = WOLFCLU_FATAL_ERROR;
}
Expand All @@ -197,11 +184,10 @@ int wolfCLU_x509Verify(int argc, char** argv)
if (ret == WOLFCLU_SUCCESS) {
int err;

err = wolfSSL_CertManagerVerify(store->cm, verifyCert,
WOLFSSL_FILETYPE_PEM);
err = wolfSSL_CertManagerVerify(cm, verifyCert, WOLFSSL_FILETYPE_PEM);
if (err == ASN_NO_PEM_HEADER) {
/* most likely the file was DER if PEM header not found */
err = wolfSSL_CertManagerVerify(store->cm, verifyCert,
err = wolfSSL_CertManagerVerify(cm, verifyCert,
WOLFSSL_FILETYPE_ASN1);
}
if (err != WOLFSSL_SUCCESS) {
Expand All @@ -214,7 +200,7 @@ int wolfCLU_x509Verify(int argc, char** argv)
}
}

wolfSSL_X509_STORE_free(store);
wolfSSL_CertManagerFree(cm);
(void)crlCheck;
return ret;
#else
Expand Down
Loading