Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(621)

Side by Side Diff: net/base/keygen_handler.h

Issue 3186021: DONOTLAND: Start of PK11 password dialog for Linux/NSS (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Start of hooking up the hang monitor, probably requires WebKit changes Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | net/base/keygen_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
12 #include "build/build_config.h"
11 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
12 14
15 namespace base {
16 class PK11BlockingPasswordDelegate;
17 };
18
13 namespace net { 19 namespace net {
14 20
15 // This class handles keypair generation for generating client 21 // This class handles keypair generation for generating client
16 // certificates via the <keygen> tag. 22 // certificates via the <keygen> tag.
17 // <http://dev.w3.org/html5/spec/Overview.html#the-keygen-element> 23 // <http://dev.w3.org/html5/spec/Overview.html#the-keygen-element>
18 // <https://developer.mozilla.org/En/HTML/HTML_Extensions/KEYGEN_Tag> 24 // <https://developer.mozilla.org/En/HTML/HTML_Extensions/KEYGEN_Tag>
19 25
20 class KeygenHandler { 26 class KeygenHandler {
21 public: 27 public:
22 // Creates a handler that will generate a key with the given key size and 28 // Creates a handler that will generate a key with the given key size and
23 // incorporate the |challenge| into the Netscape SPKAC structure. The request 29 // incorporate the |challenge| into the Netscape SPKAC structure. The request
24 // for the key originated from |url|. 30 // for the key originated from |url|.
25 inline KeygenHandler(int key_size_in_bits, 31 KeygenHandler(int key_size_in_bits,
26 const std::string& challenge, 32 const std::string& challenge,
27 const GURL& url); 33 const GURL& url);
34 // Define the destructor elsewhere to forward-declare PK11PasswordCallback.
35 ~KeygenHandler();
28 36
29 // Actually generates the key-pair and the cert request (SPKAC), and returns 37 // Actually generates the key-pair and the cert request (SPKAC), and returns
30 // a base64-encoded string suitable for use as the form value of <keygen>. 38 // a base64-encoded string suitable for use as the form value of <keygen>.
31 std::string GenKeyAndSignChallenge(); 39 std::string GenKeyAndSignChallenge();
32 40
33 // Exposed only for unit tests. 41 // Exposed only for unit tests.
34 void set_stores_key(bool store) { stores_key_ = store;} 42 void set_stores_key(bool store) { stores_key_ = store;}
35 43
44 #if defined(USE_NSS)
45 // On NSS, the token may be unauthenticated. We pass the blocking delegate for
46 // simplicity; GenKeyAndSignChallenge will block on generating a key anyway,
47 // so this is used on a worker thread. Takes ownership of the delegate.
48 void set_pk11_password_delegate(base::PK11BlockingPasswordDelegate* delegate);
49 #endif // defined(USE_NSS)
50
36 private: 51 private:
37 int key_size_in_bits_; // key size in bits (usually 2048) 52 int key_size_in_bits_; // key size in bits (usually 2048)
38 std::string challenge_; // challenge string sent by server 53 std::string challenge_; // challenge string sent by server
39 GURL url_; // the URL that requested the key 54 GURL url_; // the URL that requested the key
40 bool stores_key_; // should the generated key-pair be stored persistently? 55 bool stores_key_; // should the generated key-pair be stored persistently?
56 #if defined(USE_NSS)
57 // The callback for requesting a password to the PKCS#11 store.
58 scoped_ptr<base::PK11BlockingPasswordDelegate> pk11_password_delegate_;
59 #endif // defined(USE_NSS)
41 }; 60 };
42 61
43 KeygenHandler::KeygenHandler(int key_size_in_bits,
44 const std::string& challenge,
45 const GURL& url)
46 : key_size_in_bits_(key_size_in_bits),
47 challenge_(challenge),
48 url_(url),
49 stores_key_(true) {
50 }
51
52 } // namespace net 62 } // namespace net
53 63
54 #endif // NET_BASE_KEYGEN_HANDLER_H_ 64 #endif // NET_BASE_KEYGEN_HANDLER_H_
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | net/base/keygen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698