skoll fixes

Author: aidankeefe2022

src/dh/clu_dh.c

@@ -20,6 +20,7 @@
  */
 
 #include <wolfclu/clu_header_main.h>
+#include <wolfclu/clu_error_codes.h>
 #include <wolfclu/clu_log.h>
 #include <wolfclu/clu_optargs.h>
 
@@ -392,7 +393,8 @@ int wolfCLU_DhParamSetup(int argc, char** argv)
         switch (option) {
             case ARG_FOUND_TWICE:
                 wolfCLU_LogError("Found duplicate argument");
-                return WOLFCLU_FATAL_ERROR;
+                ret = WOLFCLU_FATAL_ERROR;
+                break;
 
             case WOLFCLU_INFILE:
 #ifdef WOLFCLU_NO_FILESYSTEM

src/dsa/clu_dsa.c

@@ -20,6 +20,7 @@
  */
 
 #include <wolfclu/clu_header_main.h>
+#include <wolfclu/clu_error_codes.h>
 #include <wolfclu/clu_log.h>
 #include <wolfclu/clu_optargs.h>
 
@@ -82,7 +83,8 @@ int wolfCLU_DsaParamSetup(int argc, char** argv)
         switch (option) {
             case ARG_FOUND_TWICE:
                 wolfCLU_LogError("Found duplicate argument");
-                return WOLFCLU_FATAL_ERROR;
+                ret = WOLFCLU_FATAL_ERROR;
+                break;
 
             case WOLFCLU_INFILE:
 #ifdef WOLFCLU_NO_FILESYSTEM

src/ocsp/clu_ocsp.c

@@ -913,7 +913,8 @@ int wolfCLU_OcspSetup(int argc, char** argv)
     opterr = 0;
     optind = 0;
 
-    while ((option = wolfCLU_GetOpt(argc, argv, "", ocsp_options, &longIndex)) != END_OF_ARGS) {
+    while ((option = wolfCLU_GetOpt(argc, argv, "",
+                    ocsp_options, &longIndex)) != END_OF_ARGS) {
         switch (option) {
             case ARG_FOUND_TWICE:
                 wolfCLU_LogError("Found duplicate argument");

src/pkcs/clu_pkcs12.c

@@ -20,6 +20,7 @@
  */
 
 #include <wolfclu/clu_header_main.h>
+#include <wolfclu/clu_error_codes.h>
 #include <wolfclu/clu_log.h>
 #include <wolfclu/clu_optargs.h>
 #include <wolfclu/pkey/clu_pkey.h>
@@ -81,7 +82,8 @@ int wolfCLU_PKCS12(int argc, char** argv)
         switch (option) {
             case ARG_FOUND_TWICE:
                 wolfCLU_LogError("Found duplicate argument");
-                return WOLFCLU_FATAL_ERROR;
+                ret = WOLFCLU_FATAL_ERROR;
+                break;
 
             case WOLFCLU_NODES:
                 useDES = 0;

src/pkcs/clu_pkcs8.c

@@ -96,7 +96,8 @@ int wolfCLU_PKCS8(int argc, char** argv)
         switch (option) {
             case ARG_FOUND_TWICE:
                 wolfCLU_LogError("Found duplicate argument");
-                return WOLFCLU_FATAL_ERROR;
+                ret = WOLFCLU_FATAL_ERROR;
+                break;
 
             case WOLFCLU_INFILE:
                 bioIn = wolfSSL_BIO_new_file(optarg, "rb");

src/pkey/clu_pkey.c

@@ -20,6 +20,7 @@
  */
 
 #include <wolfclu/clu_header_main.h>
+#include <wolfclu/clu_error_codes.h>
 #include <wolfclu/clu_log.h>
 #include <wolfclu/clu_optargs.h>
 #include <wolfclu/pkey/clu_pkey.h>
@@ -427,12 +428,13 @@ int wolfCLU_pKeySetup(int argc, char** argv)
     WOLFSSL_BIO *bioOut = NULL;
 
     optind = 0; /* start at indent 0 */
-    while ((option = wolfCLU_GetOpt(argc, argv, "",
-                   pkey_options, &longIndex )) != END_OF_ARGS) {
+    while ((option = wolfCLU_GetOpt(argc, argv, "", pkey_options,
+                    &longIndex )) != END_OF_ARGS) {
         switch (option) {
             case ARG_FOUND_TWICE:
                 wolfCLU_LogError("Found duplicate argument");
-                return WOLFCLU_FATAL_ERROR;
+                ret = WOLFCLU_FATAL_ERROR;
+                break;
 
             case WOLFCLU_PUBOUT:
                 pubOut = 1;

src/pkey/clu_rsa.c

@@ -88,7 +88,8 @@ int wolfCLU_RSA(int argc, char** argv)
         switch (option) {
             case ARG_FOUND_TWICE:
                 wolfCLU_LogError("Found duplicate argument");
-                return WOLFCLU_FATAL_ERROR;
+                ret = WOLFCLU_FATAL_ERROR;
+                break;
 
             case WOLFCLU_INFILE:
                 bioIn = wolfSSL_BIO_new_file(optarg, "rb");

src/sign-verify/clu_crl_verify.c

@@ -78,12 +78,13 @@ int wolfCLU_CRLVerify(int argc, char** argv)
 
     opterr = 0; /* do not display unrecognized options */
     optind = 0; /* start at indent 0 */
-    while ((option = wolfCLU_GetOpt(argc, argv, "", crl_options,
-                    &longIndex )) != END_OF_ARGS) {
+    while ((option = wolfCLU_GetOpt(argc, argv, "", crl_options, &longIndex ))
+            != END_OF_ARGS) {
         switch (option) {
             case ARG_FOUND_TWICE:
                 wolfCLU_LogError("Found duplicate argument");
-                return WOLFCLU_FATAL_ERROR;
+                ret = WOLFCLU_FATAL_ERROR;
+                break;
 
             case WOLFCLU_OUTFILE:
                 out = optarg;

src/sign-verify/clu_x509_verify.c

@@ -20,6 +20,7 @@
  */
 
 #include <wolfclu/clu_header_main.h>
+#include <wolfclu/clu_error_codes.h>
 #include <wolfclu/clu_log.h>
 #include <wolfclu/clu_optargs.h>
 #include <wolfclu/sign-verify/clu_verify.h>
@@ -112,12 +113,13 @@ int wolfCLU_x509Verify(int argc, char** argv)
 
         opterr = 0; /* do not display unrecognized options */
         optind = 0; /* start at indent 0 */
-        while ((option = wolfCLU_GetOpt(argc - 1, argv, "",
-                       verify_options, &longIndex )) != END_OF_ARGS) {
+        while ((option = wolfCLU_GetOpt(argc - 1, argv,
+                        "", verify_options, &longIndex )) != END_OF_ARGS) {
             switch (option) {
                 case ARG_FOUND_TWICE:
                     wolfCLU_LogError("Found duplicate argument");
-                    return WOLFCLU_FATAL_ERROR;
+                    ret = WOLFCLU_FATAL_ERROR;
+                    break;
 
                 case WOLFCLU_CHECK_CRL:
                 #ifndef HAVE_CRL

tests/hash/blake2b-expect.hex

@@ -0,0 +1 @@
+f959d994c3efa0ff765700f1d3044cddc7c425d68ba29ded1a5132ea648b947744fc7395a2740a2774feb086b34314a038411244a43420e238091dd688f47383