diff options
| author | wtc%google.com <devnull@localhost> | 2007-11-21 18:22:11 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2007-11-21 18:22:11 +0000 |
| commit | 6d485446135918d23688d44345fafcb65bf63872 (patch) | |
| tree | 44d2e39d85687cb2d607411964607a242ccc96ea | |
| parent | 27a91b3aa22f135229ba220de4456eebf6a9958c (diff) | |
| download | nss-hg-6d485446135918d23688d44345fafcb65bf63872.tar.gz | |
Bug 353577 and bug 404610: Delete PURE_STAN code and code outside
NSS_3_4_CODE. tbr=julien.pierre
Modified Files:
Tag: NSS_3_11_BRANCH
tdcache.c trustdomain.c
| -rw-r--r-- | security/nss/lib/pki/tdcache.c | 8 | ||||
| -rw-r--r-- | security/nss/lib/pki/trustdomain.c | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/security/nss/lib/pki/tdcache.c b/security/nss/lib/pki/tdcache.c index 3c3e0eeb1..101c482bf 100644 --- a/security/nss/lib/pki/tdcache.c +++ b/security/nss/lib/pki/tdcache.c @@ -62,11 +62,9 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$"; #include "base.h" #endif /* BASE_H */ -#ifdef NSS_3_4_CODE #include "cert.h" #include "dev.h" #include "pki3hack.h" -#endif #ifdef DEBUG_CACHE static PRLogModuleInfo *s_log = NULL; @@ -1073,7 +1071,6 @@ nssTrustDomain_GetCertForIssuerAndSNFromCache ( return rvCert; } -#ifdef NSS_3_4_CODE static PRStatus issuer_and_serial_from_encoding ( NSSBER *encoding, @@ -1099,7 +1096,6 @@ issuer_and_serial_from_encoding ( serial->size = derSerial.len; return PR_SUCCESS; } -#endif /* * Look for a specific cert in the cache @@ -1113,9 +1109,7 @@ nssTrustDomain_GetCertByDERFromCache ( PRStatus nssrv = PR_FAILURE; NSSDER issuer, serial; NSSCertificate *rvCert; -#ifdef NSS_3_4_CODE nssrv = issuer_and_serial_from_encoding(der, &issuer, &serial); -#endif if (nssrv != PR_SUCCESS) { return NULL; } @@ -1124,10 +1118,8 @@ nssTrustDomain_GetCertByDERFromCache ( #endif rvCert = nssTrustDomain_GetCertForIssuerAndSNFromCache(td, &issuer, &serial); -#ifdef NSS_3_4_CODE PORT_Free(issuer.data); PORT_Free(serial.data); -#endif return rvCert; } diff --git a/security/nss/lib/pki/trustdomain.c b/security/nss/lib/pki/trustdomain.c index 8a76840b7..3d9fd79fe 100644 --- a/security/nss/lib/pki/trustdomain.c +++ b/security/nss/lib/pki/trustdomain.c @@ -50,10 +50,8 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$"; #include "pki1t.h" #endif /* PKI1T_H */ -#ifdef NSS_3_4_CODE #include "cert.h" #include "pki3hack.h" -#endif #include "nssrwlk.h" @@ -89,9 +87,7 @@ NSSTrustDomain_Create ( nssTrustDomain_InitializeCache(rvTD, NSSTRUSTDOMAIN_DEFAULT_CACHE_SIZE); rvTD->arena = arena; rvTD->refCount = 1; -#ifdef NSS_3_4_CODE rvTD->statusConfig = NULL; -#endif return rvTD; loser: if (rvTD && rvTD->tokensLock) { |