diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/net/ssl/ssl_platform_key_mac.cc | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/net/ssl/ssl_platform_key_mac.cc')
| -rw-r--r-- | chromium/net/ssl/ssl_platform_key_mac.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chromium/net/ssl/ssl_platform_key_mac.cc b/chromium/net/ssl/ssl_platform_key_mac.cc index 0eb787a03eb..ec7cb42f0db 100644 --- a/chromium/net/ssl/ssl_platform_key_mac.cc +++ b/chromium/net/ssl/ssl_platform_key_mac.cc @@ -14,21 +14,21 @@ #include <Security/SecIdentity.h> #include <Security/SecKey.h> -#include "base/lazy_instance.h" #include "base/location.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/mac/scoped_cftyperef.h" +#include "base/macros.h" #include "base/memory/scoped_policy.h" #include "base/memory/scoped_ptr.h" #include "base/sequenced_task_runner.h" -#include "base/stl_util.h" #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" #include "net/ssl/ssl_private_key.h" #include "net/ssl/threaded_ssl_private_key.h" @@ -199,7 +199,7 @@ class SSLPlatformKeyMac : public ThreadedSSLPrivateKey::Delegate { signature->resize(GetMaxSignatureLengthInBytes()); CSSM_DATA signature_data; signature_data.Length = signature->size(); - signature_data.Data = vector_as_array(signature); + signature_data.Data = signature->data(); if (CSSM_SignData(cssm_signature.get(), &hash_data, 1, CSSM_ALGID_NONE, &signature_data) != CSSM_OK) { @@ -218,9 +218,8 @@ class SSLPlatformKeyMac : public ThreadedSSLPrivateKey::Delegate { } // namespace -scoped_ptr<SSLPrivateKey> FetchClientCertPrivateKey( - X509Certificate* certificate, - scoped_refptr<base::SequencedTaskRunner> task_runner) { +scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey( + X509Certificate* certificate) { // Look up the private key. base::ScopedCFTypeRef<SecKeyRef> private_key( FetchSecKeyRefForCertificate(certificate)); @@ -237,9 +236,9 @@ scoped_ptr<SSLPrivateKey> FetchClientCertPrivateKey( LOG(ERROR) << "Unknown key type: " << cssm_key->KeyHeader.AlgorithmId; return nullptr; } - return make_scoped_ptr(new ThreadedSSLPrivateKey( + return make_scoped_refptr(new ThreadedSSLPrivateKey( make_scoped_ptr(new SSLPlatformKeyMac(private_key.get(), cssm_key)), - task_runner.Pass())); + GetSSLPlatformKeyTaskRunner())); } } // namespace net |