bug 399589, PSM + tip of NSS, error ‘SECAlgorithmIDTemplate’ not declared r=rrelyea, a=mtschrep

This commit is contained in:
kaie@kuix.de 2007-11-19 09:02:43 -08:00
parent 5f02721e01
commit e9b5f29921

View File

@ -70,6 +70,16 @@ extern "C" {
#define CKM_DH_PKCS_KEY_PAIR_GEN 0x00000020 #define CKM_DH_PKCS_KEY_PAIR_GEN 0x00000020
#define CKM_DSA_KEY_PAIR_GEN 0x00000010 #define CKM_DSA_KEY_PAIR_GEN 0x00000010
DERTemplate SECAlgorithmIDTemplate[] = {
{ DER_SEQUENCE,
0, NULL, sizeof(SECAlgorithmID) },
{ DER_OBJECT_ID,
offsetof(SECAlgorithmID,algorithm), },
{ DER_OPTIONAL | DER_ANY,
offsetof(SECAlgorithmID,parameters), },
{ 0, }
};
DERTemplate CERTSubjectPublicKeyInfoTemplate[] = { DERTemplate CERTSubjectPublicKeyInfoTemplate[] = {
{ DER_SEQUENCE, { DER_SEQUENCE,
0, nsnull, sizeof(CERTSubjectPublicKeyInfo) }, 0, nsnull, sizeof(CERTSubjectPublicKeyInfo) },
@ -89,16 +99,6 @@ DERTemplate CERTPublicKeyAndChallengeTemplate[] =
{ 0, } { 0, }
}; };
DERTemplate SECAlgorithmIDTemplate[] = {
{ DER_SEQUENCE,
0, NULL, sizeof(SECAlgorithmID) },
{ DER_OBJECT_ID,
offsetof(SECAlgorithmID,algorithm), },
{ DER_OPTIONAL | DER_ANY,
offsetof(SECAlgorithmID,parameters), },
{ 0, }
};
const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = { const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = {
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(PQGParams) }, { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(PQGParams) },
{ SEC_ASN1_INTEGER, offsetof(PQGParams,prime) }, { SEC_ASN1_INTEGER, offsetof(PQGParams,prime) },