Bug 1397990 - Move the semi-colons, a=bustage NSS_TLS13_DRAFT19_BRANCH
authorMartin Thomson <martin.thomson@gmail.com>
Mon, 25 Sep 2017 11:36:36 +1000
branchNSS_TLS13_DRAFT19_BRANCH
changeset 13607 3ace64039e117f508f6f2951f269b5abc6d80509
parent 13606 9f0d109d125bb1302c37a4d0f77c6499f3ffbb54
child 13608 3efb83875558adc1674dfa2ddba0a47f85979ed5
push id2388
push usermartin.thomson@gmail.com
push dateMon, 25 Sep 2017 01:36:57 +0000
reviewersbustage
bugs1397990
Bug 1397990 - Move the semi-colons, a=bustage
gtests/pk11_gtest/pk11_ecdsa_unittest.cc
gtests/pk11_gtest/pk11_signature_test.h
--- a/gtests/pk11_gtest/pk11_ecdsa_unittest.cc
+++ b/gtests/pk11_gtest/pk11_ecdsa_unittest.cc
@@ -31,33 +31,39 @@ class Pkcs11EcdsaSha384Test : public Pkc
   SECOidTag hashOID() { return SEC_OID_SHA384; }
 };
 
 class Pkcs11EcdsaSha512Test : public Pkcs11EcdsaTest {
  protected:
   SECOidTag hashOID() { return SEC_OID_SHA512; }
 };
 
-TEST_F(Pkcs11EcdsaSha256Test,
-       VerifyP256){SIG_TEST_VECTOR_VERIFY(kP256Spki, kP256Data, kP256Signature)}
+TEST_F(Pkcs11EcdsaSha256Test, VerifyP256) {
+  SIG_TEST_VECTOR_VERIFY(kP256Spki, kP256Data, kP256Signature);
+}
 
-TEST_F(Pkcs11EcdsaSha256Test, SignAndVerifyP256){
-    SIG_TEST_VECTOR_SIGN_VERIFY(kP256Pkcs8, kP256Spki, kP256Data)}
+TEST_F(Pkcs11EcdsaSha256Test, SignAndVerifyP256) {
+  SIG_TEST_VECTOR_SIGN_VERIFY(kP256Pkcs8, kP256Spki, kP256Data);
+}
 
-TEST_F(Pkcs11EcdsaSha384Test,
-       VerifyP384){SIG_TEST_VECTOR_VERIFY(kP384Spki, kP384Data, kP384Signature)}
+TEST_F(Pkcs11EcdsaSha384Test, VerifyP384) {
+  SIG_TEST_VECTOR_VERIFY(kP384Spki, kP384Data, kP384Signature);
+}
 
-TEST_F(Pkcs11EcdsaSha384Test, SignAndVerifyP384){
-    SIG_TEST_VECTOR_SIGN_VERIFY(kP384Pkcs8, kP384Spki, kP384Data)}
+TEST_F(Pkcs11EcdsaSha384Test, SignAndVerifyP384) {
+  SIG_TEST_VECTOR_SIGN_VERIFY(kP384Pkcs8, kP384Spki, kP384Data);
+}
 
-TEST_F(Pkcs11EcdsaSha512Test,
-       VerifyP521){SIG_TEST_VECTOR_VERIFY(kP521Spki, kP521Data, kP521Signature)}
+TEST_F(Pkcs11EcdsaSha512Test, VerifyP521) {
+  SIG_TEST_VECTOR_VERIFY(kP521Spki, kP521Data, kP521Signature);
+}
 
-TEST_F(Pkcs11EcdsaSha512Test, SignAndVerifyP521){
-    SIG_TEST_VECTOR_SIGN_VERIFY(kP521Pkcs8, kP521Spki, kP521Data)}
+TEST_F(Pkcs11EcdsaSha512Test, SignAndVerifyP521) {
+  SIG_TEST_VECTOR_SIGN_VERIFY(kP521Pkcs8, kP521Spki, kP521Data);
+}
 
 // Importing a private key in PKCS#8 format must fail when the outer AlgID
 // struct contains neither id-ecPublicKey nor a namedCurve parameter.
 TEST_F(Pkcs11EcdsaSha256Test, ImportNoCurveOIDOrAlgorithmParams) {
   EXPECT_FALSE(ImportPrivateKey(kP256Pkcs8NoCurveOIDOrAlgorithmParams,
                                 sizeof(kP256Pkcs8NoCurveOIDOrAlgorithmParams)));
 };
 
--- a/gtests/pk11_gtest/pk11_signature_test.h
+++ b/gtests/pk11_gtest/pk11_signature_test.h
@@ -125,14 +125,14 @@ class Pk11SignatureTest : public ::testi
         ImportPrivateKeyAndSignHashedData(pkcs8, pkcs8_len, data, data_len));
     ASSERT_TRUE(sig);
 
     Verify(spki, spki_len, data, data_len, sig->data, sig->len);
   }
 };
 
 #define SIG_TEST_VECTOR_VERIFY(spki, data, sig) \
-  Verify(spki, sizeof(spki), data, sizeof(data), sig, sizeof(sig));
+  Verify(spki, sizeof(spki), data, sizeof(data), sig, sizeof(sig))
 
 #define SIG_TEST_VECTOR_SIGN_VERIFY(pkcs8, spki, data) \
-  SignAndVerify(pkcs8, sizeof(pkcs8), spki, sizeof(spki), data, sizeof(data));
+  SignAndVerify(pkcs8, sizeof(pkcs8), spki, sizeof(spki), data, sizeof(data))
 
 }  // namespace nss_test