Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Unified Diff: net/ssl/ssl_platform_key_mac.cc

Issue 2400033005: Use BoringSSL scopers in //net. (Closed)
Patch Set: eroman comments Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/ssl/ssl_platform_key_chromecast.cc ('k') | net/ssl/ssl_platform_key_nss.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/ssl_platform_key_mac.cc
diff --git a/net/ssl/ssl_platform_key_mac.cc b/net/ssl/ssl_platform_key_mac.cc
index ce653d5c3c92e5cdcec6f56881c6ce7be9a0f37e..e7313c07d2d0ff72c902e4462458f72f15953b7c 100644
--- a/net/ssl/ssl_platform_key_mac.cc
+++ b/net/ssl/ssl_platform_key_mac.cc
@@ -10,7 +10,8 @@
#include <Security/SecKey.h>
#include <Security/cssm.h>
#include <openssl/ecdsa.h>
-#include <openssl/obj.h>
+#include <openssl/mem.h>
+#include <openssl/nid.h>
#include <openssl/rsa.h>
#include <memory>
@@ -26,7 +27,6 @@
#include "base/synchronization/lock.h"
#include "crypto/mac_security_services_lock.h"
#include "crypto/openssl_util.h"
-#include "crypto/scoped_openssl_types.h"
#include "net/base/net_errors.h"
#include "net/cert/x509_certificate.h"
#include "net/ssl/ssl_platform_key_task_runner.h"
@@ -161,7 +161,7 @@ class SSLPlatformKeyMac : public ThreadedSSLPrivateKey::Delegate {
hash_data.Data =
const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(input.data()));
- crypto::ScopedOpenSSLBytes free_digest_info;
+ bssl::UniquePtr<uint8_t> free_digest_info;
if (cssm_key_->KeyHeader.AlgorithmId == CSSM_ALGID_RSA) {
// CSSM expects the caller to prepend the DigestInfo.
int hash_nid = NID_undef;
« no previous file with comments | « net/ssl/ssl_platform_key_chromecast.cc ('k') | net/ssl/ssl_platform_key_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698