diff options
author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 05:46:13 +0000 |
---|---|---|
committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 05:46:13 +0000 |
commit | 8395d799b84405be26391ddcbbcf963429179202 (patch) | |
tree | 81b7d00b2b7a6fed25690f5fd490bd8ed6fee04b /content/child/webcrypto | |
parent | a4ac6e000b5bf5360962c774b1457b1994db26f8 (diff) | |
download | chromium_src-8395d799b84405be26391ddcbbcf963429179202.zip chromium_src-8395d799b84405be26391ddcbbcf963429179202.tar.gz chromium_src-8395d799b84405be26391ddcbbcf963429179202.tar.bz2 |
[webcrypto] Remove support for SHA-224 (CL 2 or 3).
Chromium side of the change.
This was removed by the spec: https://dvcs.w3.org/hg/webcrypto-api/rev/3f7df730b2c7
BUG=245025
Review URL: https://codereview.chromium.org/194203002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256764 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child/webcrypto')
-rw-r--r-- | content/child/webcrypto/platform_crypto_nss.cc | 10 | ||||
-rw-r--r-- | content/child/webcrypto/platform_crypto_openssl.cc | 2 | ||||
-rw-r--r-- | content/child/webcrypto/shared_crypto.cc | 1 | ||||
-rw-r--r-- | content/child/webcrypto/shared_crypto_unittest.cc | 1 | ||||
-rw-r--r-- | content/child/webcrypto/webcrypto_util.cc | 2 |
5 files changed, 0 insertions, 16 deletions
diff --git a/content/child/webcrypto/platform_crypto_nss.cc b/content/child/webcrypto/platform_crypto_nss.cc index be6d0b0..1c86f04 100644 --- a/content/child/webcrypto/platform_crypto_nss.cc +++ b/content/child/webcrypto/platform_crypto_nss.cc @@ -181,8 +181,6 @@ HASH_HashType WebCryptoAlgorithmToNSSHashType( switch (algorithm) { case blink::WebCryptoAlgorithmIdSha1: return HASH_AlgSHA1; - case blink::WebCryptoAlgorithmIdSha224: - return HASH_AlgSHA224; case blink::WebCryptoAlgorithmIdSha256: return HASH_AlgSHA256; case blink::WebCryptoAlgorithmIdSha384: @@ -200,8 +198,6 @@ CK_MECHANISM_TYPE WebCryptoHashToHMACMechanism( switch (algorithm.id()) { case blink::WebCryptoAlgorithmIdSha1: return CKM_SHA_1_HMAC; - case blink::WebCryptoAlgorithmIdSha224: - return CKM_SHA224_HMAC; case blink::WebCryptoAlgorithmIdSha256: return CKM_SHA256_HMAC; case blink::WebCryptoAlgorithmIdSha384: @@ -808,9 +804,6 @@ Status SignRsaSsaPkcs1v1_5(PrivateKey* key, case blink::WebCryptoAlgorithmIdSha1: sign_alg_tag = SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION; break; - case blink::WebCryptoAlgorithmIdSha224: - sign_alg_tag = SEC_OID_PKCS1_SHA224_WITH_RSA_ENCRYPTION; - break; case blink::WebCryptoAlgorithmIdSha256: sign_alg_tag = SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION; break; @@ -849,9 +842,6 @@ Status VerifyRsaSsaPkcs1v1_5(PublicKey* key, case blink::WebCryptoAlgorithmIdSha1: hash_alg_tag = SEC_OID_SHA1; break; - case blink::WebCryptoAlgorithmIdSha224: - hash_alg_tag = SEC_OID_SHA224; - break; case blink::WebCryptoAlgorithmIdSha256: hash_alg_tag = SEC_OID_SHA256; break; diff --git a/content/child/webcrypto/platform_crypto_openssl.cc b/content/child/webcrypto/platform_crypto_openssl.cc index 583f2fa..918dd66 100644 --- a/content/child/webcrypto/platform_crypto_openssl.cc +++ b/content/child/webcrypto/platform_crypto_openssl.cc @@ -63,8 +63,6 @@ const EVP_MD* GetDigest(blink::WebCryptoAlgorithmId id) { switch (id) { case blink::WebCryptoAlgorithmIdSha1: return EVP_sha1(); - case blink::WebCryptoAlgorithmIdSha224: - return EVP_sha224(); case blink::WebCryptoAlgorithmIdSha256: return EVP_sha256(); case blink::WebCryptoAlgorithmIdSha384: diff --git a/content/child/webcrypto/shared_crypto.cc b/content/child/webcrypto/shared_crypto.cc index bbcd9a6..56a6e15 100644 --- a/content/child/webcrypto/shared_crypto.cc +++ b/content/child/webcrypto/shared_crypto.cc @@ -284,7 +284,6 @@ Status Digest(const blink::WebCryptoAlgorithm& algorithm, blink::WebArrayBuffer* buffer) { switch (algorithm.id()) { case blink::WebCryptoAlgorithmIdSha1: - case blink::WebCryptoAlgorithmIdSha224: case blink::WebCryptoAlgorithmIdSha256: case blink::WebCryptoAlgorithmIdSha384: case blink::WebCryptoAlgorithmIdSha512: diff --git a/content/child/webcrypto/shared_crypto_unittest.cc b/content/child/webcrypto/shared_crypto_unittest.cc index 3fcfd08..c5c1c9d 100644 --- a/content/child/webcrypto/shared_crypto_unittest.cc +++ b/content/child/webcrypto/shared_crypto_unittest.cc @@ -260,7 +260,6 @@ blink::WebCryptoAlgorithm GetDigestAlgorithm(base::DictionaryValue* dict, const char* name; blink::WebCryptoAlgorithmId id; } kDigestNameToId[] = {{"sha-1", blink::WebCryptoAlgorithmIdSha1}, - {"sha-224", blink::WebCryptoAlgorithmIdSha224}, {"sha-256", blink::WebCryptoAlgorithmIdSha256}, {"sha-384", blink::WebCryptoAlgorithmIdSha384}, {"sha-512", blink::WebCryptoAlgorithmIdSha512}, }; diff --git a/content/child/webcrypto/webcrypto_util.cc b/content/child/webcrypto/webcrypto_util.cc index 3058d0a..1fa4658 100644 --- a/content/child/webcrypto/webcrypto_util.cc +++ b/content/child/webcrypto/webcrypto_util.cc @@ -221,7 +221,6 @@ bool Base64DecodeUrlSafe(const std::string& input, std::string* output) { bool IsHashAlgorithm(blink::WebCryptoAlgorithmId alg_id) { return alg_id == blink::WebCryptoAlgorithmIdSha1 || - alg_id == blink::WebCryptoAlgorithmIdSha224 || alg_id == blink::WebCryptoAlgorithmIdSha256 || alg_id == blink::WebCryptoAlgorithmIdSha384 || alg_id == blink::WebCryptoAlgorithmIdSha512; @@ -275,7 +274,6 @@ blink::WebCryptoAlgorithm CreateRsaOaepImportAlgorithm( unsigned int ShaBlockSizeBytes(blink::WebCryptoAlgorithmId hash_id) { switch (hash_id) { case blink::WebCryptoAlgorithmIdSha1: - case blink::WebCryptoAlgorithmIdSha224: case blink::WebCryptoAlgorithmIdSha256: return 64; case blink::WebCryptoAlgorithmIdSha384: |