Index: lib/cryptohi/seckey.c |
=================================================================== |
--- a/lib/cryptohi/seckey.c |
+++ b/lib/cryptohi/seckey.c |
@@ -20,33 +20,33 @@ SEC_ASN1_MKSUB(SEC_IntegerTemplate) |
const SEC_ASN1Template CERT_SubjectPublicKeyInfoTemplate[] = { |
{ SEC_ASN1_SEQUENCE, |
0, NULL, sizeof(CERTSubjectPublicKeyInfo) }, |
{ SEC_ASN1_INLINE | SEC_ASN1_XTRN, |
offsetof(CERTSubjectPublicKeyInfo,algorithm), |
SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) }, |
{ SEC_ASN1_BIT_STRING, |
- offsetof(CERTSubjectPublicKeyInfo,subjectPublicKey), }, |
- { 0, } |
+ offsetof(CERTSubjectPublicKeyInfo,subjectPublicKey) }, |
+ { 0 } |
}; |
const SEC_ASN1Template CERT_PublicKeyAndChallengeTemplate[] = |
{ |
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(CERTPublicKeyAndChallenge) }, |
{ SEC_ASN1_ANY, offsetof(CERTPublicKeyAndChallenge,spki) }, |
{ SEC_ASN1_IA5_STRING, offsetof(CERTPublicKeyAndChallenge,challenge) }, |
{ 0 } |
}; |
const SEC_ASN1Template SECKEY_RSAPublicKeyTemplate[] = { |
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SECKEYPublicKey) }, |
- { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.rsa.modulus), }, |
- { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.rsa.publicExponent), }, |
- { 0, } |
+ { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.rsa.modulus) }, |
+ { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.rsa.publicExponent) }, |
+ { 0 } |
}; |
static const SEC_ASN1Template seckey_PointerToAlgorithmIDTemplate[] = { |
{ SEC_ASN1_POINTER | SEC_ASN1_XTRN, 0, |
SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) } |
}; |
/* Parameters for SEC_OID_PKCS1_RSA_PSS_SIGNATURE */ |
@@ -68,40 +68,40 @@ const SEC_ASN1Template SECKEY_RSAPSSPara |
{ SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_EXPLICIT | |
SEC_ASN1_XTRN | SEC_ASN1_CONTEXT_SPECIFIC | 3, |
offsetof(SECKEYRSAPSSParams, trailerField), |
SEC_ASN1_SUB(SEC_IntegerTemplate) }, |
{ 0 } |
}; |
const SEC_ASN1Template SECKEY_DSAPublicKeyTemplate[] = { |
- { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dsa.publicValue), }, |
- { 0, } |
+ { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dsa.publicValue) }, |
+ { 0 } |
}; |
const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = { |
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SECKEYPQGParams) }, |
{ SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams,prime) }, |
{ SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams,subPrime) }, |
{ SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams,base) }, |
- { 0, } |
+ { 0 } |
}; |
const SEC_ASN1Template SECKEY_DHPublicKeyTemplate[] = { |
- { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dh.publicValue), }, |
- { 0, } |
+ { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dh.publicValue) }, |
+ { 0 } |
}; |
const SEC_ASN1Template SECKEY_DHParamKeyTemplate[] = { |
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SECKEYPublicKey) }, |
- { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dh.prime), }, |
- { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dh.base), }, |
+ { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dh.prime) }, |
+ { SEC_ASN1_INTEGER, offsetof(SECKEYPublicKey,u.dh.base) }, |
/* XXX chrisk: this needs to be expanded for decoding of j and validationParms (RFC2459 7.3.2) */ |
{ SEC_ASN1_SKIP_REST }, |
- { 0, } |
+ { 0 } |
}; |
SEC_ASN1_CHOOSER_IMPLEMENT(SECKEY_DSAPublicKeyTemplate) |
SEC_ASN1_CHOOSER_IMPLEMENT(SECKEY_RSAPublicKeyTemplate) |
SEC_ASN1_CHOOSER_IMPLEMENT(SECKEY_RSAPSSParamsTemplate) |
SEC_ASN1_CHOOSER_IMPLEMENT(CERT_SubjectPublicKeyInfoTemplate) |
/* |