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.

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

Prepare for v0.1.5 Release #139

Merged
merged 1 commit into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
24 changes: 11 additions & 13 deletions src/x509/clu_x509_sign.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
JacobBarthelmeh marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
4 changes: 2 additions & 2 deletions wolfclu/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Loading