Assert the actual verify result in the pkcs7 and rsa-nb checks

Author: aidangarske

pk/rsa/Makefile

@@ -38,5 +38,5 @@ clean:
 check: SHELL := /bin/bash
 check: .SHELLFLAGS := -eo pipefail -c
 check: rsa-nb
-	./rsa-nb | grep -q 'RSA non-block verify:'
+	./rsa-nb | grep -q 'RSA non-block verify successful'
 	@echo "PASS: pk-rsa checks"

pk/rsa/rsa-nb.c

@@ -227,6 +227,9 @@ int main(int argc, char** argv)
     if (verifySz != (int)inSz || XMEMCMP(plain, in, inSz) != 0) {
         ret = SIG_VERIFY_E;
     }
+    else {
+        printf("RSA non-block verify successful\n");
+    }
 
 prog_end:
 

pkcs7/Makefile

@@ -62,5 +62,5 @@ clean:
 check: SHELL := /bin/bash
 check: .SHELLFLAGS := -eo pipefail -c
 check: signedData-stream
-	./signedData-stream content.txt | grep -q 'bytes from file'
+	./signedData-stream content.txt | grep -q 'Successfully verified SignedData bundle'
 	@echo "PASS: pkcs7-signeddata-stream checks"