components/webcrypto/nss/sym_key_nss.cc - Issue 1077273002: html_viewer: Move webcrypto to a place where html_viewer can use it.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: components/webcrypto/nss/sym_key_nss.cc

Issue 1077273002: html_viewer: Move webcrypto to a place where html_viewer can use it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Copy the msvs_disabled_warnings to the new target. Created 5 years, 8 months 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

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 "components/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 "components/webcrypto/crypto_data.h"

9 #include "content/child/webcrypto/generate_key_result.h"	9 #include "components/webcrypto/generate_key_result.h"

10 #include "content/child/webcrypto/nss/key_nss.h"	10 #include "components/webcrypto/nss/key_nss.h"

11 #include "content/child/webcrypto/nss/util_nss.h"	11 #include "components/webcrypto/nss/util_nss.h"

12 #include "content/child/webcrypto/status.h"	12 #include "components/webcrypto/status.h"

13 #include "content/child/webcrypto/webcrypto_util.h"	13 #include "components/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 components {

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 int keylen_bits,	24 unsigned int keylen_bits,

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);

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
70 scoped_ptr<SymKeyNss> handle(new SymKeyNss(pk11_sym_key.Pass(), key_data));	70 scoped_ptr<SymKeyNss> handle(new SymKeyNss(pk11_sym_key.Pass(), key_data));

71	71

72 *key = blink::WebCryptoKey::create(handle.release(),	72 *key = blink::WebCryptoKey::create(handle.release(),

73 blink::WebCryptoKeyTypeSecret, extractable,	73 blink::WebCryptoKeyTypeSecret, extractable,

74 algorithm, usages);	74 algorithm, usages);

75 return Status::Success();	75 return Status::Success();

76 }	76 }

77	77

78 } // namespace webcrypto	78 } // namespace webcrypto

79	79

80 } // namespace content	80 } // namespace components

OLD	NEW

« components/webcrypto/algorithm_implementation.h ('K') | « components/webcrypto/nss/sym_key_nss.h ('k') | components/webcrypto/nss/util_nss.h » ('j') | content/DEPS » ('J')