| 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 "components/webcrypto/algorithms/asymmetric_key_util.h" | 5 #include "components/webcrypto/algorithms/asymmetric_key_util.h" |
| 6 | 6 |
| 7 #include <openssl/pkcs12.h> | 7 #include <openssl/pkcs12.h> |
| 8 #include <stdint.h> |
| 8 | 9 |
| 9 #include "components/webcrypto/algorithms/util.h" | 10 #include "components/webcrypto/algorithms/util.h" |
| 10 #include "components/webcrypto/blink_key_handle.h" | 11 #include "components/webcrypto/blink_key_handle.h" |
| 11 #include "components/webcrypto/crypto_data.h" | 12 #include "components/webcrypto/crypto_data.h" |
| 12 #include "components/webcrypto/generate_key_result.h" | 13 #include "components/webcrypto/generate_key_result.h" |
| 13 #include "components/webcrypto/status.h" | 14 #include "components/webcrypto/status.h" |
| 14 #include "crypto/openssl_util.h" | 15 #include "crypto/openssl_util.h" |
| 15 | 16 |
| 16 namespace webcrypto { | 17 namespace webcrypto { |
| 17 | 18 |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 return status; | 186 return status; |
| 186 | 187 |
| 187 *public_usages = combined_usages & all_public_usages; | 188 *public_usages = combined_usages & all_public_usages; |
| 188 *private_usages = combined_usages & all_private_usages; | 189 *private_usages = combined_usages & all_private_usages; |
| 189 | 190 |
| 190 // Ensure that the private key has non-empty usages. | 191 // Ensure that the private key has non-empty usages. |
| 191 return CheckPrivateKeyCreationUsages(all_private_usages, *private_usages); | 192 return CheckPrivateKeyCreationUsages(all_private_usages, *private_usages); |
| 192 } | 193 } |
| 193 | 194 |
| 194 } // namespace webcrypto | 195 } // namespace webcrypto |
| OLD | NEW |