diff options
| author | kaie%kuix.de <devnull@localhost> | 2006-05-16 01:14:41 +0000 |
|---|---|---|
| committer | kaie%kuix.de <devnull@localhost> | 2006-05-16 01:14:41 +0000 |
| commit | 1750eec57ab1ad5a82ec316d754f2c6adda72405 (patch) | |
| tree | b2260163e383604bd9754d1f4a84c558aebc9a74 /security/nss/lib/certdb/stanpcertdb.c | |
| parent | 617436e372f5b4ade30e234767bbf37401ea5e29 (diff) | |
| download | nss-hg-1750eec57ab1ad5a82ec316d754f2c6adda72405.tar.gz | |
bug 338058, Upgrade to NSS 3.11.2 second pre-release
r=wtchang, a=wtchang
Diffstat (limited to 'security/nss/lib/certdb/stanpcertdb.c')
| -rw-r--r-- | security/nss/lib/certdb/stanpcertdb.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/security/nss/lib/certdb/stanpcertdb.c b/security/nss/lib/certdb/stanpcertdb.c index ae5c15a11..ea04bb075 100644 --- a/security/nss/lib/certdb/stanpcertdb.c +++ b/security/nss/lib/certdb/stanpcertdb.c @@ -819,18 +819,13 @@ certdb_SaveSingleProfile(CERTCertificate *cert, const char *emailAddr, NSSItem profTime, profData; NSSItem *pprofTime, *pprofData; NSSITEM_FROM_SECITEM(&subject, &cert->derSubject); - if (profileTime) { - NSSITEM_FROM_SECITEM(&profTime, profileTime); - pprofTime = &profTime; - } else { - pprofTime = NULL; - } - if (emailProfile) { - NSSITEM_FROM_SECITEM(&profData, emailProfile); - pprofData = &profData; - } else { - pprofData = NULL; - } + + NSSITEM_FROM_SECITEM(&profTime, profileTime); + pprofTime = &profTime; + + NSSITEM_FROM_SECITEM(&profData, emailProfile); + pprofData = &profData; + stanProfile = nssSMIMEProfile_Create(c, pprofTime, pprofData); if (!stanProfile) goto loser; nssrv = nssCryptoContext_ImportSMIMEProfile(cc, stanProfile); |