| 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 "base/crypto/rsa_private_key.h" | 5 #include "crypto/rsa_private_key.h" |
| 6 | 6 |
| 7 #include <cryptohi.h> | 7 #include <cryptohi.h> |
| 8 #include <keyhi.h> | 8 #include <keyhi.h> |
| 9 #include <pk11pub.h> | 9 #include <pk11pub.h> |
| 10 | 10 |
| 11 #include <list> | 11 #include <list> |
| 12 | 12 |
| 13 #include "base/debug/leak_annotations.h" | 13 #include "base/debug/leak_annotations.h" |
| 14 #include "base/logging.h" | 14 #include "base/logging.h" |
| 15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 16 #include "base/nss_util.h" | |
| 17 #include "base/nss_util_internal.h" | |
| 18 #include "base/string_util.h" | 16 #include "base/string_util.h" |
| 17 #include "crypto/nss_util.h" |
| 18 #include "crypto/nss_util_internal.h" |
| 19 | 19 |
| 20 // TODO(rafaelw): Consider refactoring common functions and definitions from | 20 // TODO(rafaelw): Consider refactoring common functions and definitions from |
| 21 // rsa_private_key_win.cc or using NSS's ASN.1 encoder. | 21 // rsa_private_key_win.cc or using NSS's ASN.1 encoder. |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 static bool ReadAttribute(SECKEYPrivateKey* key, | 24 static bool ReadAttribute(SECKEYPrivateKey* key, |
| 25 CK_ATTRIBUTE_TYPE type, | 25 CK_ATTRIBUTE_TYPE type, |
| 26 std::vector<uint8>* output) { | 26 std::vector<uint8>* output) { |
| 27 SECItem item; | 27 SECItem item; |
| 28 SECStatus rv; | 28 SECStatus rv; |
| 29 rv = PK11_ReadRawAttribute(PK11_TypePrivKey, key, type, &item); | 29 rv = PK11_ReadRawAttribute(PK11_TypePrivKey, key, type, &item); |
| 30 if (rv != SECSuccess) { | 30 if (rv != SECSuccess) { |
| 31 NOTREACHED(); | 31 NOTREACHED(); |
| 32 return false; | 32 return false; |
| 33 } | 33 } |
| 34 | 34 |
| 35 output->assign(item.data, item.data + item.len); | 35 output->assign(item.data, item.data + item.len); |
| 36 SECITEM_FreeItem(&item, PR_FALSE); | 36 SECITEM_FreeItem(&item, PR_FALSE); |
| 37 return true; | 37 return true; |
| 38 } | 38 } |
| 39 | 39 |
| 40 } // namespace | 40 } // namespace |
| 41 | 41 |
| 42 namespace base { | 42 namespace crypto { |
| 43 | 43 |
| 44 RSAPrivateKey::~RSAPrivateKey() { | 44 RSAPrivateKey::~RSAPrivateKey() { |
| 45 if (key_) | 45 if (key_) |
| 46 SECKEY_DestroyPrivateKey(key_); | 46 SECKEY_DestroyPrivateKey(key_); |
| 47 if (public_key_) | 47 if (public_key_) |
| 48 SECKEY_DestroyPublicKey(public_key_); | 48 SECKEY_DestroyPublicKey(public_key_); |
| 49 } | 49 } |
| 50 | 50 |
| 51 // static | 51 // static |
| 52 RSAPrivateKey* RSAPrivateKey::Create(uint16 num_bits) { | 52 RSAPrivateKey* RSAPrivateKey::Create(uint16 num_bits) { |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 | 238 |
| 239 result->public_key_ = SECKEY_ConvertToPublicKey(result->key_); | 239 result->public_key_ = SECKEY_ConvertToPublicKey(result->key_); |
| 240 if (!result->public_key_) { | 240 if (!result->public_key_) { |
| 241 NOTREACHED(); | 241 NOTREACHED(); |
| 242 return NULL; | 242 return NULL; |
| 243 } | 243 } |
| 244 | 244 |
| 245 return result.release(); | 245 return result.release(); |
| 246 } | 246 } |
| 247 | 247 |
| 248 } // namespace base | 248 } // namespace crypto |
| OLD | NEW |