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

Side by Side Diff: net/ssl/openssl_platform_key_mac.cc

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 unified diff | Download patch
« no previous file with comments | « net/spdy/spdy_test_util_common.cc ('k') | net/ssl/openssl_platform_key_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/ssl/openssl_platform_key.h" 5 #include "net/ssl/openssl_platform_key.h"
6 6
7 #include <openssl/ec_key.h>
7 #include <openssl/err.h> 8 #include <openssl/err.h>
9 #include <openssl/engine.h>
8 #include <openssl/evp.h> 10 #include <openssl/evp.h>
9 #include <openssl/rsa.h> 11 #include <openssl/rsa.h>
10 12
11 #include <Security/cssm.h> 13 #include <Security/cssm.h>
12 #include <Security/SecBase.h> 14 #include <Security/SecBase.h>
13 #include <Security/SecCertificate.h> 15 #include <Security/SecCertificate.h>
14 #include <Security/SecIdentity.h> 16 #include <Security/SecIdentity.h>
15 #include <Security/SecKey.h> 17 #include <Security/SecKey.h>
16 18
17 #include "base/lazy_instance.h" 19 #include "base/lazy_instance.h"
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 base::ScopedCFTypeRef<SecKeyRef> private_key( 457 base::ScopedCFTypeRef<SecKeyRef> private_key(
456 FetchSecKeyRefForCertificate(certificate)); 458 FetchSecKeyRefForCertificate(certificate));
457 if (!private_key) 459 if (!private_key)
458 return crypto::ScopedEVP_PKEY(); 460 return crypto::ScopedEVP_PKEY();
459 461
460 // Create an EVP_PKEY wrapper. 462 // Create an EVP_PKEY wrapper.
461 return CreatePkeyWrapper(private_key.get()); 463 return CreatePkeyWrapper(private_key.get());
462 } 464 }
463 465
464 } // namespace net 466 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_test_util_common.cc ('k') | net/ssl/openssl_platform_key_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698