Remove the non-RFC 7539 variants of ChaCha20Poly1305 crypters in QUIC

net/BUILD.gn

 # 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.
 
 import("//build/buildflag_header.gni")
 import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
@@ skipping 145 matching lines @@
       "base/nss_memio.h",
       "cert/ct_log_verifier_nss.cc",
       "cert/ct_objects_extractor_nss.cc",
       "cert/jwk_serializer_nss.cc",
       "cert/scoped_nss_types.h",
       "cert/x509_util_nss.cc",
       "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",

[davidben, 2016/04/04 20:22:39]

Similar change in net_common.gypi?

[Ryan Hamilton, 2016/04/04 20:34:12]

Done!

       "quic/crypto/chacha20_poly1305_rfc7539_decrypter_nss.cc",
       "quic/crypto/chacha20_poly1305_rfc7539_encrypter_nss.cc",
       "quic/crypto/channel_id_nss.cc",
       "quic/crypto/p256_key_exchange_nss.cc",
       "quic/crypto/proof_source_chromium_nss.cc",
       "socket/nss_ssl_util.cc",
       "socket/nss_ssl_util.h",
       "socket/ssl_client_socket_nss.cc",
       "socket/ssl_client_socket_nss.h",
       "socket/ssl_server_socket_nss.cc",
@@ skipping 11 matching lines @@
       "cert/ct_log_verifier_openssl.cc",
       "cert/ct_objects_extractor_openssl.cc",
       "cert/jwk_serializer_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",

[davidben, 2016/04/04 20:22:39]

iOS is unhappy you haven't removed these two lines. Ditto in net_common.gypi I
expect.

[Ryan Hamilton, 2016/04/04 20:34:12]

Thanks! Done.

       "quic/crypto/chacha20_poly1305_rfc7539_decrypter_openssl.cc",
       "quic/crypto/chacha20_poly1305_rfc7539_encrypter_openssl.cc",
       "quic/crypto/channel_id_openssl.cc",
       "quic/crypto/p256_key_exchange_openssl.cc",
       "quic/crypto/proof_source_chromium_openssl.cc",
       "quic/crypto/scoped_evp_aead_ctx.cc",
       "quic/crypto/scoped_evp_aead_ctx.h",
       "socket/ssl_client_socket_openssl.cc",
       "socket/ssl_client_socket_openssl.h",
       "socket/ssl_server_socket_openssl.cc",
@@ skipping 1740 matching lines @@
 fuzzer_test("net_quic_crypto_framer_parse_message_fuzzer") {
   sources = [
     "quic/quic_crypto_framer_parse_message_fuzzer.cc",
   ]
   deps = [
     ":net_fuzzer_test_support",
     "//base",
     "//net",
   ]
 }