Add the files created with "svn copy" first.

Add the files created with "svn copy" first.

These files are part of the CL at
https://codereview.chromium.org/189893002/

TBR=rtenneti@chromium.org
BUG=none
TEST=net_unittests

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256650

[wtc, 2014-03-12 21:14:03]

The CQ bit was checked by wtc@chromium.org

[commit-bot: I haz the power, 2014-03-12 21:15:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/wtc@chromium.org/196743005/20001

[commit-bot: I haz the power, 2014-03-12 21:16:06]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-12 21:16:06]

Failed to apply patch for net/quic/crypto/aead_base_decrypter.h:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 5
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: net/quic/crypto/aead_base_decrypter.h
  |===================================================================
  |--- net/quic/crypto/aead_base_decrypter.h	(revision 255481)
  |+++ net/quic/crypto/aead_base_decrypter.h	(working copy)
  --------------------------
  No file to patch.  Skipping patch.
  3 out of 3 hunks ignored

Patch:   N   net/quic/crypto/aead_base_decrypter.h
Index: net/quic/crypto/aead_base_decrypter.h
===================================================================
--- net/quic/crypto/aead_base_decrypter.h	(revision 255481)
+++ net/quic/crypto/aead_base_decrypter.h	(working copy)
@@ -2,43 +2,43 @@
 // 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_
+#ifndef NET_QUIC_CRYPTO_AEAD_BASE_DECRYPTER_H_
+#define NET_QUIC_CRYPTO_AEAD_BASE_DECRYPTER_H_
 
-#include <string>
-
 #include "base/compiler_specific.h"
 #include "net/quic/crypto/quic_decrypter.h"
 
 #if defined(USE_OPENSSL)
 #include "net/quic/crypto/scoped_evp_aead_ctx.h"
+#else
+#include <pkcs11t.h>
+#include <seccomon.h>
+typedef struct PK11SymKeyStr PK11SymKey;
+typedef SECStatus (*PK11_DecryptFunction)(
+      PK11SymKey* symKey, CK_MECHANISM_TYPE mechanism, SECItem* param,
+      unsigned char* out, unsigned int* outLen, unsigned int maxLen,
+      const unsigned char* enc, unsigned encLen);
 #endif
 
 namespace net {
 
-namespace test {
-class Aes128Gcm12DecrypterPeer;
-}  // namespace test
-
-// An Aes128Gcm12Decrypter is a QuicDecrypter that implements the
-// AEAD_AES_128_GCM_12 algorithm specified in RFC 5282. Create an instance by
-// calling QuicDecrypter::Create(kAESG).
-//
-// 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 {
+// AeadBaseDecrypter is the base class of AEAD QuicDecrypter subclasses.
+class NET_EXPORT_PRIVATE AeadBaseDecrypter : public QuicDecrypter {
  public:
-  enum {
-    // Authentication tags are truncated to 96 bits.
-    kAuthTagSize = 12,
-  };
+#if defined(USE_OPENSSL)
+  AeadBaseDecrypter(const EVP_AEAD* aead_alg,
+                    size_t key_size,
+                    size_t auth_tag_size,
+                    size_t nonce_prefix_size);
+#else
+  AeadBaseDecrypter(CK_MECHANISM_TYPE aead_mechanism,
+                    PK11_DecryptFunction pk11_decrypt,
+                    size_t key_size,
+                    size_t auth_tag_size,
+                    size_t nonce_prefix_size);
+#endif
+  virtual ~AeadBaseDecrypter();
 
-  Aes128Gcm12Decrypter();
-  virtual ~Aes128Gcm12Decrypter();
-
-  // 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;
@@ -53,11 +53,47 @@
   virtual base::StringPiece GetKey() const OVERRIDE;
   virtual base::StringPiece GetNoncePrefix() const OVERRIDE;
 
+ protected:
+  // Make these constants available to the subclasses so that the subclasses
+  // can assert at compile time their key_size_ and nonce_prefix_size_ do not
+  // exceed the maximum.
+  static const size_t kMaxKeySize = 32;
+  static const size_t kMaxNoncePrefixSize = 4;
+
+#if !defined(USE_OPENSSL)
+  struct AeadParams {
+    unsigned int len;
+    union {
+      CK_GCM_PARAMS gcm_params;
+#if !defined(USE_NSS)
+      // USE_NSS means we are using system NSS rather than our copy of NSS.
+      // The system NSS <pkcs11n.h> header doesn't define this type yet.
+      CK_NSS_AEAD_PARAMS nss_aead_params;
+#endif
+    } data;
+  };
+
+  virtual void FillAeadParams(base::StringPiece nonce,
+                              base::StringPiece associated_data,
+                              size_t auth_tag_size,
+                              AeadParams* aead_params) const = 0;
+#endif  // !defined(USE_OPENSSL)
+
  private:
-  // The 128-bit AES key.
-  unsigned char key_[16];
+#if defined(USE_OPENSSL)
+  const EVP_AEAD* const aead_alg_;
+#else
+  const CK_MECHANISM_TYPE aead_mechanism_;
+  const PK11_DecryptFunction pk11_decrypt_;
+#endif
+  const size_t key_size_;
+  const size_t auth_tag_size_;
+  const size_t nonce_prefix_size_;
+
+  // The key.
+  unsigned char key_[kMaxKeySize];
   // The nonce prefix.
-  unsigned char nonce_prefix_[4];
+  unsigned char nonce_prefix_[kMaxNoncePrefixSize];
 
 #if defined(USE_OPENSSL)
   ScopedEVPAEADCtx ctx_;
@@ -66,4 +102,4 @@
 
 }  // namespace net
 
-#endif  // NET_QUIC_CRYPTO_AES_128_GCM_12_DECRYPTER_H_
+#endif  // NET_QUIC_CRYPTO_AEAD_BASE_DECRYPTER_H_

[wtc, 2014-03-12 21:18:22]

Committed patchset #2 manually as r256650 (presubmit successful).

[ramant (doing other things), 2014-03-12 21:22:49]

lgtm