diff options
| author | nelsonb%netscape.com <devnull@localhost> | 2001-01-07 08:13:13 +0000 |
|---|---|---|
| committer | nelsonb%netscape.com <devnull@localhost> | 2001-01-07 08:13:13 +0000 |
| commit | 09bcb513a27be8edb6e06c9e92564c66eb948aab (patch) | |
| tree | d29b00b8add7f177020b5d071fb45be6d669312f /security/nss/lib/certdb/certt.h | |
| parent | 33fa5f1efdab14c312b73593860b9b497310bd3f (diff) | |
| download | nss-hg-09bcb513a27be8edb6e06c9e92564c66eb948aab.tar.gz | |
MSVC won't let you initialize a pointer in a data structure with the
address of an external variable that comes from another DLL.
This is a fundamental difference between WIN32 DLLs and Unix DSOs.
So, for every SEC_ASN1Template inside of libnss3 that is referenced by
other templates outside of libnss3, a new "chooser" function was created
that returns the address of that template. For WIN32, the templates
outside of libnss3 access libnss3's templates by the chooser function
rather than by direct reference. Some simple macros allow Unix to
continue to use direct references, avoiding the extra function calls.
With these changes, all.sh (qa script) passes all tests on NT with DLLs.
Modified Files:
cmd/checkcert/checkcert.c cmd/lib/secutil.c lib/asn1/asn1t.h
lib/certdb/certdb.c lib/certdb/certt.h lib/certdb/crl.c
lib/certhigh/certreq.c lib/crmf/asn1cmn.c lib/crmf/crmfcont.c
lib/crmf/crmftmpl.c lib/cryptohi/secsign.c lib/nss/nss.def
lib/pkcs12/p12local.c lib/pkcs12/p12tmpl.c
lib/pkcs7/certread.c lib/pkcs7/p7decode.c lib/pkcs7/p7local.c
lib/smime/cmsasn1.c lib/smime/cmsattr.c lib/smime/cmspubkey.c
lib/smime/cmssigdata.c lib/smime/smimeutil.c
lib/softoken/keydb.c lib/softoken/keydbt.h lib/util/secalgid.c
lib/util/secasn1.h lib/util/secasn1d.c lib/util/secasn1t.h
lib/util/secasn1u.c lib/util/secdig.c lib/util/secdig.h
lib/util/secoid.h
Diffstat (limited to 'security/nss/lib/certdb/certt.h')
| -rw-r--r-- | security/nss/lib/certdb/certt.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/security/nss/lib/certdb/certt.h b/security/nss/lib/certdb/certt.h index e3d05bc97..f4d200be3 100644 --- a/security/nss/lib/certdb/certt.h +++ b/security/nss/lib/certdb/certt.h @@ -801,4 +801,14 @@ extern const SEC_ASN1Template CERT_CrlTemplate[]; extern const SEC_ASN1Template CERT_AttributeTemplate[]; extern const SEC_ASN1Template CERT_SetOfAttributeTemplate[]; +/* These functions simply return the address of the above-declared templates. +** This is necessary for Windows DLLs. Sigh. +*/ +SEC_ASN1_CHOOSER_DECLARE(CERT_CertificateRequestTemplate); +SEC_ASN1_CHOOSER_DECLARE(CERT_CertificateTemplate); +SEC_ASN1_CHOOSER_DECLARE(CERT_CrlTemplate); +SEC_ASN1_CHOOSER_DECLARE(CERT_IssuerAndSNTemplate); +SEC_ASN1_CHOOSER_DECLARE(CERT_SetOfSignedCrlTemplate); +SEC_ASN1_CHOOSER_DECLARE(CERT_SignedDataTemplate); + #endif /* _CERTT_H_ */ |