OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/child/webcrypto/nss/sym_key_nss.h" | 5 #include "content/child/webcrypto/nss/sym_key_nss.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/child/webcrypto/crypto_data.h" | 8 #include "content/child/webcrypto/crypto_data.h" |
9 #include "content/child/webcrypto/generate_key_result.h" | 9 #include "content/child/webcrypto/generate_key_result.h" |
10 #include "content/child/webcrypto/nss/key_nss.h" | 10 #include "content/child/webcrypto/nss/key_nss.h" |
11 #include "content/child/webcrypto/nss/util_nss.h" | 11 #include "content/child/webcrypto/nss/util_nss.h" |
12 #include "content/child/webcrypto/status.h" | 12 #include "content/child/webcrypto/status.h" |
13 #include "content/child/webcrypto/webcrypto_util.h" | 13 #include "content/child/webcrypto/webcrypto_util.h" |
14 #include "crypto/scoped_nss_types.h" | 14 #include "crypto/scoped_nss_types.h" |
15 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h" | 15 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h" |
16 | 16 |
17 namespace content { | 17 namespace content { |
18 | 18 |
19 namespace webcrypto { | 19 namespace webcrypto { |
20 | 20 |
21 Status GenerateSecretKeyNss(const blink::WebCryptoKeyAlgorithm& algorithm, | 21 Status GenerateSecretKeyNss(const blink::WebCryptoKeyAlgorithm& algorithm, |
22 bool extractable, | 22 bool extractable, |
23 blink::WebCryptoKeyUsageMask usages, | 23 blink::WebCryptoKeyUsageMask usages, |
24 unsigned keylen_bytes, | 24 unsigned keylen_bytes, |
25 CK_MECHANISM_TYPE mechanism, | 25 CK_MECHANISM_TYPE mechanism, |
26 GenerateKeyResult* result) { | 26 GenerateKeyResult* result) { |
27 DCHECK_NE(CKM_INVALID_MECHANISM, mechanism); | 27 DCHECK_NE(CKM_INVALID_MECHANISM, mechanism); |
28 | 28 |
| 29 if (usages == 0) |
| 30 return Status::ErrorCreateKeyEmptyUsages(); |
| 31 |
29 crypto::ScopedPK11Slot slot(PK11_GetInternalKeySlot()); | 32 crypto::ScopedPK11Slot slot(PK11_GetInternalKeySlot()); |
30 if (!slot) | 33 if (!slot) |
31 return Status::OperationError(); | 34 return Status::OperationError(); |
32 | 35 |
33 crypto::ScopedPK11SymKey pk11_key( | 36 crypto::ScopedPK11SymKey pk11_key( |
34 PK11_KeyGen(slot.get(), mechanism, NULL, keylen_bytes, NULL)); | 37 PK11_KeyGen(slot.get(), mechanism, NULL, keylen_bytes, NULL)); |
35 | 38 |
36 if (!pk11_key) | 39 if (!pk11_key) |
37 return Status::OperationError(); | 40 return Status::OperationError(); |
38 | 41 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 | 77 |
75 *key = blink::WebCryptoKey::create(handle.release(), | 78 *key = blink::WebCryptoKey::create(handle.release(), |
76 blink::WebCryptoKeyTypeSecret, extractable, | 79 blink::WebCryptoKeyTypeSecret, extractable, |
77 algorithm, usages); | 80 algorithm, usages); |
78 return Status::Success(); | 81 return Status::Success(); |
79 } | 82 } |
80 | 83 |
81 } // namespace webcrypto | 84 } // namespace webcrypto |
82 | 85 |
83 } // namespace content | 86 } // namespace content |
OLD | NEW |