Index: lib/softoken/legacydb/lowkey.c |
=================================================================== |
--- a/lib/softoken/legacydb/lowkey.c |
+++ b/lib/softoken/legacydb/lowkey.c |
@@ -42,17 +42,17 @@ const SEC_ASN1Template lg_nsslowkey_Priv |
{ 0 } |
}; |
const SEC_ASN1Template lg_nsslowkey_PQGParamsTemplate[] = { |
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(PQGParams) }, |
{ SEC_ASN1_INTEGER, offsetof(PQGParams,prime) }, |
{ SEC_ASN1_INTEGER, offsetof(PQGParams,subPrime) }, |
{ SEC_ASN1_INTEGER, offsetof(PQGParams,base) }, |
- { 0, } |
+ { 0 } |
}; |
const SEC_ASN1Template lg_nsslowkey_RSAPrivateKeyTemplate[] = { |
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWKEYPrivateKey) }, |
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPrivateKey,u.rsa.version) }, |
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPrivateKey,u.rsa.modulus) }, |
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPrivateKey,u.rsa.publicExponent) }, |
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPrivateKey,u.rsa.privateExponent) }, |
@@ -82,40 +82,40 @@ const SEC_ASN1Template lg_nsslowkey_RSAP |
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPrivateKey,u.rsa.coefficient) }, |
{ 0 } |
}; |
const SEC_ASN1Template lg_nsslowkey_DSAPrivateKeyTemplate[] = { |
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWKEYPrivateKey) }, |
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPrivateKey,u.dsa.publicValue) }, |
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPrivateKey,u.dsa.privateValue) }, |
- { 0, } |
+ { 0 } |
}; |
const SEC_ASN1Template lg_nsslowkey_DHPrivateKeyTemplate[] = { |
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWKEYPrivateKey) }, |
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPrivateKey,u.dh.publicValue) }, |
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPrivateKey,u.dh.privateValue) }, |
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPrivateKey,u.dh.base) }, |
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPrivateKey,u.dh.prime) }, |
- { 0, } |
+ { 0 } |
}; |
#ifndef NSS_DISABLE_ECC |
/* XXX This is just a placeholder for later when we support |
* generic curves and need full-blown support for parsing EC |
* parameters. For now, we only support named curves in which |
* EC params are simply encoded as an object ID and we don't |
* use lg_nsslowkey_ECParamsTemplate. |
*/ |
const SEC_ASN1Template lg_nsslowkey_ECParamsTemplate[] = { |
{ SEC_ASN1_CHOICE, offsetof(ECParams,type), NULL, sizeof(ECParams) }, |
{ SEC_ASN1_OBJECT_ID, offsetof(ECParams,curveOID), NULL, ec_params_named }, |
- { 0, } |
+ { 0 } |
}; |
/* NOTE: The SECG specification allows the private key structure |
* to contain curve parameters but recommends that they be stored |
* in the PrivateKeyAlgorithmIdentifier field of the PrivateKeyInfo |
* instead. |
*/ |
@@ -140,17 +140,17 @@ const SEC_ASN1Template lg_nsslowkey_ECPr |
offsetof(NSSLOWKEYPrivateKey,u.ec.ecParams), |
lg_nsslowkey_ECParamsTemplate }, |
#endif |
{ SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | |
SEC_ASN1_EXPLICIT | SEC_ASN1_CONTEXT_SPECIFIC | |
SEC_ASN1_XTRN | 1, |
offsetof(NSSLOWKEYPrivateKey,u.ec.publicValue), |
SEC_ASN1_SUB(SEC_BitStringTemplate) }, |
- { 0, } |
+ { 0 } |
}; |
/* |
* smaller version of EC_FillParams. In this code, we only need |
* oid and DER data. |
*/ |
SECStatus |