Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: content/child/webcrypto/test/aes_kw_unittest.cc

Issue 751883002: Revert of Check that usage isn't empty when generateKey() is called (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/stl_util.h" 5 #include "base/stl_util.h"
6 #include "content/child/webcrypto/algorithm_dispatch.h" 6 #include "content/child/webcrypto/algorithm_dispatch.h"
7 #include "content/child/webcrypto/crypto_data.h" 7 #include "content/child/webcrypto/crypto_data.h"
8 #include "content/child/webcrypto/status.h" 8 #include "content/child/webcrypto/status.h"
9 #include "content/child/webcrypto/test/test_helpers.h" 9 #include "content/child/webcrypto/test/test_helpers.h"
10 #include "content/child/webcrypto/webcrypto_util.h" 10 #include "content/child/webcrypto/webcrypto_util.h"
(...skipping 16 matching lines...) Expand all
27 const unsigned short kKeyLen[] = {0, 127, 257}; 27 const unsigned short kKeyLen[] = {0, 127, 257};
28 blink::WebCryptoKey key; 28 blink::WebCryptoKey key;
29 for (size_t i = 0; i < arraysize(kKeyLen); ++i) { 29 for (size_t i = 0; i < arraysize(kKeyLen); ++i) {
30 SCOPED_TRACE(i); 30 SCOPED_TRACE(i);
31 EXPECT_EQ(Status::ErrorGenerateKeyLength(), 31 EXPECT_EQ(Status::ErrorGenerateKeyLength(),
32 GenerateSecretKey( 32 GenerateSecretKey(
33 CreateAesKwKeyGenAlgorithm(kKeyLen[i]), true, 0, &key)); 33 CreateAesKwKeyGenAlgorithm(kKeyLen[i]), true, 0, &key));
34 } 34 }
35 } 35 }
36 36
37 TEST(WebCryptoAesKwTest, GenerateKeyEmptyUsage) {
38 blink::WebCryptoKey key;
39 EXPECT_EQ(Status::ErrorCreateKeyEmptyUsages(),
40 GenerateSecretKey(CreateAesKwKeyGenAlgorithm(256), true, 0, &key));
41 }
42
43 TEST(WebCryptoAesKwTest, ImportKeyJwkKeyOpsWrapUnwrap) { 37 TEST(WebCryptoAesKwTest, ImportKeyJwkKeyOpsWrapUnwrap) {
44 blink::WebCryptoKey key; 38 blink::WebCryptoKey key;
45 base::DictionaryValue dict; 39 base::DictionaryValue dict;
46 dict.SetString("kty", "oct"); 40 dict.SetString("kty", "oct");
47 dict.SetString("k", "GADWrMRHwQfoNaXU5fZvTg=="); 41 dict.SetString("k", "GADWrMRHwQfoNaXU5fZvTg==");
48 base::ListValue* key_ops = new base::ListValue; 42 base::ListValue* key_ops = new base::ListValue;
49 dict.Set("key_ops", key_ops); // Takes ownership. 43 dict.Set("key_ops", key_ops); // Takes ownership.
50 44
51 key_ops->AppendString("wrapKey"); 45 key_ops->AppendString("wrapKey");
52 46
(...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 bad_usages[i], 598 bad_usages[i],
605 &key)); 599 &key));
606 } 600 }
607 } 601 }
608 602
609 } // namespace 603 } // namespace
610 604
611 } // namespace webcrypto 605 } // namespace webcrypto
612 606
613 } // namespace content 607 } // namespace content
OLDNEW
« no previous file with comments | « content/child/webcrypto/test/aes_gcm_unittest.cc ('k') | content/child/webcrypto/test/ecdsa_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698