diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 15:23:53 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 15:23:53 +0000 |
| commit | 37e7e47e998da8f253850f5a707c47f4d2b4f25c (patch) | |
| tree | 3867e9cb6352f1c05add00c31c906622acdaef89 /net/net.gyp | |
| parent | 438c69e18ab05ea3701b4bdf51cffdd7d1982e5a (diff) | |
| download | chromium_src-37e7e47e998da8f253850f5a707c47f4d2b4f25c.zip chromium_src-37e7e47e998da8f253850f5a707c47f4d2b4f25c.tar.gz chromium_src-37e7e47e998da8f253850f5a707c47f4d2b4f25c.tar.bz2 | |
Add ChaCha20Poly1305Encrypter, based on
draft-agl-tls-chacha20poly1305-04 and identified by the tag CC12.
Add the base class AeadBaseEncrypter for Aes128Gcm12Encrypter and
ChaCha20Poly1305Encrypter. Both subclasses can be defined by
configuring the base class with four parameters.
Merge internal CL: 62224774
Add ChaCha20Poly1305Decrypter, based on
draft-agl-tls-chacha20poly1305-04 and identified by the tag CC12.
This continues the previous CL that added ChaCha20Poly1305Encrypter.
Add the base class AeadBaseDecrypter for Aes128Gcm12Decrypter and
ChaCha20Poly1305Decrypter. Both subclasses can be defined by
configuring the base class with four parameters.
Merge internal CL: 62637549
Note: The chacha20_poly1305_*_nss.cc files will be implemented in
a follow-up CL. Six files created with "svn copy" were added
separately in https://codereview.chromium.org/196743005/ (r256650).
R=agl@chromium.org,rtenneti@chromium.org
BUG=none
TEST=net_unittests
Review URL: https://codereview.chromium.org/189893002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 4fde550..afef18d 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -786,6 +786,12 @@ 'quic/congestion_control/tcp_receiver.h', 'quic/congestion_control/time_loss_algorithm.cc', 'quic/congestion_control/time_loss_algorithm.h', + 'quic/crypto/aead_base_decrypter.h', + 'quic/crypto/aead_base_decrypter_nss.cc', + 'quic/crypto/aead_base_decrypter_openssl.cc', + 'quic/crypto/aead_base_encrypter.h', + 'quic/crypto/aead_base_encrypter_nss.cc', + 'quic/crypto/aead_base_encrypter_openssl.cc', 'quic/crypto/aes_128_gcm_12_decrypter.h', 'quic/crypto/aes_128_gcm_12_decrypter_nss.cc', 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc', @@ -794,6 +800,12 @@ 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc', 'quic/crypto/cert_compressor.cc', 'quic/crypto/cert_compressor.h', + 'quic/crypto/chacha20_poly1305_decrypter.h', + 'quic/crypto/chacha20_poly1305_decrypter_nss.cc', + 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc', + 'quic/crypto/chacha20_poly1305_encrypter.h', + 'quic/crypto/chacha20_poly1305_encrypter_nss.cc', + 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc', 'quic/crypto/channel_id.cc', 'quic/crypto/channel_id.h', 'quic/crypto/channel_id_nss.cc', @@ -1374,8 +1386,12 @@ 'cert/x509_util_nss.h', 'ocsp/nss_ocsp.cc', 'ocsp/nss_ocsp.h', + 'quic/crypto/aead_base_decrypter_nss.cc', + 'quic/crypto/aead_base_encrypter_nss.cc', 'quic/crypto/aes_128_gcm_12_decrypter_nss.cc', 'quic/crypto/aes_128_gcm_12_encrypter_nss.cc', + 'quic/crypto/chacha20_poly1305_decrypter_nss.cc', + 'quic/crypto/chacha20_poly1305_encrypter_nss.cc', 'quic/crypto/channel_id_nss.cc', 'quic/crypto/p256_key_exchange_nss.cc', 'socket/nss_ssl_util.cc', @@ -1409,8 +1425,12 @@ 'cert/x509_certificate_openssl.cc', 'cert/x509_util_openssl.cc', 'cert/x509_util_openssl.h', + 'quic/crypto/aead_base_decrypter_openssl.cc', + 'quic/crypto/aead_base_encrypter_openssl.cc', 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc', 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc', + 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc', + 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc', 'quic/crypto/channel_id_openssl.cc', 'quic/crypto/p256_key_exchange_openssl.cc', 'quic/crypto/scoped_evp_aead_ctx.cc', @@ -1866,6 +1886,8 @@ 'quic/crypto/aes_128_gcm_12_decrypter_test.cc', 'quic/crypto/aes_128_gcm_12_encrypter_test.cc', 'quic/crypto/cert_compressor_test.cc', + 'quic/crypto/chacha20_poly1305_decrypter_test.cc', + 'quic/crypto/chacha20_poly1305_encrypter_test.cc', 'quic/crypto/channel_id_test.cc', 'quic/crypto/common_cert_set_test.cc', 'quic/crypto/crypto_framer_test.cc', |