| Index: crypto/openssl_util.cc
|
| diff --git a/crypto/openssl_util.cc b/crypto/openssl_util.cc
|
| index f8ef0acb8c0f79e24e543367c6c6f47d71e297d2..65be615a50519dbaf317746bc76a2faa1110cb5b 100644
|
| --- a/crypto/openssl_util.cc
|
| +++ b/crypto/openssl_util.cc
|
| @@ -9,13 +9,10 @@
|
|
|
| #include <string>
|
|
|
| -#include "base/feature_list.h"
|
| -#include "base/lazy_instance.h"
|
| #include "base/logging.h"
|
| #include "base/strings/string_piece.h"
|
| #include "third_party/boringssl/src/include/openssl/crypto.h"
|
| #include "third_party/boringssl/src/include/openssl/err.h"
|
| -#include "third_party/boringssl/src/include/openssl/evp.h"
|
|
|
| namespace crypto {
|
|
|
| @@ -35,30 +32,11 @@ int OpenSSLErrorCallback(const char* str, size_t len, void* context) {
|
| return 1;
|
| }
|
|
|
| -// TODO(davidben): Remove this after Chrome 61 is released to
|
| -// stable. https://crbug.com/735616.
|
| -const base::Feature kBuggyRSAParser{
|
| - "BuggyRSAParser", base::FEATURE_DISABLED_BY_DEFAULT,
|
| -};
|
| -
|
| -class BuggyRSAParser {
|
| - public:
|
| - BuggyRSAParser() {
|
| - EVP_set_buggy_rsa_parser(base::FeatureList::IsEnabled(kBuggyRSAParser));
|
| - }
|
| -};
|
| -
|
| -base::LazyInstance<BuggyRSAParser>::Leaky g_buggy_rsa_parser =
|
| - LAZY_INSTANCE_INITIALIZER;
|
| -
|
| } // namespace
|
|
|
| void EnsureOpenSSLInit() {
|
| // CRYPTO_library_init may be safely called concurrently.
|
| CRYPTO_library_init();
|
| -
|
| - // Configure the RSA parser.
|
| - g_buggy_rsa_parser.Get();
|
| }
|
|
|
| void ClearOpenSSLERRStack(const tracked_objects::Location& location) {
|
|
|