Skip to content

Commit

Permalink
[refactor] Change ordering of wrapkey parameters
Browse files Browse the repository at this point in the history 
crypto.subtle.wrapKey() orders the key to be wrapped before the wrapping key. Use the same convention throughout webcrypto code to avoid confusion.

BUG=245025

Review URL: https://codereview.chromium.org/272033003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269478 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
eroman@chromium.org committed May 10, 2014
1 parent 991229a commit 82ca153
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 31 deletions.
12 changes: 6 additions & 6 deletions content/child/webcrypto/platform_crypto.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,10 @@ Status ExportKeyPkcs8(PrivateKey* key,
std::vector<uint8>* buffer);

// Preconditions:
// * |wrapping_key| is non-null
// * |key| is non-null
Status WrapSymKeyAesKw(SymKey* wrapping_key,
SymKey* key,
// * |wrapping_key| is non-null
Status WrapSymKeyAesKw(SymKey* key,
SymKey* wrapping_key,
std::vector<uint8>* buffer);

// Unwraps (decrypts) |wrapped_key_data| using AES-KW and places the results in
Expand Down Expand Up @@ -263,10 +263,10 @@ Status DecryptAesKw(SymKey* key,
std::vector<uint8>* buffer);

// Preconditions:
// * |wrapping_key| is non-null
// * |key| is non-null
Status WrapSymKeyRsaEs(PublicKey* wrapping_key,
SymKey* key,
// * |wrapping_key| is non-null
Status WrapSymKeyRsaEs(SymKey* key,
PublicKey* wrapping_key,
std::vector<uint8>* buffer);

// Preconditions:
Expand Down
8 changes: 4 additions & 4 deletions content/child/webcrypto/platform_crypto_nss.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1494,8 +1494,8 @@ Status ImportRsaPublicKey(const blink::WebCryptoAlgorithm& algorithm,
return Status::Success();
}

Status WrapSymKeyAesKw(SymKey* wrapping_key,
SymKey* key,
Status WrapSymKeyAesKw(SymKey* key,
SymKey* wrapping_key,
std::vector<uint8>* buffer) {
// The data size must be at least 16 bytes and a multiple of 8 bytes.
// RFC 3394 does not specify a maximum allowed data length, but since only
Expand Down Expand Up @@ -1594,8 +1594,8 @@ Status DecryptAesKw(SymKey* wrapping_key,
return Status::Success();
}

Status WrapSymKeyRsaEs(PublicKey* wrapping_key,
SymKey* key,
Status WrapSymKeyRsaEs(SymKey* key,
PublicKey* wrapping_key,
std::vector<uint8>* buffer) {
// Check the raw length of the key to be wrapped against the max size allowed
// by the RSA wrapping key. With PKCS#1 v1.5 padding used in this function,
Expand Down
8 changes: 4 additions & 4 deletions content/child/webcrypto/platform_crypto_openssl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,8 @@ Status ExportRsaPublicKey(PublicKey* key,
return Status::ErrorUnsupported();
}

Status WrapSymKeyAesKw(SymKey* wrapping_key,
SymKey* key,
Status WrapSymKeyAesKw(SymKey* key,
SymKey* wrapping_key,
std::vector<uint8>* buffer) {
// TODO(eroman): http://crbug.com/267888
return Status::ErrorUnsupported();
Expand All @@ -486,8 +486,8 @@ Status DecryptAesKw(SymKey* key,
return Status::ErrorUnsupported();
}

Status WrapSymKeyRsaEs(PublicKey* wrapping_key,
SymKey* key,
Status WrapSymKeyRsaEs(SymKey* key,
PublicKey* wrapping_key,
std::vector<uint8>* buffer) {
// TODO(eroman): http://crbug.com/267888
return Status::ErrorUnsupported();
Expand Down
16 changes: 8 additions & 8 deletions content/child/webcrypto/shared_crypto.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ Status UnwrapKeyRaw(const CryptoData& wrapped_key_data,
}
}

Status WrapKeyRaw(const blink::WebCryptoKey& wrapping_key,
const blink::WebCryptoKey& key_to_wrap,
Status WrapKeyRaw(const blink::WebCryptoKey& key_to_wrap,
const blink::WebCryptoKey& wrapping_key,
const blink::WebCryptoAlgorithm& wrapping_algorithm,
std::vector<uint8>* buffer) {
// A raw key is always a symmetric key.
Expand All @@ -393,15 +393,15 @@ Status WrapKeyRaw(const blink::WebCryptoKey& wrapping_key,
if (status.IsError())
return status;
return platform::WrapSymKeyAesKw(
platform_wrapping_key, platform_key, buffer);
platform_key, platform_wrapping_key, buffer);
}
case blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5: {
platform::PublicKey* platform_wrapping_key;
status = ToPlatformPublicKey(wrapping_key, &platform_wrapping_key);
if (status.IsError())
return status;
return platform::WrapSymKeyRsaEs(
platform_wrapping_key, platform_key, buffer);
platform_key, platform_wrapping_key, buffer);
}
default:
return Status::ErrorUnsupported();
Expand Down Expand Up @@ -484,8 +484,8 @@ Status UnwrapKeyDecryptAndImport(

Status WrapKeyExportAndEncrypt(
blink::WebCryptoKeyFormat format,
const blink::WebCryptoKey& wrapping_key,
const blink::WebCryptoKey& key_to_wrap,
const blink::WebCryptoKey& wrapping_key,
const blink::WebCryptoAlgorithm& wrapping_algorithm,
std::vector<uint8>* buffer) {
std::vector<uint8> exported_data;
Expand Down Expand Up @@ -751,8 +751,8 @@ Status VerifySignature(const blink::WebCryptoAlgorithm& algorithm,
}

Status WrapKey(blink::WebCryptoKeyFormat format,
const blink::WebCryptoKey& wrapping_key,
const blink::WebCryptoKey& key_to_wrap,
const blink::WebCryptoKey& wrapping_key,
const blink::WebCryptoAlgorithm& wrapping_algorithm,
std::vector<uint8>* buffer) {
if (!KeyUsageAllows(wrapping_key, blink::WebCryptoKeyUsageWrapKey))
Expand All @@ -762,10 +762,10 @@ Status WrapKey(blink::WebCryptoKeyFormat format,

switch (format) {
case blink::WebCryptoKeyFormatRaw:
return WrapKeyRaw(wrapping_key, key_to_wrap, wrapping_algorithm, buffer);
return WrapKeyRaw(key_to_wrap, wrapping_key, wrapping_algorithm, buffer);
case blink::WebCryptoKeyFormatJwk:
return WrapKeyExportAndEncrypt(
format, wrapping_key, key_to_wrap, wrapping_algorithm, buffer);
format, key_to_wrap, wrapping_key, wrapping_algorithm, buffer);
case blink::WebCryptoKeyFormatSpki:
case blink::WebCryptoKeyFormatPkcs8:
return Status::ErrorUnsupported(); // TODO(padolph)
Expand Down
2 changes: 1 addition & 1 deletion content/child/webcrypto/shared_crypto.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ CONTENT_EXPORT Status

CONTENT_EXPORT Status
WrapKey(blink::WebCryptoKeyFormat format,
const blink::WebCryptoKey& wrapping_key,
const blink::WebCryptoKey& key_to_wrap,
const blink::WebCryptoKey& wrapping_key,
const blink::WebCryptoAlgorithm& wrapping_algorithm,
std::vector<uint8>* buffer);

Expand Down
10 changes: 5 additions & 5 deletions content/child/webcrypto/shared_crypto_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2764,8 +2764,8 @@ TEST_F(SharedCryptoTest, MAYBE(AesKwRawSymkeyWrapUnwrapKnownAnswer)) {
std::vector<uint8> wrapped_key;
ASSERT_EQ(Status::Success(),
WrapKey(blink::WebCryptoKeyFormatRaw,
wrapping_key,
key,
wrapping_key,
wrapping_algorithm,
&wrapped_key));
EXPECT_BYTES_EQ(test_ciphertext, wrapped_key);
Expand Down Expand Up @@ -3163,8 +3163,8 @@ TEST_F(SharedCryptoTest, MAYBE(RsaEsRawSymkeyWrapUnwrapKnownAnswer)) {
std::vector<uint8> wrapped_key;
ASSERT_EQ(Status::Success(),
WrapKey(blink::WebCryptoKeyFormatRaw,
public_key,
key,
public_key,
algorithm,
&wrapped_key));

Expand Down Expand Up @@ -3240,8 +3240,8 @@ TEST_F(SharedCryptoTest, MAYBE(RsaEsRawSymkeyWrapUnwrapErrors)) {
std::vector<uint8> wrapped_key;
EXPECT_EQ(Status::ErrorUnexpectedKeyType(),
WrapKey(blink::WebCryptoKeyFormatRaw,
private_key,
key,
private_key,
wrapping_algorithm,
&wrapped_key));

Expand All @@ -3262,8 +3262,8 @@ TEST_F(SharedCryptoTest, MAYBE(RsaEsRawSymkeyWrapUnwrapErrors)) {
&big_key));
EXPECT_EQ(Status::ErrorDataTooLarge(),
WrapKey(blink::WebCryptoKeyFormatRaw,
public_key,
big_key,
public_key,
wrapping_algorithm,
&wrapped_key));

Expand Down Expand Up @@ -3383,8 +3383,8 @@ TEST_F(SharedCryptoTest, MAYBE(RsaEsJwkSymkeyWrapUnwrapRoundTrip)) {
std::vector<uint8> wrapped_data;
ASSERT_EQ(Status::Success(),
WrapKey(blink::WebCryptoKeyFormatJwk,
public_wrapping_key,
key_to_wrap,
public_wrapping_key,
wrapping_algorithm,
&wrapped_data));

Expand Down
4 changes: 1 addition & 3 deletions content/child/webcrypto/webcrypto_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,11 +519,9 @@ void DoWrapKeyReply(scoped_ptr<WrapKeyState> state) {

void DoWrapKey(scoped_ptr<WrapKeyState> passed_state) {
WrapKeyState* state = passed_state.get();
// TODO(eroman): The parameter ordering of webcrypto::WrapKey() is
// inconsistent with that of blink::WebCrypto::wrapKey().
state->status = webcrypto::WrapKey(state->format,
state->wrapping_key,
state->key,
state->wrapping_key,
state->wrap_algorithm,
&state->buffer);

Expand Down

0 comments on commit 82ca153

Please sign in to comment.