diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 18:49:47 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-01 18:49:47 +0000 |
| commit | 9aed77b6dace047bff676a7cdcfef345a858d1a7 (patch) | |
| tree | fddd5e0fac4ee39b6c79af56871f022472f276d9 /net/base/keygen_handler_mac.cc | |
| parent | 2779491e15b4a157b6351e20bb0f2dd26f6d84de (diff) | |
| download | chromium_src-9aed77b6dace047bff676a7cdcfef345a858d1a7.zip chromium_src-9aed77b6dace047bff676a7cdcfef345a858d1a7.tar.gz chromium_src-9aed77b6dace047bff676a7cdcfef345a858d1a7.tar.bz2 | |
Adds support for the <keygen> element to Windows, matching
support present on Linux and Mac OS X.
Contributed by Ryan Sleevi <ryan.sleevi@gmail.com>.
Original review URL: http://codereview.chromium.org/843005
R=wtc
BUG=148
TEST=KeygenHandler.SmokeTest
Review URL: http://codereview.chromium.org/1591006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43365 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/keygen_handler_mac.cc')
| -rw-r--r-- | net/base/keygen_handler_mac.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/base/keygen_handler_mac.cc b/net/base/keygen_handler_mac.cc index e5fd619..35e4714 100644 --- a/net/base/keygen_handler_mac.cc +++ b/net/base/keygen_handler_mac.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -88,6 +88,11 @@ static OSStatus SignData(CSSM_DATA data, CSSM_DATA* signature); +bool KeygenHandler::KeyLocation::Equals( + const KeygenHandler::KeyLocation& location) const { + return keychain_path == location.keychain_path; +} + std::string KeygenHandler::GenKeyAndSignChallenge() { std::string result; OSStatus err; @@ -154,7 +159,7 @@ std::string KeygenHandler::GenKeyAndSignChallenge() { base::Base64Encode(input, &result); } -failure: + failure: if (err) { LOG(ERROR) << "SSL Keygen failed! OSStatus = " << err; } else { @@ -199,7 +204,7 @@ static OSStatus CreateRSAKeyPair(int size_in_bits, CSSM_KEYUSE_ENCRYPT | CSSM_KEYUSE_VERIFY | CSSM_KEYUSE_WRAP, CSSM_KEYATTR_EXTRACTABLE | CSSM_KEYATTR_PERMANENT, // private key usage and attributes: - CSSM_KEYUSE_DECRYPT | CSSM_KEYUSE_SIGN | CSSM_KEYUSE_UNWRAP, // private key + CSSM_KEYUSE_DECRYPT | CSSM_KEYUSE_SIGN | CSSM_KEYUSE_UNWRAP, CSSM_KEYATTR_EXTRACTABLE | CSSM_KEYATTR_PERMANENT | CSSM_KEYATTR_SENSITIVE, NULL, |