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

Side by Side Diff: content/child/webcrypto/openssl/sym_key_openssl.cc

Issue 745443002: 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 "content/child/webcrypto/openssl/sym_key_openssl.h" 5 #include "content/child/webcrypto/openssl/sym_key_openssl.h"
6 6
7 #include <vector> 7 #include <vector>
8 #include <openssl/rand.h> 8 #include <openssl/rand.h>
9 9
10 #include "content/child/webcrypto/crypto_data.h" 10 #include "content/child/webcrypto/crypto_data.h"
11 #include "content/child/webcrypto/generate_key_result.h" 11 #include "content/child/webcrypto/generate_key_result.h"
12 #include "content/child/webcrypto/openssl/key_openssl.h" 12 #include "content/child/webcrypto/openssl/key_openssl.h"
13 #include "content/child/webcrypto/status.h" 13 #include "content/child/webcrypto/status.h"
14 #include "crypto/openssl_util.h" 14 #include "crypto/openssl_util.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 GenerateSecretKeyOpenSsl(const blink::WebCryptoKeyAlgorithm& algorithm, 21 Status GenerateSecretKeyOpenSsl(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 GenerateKeyResult* result) { 25 GenerateKeyResult* result) {
26 crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE); 26 crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
27 27
28 std::vector<unsigned char> random_bytes(keylen_bytes, 0); 28 std::vector<unsigned char> random_bytes(keylen_bytes, 0);
29 29
30 if (usages == 0)
31 return Status::ErrorCreateKeyEmptyUsages();
eroman 2014/11/21 23:35:34 Move this higher up, so the failure happens before
nharper 2014/11/22 00:26:45 Done.
32
30 if (keylen_bytes > 0) { 33 if (keylen_bytes > 0) {
31 if (!(RAND_bytes(&random_bytes[0], keylen_bytes))) 34 if (!(RAND_bytes(&random_bytes[0], keylen_bytes)))
32 return Status::OperationError(); 35 return Status::OperationError();
33 } 36 }
34 37
35 result->AssignSecretKey( 38 result->AssignSecretKey(
36 blink::WebCryptoKey::create(new SymKeyOpenSsl(CryptoData(random_bytes)), 39 blink::WebCryptoKey::create(new SymKeyOpenSsl(CryptoData(random_bytes)),
37 blink::WebCryptoKeyTypeSecret, 40 blink::WebCryptoKeyTypeSecret,
38 extractable, 41 extractable,
39 algorithm, 42 algorithm,
(...skipping 11 matching lines...) Expand all
51 blink::WebCryptoKeyTypeSecret, 54 blink::WebCryptoKeyTypeSecret,
52 extractable, 55 extractable,
53 algorithm, 56 algorithm,
54 usages); 57 usages);
55 return Status::Success(); 58 return Status::Success();
56 } 59 }
57 60
58 } // namespace webcrypto 61 } // namespace webcrypto
59 62
60 } // namespace content 63 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698