From fab7ddf36eac1029d160647671d0f65d517c161b Mon Sep 17 00:00:00 2001 From: "kaie%kuix.de" Date: Mon, 19 Nov 2007 17:02:43 +0000 Subject: [PATCH] =?UTF-8?q?bug=20399589,=20PSM=20+=20tip=20of=20NSS,=20err?= =?UTF-8?q?or=20=C3=A2=C2=80=C2=98SECAlgorithmIDTemplate=C3=A2=C2=80=C2=99?= =?UTF-8?q?=20not=20declared=20r=3Drrelyea,=20a=3Dmtschrep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.0.0.236/trunk@239658 18797224-902f-48f8-a5cc-f745e15eee43 --- .../manager/ssl/src/nsKeygenHandler.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp b/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp index 2cdef76b2c8..384524b4675 100644 --- a/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp +++ b/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp @@ -70,6 +70,16 @@ extern "C" { #define CKM_DH_PKCS_KEY_PAIR_GEN 0x00000020 #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[] = { { DER_SEQUENCE, 0, nsnull, sizeof(CERTSubjectPublicKeyInfo) }, @@ -89,16 +99,6 @@ DERTemplate CERTPublicKeyAndChallengeTemplate[] = { 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[] = { { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(PQGParams) }, { SEC_ASN1_INTEGER, offsetof(PQGParams,prime) },