aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2011-09-20 12:05:31 +0200
committerGuenter Knauf <lists@gknw.net>2011-09-20 12:05:31 +0200
commitcd3cf55b47332769a0e737feb9c5a6d48dce5de9 (patch)
tree2dd12c741b33d5274f5ab2bd0b700b86e8ae12c9
parent98a61d8e2e8982786aaf3916cbbcac96838316e7 (diff)
Also skip certs masked as CKT_NSS_TRUST_UNKNOWN.
Fix posted by Tomas Hoger <thoger redhat com>.
-rwxr-xr-xlib/mk-ca-bundle.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/mk-ca-bundle.pl b/lib/mk-ca-bundle.pl
index 868e23843..189ed01b6 100755
--- a/lib/mk-ca-bundle.pl
+++ b/lib/mk-ca-bundle.pl
@@ -160,7 +160,8 @@ while (<TXT>) {
}
while (<TXT>) {
last if (/^#$/);
- $untrusted = 1 if (/^CKA_TRUST_SERVER_AUTH\s+CK_TRUST\s+CKT_NSS_NOT_TRUSTED$/);
+ $untrusted = 1 if (/^CKA_TRUST_SERVER_AUTH\s+CK_TRUST\s+CKT_NSS_NOT_TRUSTED$/
+ or /^CKA_TRUST_SERVER_AUTH\s+CK_TRUST\s+CKT_NSS_TRUST_UNKNOWN$/);
}
if ($untrusted) {
$skipnum ++;