--- mozilla.orig/security/manager/ssl/src/nsKeygenHandler.cpp 2007-07-31 21:20:55.000000000 +0200 +++ mozilla/security/manager/ssl/src/nsKeygenHandler.cpp 2009-03-27 10:12:48.000000000 +0100 @@ -59,6 +59,15 @@ { 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, @@ -79,16 +88,6 @@ { 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) }, .