Land Recent QUIC Changes.

net/quic/crypto/aes_128_gcm_12_decrypter.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_QUIC_CRYPTO_AES_128_GCM_12_DECRYPTER_H_
 #define NET_QUIC_CRYPTO_AES_128_GCM_12_DECRYPTER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 16 matching lines @@
 // It uses an authentication tag of 12 bytes (96 bits). The fixed prefix
 // of the nonce is four bytes.
 class NET_EXPORT_PRIVATE Aes128Gcm12Decrypter : public QuicDecrypter {
  public:
   enum {
     // Authentication tags are truncated to 96 bits.
     kAuthTagSize = 12,
   };
 
   Aes128Gcm12Decrypter();
-  virtual ~Aes128Gcm12Decrypter();
+  virtual ~Aes128Gcm12Decrypter() OVERRIDE;
 
   // Returns true if the underlying crypto library supports AES GCM.
   static bool IsSupported();
 
   // QuicDecrypter implementation
   virtual bool SetKey(base::StringPiece key) OVERRIDE;
   virtual bool SetNoncePrefix(base::StringPiece nonce_prefix) OVERRIDE;
   virtual bool Decrypt(base::StringPiece nonce,
                        base::StringPiece associated_data,
                        base::StringPiece ciphertext,
@@ skipping 12 matching lines @@
   unsigned char nonce_prefix_[4];
 
 #if defined(USE_OPENSSL)
   ScopedEVPAEADCtx ctx_;
 #endif
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_AES_128_GCM_12_DECRYPTER_H_