summaryrefslogtreecommitdiff
path: root/security/nss/lib/pki/pki3hack.c
diff options
context:
space:
mode:
authorkaie%kuix.de <devnull@localhost>2011-11-16 19:12:36 +0000
committerkaie%kuix.de <devnull@localhost>2011-11-16 19:12:36 +0000
commit7d3896063ce456af19af7068a76d1c4ddd7d7f7c (patch)
tree0a5b08318c0651e605b283caadde04c62e5e13f4 /security/nss/lib/pki/pki3hack.c
parent6124ade9c8c61c20e70038dcbdd0ace11111bac5 (diff)
downloadnss-hg-7d3896063ce456af19af7068a76d1c4ddd7d7f7c.tar.gz
Fix Tinderbox bustage, backout all patches from 2011-11-11
Diffstat (limited to 'security/nss/lib/pki/pki3hack.c')
-rw-r--r--security/nss/lib/pki/pki3hack.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/security/nss/lib/pki/pki3hack.c b/security/nss/lib/pki/pki3hack.c
index ed9eec72b..a35f4f838 100644
--- a/security/nss/lib/pki/pki3hack.c
+++ b/security/nss/lib/pki/pki3hack.c
@@ -592,6 +592,10 @@ cert_trust_from_stan_trust(NSSTrust *t, PRArenaPool *arena)
rvTrust->sslFlags |= client;
rvTrust->emailFlags = get_nss3trust_from_nss4trust(t->emailProtection);
rvTrust->objectSigningFlags = get_nss3trust_from_nss4trust(t->codeSigning);
+ /* The cert is a valid step-up cert (in addition to/lieu of trust above */
+ if (t->stepUpApproved) {
+ rvTrust->sslFlags |= CERTDB_GOVT_APPROVED_CA;
+ }
return rvTrust;
}