--- mozilla/security/manager/ssl/src/nsKeygenHandler.cpp.fix	2007-11-21 17:09:17 +0300

+++ mozilla/security/manager/ssl/src/nsKeygenHandler.cpp	2007-11-28 08:12:38 +0300

@@ -76,8 +76,17 @@ static SECKeySizeChoiceInfo SECKeySizeCh

     { nsnull, 1024 },

     { nsnull, 0 }, 

 };

+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) },

@@ -96,17 +105,8 @@ DERTemplate CERTPublicKeyAndChallengeTem

     { DER_IA5_STRING, offsetof(CERTPublicKeyAndChallenge,challenge), },

     { 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) },