From a22e06db13837451e87585681bd2577d0bc6d852 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Feb 23 2018 16:18:22 +0000
Subject: SQLite databases require a password to modify trust and to sign


This affects certutil -M and cmsutil -S. Need to add -f pinfile.

https://pagure.io/certmonger/issue/88

---

diff --git a/tests/030-rekey/run.sh b/tests/030-rekey/run.sh
index 9b50da4..07fea68 100755
--- a/tests/030-rekey/run.sh
+++ b/tests/030-rekey/run.sh
@@ -140,11 +140,11 @@ for preserve in 1 0 ; do
 
 	echo "This is the plaintext." > plain.txt
 	echo "NSS Signing:"
-	certutil -M -d $tmpdir -n i$size -t P,P,P
-	cmsutil -S -d $tmpdir -f pinfile -N i$size -i plain.txt -o signed
+	certutil -M -d $tmpdir -n i$size -t P,P,P -f pinfile
+	cmsutil -S -d $tmpdir -f pinfile -N i$size -i plain.txt -o signed -f pinfile
 	echo "NSS Verify:"
-	cmsutil -D -d $tmpdir -f pinfile -i signed
-	certutil -M -d $tmpdir -n i$size -t ,,
+	cmsutil -D -d $tmpdir -f pinfile -i signed -f pinfile
+	certutil -M -d $tmpdir -n i$size -t ,, -f pinfile
 
 	# Go and save the new certs and keys (NSS).
 	echo '(saving)'
@@ -163,11 +163,11 @@ for preserve in 1 0 ; do
 
 	echo "This is the plaintext." > plain.txt
 	echo "NSS Signing:"
-	certutil -M -d $tmpdir -n i$size -t P,P,P
-	cmsutil -S -d $tmpdir -f pinfile -N i$size -i plain.txt -o signed
+	certutil -M -d $tmpdir -n i$size -t P,P,P -f pinfile
+	cmsutil -S -d $tmpdir -f pinfile -N i$size -i plain.txt -o signed -f pinfile
 	echo "NSS Verify:"
-	cmsutil -D -d $tmpdir -f pinfile -i signed
-	certutil -M -d $tmpdir -n i$size -t ,,
+	cmsutil -D -d $tmpdir -f pinfile -i signed -f pinfile
+	certutil -M -d $tmpdir -n i$size -t ,, -f pinfile
 
 	# Now generate new keys, CSRs, and certificates (OpenSSL).
 	echo "PEM keys before re-keygen (preserve=$preserve,pin=\"$pin\"):"