Bug 1115906, Part 2: Annotate classes and member functions with override and final, r=keeler

--HG--
extra : rebase_source : 79bb236bef83ed3e884d73e029ac29a5aa999840
extra : source : d14d86bcebd38be80d00a263c3145eb0dbcc53cd

Author: briansmith

security/manager/ssl/tests/gtest/OCSPCacheTest.cpp

@@ -18,6 +18,13 @@ using namespace mozilla::pkix;
 using namespace mozilla::pkix::test;
 using namespace mozilla::psm;
 
+template <size_t N>
+inline Input
+LiteralInput(const char(&valueString)[N])
+{
+  return Input(reinterpret_cast<const uint8_t(&)[N - 1]>(valueString));
+}
+
 const int MaxCacheEntries = 1024;
 
 class OCSPCacheTest : public ::testing::Test
@@ -54,15 +61,15 @@ PutAndGet(OCSPCache& cache, const CertID& certID, Result result,
   ASSERT_EQ(time, timeOut);
 }
 
-TestInput fakeIssuer1("CN=issuer1");
-TestInput fakeKey000("key000");
-TestInput fakeKey001("key001");
-TestInput fakeSerial0000("0000");
+Input fakeIssuer1(LiteralInput("CN=issuer1"));
+Input fakeKey000(LiteralInput("key000"));
+Input fakeKey001(LiteralInput("key001"));
+Input fakeSerial0000(LiteralInput("0000"));
 
 TEST_F(OCSPCacheTest, TestPutAndGet)
 {
-  TestInput fakeSerial000("000");
-  TestInput fakeSerial001("001");
+  Input fakeSerial000(LiteralInput("000"));
+  Input fakeSerial001(LiteralInput("001"));
 
   SCOPED_TRACE("");
   PutAndGet(cache, CertID(fakeIssuer1, fakeKey000, fakeSerial001),
@@ -105,7 +112,7 @@ TEST_F(OCSPCacheTest, TestVariousGets)
   Time timeInPlus512(now);
   ASSERT_EQ(Success, timeInPlus512.AddSeconds(512));
 
-  static const TestInput fakeSerial0512("0512");
+  static const Input fakeSerial0512(LiteralInput("0512"));
   CertID cert0512(fakeIssuer1, fakeKey000, fakeSerial0512);
   ASSERT_TRUE(cache.Get(cert0512, resultOut, timeOut));
   ASSERT_EQ(Success, resultOut);
@@ -115,7 +122,7 @@ TEST_F(OCSPCacheTest, TestVariousGets)
   ASSERT_EQ(timeInPlus512, timeOut);
 
   // We've never seen this certificate
-  static const TestInput fakeSerial1111("1111");
+  static const Input fakeSerial1111(LiteralInput("1111"));
   ASSERT_FALSE(cache.Get(CertID(fakeIssuer1, fakeKey000, fakeSerial1111),
                          resultOut, timeOut));
 }
@@ -166,7 +173,7 @@ TEST_F(OCSPCacheTest, TestNoEvictionForRevokedResponses)
   ASSERT_EQ(Result::ERROR_REVOKED_CERTIFICATE, resultOut);
   ASSERT_EQ(timeIn, timeOut);
 
-  TestInput fakeSerial0001("0001");
+  Input fakeSerial0001(LiteralInput("0001"));
   CertID evicted(fakeIssuer1, fakeKey000, fakeSerial0001);
   ASSERT_FALSE(cache.Get(evicted, resultOut, timeOut));
 }
@@ -186,7 +193,7 @@ TEST_F(OCSPCacheTest, TestEverythingIsRevoked)
     PutAndGet(cache, CertID(fakeIssuer1, fakeKey000, fakeSerial),
               Result::ERROR_REVOKED_CERTIFICATE, timeIn);
   }
-  static const TestInput fakeSerial1025("1025");
+  static const Input fakeSerial1025(LiteralInput("1025"));
   CertID good(fakeIssuer1, fakeKey000, fakeSerial1025);
   // This will "succeed", allowing verification to continue. However,
   // nothing was actually put in the cache.
@@ -201,7 +208,7 @@ TEST_F(OCSPCacheTest, TestEverythingIsRevoked)
   Time timeOut(Time::uninitialized);
   ASSERT_FALSE(cache.Get(good, resultOut, timeOut));
 
-  static const TestInput fakeSerial1026("1026");
+  static const Input fakeSerial1026(LiteralInput("1026"));
   CertID revoked(fakeIssuer1, fakeKey000, fakeSerial1026);
   // This will fail, causing verification to fail.
   Time timeInPlus1026(timeIn);
