| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/base/keygen_handler.h" | 5 #include "net/base/keygen_handler.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "crypto/nss_crypto_module_delegate.h" | 8 #include "crypto/nss_crypto_module_delegate.h" |
| 9 #include "crypto/nss_util.h" | 9 #include "crypto/nss_util.h" |
| 10 #include "crypto/scoped_nss_types.h" | 10 #include "crypto/scoped_nss_types.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 } | 27 } |
| 28 | 28 |
| 29 // Authenticate to the token. | 29 // Authenticate to the token. |
| 30 if (SECSuccess != PK11_Authenticate(slot.get(), | 30 if (SECSuccess != PK11_Authenticate(slot.get(), |
| 31 PR_TRUE, | 31 PR_TRUE, |
| 32 crypto_module_delegate_->wincx())) { | 32 crypto_module_delegate_->wincx())) { |
| 33 LOG(ERROR) << "Could not authenticate to the key slot."; | 33 LOG(ERROR) << "Could not authenticate to the key slot."; |
| 34 return std::string(); | 34 return std::string(); |
| 35 } | 35 } |
| 36 | 36 |
| 37 return psm::GenKeyAndSignChallenge(key_size_in_bits_, challenge_, url_, | 37 return psm::GenKeyAndSignChallenge( |
| 38 slot.get(), stores_key_); | 38 key_size_in_bits_, challenge_, url_, slot.get(), stores_key_); |
| 39 } | 39 } |
| 40 | 40 |
| 41 void KeygenHandler::set_crypto_module_delegate( | 41 void KeygenHandler::set_crypto_module_delegate( |
| 42 scoped_ptr<crypto::NSSCryptoModuleDelegate> delegate) { | 42 scoped_ptr<crypto::NSSCryptoModuleDelegate> delegate) { |
| 43 crypto_module_delegate_ = delegate.Pass(); | 43 crypto_module_delegate_ = delegate.Pass(); |
| 44 } | 44 } |
| 45 | 45 |
| 46 } // namespace net | 46 } // namespace net |
| OLD | NEW |