| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "crypto/nss_key_util.h" | 5 #include "crypto/nss_key_util.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 #include <stdint.h> |
| 10 | 11 |
| 11 #include "base/logging.h" | 12 #include "base/logging.h" |
| 12 #include "crypto/nss_util.h" | 13 #include "crypto/nss_util.h" |
| 13 | 14 |
| 14 #if defined(USE_NSS_CERTS) | 15 #if defined(USE_NSS_CERTS) |
| 15 #include <secmod.h> | 16 #include <secmod.h> |
| 16 #include "crypto/nss_util_internal.h" | 17 #include "crypto/nss_util_internal.h" |
| 17 #endif | 18 #endif |
| 18 | 19 |
| 19 namespace crypto { | 20 namespace crypto { |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 if (!cka_id) | 154 if (!cka_id) |
| 154 return nullptr; | 155 return nullptr; |
| 155 | 156 |
| 156 return ScopedSECKEYPrivateKey( | 157 return ScopedSECKEYPrivateKey( |
| 157 PK11_FindKeyByKeyID(slot, cka_id.get(), nullptr)); | 158 PK11_FindKeyByKeyID(slot, cka_id.get(), nullptr)); |
| 158 } | 159 } |
| 159 | 160 |
| 160 #endif // defined(USE_NSS_CERTS) | 161 #endif // defined(USE_NSS_CERTS) |
| 161 | 162 |
| 162 } // namespace crypto | 163 } // namespace crypto |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1539353003:
Switch to standard integer types in crypto/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master