@@ -217,8 +224,8 @@ TEST_F(OCSPCacheTest, VariousIssuers)
 {
   SCOPED_TRACE("");
   Time timeIn(now);
-  static const TestInput fakeIssuer2("CN=issuer2");
-  static const TestInput fakeSerial001("001");
+  static const Input fakeIssuer2(LiteralInput("CN=issuer2"));
+  static const Input fakeSerial001(LiteralInput("001"));
   CertID subject(fakeIssuer1, fakeKey000, fakeSerial001);
   PutAndGet(cache, subject, Success, now);
   Result resultOut;

security/pkix/include/pkix/Input.h

@@ -50,7 +50,7 @@ class Reader;
 //
 // Note that in the example, GoodExample has the same performance
 // characteristics as WorseExample, but with much better safety guarantees.
-class Input
+class Input final
 {
 public:
   typedef uint16_t size_type;
@@ -142,7 +142,7 @@ InputsAreEqual(const Input& a, const Input& b)
 //
 // In general, Reader allows for one byte of lookahead and no backtracking.
 // However, the Match* functions internally may have more lookahead.
-class Reader
+class Reader final
 {
 public:
   Reader()
@@ -284,7 +284,7 @@ class Reader
 
   bool AtEnd() const { return input == end; }
 
-  class Mark
+  class Mark final
   {
   private:
     friend class Reader;

security/pkix/include/pkix/ScopedPtr.h

@@ -32,7 +32,7 @@ namespace mozilla { namespace pkix {
 // Similar to boost::scoped_ptr and std::unique_ptr. Does not support copying
 // or assignment.
 template <typename T, void (&Destroyer)(T*)>
-class ScopedPtr
+class ScopedPtr final
 {
 public:
   explicit ScopedPtr(T* value = nullptr) : mValue(value) { }

security/pkix/include/pkix/Time.h

@@ -39,7 +39,7 @@ namespace mozilla { namespace pkix {
 // OCSP. This type has second-level precision. The time zone is always UTC.
 //
 // Pass by value, not by reference.
-class Time
+class Time final
 {
 public:
   // Construct an uninitilized instance.

security/pkix/include/pkix/pkixtypes.h

@@ -73,7 +73,7 @@ enum class SignatureAlgorithm
   unsupported_algorithm = 19,
 };
 
-struct SignedDataWithSignature
+struct SignedDataWithSignature final
 {
 public:
   Input data;
@@ -107,7 +107,8 @@ enum class KeyPurposeId {
   id_kp_OCSPSigning = 9,          // id-kp-OCSPSigning
 };
 
-struct CertPolicyId {
+struct CertPolicyId final
+{
   uint16_t numBytes;
   static const uint16_t MAX_BYTES = 24;
   uint8_t bytes[MAX_BYTES];
@@ -135,7 +136,7 @@ enum class TrustLevel {
 // field from the issuer's certificate. serialNumber is the entire DER-encoded
 // serial number from the subject certificate (the certificate for which we are
 // checking the revocation status).
-struct CertID
+struct CertID final
 {
 public:
   CertID(Input issuer, Input issuerSubjectPublicKeyInfo, Input serialNumber)

security/pkix/lib/pkixbuild.cpp

@@ -43,7 +43,7 @@ TrustDomain::IssuerChecker::~IssuerChecker() { }
 
 // The implementation of TrustDomain::IssuerTracker is in a subclass only to
 // hide the implementation from external users.
-class PathBuildingStep : public TrustDomain::IssuerChecker
+class PathBuildingStep final : public TrustDomain::IssuerChecker
 {
 public:
   PathBuildingStep(TrustDomain& trustDomain, const BackCert& subject,
@@ -66,7 +66,7 @@ class PathBuildingStep : public TrustDomain::IssuerChecker
 
   Result Check(Input potentialIssuerDER,
                /*optional*/ const Input* additionalNameConstraints,
-               /*out*/ bool& keepGoing);
+               /*out*/ bool& keepGoing) override;
 
   Result CheckResult() const;
 

security/pkix/lib/pkixocsp.cpp

@@ -39,7 +39,7 @@ enum class CertStatus : uint8_t {
   Unknown = der::CONTEXT_SPECIFIC | 2
 };
 
-class Context
+class Context final
 {
 public:
   Context(TrustDomain& trustDomain, const CertID& certID, Time time,

security/pkix/lib/pkixutil.h

@@ -38,7 +38,7 @@ namespace mozilla { namespace pkix {
 // Each BackCert contains pointers to all the given certificate's extensions
 // so that we can parse the extension block once and then process the
 // extensions in an order that may be different than they appear in the cert.
-class BackCert
+class BackCert final
 {
 public:
   // certDER and childCert must be valid for the lifetime of BackCert.
@@ -147,7 +147,7 @@ class BackCert
   void operator=(const BackCert&) = delete;
 };
 
-class NonOwningDERArray : public DERArray
+class NonOwningDERArray final : public DERArray
 {
 public:
   NonOwningDERArray()
@@ -157,9 +157,9 @@ class NonOwningDERArray : public DERArray
     // numItems before accessing i.
   }
 
-  virtual size_t GetLength() const { return numItems; }
+  size_t GetLength() const override { return numItems; }
 
-  virtual const Input* GetDER(size_t i) const
+  const Input* GetDER(size_t i) const override
   {
     return i < numItems ? &items[i] : nullptr;
   }