summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreroman <eroman@chromium.org>2014-12-05 13:32:29 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-05 21:32:54 +0000
commitcb4e417aca740b7039dfaafb181d62a12cc25460 (patch)
tree8a19ed3f2936913b8cf2223f68f8b52bf89ef8ad
parent873b12682cae0167bfa7bbfa3038f817ef7ea2b3 (diff)
downloadchromium_src-cb4e417aca740b7039dfaafb181d62a12cc25460.zip
chromium_src-cb4e417aca740b7039dfaafb181d62a12cc25460.tar.gz
chromium_src-cb4e417aca740b7039dfaafb181d62a12cc25460.tar.bz2
Fix a WebCrypto error type: InvalidAccessError --> OperationError.
BUG=439240 Review URL: https://codereview.chromium.org/780923003 Cr-Commit-Position: refs/heads/master@{#307084}
-rw-r--r--content/child/webcrypto/status.cc2
-rw-r--r--content/test/data/webcrypto/ecdh.json6
2 files changed, 4 insertions, 4 deletions
diff --git a/content/child/webcrypto/status.cc b/content/child/webcrypto/status.cc
index 535d221..fa5f464 100644
--- a/content/child/webcrypto/status.cc
+++ b/content/child/webcrypto/status.cc
@@ -320,7 +320,7 @@ Status Status::ErrorEcdhCurveMismatch() {
}
Status Status::ErrorEcdhLengthTooBig(unsigned int max_length_bits) {
- return Status(blink::WebCryptoErrorTypeInvalidAccess,
+ return Status(blink::WebCryptoErrorTypeOperation,
base::StringPrintf(
"Length specified for ECDH key derivation is too large. "
"Maximum allowed is %u bits",
diff --git a/content/test/data/webcrypto/ecdh.json b/content/test/data/webcrypto/ecdh.json
index 10ff5c6..fbe2a09 100644
--- a/content/test/data/webcrypto/ecdh.json
+++ b/content/test/data/webcrypto/ecdh.json
@@ -275,7 +275,7 @@
},
"length_bits": 257,
- "error": "InvalidAccess: Length specified for ECDH key derivation is too large. Maximum allowed is 256 bits"
+ "error": "OperationError: Length specified for ECDH key derivation is too large. Maximum allowed is 256 bits"
},
// The length is too long, by 1 byte
@@ -295,7 +295,7 @@
},
"length_bits": 264,
- "error": "InvalidAccess: Length specified for ECDH key derivation is too large. Maximum allowed is 256 bits"
+ "error": "OperationError: Length specified for ECDH key derivation is too large. Maximum allowed is 256 bits"
},
// The public key parameter is in fact a private key
@@ -359,7 +359,7 @@
},
"length_bits": 529,
- "error": "InvalidAccess: Length specified for ECDH key derivation is too large. Maximum allowed is 528 bits"
+ "error": "OperationError: Length specified for ECDH key derivation is too large. Maximum allowed is 528 bits"
}
]