| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "base/crypto/rsa_private_key.h" |
| 6 | 6 |
| 7 // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=455424 | |
| 8 // until NSS 3.12.2 comes out and we update to it. | |
| 9 #define Lock FOO_NSS_Lock | |
| 10 #include <cryptohi.h> | 7 #include <cryptohi.h> |
| 11 #include <keyhi.h> | 8 #include <keyhi.h> |
| 12 #include <pk11pub.h> | 9 #include <pk11pub.h> |
| 13 #undef Lock | |
| 14 | 10 |
| 15 #include <iostream> | 11 #include <iostream> |
| 16 #include <list> | 12 #include <list> |
| 17 | 13 |
| 18 #include "base/logging.h" | 14 #include "base/logging.h" |
| 19 #include "base/nss_init.h" | 15 #include "base/nss_init.h" |
| 20 #include "base/scoped_ptr.h" | 16 #include "base/scoped_ptr.h" |
| 21 #include "base/string_util.h" | 17 #include "base/string_util.h" |
| 22 | 18 |
| 23 // TODO(rafaelw): Consider refactoring common functions and definitions from | 19 // TODO(rafaelw): Consider refactoring common functions and definitions from |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 } | 131 } |
| 136 | 132 |
| 137 for (size_t i = 0; i < der_pubkey->len; ++i) | 133 for (size_t i = 0; i < der_pubkey->len; ++i) |
| 138 output->push_back(der_pubkey->data[i]); | 134 output->push_back(der_pubkey->data[i]); |
| 139 | 135 |
| 140 SECITEM_FreeItem(der_pubkey, PR_TRUE); | 136 SECITEM_FreeItem(der_pubkey, PR_TRUE); |
| 141 return true; | 137 return true; |
| 142 } | 138 } |
| 143 | 139 |
| 144 } // namespace base | 140 } // namespace base |
| OLD | NEW |