Export CERT_SequenceOfCertExtensionTemplate on Windows.

Fix type of "attributes" member of struct CERTCertificateRequestStr.
Bug 284200.  r=nelson.williams & wtchang.
This commit is contained in:
nelsonb%netscape.com 2005-03-05 08:03:04 +00:00
Родитель 701ba013cf
Коммит f9e9a4b85f
3 изменённых файлов: 11 добавлений и 3 удалений

Просмотреть файл

@ -38,7 +38,7 @@
/*
* Certificate handling code
*
* $Id: certdb.c,v 1.71 2004/12/02 22:08:14 nelsonb%netscape.com Exp $
* $Id: certdb.c,v 1.72 2005/03/05 08:03:03 nelsonb%netscape.com Exp $
*/
#include "nssilock.h"
@ -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,

Просмотреть файл

@ -36,7 +36,7 @@
/*
* certt.h - public data structures for the certificate library
*
* $Id: certt.h,v 1.28 2004/05/11 02:43:09 jpierre%netscape.com Exp $
* $Id: certt.h,v 1.29 2005/03/05 08:03:03 nelsonb%netscape.com Exp $
*/
#ifndef _CERTT_H_
#define _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)

Просмотреть файл

@ -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:
;+ *;
;+};