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/nss_util_internal.h" | 10 #include "crypto/nss_util_internal.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 // Authenticate to the token. | 33 // Authenticate to the token. |
34 if (SECSuccess != | 34 if (SECSuccess != |
35 PK11_Authenticate( | 35 PK11_Authenticate( |
36 slot.get(), | 36 slot.get(), |
37 PR_TRUE, | 37 PR_TRUE, |
38 crypto_module_delegate_ ? crypto_module_delegate_->wincx() : NULL)) { | 38 crypto_module_delegate_ ? crypto_module_delegate_->wincx() : NULL)) { |
39 LOG(ERROR) << "Couldn't authenticate to private key slot!"; | 39 LOG(ERROR) << "Couldn't authenticate to private key slot!"; |
40 return std::string(); | 40 return std::string(); |
41 } | 41 } |
42 | 42 |
43 return psm::GenKeyAndSignChallenge(key_size_in_bits_, challenge_, url_, | 43 return psm::GenKeyAndSignChallenge( |
44 slot.get(), stores_key_); | 44 key_size_in_bits_, challenge_, url_, slot.get(), stores_key_); |
45 } | 45 } |
46 | 46 |
47 void KeygenHandler::set_crypto_module_delegate( | 47 void KeygenHandler::set_crypto_module_delegate( |
48 scoped_ptr<crypto::NSSCryptoModuleDelegate> delegate) { | 48 scoped_ptr<crypto::NSSCryptoModuleDelegate> delegate) { |
49 crypto_module_delegate_ = delegate.Pass(); | 49 crypto_module_delegate_ = delegate.Pass(); |
50 } | 50 } |
51 | 51 |
52 } // namespace net | 52 } // namespace net |
OLD | NEW |