diff --git a/ChangeLog.md b/ChangeLog.md index 5ab82405..bab4ed32 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,7 @@ +# wolfCLU v0.1.5 (Dec 22, 2023) +- Fix memory type typo in clu_rsa.c +- Add missing void arg to functions in clu_funcs.c + # wolfCLU v0.1.4 (Nov 21, 2023) - Removed erroneous file generation on ecc keygen - Added options -req, -signkey, -extfile, -extensions and -md for x509 command diff --git a/configure.ac b/configure.ac index 09177bc6..29e18be6 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ #requires user to have AutoConf version 2.63 or greater. AC_PREREQ([2.63]) -AC_INIT([wolfclu], [0.1.4], [http://www.wolfssl.com]) +AC_INIT([wolfclu], [0.1.5], [http://www.wolfssl.com]) #a helpful directory to keep clutter out of root AC_CONFIG_AUX_DIR([build-aux]) diff --git a/src/x509/clu_x509_sign.c b/src/x509/clu_x509_sign.c index 3f26bd05..33cda135 100644 --- a/src/x509/clu_x509_sign.c +++ b/src/x509/clu_x509_sign.c @@ -599,25 +599,23 @@ int wolfCLU_CertSign(WOLFCLU_CERT_SIGN* csign, WOLFSSL_X509* x509) } /* set extensions */ - if (csign->ext != NULL) { + if (ret == WOLFCLU_SUCCESS && csign->ext != NULL) { wolfCLU_setExtensions(x509, csign->config, csign->ext); } /* sign the certificate */ - if (csign->keyType == RSAk || csign->keyType == ECDSAk) { - if (ret == WOLFCLU_SUCCESS) { - if (wolfSSL_X509_check_private_key(csign->ca, csign->caKey.pkey) != - WOLFSSL_SUCCESS) { - wolfCLU_LogError("Private key does not match with CA"); - ret = WOLFCLU_FATAL_ERROR; - } + if (ret == WOLFCLU_SUCCESS && + (csign->keyType == RSAk || csign->keyType == ECDSAk)) { + if (wolfSSL_X509_check_private_key(csign->ca, csign->caKey.pkey) != + WOLFSSL_SUCCESS) { + wolfCLU_LogError("Private key does not match with CA"); + ret = WOLFCLU_FATAL_ERROR; } - if (ret == WOLFCLU_SUCCESS) { - if (wolfSSL_X509_sign(x509, csign->caKey.pkey, md) <= 0) { - wolfCLU_LogError("Error signing certificate"); - ret = WOLFCLU_FATAL_ERROR; - } + if (ret == WOLFCLU_SUCCESS && + wolfSSL_X509_sign(x509, csign->caKey.pkey, md) <= 0) { + wolfCLU_LogError("Error signing certificate"); + ret = WOLFCLU_FATAL_ERROR; } } /* @TODO else case here could get the tbs buffer or just the der of the * x509 struct and use a different method for signing and creating the diff --git a/wolfclu/version.h b/wolfclu/version.h index 6ebaf341..82438bff 100644 --- a/wolfclu/version.h +++ b/wolfclu/version.h @@ -26,8 +26,8 @@ extern "C" { #endif -#define CLUWOLFSSL_VERSION_STRING "0.1.4" -#define CLUWOLFSSL_VERSION_HEX 0x00001004 +#define CLUWOLFSSL_VERSION_STRING "0.1.5" +#define CLUWOLFSSL_VERSION_HEX 0x00001005 #ifdef __cplusplus }