From cd192f3352a529d2e3ebf85ff2dcbd8c74cef889 Mon Sep 17 00:00:00 2001 From: Zero King Date: Sat, 29 Apr 2017 13:41:23 +0000 Subject: [PATCH] Fix smime_keys_test.pl --- contrib/smime_keys_test.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/smime_keys_test.pl b/contrib/smime_keys_test.pl index 6ef798008..bcf514938 100644 --- a/contrib/smime_keys_test.pl +++ b/contrib/smime_keys_test.pl @@ -60,6 +60,7 @@ run 'openssl pkcs12 -export -inkey user.key -in newcert.pem -out cert.p12 -CAfil unlink 'newcert.pem' or die; unlink 'demoCA/cacert.pem' or die; unlink 'demoCA/index.txt' or die; +unlink 'demoCA/index.txt.attr' or die; unlink 'demoCA/index.txt.old' or die; unlink 'demoCA/serial' or die; unlink 'demoCA/serial.old' or die; @@ -80,7 +81,7 @@ run 'smime_keys list > list'; open IN, 'list' or die; eq "\n" or die; - =~ /^(.*)\: Issued for\: user\@smime\.mutt \"old_label\" \(Unverified\)\n/ or die; + =~ /^(.*)\: Issued for\: user\@smime\.mutt \"old_label\" \(Trusted\)\n/ or die; close IN; my $keyid = $1; @@ -93,13 +94,13 @@ run 'smime_keys list > list'; open IN, 'list' or die; eq "\n" or die; - =~ /^$keyid\: Issued for\: user\@smime\.mutt \"new_label\" \(Unverified\)\n/ or die; + =~ /^$keyid\: Issued for\: user\@smime\.mutt \"new_label\" \(Trusted\)\n/ or die; close IN; unlink 'list' or die; # try signing something -run "openssl smime -sign -signer certificates/$keyid -inkey user.key -in /etc/passwd -certfile certificates/37adefc3.0 > signed"; +run "openssl smime -sign -signer certificates/$keyid -inkey user.key -in /etc/passwd -certfile ca-bundle.crt > signed"; unlink 'user.key' or die; # verify it -- 2.40.0