| Index: net/ssl/ssl_platform_key_nss.cc
|
| diff --git a/net/ssl/ssl_platform_key_nss.cc b/net/ssl/ssl_platform_key_nss.cc
|
| index 79db0d6e66afbc67232a8c014ccd00649527509e..e5712940458defb074c44cccee5ac62b31c39753 100644
|
| --- a/net/ssl/ssl_platform_key_nss.cc
|
| +++ b/net/ssl/ssl_platform_key_nss.cc
|
| @@ -5,6 +5,8 @@
|
| #include <keyhi.h>
|
| #include <openssl/bn.h>
|
| #include <openssl/ecdsa.h>
|
| +#include <openssl/mem.h>
|
| +#include <openssl/nid.h>
|
| #include <openssl/rsa.h>
|
| #include <pk11pub.h>
|
| #include <prerror.h>
|
| @@ -16,7 +18,6 @@
|
| #include "base/memory/ptr_util.h"
|
| #include "base/sequenced_task_runner.h"
|
| #include "crypto/scoped_nss_types.h"
|
| -#include "crypto/scoped_openssl_types.h"
|
| #include "net/cert/x509_certificate.h"
|
| #include "net/ssl/client_key_store.h"
|
| #include "net/ssl/ssl_platform_key.h"
|
| @@ -71,7 +72,7 @@ class SSLPlatformKeyNSS : public ThreadedSSLPrivateKey::Delegate {
|
| const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(input.data()));
|
| digest_item.len = input.size();
|
|
|
| - crypto::ScopedOpenSSLBytes free_digest_info;
|
| + bssl::UniquePtr<uint8_t> free_digest_info;
|
| if (type_ == SSLPrivateKey::Type::RSA) {
|
| // PK11_Sign expects the caller to prepend the DigestInfo.
|
| int hash_nid = NID_undef;
|
| @@ -131,7 +132,7 @@ class SSLPlatformKeyNSS : public ThreadedSSLPrivateKey::Delegate {
|
| size_t order_len = signature->size() / 2;
|
|
|
| // Convert the RAW ECDSA signature to a DER-encoded ECDSA-Sig-Value.
|
| - crypto::ScopedECDSA_SIG sig(ECDSA_SIG_new());
|
| + bssl::UniquePtr<ECDSA_SIG> sig(ECDSA_SIG_new());
|
| if (!sig || !BN_bin2bn(signature->data(), order_len, sig->r) ||
|
| !BN_bin2bn(signature->data() + order_len, order_len, sig->s)) {
|
| return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
|
|
|