Merge pull request #122 from JacobBarthelmeh/release

Release version 0.1.2

Author: dgarske

ChangeLog.md

@@ -1,3 +1,11 @@
+# wolfCLU v0.1.2 (Mar 31, 2023)
+### Fixes and Enhancements
+- Fix for DH use with FIPS build and cross compile warning
+- Fix for configure cross compile QA warning with Yocto builds
+- Fix for macro guards on Shake
+- Improve VS build to generate .exe for all platforms
+- Fix for linking to wolfSSL library built with --enable-ipv6
+
 # wolfCLU v0.1.0 (Sep 12, 2022)
 ### Fixes and Enhancements
 - Fix for buffer issue with s_client

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.0], [http://www.wolfssl.com])
+AC_INIT([wolfclu], [0.1.2], [http://www.wolfssl.com])
 
 #a helpful directory to keep clutter out of root
 AC_CONFIG_AUX_DIR([build-aux])

src/x509/clu_config.c

@@ -34,7 +34,6 @@ static int wolfCLU_setAttributes(WOLFSSL_X509* x509, WOLFSSL_CONF* conf,
     const char* current;
     int currentSz;
 
-    currentSz = 0;
     current = wolfSSL_NCONF_get_string(conf, sect, "challengePassword");
     if (current != NULL) {
         currentSz = (int)XSTRLEN(current);

src/x509/clu_x509_sign.c

@@ -574,21 +574,25 @@ int wolfCLU_CertSign(WOLFCLU_CERT_SIGN* csign, WOLFSSL_X509* x509)
             }
         }
         else {
-            int defaultSerialSz = 20;
             WOLFSSL_BIGNUM* bn;
+            int numBits;
 
-            bn = wolfSSL_BN_new();
-            if (wolfSSL_BN_rand(bn, (defaultSerialSz*WOLFSSL_BIT_SIZE), 0, 0)
+            do {
+                bn = wolfSSL_BN_new();
+                if (wolfSSL_BN_rand(bn, (CTC_GEN_SERIAL_SZ*WOLFSSL_BIT_SIZE),
+                    WOLFSSL_BN_RAND_TOP_ANY, WOLFSSL_BN_RAND_BOTTOM_ODD)
                     != WOLFSSL_SUCCESS) {
-                wolfCLU_LogError("Creating a random serail number fail");
-                ret = WOLFCLU_FATAL_ERROR;
-            }
-
-            /* make positive */
-            wolfSSL_BN_clear_bit(bn, (defaultSerialSz*WOLFSSL_BIT_SIZE)-1);
+                    wolfCLU_LogError("Creating a random serial number fail");
+                    ret = WOLFCLU_FATAL_ERROR;
+                }
 
-            s = wolfSSL_BN_to_ASN1_INTEGER(bn, NULL);
-            wolfSSL_BN_free(bn);
+                /* work around BN_to_ASN1_INTEGER check */
+                numBits = wolfSSL_BN_num_bits(bn);
+                if ((numBits % 8) != 7) {
+                    s = wolfSSL_BN_to_ASN1_INTEGER(bn, NULL);
+                }
+                wolfSSL_BN_free(bn);
+            } while ((numBits % 8) == 7);
         }
         wolfSSL_X509_set_serialNumber(x509, s);
         wolfSSL_ASN1_INTEGER_free(s);

wolfclu/version.h

@@ -26,8 +26,8 @@
 extern "C" {
 #endif
 
-#define CLUWOLFSSL_VERSION_STRING "0.1.0"
-#define CLUWOLFSSL_VERSION_HEX 0x00001000
+#define CLUWOLFSSL_VERSION_STRING "0.1.2"
+#define CLUWOLFSSL_VERSION_HEX 0x00001002
 
 #ifdef __cplusplus
 }