Return nonzero from pkcs12-create-example on a failed create so the check is not a false pass

Author: aidangarske

crypto/pkcs12/Makefile

@@ -14,12 +14,14 @@ pkcs12-create-example: pkcs12-create-example.o
 .PHONY: clean check
 
 clean:
-	rm -f *.o pkcs12-example pkcs12-create-example output.p12
+	rm -f *.o pkcs12-example pkcs12-create-example output.p12 example.log create.log
 
-check: SHELL := /bin/bash
-check: .SHELLFLAGS := -eo pipefail -c
+# Redirect then grep (no pipe) so the binary's nonzero exit fails the recipe and
+# there is no SIGPIPE on the long DER dump; both examples now return nonzero on
+# failure, so the exit code carries the result and the grep confirms the output.
 check: pkcs12-example pkcs12-create-example
-	# capture first: grep -q closes the pipe on the long DER dump and pipefail then sees the binary's SIGPIPE
-	out=$$(./pkcs12-example 2>&1); grep -q 'return value of parsing pkcs12 = 0 SUCCESS' <<< "$$out"
-	out=$$(./pkcs12-create-example 2>&1); grep -q 'Printing PKCS12 DER file to output.p12' <<< "$$out"
+	./pkcs12-example > example.log
+	grep -q 'return value of parsing pkcs12 = 0 SUCCESS' example.log
+	./pkcs12-create-example > create.log
+	grep -q 'Printing PKCS12 DER file to output.p12' create.log
 	@echo "PASS: crypto-pkcs12 checks"

crypto/pkcs12/pkcs12-create-example.c

@@ -263,6 +263,7 @@ static int createCert(byte** certDer, word32* certSz, RsaKey* key, WC_RNG* rng)
 
 int main(int argc, char* argv[])
 {
+    int result = 0;
 #if defined(HAVE_PKCS12) && defined(WOLFSSL_KEY_GEN) && \
     defined(WOLFSSL_CERT_GEN) && !defined(NO_RSA)
     WC_PKCS12* pkcs12 = NULL;
@@ -316,6 +317,7 @@ int main(int argc, char* argv[])
         printf("Created new PKCS12 structure now converting to DER\n");
         if ((ret = wc_i2d_PKCS12(pkcs12, &pkcs12Der, &pkcs12DerSz)) < 0) {
             printf("unable to convert structure to DER\n");
+            result = -1;
         }
         else {
             char output[] = "output.p12";
@@ -327,6 +329,7 @@ int main(int argc, char* argv[])
     }
     else {
         printf("Issue creating new PKCS12 structure\n");
+        result = -1;
     }
 
     wc_FreeRsaKey(&rsa);
@@ -339,5 +342,5 @@ int main(int argc, char* argv[])
     printf("pkcs12-create-key requires wolfssl to be built with:\n");
     printf("\t./configure --enable-pkcs12 --enable-pwdbased --enable-des3 --enable-keygen --enable-certgen\n");
 #endif
-    return 0;
+    return result;
 }