diff options
| author | nelsonb%netscape.com <devnull@localhost> | 2005-03-05 08:03:04 +0000 |
|---|---|---|
| committer | nelsonb%netscape.com <devnull@localhost> | 2005-03-05 08:03:04 +0000 |
| commit | 89a4d0ccdc804efc6d09316d54a48f45e21666db (patch) | |
| tree | 7e3b9650daebfe967aad840f9df7cd23d253ca2e /security | |
| parent | c2d79391bb40d6c9886ba44a18229c9aa73cd9a6 (diff) | |
| download | nss-hg-89a4d0ccdc804efc6d09316d54a48f45e21666db.tar.gz | |
Export CERT_SequenceOfCertExtensionTemplate on Windows.
Fix type of "attributes" member of struct CERTCertificateRequestStr.
Bug 284200. r=nelson.williams & wtchang.
Diffstat (limited to 'security')
| -rw-r--r-- | security/nss/lib/certdb/certdb.c | 1 | ||||
| -rw-r--r-- | security/nss/lib/certdb/certt.h | 3 | ||||
| -rw-r--r-- | security/nss/lib/nss/nss.def | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/security/nss/lib/certdb/certdb.c b/security/nss/lib/certdb/certdb.c index 3bb647423..d7742d83c 100644 --- a/security/nss/lib/certdb/certdb.c +++ b/security/nss/lib/certdb/certdb.c @@ -220,6 +220,7 @@ const SEC_ASN1Template CERT_CertKeyTemplate[] = { SEC_ASN1_CHOOSER_IMPLEMENT(CERT_CertificateTemplate) SEC_ASN1_CHOOSER_IMPLEMENT(SEC_SignedCertificateTemplate) +SEC_ASN1_CHOOSER_IMPLEMENT(CERT_SequenceOfCertExtensionTemplate) SECStatus CERT_KeyFromIssuerAndSN(PRArenaPool *arena, SECItem *issuer, SECItem *sn, diff --git a/security/nss/lib/certdb/certt.h b/security/nss/lib/certdb/certt.h index 50a119308..568524734 100644 --- a/security/nss/lib/certdb/certt.h +++ b/security/nss/lib/certdb/certt.h @@ -348,7 +348,7 @@ struct CERTCertificateRequestStr { SECItem version; CERTName subject; CERTSubjectPublicKeyInfo subjectPublicKeyInfo; - SECItem **attributes; + CERTAttribute **attributes; }; #define SEC_CERTIFICATE_REQUEST_VERSION 0 /* what we *create* */ @@ -858,6 +858,7 @@ SEC_ASN1_CHOOSER_DECLARE(CERT_CertificateTemplate) SEC_ASN1_CHOOSER_DECLARE(CERT_CrlTemplate) SEC_ASN1_CHOOSER_DECLARE(CERT_IssuerAndSNTemplate) SEC_ASN1_CHOOSER_DECLARE(CERT_NameTemplate) +SEC_ASN1_CHOOSER_DECLARE(CERT_SequenceOfCertExtensionTemplate) SEC_ASN1_CHOOSER_DECLARE(CERT_SetOfSignedCrlTemplate) SEC_ASN1_CHOOSER_DECLARE(CERT_SignedDataTemplate) SEC_ASN1_CHOOSER_DECLARE(CERT_SubjectPublicKeyInfoTemplate) diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def index 8e9298d91..a800cb42b 100644 --- a/security/nss/lib/nss/nss.def +++ b/security/nss/lib/nss/nss.def @@ -832,6 +832,12 @@ HASH_ResultLenByOidTag; HASH_ResultLenContext; SECKEY_CacheStaticFlags; SECOID_AddEntry; +;+# +;+# Data objects +;+# +;+# Don't export these DATA symbols on Windows because they don't work right. +;;CERT_SequenceOfCertExtensionTemplate DATA ; +NSS_Get_CERT_SequenceOfCertExtensionTemplate; ;+ local: ;+ *; ;+}; |