OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #ifndef NET_BASE_KEYGEN_HANDLER_H_ | 5 #ifndef NET_BASE_KEYGEN_HANDLER_H_ |
6 #define NET_BASE_KEYGEN_HANDLER_H_ | 6 #define NET_BASE_KEYGEN_HANDLER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
11 #include "base/scoped_ptr.h" | 11 #include "base/scoped_ptr.h" |
12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
13 #include "googleurl/src/gurl.h" | 13 #include "googleurl/src/gurl.h" |
14 | 14 |
15 #if defined(USE_NSS) | 15 #if defined(USE_NSS) |
16 namespace base { | 16 namespace base { |
17 class PK11BlockingPasswordDelegate; | 17 class CryptoModuleBlockingPasswordDelegate; |
18 }; | 18 }; |
19 #endif // defined(USE_NSS) | 19 #endif // defined(USE_NSS) |
20 | 20 |
21 namespace net { | 21 namespace net { |
22 | 22 |
23 // This class handles keypair generation for generating client | 23 // This class handles keypair generation for generating client |
24 // certificates via the <keygen> tag. | 24 // certificates via the <keygen> tag. |
25 // <http://dev.w3.org/html5/spec/Overview.html#the-keygen-element> | 25 // <http://dev.w3.org/html5/spec/Overview.html#the-keygen-element> |
26 // <https://developer.mozilla.org/En/HTML/HTML_Extensions/KEYGEN_Tag> | 26 // <https://developer.mozilla.org/En/HTML/HTML_Extensions/KEYGEN_Tag> |
27 | 27 |
(...skipping 12 matching lines...) Expand all Loading... |
40 std::string GenKeyAndSignChallenge(); | 40 std::string GenKeyAndSignChallenge(); |
41 | 41 |
42 // Exposed only for unit tests. | 42 // Exposed only for unit tests. |
43 void set_stores_key(bool store) { stores_key_ = store;} | 43 void set_stores_key(bool store) { stores_key_ = store;} |
44 | 44 |
45 #if defined(USE_NSS) | 45 #if defined(USE_NSS) |
46 // Register the password delegate to be used if the token is unauthenticated. | 46 // Register the password delegate to be used if the token is unauthenticated. |
47 // GenKeyAndSignChallenge runs on a worker thread, so using the blocking | 47 // GenKeyAndSignChallenge runs on a worker thread, so using the blocking |
48 // password callback is okay here. | 48 // password callback is okay here. |
49 // Takes ownership of the delegate. | 49 // Takes ownership of the delegate. |
50 void set_pk11_password_delegate(base::PK11BlockingPasswordDelegate* delegate); | 50 void set_crypto_module_password_delegate( |
| 51 base::CryptoModuleBlockingPasswordDelegate* delegate); |
51 #endif // defined(USE_NSS) | 52 #endif // defined(USE_NSS) |
52 | 53 |
53 private: | 54 private: |
54 int key_size_in_bits_; // key size in bits (usually 2048) | 55 int key_size_in_bits_; // key size in bits (usually 2048) |
55 std::string challenge_; // challenge string sent by server | 56 std::string challenge_; // challenge string sent by server |
56 GURL url_; // the URL that requested the key | 57 GURL url_; // the URL that requested the key |
57 bool stores_key_; // should the generated key-pair be stored persistently? | 58 bool stores_key_; // should the generated key-pair be stored persistently? |
58 #if defined(USE_NSS) | 59 #if defined(USE_NSS) |
59 // The callback for requesting a password to the PKCS#11 token. | 60 // The callback for requesting a password to the PKCS#11 token. |
60 scoped_ptr<base::PK11BlockingPasswordDelegate> pk11_password_delegate_; | 61 scoped_ptr<base::CryptoModuleBlockingPasswordDelegate> |
| 62 crypto_module_password_delegate_; |
61 #endif // defined(USE_NSS) | 63 #endif // defined(USE_NSS) |
62 }; | 64 }; |
63 | 65 |
64 } // namespace net | 66 } // namespace net |
65 | 67 |
66 #endif // NET_BASE_KEYGEN_HANDLER_H_ | 68 #endif // NET_BASE_KEYGEN_HANDLER_H_ |
OLD | NEW |