Reland dd7edfa67: Switch Mac over to BoringSSL from NSS.

crypto/openssl_util.cc

 // Copyright (c) 2011 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.
 
 #include "crypto/openssl_util.h"
 
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <openssl/cpu.h>
 
@@ skipping 32 matching lines @@
     //      allowing the global environment to leak at least ensures it is
     //      available for those other singletons to reliably cleanup.
     return Singleton<OpenSSLInitSingleton,
                LeakySingletonTraits<OpenSSLInitSingleton> >::get();
   }
  private:
   friend struct DefaultSingletonTraits<OpenSSLInitSingleton>;
   OpenSSLInitSingleton() {
     SSL_load_error_strings();
     SSL_library_init();
-    OpenSSL_add_all_algorithms();

[davidben, 2014/09/12 00:31:28]

Removing this line because it's #define-d to SSL_library_init. Pretty sure it
was redundant in upstream OpenSSL too.

     int num_locks = CRYPTO_num_locks();
     locks_.reserve(num_locks);
     for (int i = 0; i < num_locks; ++i)
       locks_.push_back(new base::Lock());
     CRYPTO_set_locking_callback(LockingCallback);
     CRYPTO_THREADID_set_callback(CurrentThreadId);
 
 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
     const bool has_neon =
         (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
@@ skipping 58 matching lines @@
     std::string message;
     location.Write(true, true, &message);
     DVLOG(1) << "OpenSSL ERR_get_error stack from " << message;
     ERR_print_errors_cb(&OpenSSLErrorCallback, NULL);
   } else {
     ERR_clear_error();
   }
 }
 
 }  // namespace crypto