Commit 1a1ccb88 authored by Franziskus Kiefer's avatar Franziskus Kiefer

Bug 1118245. Apply uniform style across NSS [remove trailing commas in initializers]. r=ekr

parent be559892
......@@ -42,7 +42,7 @@ const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = {
{ SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams,prime) },
{ SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams,subPrime) },
{ SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams,base) },
{ 0, }
{ 0 }
};
/* returns 0 for success, -1 for failure (EOF encountered) */
......
......@@ -5344,9 +5344,9 @@ rsa_siggen_test(char *reqfn)
NSSLOWKEYPublicKey * rsa_public_key;
NSSLOWKEYPrivateKey * rsa_private_key;
NSSLOWKEYPrivateKey low_RSA_private_key = { NULL,
NSSLOWKEYRSAKey, };
NSSLOWKEYRSAKey };
NSSLOWKEYPublicKey low_RSA_public_key = { NULL,
NSSLOWKEYRSAKey, };
NSSLOWKEYRSAKey };
low_RSA_private_key.u.rsa = *rsaBlapiPrivKey;
low_RSA_public_key.u.rsa = *rsaBlapiPublicKey;
......@@ -5610,7 +5610,7 @@ rsa_sigver_test(char *reqfn)
SECStatus rv = SECFailure;
NSSLOWKEYPublicKey * rsa_public_key;
NSSLOWKEYPublicKey low_RSA_public_key = { NULL,
NSSLOWKEYRSAKey, };
NSSLOWKEYRSAKey };
/* convert to a low RSA public key */
low_RSA_public_key.u.rsa = rsaBlapiPublicKey;
......
......@@ -154,7 +154,7 @@ testFunctionRef testFnRefTable[] = {
{"test_mutex3", test_mutex3},
{"test_object", test_object},
{"test_oid", test_oid},
/* {"test_rwlock", test_rwlock, }*/
/* {"test_rwlock", test_rwlock }*/
{"test_string", test_string},
{"test_string2", test_string2},
{"build_chain", build_chain},
......
......@@ -28,7 +28,7 @@ const SEC_ASN1Template seckey_PQGParamsTemplate[] = {
{ SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams,prime) },
{ SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams,subPrime) },
{ SEC_ASN1_INTEGER, offsetof(SECKEYPQGParams,base) },
{ 0, }
{ 0 }
};
......
......@@ -44,8 +44,8 @@ SEC_ASN1Template CERTSignatureDataTemplate[] =
offsetof(CERTSignedData,signatureAlgorithm),
SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
{ SEC_ASN1_BIT_STRING,
offsetof(CERTSignedData,signature), },
{ 0, }
offsetof(CERTSignedData,signature) },
{ 0 }
};
......
......@@ -51,7 +51,7 @@ const SEC_ASN1Template CERT_CertExtensionTemplate[] = {
offsetof(CERTCertExtension,critical) },
{ SEC_ASN1_OCTET_STRING,
offsetof(CERTCertExtension,value) },
{ 0, }
{ 0 }
};
const SEC_ASN1Template CERT_SequenceOfCertExtensionTemplate[] = {
......
......@@ -30,10 +30,10 @@ const SEC_ASN1Template SEC_CERTExtensionTemplate[] = {
{ SEC_ASN1_OBJECT_ID,
offsetof(CERTCertExtension,id) },
{ SEC_ASN1_OPTIONAL | SEC_ASN1_BOOLEAN, /* XXX DER_DEFAULT */
offsetof(CERTCertExtension,critical), },
offsetof(CERTCertExtension,critical) },
{ SEC_ASN1_OCTET_STRING,
offsetof(CERTCertExtension,value) },
{ 0, }
{ 0 }
};
static const SEC_ASN1Template SEC_CERTExtensionsTemplate[] = {
......
......@@ -32,7 +32,7 @@ static const SEC_ASN1Template CERTNameConstraintTemplate[] = {
{ SEC_ASN1_OPTIONAL | SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 1,
offsetof(CERTNameConstraint, max),
SEC_ASN1_SUB(SEC_IntegerTemplate) },
{ 0, }
{ 0 }
};
const SEC_ASN1Template CERT_NameConstraintSubtreeSubTemplate[] = {
......@@ -47,7 +47,7 @@ static const SEC_ASN1Template CERTNameConstraintsTemplate[] = {
{ SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC | 1,
offsetof(CERTNameConstraints, DERExcluded),
CERT_NameConstraintSubtreeSubTemplate},
{ 0, }
{ 0 }
};
......@@ -58,7 +58,7 @@ static const SEC_ASN1Template CERTOthNameTemplate[] = {
{ SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_CONSTRUCTED | SEC_ASN1_EXPLICIT |
SEC_ASN1_XTRN | 0, offsetof(OtherName, name),
SEC_ASN1_SUB(SEC_AnyTemplate) },
{ 0, }
{ 0 }
};
static const SEC_ASN1Template CERTOtherNameTemplate[] = {
......
......@@ -15,10 +15,10 @@ static const SEC_ASN1Template cert_AVATemplate[] = {
{ SEC_ASN1_SEQUENCE,
0, NULL, sizeof(CERTAVA) },
{ SEC_ASN1_OBJECT_ID,
offsetof(CERTAVA,type), },
offsetof(CERTAVA,type) },
{ SEC_ASN1_ANY,
offsetof(CERTAVA,value), },
{ 0, }
offsetof(CERTAVA,value) },
{ 0 }
};
const SEC_ASN1Template CERT_RDNTemplate[] = {
......
......@@ -32,7 +32,7 @@ static const SEC_ASN1Template CERTBasicConstraintsTemplate[] = {
offsetof(EncodedContext,isCA)},
{ SEC_ASN1_OPTIONAL | SEC_ASN1_INTEGER,
offsetof(EncodedContext,pathLenConstraint) },
{ 0, }
{ 0 }
};
static unsigned char hexTrue = 0xff;
......
......@@ -41,7 +41,7 @@ static const SEC_ASN1Template CERTPrivateKeyUsagePeriodTemplate[] = {
{ SEC_ASN1_OPTIONAL | SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 1,
offsetof(CERTPrivKeyUsagePeriod, notAfter),
SEC_ASN1_SUB(SEC_GeneralizedTimeTemplate)},
{ 0, }
{ 0 }
};
......@@ -57,7 +57,7 @@ const SEC_ASN1Template CERTAuthInfoAccessItemTemplate[] = {
offsetof(CERTAuthInfoAccess, method) },
{ SEC_ASN1_ANY,
offsetof(CERTAuthInfoAccess, derLocation) },
{ 0, }
{ 0 }
};
const SEC_ASN1Template CERTAuthInfoAccessTemplate[] = {
......
......@@ -126,10 +126,10 @@ static const SEC_ASN1Template mySECOID_AlgorithmIDTemplate[] = {
{ SEC_ASN1_SEQUENCE,
0, NULL, sizeof(SECAlgorithmID) },
{ SEC_ASN1_OBJECT_ID,
offsetof(SECAlgorithmID,algorithm), },
offsetof(SECAlgorithmID,algorithm) },
{ SEC_ASN1_OPTIONAL | SEC_ASN1_ANY,
offsetof(SECAlgorithmID,parameters), },
{ 0, }
offsetof(SECAlgorithmID,parameters) },
{ 0 }
};
static const SEC_ASN1Template mySEC_AnyTemplate[] = {
......@@ -184,7 +184,7 @@ static const SEC_ASN1Template myCERT_CertExtensionTemplate[] = {
offsetof(CERTCertExtension,critical) },
{ SEC_ASN1_OCTET_STRING,
offsetof(CERTCertExtension,value) },
{ 0, }
{ 0 }
};
static const SEC_ASN1Template myCERT_SequenceOfCertExtensionTemplate[] = {
......
......@@ -38,7 +38,7 @@ static const SEC_ASN1Template CRMFCertExtensionTemplate[] = {
offsetof(CRMFCertExtension,critical) },
{ SEC_ASN1_OCTET_STRING,
offsetof(CRMFCertExtension,value) },
{ 0, }
{ 0 }
};
static const SEC_ASN1Template CRMFSequenceOfCertExtensionTemplate[] = {
......
......@@ -20,7 +20,7 @@ const SEC_ASN1Template DSA_SignatureTemplate[] =
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(DSA_ASN1Signature) },
{ SEC_ASN1_INTEGER, offsetof(DSA_ASN1Signature,r) },
{ SEC_ASN1_INTEGER, offsetof(DSA_ASN1Signature,s) },
{ 0, }
{ 0 }
};
/* Input is variable length multi-byte integer, MSB first (big endian).
......
......@@ -25,8 +25,8 @@ const SEC_ASN1Template CERT_SubjectPublicKeyInfoTemplate[] = {
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[] =
......@@ -39,9 +39,9 @@ const SEC_ASN1Template CERT_PublicKeyAndChallengeTemplate[] =
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[] = {
......@@ -73,8 +73,8 @@ const SEC_ASN1Template SECKEY_RSAPSSParamsTemplate[] =
};
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[] = {
......@@ -82,21 +82,21 @@ const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = {
{ 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)
......
......@@ -113,10 +113,10 @@ static DERTemplate SECAlgorithmIDTemplate[] = {
{ DER_SEQUENCE,
0, NULL, sizeof(SECAlgorithmID) },
{ DER_OBJECT_ID,
offsetof(SECAlgorithmID,algorithm), },
offsetof(SECAlgorithmID,algorithm) },
{ DER_OPTIONAL | DER_ANY,
offsetof(SECAlgorithmID,parameters), },
{ 0, }
offsetof(SECAlgorithmID,parameters) },
{ 0 }
};
/*
......@@ -128,10 +128,10 @@ static DERTemplate SGNDigestInfoTemplate[] = {
0, NULL, sizeof(SGNDigestInfo) },
{ DER_INLINE,
offsetof(SGNDigestInfo,digestAlgorithm),
SECAlgorithmIDTemplate, },
SECAlgorithmIDTemplate },
{ DER_OCTET_STRING,
offsetof(SGNDigestInfo,digest), },
{ 0, }
offsetof(SGNDigestInfo,digest) },
{ 0 }
};
SECStatus
......@@ -269,13 +269,13 @@ DERTemplate CERTSignedDataTemplate[] =
{ DER_SEQUENCE,
0, NULL, sizeof(CERTSignedData) },
{ DER_ANY,
offsetof(CERTSignedData,data), },
offsetof(CERTSignedData,data) },
{ DER_INLINE,
offsetof(CERTSignedData,signatureAlgorithm),
SECAlgorithmIDTemplate, },
SECAlgorithmIDTemplate },
{ DER_BIT_STRING,
offsetof(CERTSignedData,signature), },
{ 0, }
offsetof(CERTSignedData,signature) },
{ 0 }
};
SEC_ASN1_MKSUB(SECOID_AlgorithmIDTemplate)
......@@ -285,13 +285,13 @@ const SEC_ASN1Template CERT_SignedDataTemplate[] =
{ SEC_ASN1_SEQUENCE,
0, NULL, sizeof(CERTSignedData) },
{ SEC_ASN1_ANY,
offsetof(CERTSignedData,data), },
offsetof(CERTSignedData,data) },
{ SEC_ASN1_INLINE | SEC_ASN1_XTRN,
offsetof(CERTSignedData,signatureAlgorithm),
SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate), },
SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
{ SEC_ASN1_BIT_STRING,
offsetof(CERTSignedData,signature), },
{ 0, }
offsetof(CERTSignedData,signature) },
{ 0 }
};
SEC_ASN1_CHOOSER_IMPLEMENT(CERT_SignedDataTemplate)
......
......@@ -207,7 +207,7 @@ const SEC_ASN1Template hashParameterTemplate[] =
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(SECItem) },
{ SEC_ASN1_OBJECT_ID, 0 },
{ SEC_ASN1_SKIP_REST },
{ 0, }
{ 0 }
};
/*
......
......@@ -39,10 +39,10 @@ const SEC_ASN1Template SECOID_AlgorithmIDTemplate[] = {
{ SEC_ASN1_SEQUENCE,
0, NULL, sizeof(SECAlgorithmID) },
{ SEC_ASN1_OBJECT_ID,
offsetof(SECAlgorithmID,algorithm), },
offsetof(SECAlgorithmID,algorithm) },
{ SEC_ASN1_OPTIONAL | SEC_ASN1_ANY,
offsetof(SECAlgorithmID,parameters), },
{ 0, }
offsetof(SECAlgorithmID,parameters) },
{ 0 }
}; */
/* --Private-HttpCertStoreContext-Object Functions----------------------- */
......
......@@ -305,10 +305,10 @@ static const SEC_ASN1Template smime_capability_template[] = {
{ SEC_ASN1_SEQUENCE,
0, NULL, sizeof(smime_capability) },
{ SEC_ASN1_OBJECT_ID,
offsetof(smime_capability,capabilityID), },
offsetof(smime_capability,capabilityID) },
{ SEC_ASN1_OPTIONAL | SEC_ASN1_ANY,
offsetof(smime_capability,parameters), },
{ 0, }
offsetof(smime_capability,parameters) },
{ 0 }
};
static const SEC_ASN1Template smime_capabilities_template[] = {
......
......@@ -47,10 +47,10 @@ static const SEC_ASN1Template NSSSMIMECapabilityTemplate[] = {
{ SEC_ASN1_SEQUENCE,
0, NULL, sizeof(NSSSMIMECapability) },
{ SEC_ASN1_OBJECT_ID,
offsetof(NSSSMIMECapability,capabilityID), },
offsetof(NSSSMIMECapability,capabilityID) },
{ SEC_ASN1_OPTIONAL | SEC_ASN1_ANY,
offsetof(NSSSMIMECapability,parameters), },
{ 0, }
offsetof(NSSSMIMECapability,parameters) },
{ 0 }
};
static const SEC_ASN1Template NSSSMIMECapabilitiesTemplate[] = {
......@@ -97,7 +97,7 @@ static const SEC_ASN1Template smime_encryptionkeypref_template[] = {
offsetof(NSSSMIMEEncryptionKeyPreference,id.subjectKeyID),
SEC_ASN1_SUB(SEC_OctetStringTemplate),
NSSSMIMEEncryptionKeyPref_SubjectKeyID },
{ 0, }
{ 0 }
};
/* smime_cipher_map - map of SMIME symmetric "ciphers" to algtag & parameters */
......
......@@ -1512,8 +1512,8 @@ sftk_fips_RSA_PowerUpSelfTest( void )
NSSLOWKEYPrivateKey * rsa_private_key;
SECStatus rsa_status;
NSSLOWKEYPublicKey low_public_key = { NULL, NSSLOWKEYRSAKey, };
NSSLOWKEYPrivateKey low_private_key = { NULL, NSSLOWKEYRSAKey, };
NSSLOWKEYPublicKey low_public_key = { NULL, NSSLOWKEYRSAKey };
NSSLOWKEYPrivateKey low_private_key = { NULL, NSSLOWKEYRSAKey };
PRUint8 rsa_computed_ciphertext[FIPS_RSA_ENCRYPT_LENGTH];
PRUint8 rsa_computed_plaintext[FIPS_RSA_DECRYPT_LENGTH];
......
......@@ -23,23 +23,23 @@ static const SEC_ASN1Template nsslowcert_SubjectPublicKeyInfoTemplate[] = {
offsetof(NSSLOWCERTSubjectPublicKeyInfo,algorithm),
SEC_ASN1_SUB(SECOID_AlgorithmIDTemplate) },
{ SEC_ASN1_BIT_STRING,
offsetof(NSSLOWCERTSubjectPublicKeyInfo,subjectPublicKey), },
{ 0, }
offsetof(NSSLOWCERTSubjectPublicKeyInfo,subjectPublicKey) },
{ 0 }
};
static const SEC_ASN1Template nsslowcert_RSAPublicKeyTemplate[] = {
{ SEC_ASN1_SEQUENCE, 0, NULL, sizeof(NSSLOWKEYPublicKey) },
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.rsa.modulus), },
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.rsa.publicExponent), },
{ 0, }
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.rsa.modulus) },
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.rsa.publicExponent) },
{ 0 }
};
static const SEC_ASN1Template nsslowcert_DSAPublicKeyTemplate[] = {
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.dsa.publicValue), },
{ 0, }
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.dsa.publicValue) },
{ 0 }
};
static const SEC_ASN1Template nsslowcert_DHPublicKeyTemplate[] = {
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.dh.publicValue), },
{ 0, }
{ SEC_ASN1_INTEGER, offsetof(NSSLOWKEYPublicKey,u.dh.publicValue) },
{ 0 }
};
/*
......
......@@ -47,7 +47,7 @@ const SEC_ASN1Template lg_nsslowkey_PQGParamsTemplate[] = {
{ 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[] = {
......@@ -87,7 +87,7 @@ 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[] = {
......@@ -96,7 +96,7 @@ const SEC_ASN1Template lg_nsslowkey_DHPrivateKeyTemplate[] = {
{ 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
......@@ -110,7 +110,7 @@ const SEC_ASN1Template lg_nsslowkey_DHPrivateKeyTemplate[] = {
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 }
};
......@@ -145,7 +145,7 @@ const SEC_ASN1Template lg_nsslowkey_ECPrivateKeyTemplate[] = {
SEC_ASN1_XTRN | 1,
offsetof(NSSLOWKEYPrivateKey,u.ec.publicValue),
SEC_ASN1_SUB(SEC_BitStringTemplate) },
{ 0, }
{ 0 }
};
......
......@@ -53,7 +53,7 @@ const SEC_ASN1Template nsslowkey_PQGParamsTemplate[] = {
{ SEC_ASN1_INTEGER, offsetof(PQGParams,prime) },
{ SEC_ASN1_INTEGER, offsetof(PQGParams,subPrime) },
{ SEC_ASN1_INTEGER, offsetof(PQGParams,base) },
{ 0, }
{ 0 }
};
const SEC_ASN1Template nsslowkey_RSAPrivateKeyTemplate[] = {
......@@ -75,7 +75,7 @@ const SEC_ASN1Template 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 nsslowkey_DSAPrivateKeyExportTemplate[] = {
......@@ -88,7 +88,7 @@ const SEC_ASN1Template nsslowkey_DHPrivateKeyTemplate[] = {
{ 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
......@@ -102,7 +102,7 @@ const SEC_ASN1Template nsslowkey_DHPrivateKeyTemplate[] = {
const SEC_ASN1Template nsslowkey_ECParamsTemplate[] = {
{ SEC_ASN1_CHOICE, offsetof(ECParams,type), NULL, sizeof(ECParams) },
{ SEC_ASN1_OBJECT_ID, offsetof(ECParams,curveOID), NULL, ec_params_named },
{ 0, }
{ 0 }
};
......@@ -138,7 +138,7 @@ const SEC_ASN1Template nsslowkey_ECPrivateKeyTemplate[] = {
SEC_ASN1_XTRN | 1,
offsetof(NSSLOWKEYPrivateKey,u.ec.publicValue),
SEC_ASN1_SUB(SEC_BitStringTemplate) },
{ 0, }
{ 0 }
};
#endif /* NSS_DISABLE_ECC */
/*
......
......@@ -2096,10 +2096,10 @@ static DERTemplate SECAlgorithmIDTemplate[] = {
{ DER_SEQUENCE,
0, NULL, sizeof(SECAlgorithmID) },
{ DER_OBJECT_ID,
offsetof(SECAlgorithmID,algorithm), },
offsetof(SECAlgorithmID,algorithm) },
{ DER_OPTIONAL | DER_ANY,
offsetof(SECAlgorithmID,parameters), },
{ 0, }
offsetof(SECAlgorithmID,parameters) },
{ 0 }
};
/*
......@@ -2111,10 +2111,10 @@ static DERTemplate SGNDigestInfoTemplate[] = {
0, NULL, sizeof(SGNDigestInfo) },
{ DER_INLINE,
offsetof(SGNDigestInfo,digestAlgorithm),
SECAlgorithmIDTemplate, },
SECAlgorithmIDTemplate },
{ DER_OCTET_STRING,
offsetof(SGNDigestInfo,digest), },
{ 0, }
offsetof(SGNDigestInfo,digest) },
{ 0 }
};
/*
......
......@@ -10925,8 +10925,8 @@ ssl3_TLSPRFWithMasterSecret(ssl3CipherSpec *spec, const char *label,
PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
rv = SECFailure;
#else
SECItem inData = { siBuffer, };
SECItem outData = { siBuffer, };
SECItem inData = { siBuffer };
SECItem outData = { siBuffer };
PRBool isFIPS = PR_FALSE;
inData.data = (unsigned char *) val;
......
......@@ -51,21 +51,21 @@ typedef struct ssl2SpecsStr {
static const ssl2Specs ssl_Specs[] = {
/* NONE */
{ 0, 0, 0, 0, },
{ 0, 0, 0, 0 },
/* SSL_CK_RC4_128_WITH_MD5 */
{ 2, 16, 1, 0, CKM_RC4, 16, 0, 0, },
{ 2, 16, 1, 0, CKM_RC4, 16, 0, 0 },
/* SSL_CK_RC4_128_EXPORT40_WITH_MD5 */
{ 2, 16, 1, 0, CKM_RC4, 16, 11, 0, },
{ 2, 16, 1, 0, CKM_RC4, 16, 11, 0 },
/* SSL_CK_RC2_128_CBC_WITH_MD5 */
{ 2, 16, 8, 3, CKM_RC2_CBC, 16, 0, 8, },
{ 2, 16, 8, 3, CKM_RC2_CBC, 16, 0, 8 },
/* SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5 */
{ 2, 16, 8, 3, CKM_RC2_CBC, 16, 11, 8, },
{ 2, 16, 8, 3, CKM_RC2_CBC, 16, 11, 8 },
/* SSL_CK_IDEA_128_CBC_WITH_MD5 */
{ 0, 0, 0, 0, },
{ 0, 0, 0, 0 },
/* SSL_CK_DES_64_CBC_WITH_MD5 */
{ 1, 8, 8, 3, CKM_DES_CBC, 8, 0, 8, },
{ 1, 8, 8, 3, CKM_DES_CBC, 8, 0, 8 },
/* SSL_CK_DES_192_EDE3_CBC_WITH_MD5 */
{ 3, 24, 8, 3, CKM_DES3_CBC, 24, 0, 8, },
{ 3, 24, 8, 3, CKM_DES3_CBC, 24, 0, 8 },
};
#define SET_ERROR_CODE /* reminder */
......
This diff is collapsed.
......@@ -22,10 +22,10 @@ const SEC_ASN1Template SECOID_AlgorithmIDTemplate[] = {
{ SEC_ASN1_SEQUENCE,
0, NULL, sizeof(SECAlgorithmID) },
{ SEC_ASN1_OBJECT_ID,
offsetof(SECAlgorithmID,algorithm), },
offsetof(SECAlgorithmID,algorithm) },
{ SEC_ASN1_OPTIONAL | SEC_ASN1_ANY,
offsetof(SECAlgorithmID,parameters), },
{ 0, }
offsetof(SECAlgorithmID,parameters) },
{ 0 }
};
SEC_ASN1_CHOOSER_IMPLEMENT(SECOID_AlgorithmIDTemplate)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment