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

Side by Side Diff: net/third_party/mozilla_security_manager/nsKeygenHandler.h

Issue 5686002: NSS: PKCS 11 password prompt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing review comments Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « net/net.gyp ('k') | net/third_party/mozilla_security_manager/nsKeygenHandler.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- 1 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
2 * 2 *
3 * ***** BEGIN LICENSE BLOCK ***** 3 * ***** BEGIN LICENSE BLOCK *****
4 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 4 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
5 * 5 *
6 * The contents of this file are subject to the Mozilla Public License Version 6 * The contents of this file are subject to the Mozilla Public License Version
7 * 1.1 (the "License"); you may not use this file except in compliance with 7 * 1.1 (the "License"); you may not use this file except in compliance with
8 * the License. You may obtain a copy of the License at 8 * the License. You may obtain a copy of the License at
9 * http://www.mozilla.org/MPL/ 9 * http://www.mozilla.org/MPL/
10 * 10 *
(...skipping 25 matching lines...) Expand all
36 * the terms of any one of the MPL, the GPL or the LGPL. 36 * the terms of any one of the MPL, the GPL or the LGPL.
37 * 37 *
38 * ***** END LICENSE BLOCK ***** */ 38 * ***** END LICENSE BLOCK ***** */
39 39
40 #ifndef _NSKEYGENHANDLER_H_ 40 #ifndef _NSKEYGENHANDLER_H_
41 #define _NSKEYGENHANDLER_H_ 41 #define _NSKEYGENHANDLER_H_
42 42
43 #include <string> 43 #include <string>
44 44
45 class GURL; 45 class GURL;
46 typedef struct PK11SlotInfoStr PK11SlotInfo;
46 47
47 namespace mozilla_security_manager { 48 namespace mozilla_security_manager {
48 49
49 #define DEFAULT_RSA_KEYGEN_PE 65537L 50 #define DEFAULT_RSA_KEYGEN_PE 65537L
50 #define DEFAULT_RSA_KEYGEN_ALG SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION 51 #define DEFAULT_RSA_KEYGEN_ALG SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION
51 52
52 // Generates the key pair and the cert request (SPKAC), and returns a 53 // Generates the key pair and the cert request (SPKAC), and returns a
53 // base64-encoded string suitable for use as the form value of <keygen>. 54 // base64-encoded string suitable for use as the form value of <keygen>.
54 // Parameters: 55 // Parameters:
55 // key_size_in_bits: key size in bits (usually 2048) 56 // key_size_in_bits: key size in bits (usually 2048)
56 // challenge: challenge string sent by server 57 // challenge: challenge string sent by server
57 // url: the URL which requested the SPKAC 58 // url: the URL which requested the SPKAC
59 // slot: a slot to generate the key in, should be authenticated
58 // stores_key: should the generated key pair be stored persistently? 60 // stores_key: should the generated key pair be stored persistently?
59 std::string GenKeyAndSignChallenge(int key_size_in_bits, 61 std::string GenKeyAndSignChallenge(int key_size_in_bits,
60 const std::string& challenge, 62 const std::string& challenge,
61 const GURL& url, 63 const GURL& url,
64 PK11SlotInfo* slot,
62 bool stores_key); 65 bool stores_key);
63 66
64 } // namespace mozilla_security_manager 67 } // namespace mozilla_security_manager
65 68
66 #endif //_NSKEYGENHANDLER_H_ 69 #endif //_NSKEYGENHANDLER_H_
OLDNEW
« no previous file with comments | « net/net.gyp ('k') | net/third_party/mozilla_security_manager/nsKeygenHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698