Cut down on usage of deprecated APIs in //crypto.

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>
+#include <openssl/crypto.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
 
 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
@@ skipping 22 matching lines @@
         OpenSSLInitSingleton,
         base::LeakySingletonTraits<OpenSSLInitSingleton>>::get();
   }
  private:
   friend struct base::DefaultSingletonTraits<OpenSSLInitSingleton>;
   OpenSSLInitSingleton() {
 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
     const bool has_neon =
         (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
     base::CPU cpu;
-    // CRYPTO_set_NEON_capable is called before |SSL_library_init| because this
-    // stops BoringSSL from probing for NEON support via SIGILL in the case that
-    // getauxval isn't present. Also workaround a CPU with broken NEON
+    // CRYPTO_set_NEON_capable is called before |CRYPTO_library_init| because
+    // this stops BoringSSL from probing for NEON support via SIGILL in the case
+    // that getauxval isn't present. Also workaround a CPU with broken NEON
     // support. See https://code.google.com/p/chromium/issues/detail?id=341598
     CRYPTO_set_NEON_capable(has_neon && !cpu.has_broken_neon());
 #endif
 
-    SSL_library_init();
+    CRYPTO_library_init();
   }
 
   ~OpenSSLInitSingleton() {}
 
   DISALLOW_COPY_AND_ASSIGN(OpenSSLInitSingleton);
 };
 
 // Callback routine for OpenSSL to print error messages. |str| is a
 // NULL-terminated string of length |len| containing diagnostic information
 // such as the library, function and reason for the error, the file and line
@@ skipping 23 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