Update from chromium https://crrev.com/301725/

crypto/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/config/crypto.gni")
 
 component("crypto") {
   output_name = "crcrypto"  # Avoid colliding with OpenSSL's libcrypto.
   sources = [
     "apple_keychain.h",
@@ skipping 31 matching lines @@
     "mac_security_services_lock.h",
     # TODO(brettw) these mocks should be moved to a test_support_crypto target
     # if possible.
     "mock_apple_keychain.cc",
     "mock_apple_keychain.h",
     "mock_apple_keychain_ios.cc",
     "mock_apple_keychain_mac.cc",
     "nss_util.cc",
     "nss_util.h",
     "nss_util_internal.h",
+    "openssl_bio_string.cc",
+    "openssl_bio_string.h",
     "openssl_util.cc",
     "openssl_util.h",
     "p224.cc",
     "p224.h",
     "p224_spake.cc",
     "p224_spake.h",
     "random.cc",
     "random.h",
     "rsa_private_key.cc",
     "rsa_private_key.h",
@@ skipping 82 matching lines @@
       "third_party/nss/rsawrapr.c",
       "third_party/nss/secsign.cc",
     ]
   } else {
     # Remove OpenSSL when using NSS.
     sources -= [
       "ec_private_key_openssl.cc",
       "ec_signature_creator_openssl.cc",
       "encryptor_openssl.cc",
       "hmac_openssl.cc",
+      "openssl_bio_string.cc",
+      "openssl_bio_string.h",
       "openssl_util.cc",
       "openssl_util.h",
       "rsa_private_key_openssl.cc",
       "secure_hash_openssl.cc",
       "signature_creator_openssl.cc",
       "signature_verifier_openssl.cc",
       "symmetric_key_openssl.cc",
     ]
   }
 
@@ skipping 34 matching lines @@
   sources = [
     # Tests.
     "curve25519_unittest.cc",
     "ec_private_key_unittest.cc",
     "ec_signature_creator_unittest.cc",
     "encryptor_unittest.cc",
     "ghash_unittest.cc",
     "hkdf_unittest.cc",
     "hmac_unittest.cc",
     "nss_util_unittest.cc",
+    "openssl_bio_string_unittest.cc",
     "p224_unittest.cc",
     "p224_spake_unittest.cc",
     "random_unittest.cc",
     "rsa_private_key_unittest.cc",
     "rsa_private_key_nss_unittest.cc",
     "secure_hash_unittest.cc",
     "sha2_unittest.cc",
     "signature_creator_unittest.cc",
     "signature_verifier_unittest.cc",
     "symmetric_key_unittest.cc",
   ]
 
   if (use_openssl || !is_linux) {
     sources -= [
       "rsa_private_key_nss_unittest.cc",
     ]
   }
 
   if (use_openssl) {
     sources -= [ "nss_util_unittest.cc" ]
+  } else {
+    sources -= [ "openssl_bio_string_unittest.cc" ]
   }
 
   deps = [
     ":crypto",
     ":platform",
     ":test_support",
     "//base",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
     "//testing/gmock",
@@ skipping 57 matching lines @@
       ]
     } else {
       # Non-Linux platforms use the hermetic NSS from the tree.
       deps += [
         "//third_party/nss:nspr",
         "//third_party/nss:nss",
       ]
     }
   }
 }