| Index: net/base/keygen_handler_nss.cc
|
| diff --git a/net/base/keygen_handler_nss.cc b/net/base/keygen_handler_nss.cc
|
| deleted file mode 100644
|
| index 97e0018f5e2409dac043fb8e2e898713fd27c1c4..0000000000000000000000000000000000000000
|
| --- a/net/base/keygen_handler_nss.cc
|
| +++ /dev/null
|
| @@ -1,48 +0,0 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "net/base/keygen_handler.h"
|
| -
|
| -#include <utility>
|
| -
|
| -#include "base/logging.h"
|
| -#include "crypto/nss_crypto_module_delegate.h"
|
| -#include "crypto/nss_util.h"
|
| -#include "crypto/scoped_nss_types.h"
|
| -#include "net/third_party/mozilla_security_manager/nsKeygenHandler.h"
|
| -
|
| -// PSM = Mozilla's Personal Security Manager.
|
| -namespace psm = mozilla_security_manager;
|
| -
|
| -namespace net {
|
| -
|
| -std::string KeygenHandler::GenKeyAndSignChallenge() {
|
| - crypto::EnsureNSSInit();
|
| -
|
| - crypto::ScopedPK11Slot slot;
|
| - if (crypto_module_delegate_) {
|
| - slot = crypto_module_delegate_->RequestSlot();
|
| - } else {
|
| - LOG(ERROR) << "Could not get an NSS key slot.";
|
| - return std::string();
|
| - }
|
| -
|
| - // Authenticate to the token.
|
| - if (SECSuccess != PK11_Authenticate(slot.get(),
|
| - PR_TRUE,
|
| - crypto_module_delegate_->wincx())) {
|
| - LOG(ERROR) << "Could not authenticate to the key slot.";
|
| - return std::string();
|
| - }
|
| -
|
| - return psm::GenKeyAndSignChallenge(key_size_in_bits_, challenge_, url_,
|
| - slot.get(), stores_key_);
|
| -}
|
| -
|
| -void KeygenHandler::set_crypto_module_delegate(
|
| - std::unique_ptr<crypto::NSSCryptoModuleDelegate> delegate) {
|
| - crypto_module_delegate_ = std::move(delegate);
|
| -}
|
| -
|
| -} // namespace net
|
|
|