Index: chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc |
diff --git a/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc b/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc |
index f4b3aa3c022d3becf0bbc94c1207be67020f43b2..492fc911e75dcc4eb1c04c57bc8ceec27f205c68 100644 |
--- a/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc |
+++ b/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc |
@@ -33,7 +33,6 @@ |
#include "content/public/test/test_navigation_observer.h" |
#include "content/public/test/test_utils.h" |
#include "crypto/rsa_private_key.h" |
-#include "crypto/scoped_openssl_types.h" |
#include "extensions/common/extension.h" |
#include "extensions/test/result_catcher.h" |
#include "net/test/spawned_test_server/spawned_test_server.h" |
@@ -82,7 +81,7 @@ void StoreDigest(std::vector<uint8_t>* digest, |
bool RsaSign(const std::vector<uint8_t>& digest, |
crypto::RSAPrivateKey* key, |
std::vector<uint8_t>* signature) { |
- crypto::ScopedRSA rsa_key(EVP_PKEY_get1_RSA(key->key())); |
+ RSA* rsa_key = EVP_PKEY_get0_RSA(key->key()); |
davidben
2016/10/11 18:58:18
get0 is the same as get1 but doesn't take an unnec
|
if (!rsa_key) |
return false; |
@@ -94,9 +93,9 @@ bool RsaSign(const std::vector<uint8_t>& digest, |
return false; |
} |
size_t len = 0; |
- signature->resize(RSA_size(rsa_key.get())); |
+ signature->resize(RSA_size(rsa_key)); |
const int rv = |
- RSA_sign_raw(rsa_key.get(), &len, signature->data(), signature->size(), |
+ RSA_sign_raw(rsa_key, &len, signature->data(), signature->size(), |
prefixed_digest, prefixed_digest_len, RSA_PKCS1_PADDING); |
if (is_alloced) |
free(prefixed_digest); |