Revert 174726 "[webcrypto] Remove RSA-ES support (3 of 3)"

trunk/Source/modules/crypto/NormalizeAlgorithm.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 55 matching lines @@
     {"HMAC", 4, blink::WebCryptoAlgorithmIdHmac},
     {"SHA-1", 5, blink::WebCryptoAlgorithmIdSha1},
     {"AES-KW", 6, blink::WebCryptoAlgorithmIdAesKw},
     {"SHA-512", 7, blink::WebCryptoAlgorithmIdSha512},
     {"SHA-384", 7, blink::WebCryptoAlgorithmIdSha384},
     {"SHA-256", 7, blink::WebCryptoAlgorithmIdSha256},
     {"AES-CBC", 7, blink::WebCryptoAlgorithmIdAesCbc},
     {"AES-GCM", 7, blink::WebCryptoAlgorithmIdAesGcm},
     {"AES-CTR", 7, blink::WebCryptoAlgorithmIdAesCtr},
     {"RSA-OAEP", 8, blink::WebCryptoAlgorithmIdRsaOaep},
+    {"RSAES-PKCS1-V1_5", 16, blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5},
     {"RSASSA-PKCS1-V1_5", 17, blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5},
 };
 
 typedef char ParamsTypeOrUndefined;
 const ParamsTypeOrUndefined Undefined = -1;
 
 struct AlgorithmInfo {
     // The canonical (case-sensitive) name for the algorithm.
     const char* name;
 
@@ skipping 40 matching lines @@
             blink::WebCryptoAlgorithmParamsTypeNone, // Verify
             Undefined, // Digest
             blink::WebCryptoAlgorithmParamsTypeRsaHashedKeyGenParams, // GenerateKey
             blink::WebCryptoAlgorithmParamsTypeRsaHashedImportParams, // ImportKey
             Undefined, // DeriveKey
             Undefined, // DeriveBits
             Undefined, // WrapKey
             Undefined // UnwrapKey
         }
     }, { // Index 3
+        "RSAES-PKCS1-v1_5", {
+            blink::WebCryptoAlgorithmParamsTypeNone, // Encrypt
+            blink::WebCryptoAlgorithmParamsTypeNone, // Decrypt
+            Undefined, // Sign
+            Undefined, // Verify
+            Undefined, // Digest
+            blink::WebCryptoAlgorithmParamsTypeRsaKeyGenParams, // GenerateKey
+            blink::WebCryptoAlgorithmParamsTypeNone, // ImportKey
+            Undefined, // DeriveKey
+            Undefined, // DeriveBits
+            blink::WebCryptoAlgorithmParamsTypeNone, // WrapKey
+            blink::WebCryptoAlgorithmParamsTypeNone // UnwrapKey
+        }
+    }, { // Index 4
         "SHA-1", {
             Undefined, // Encrypt
             Undefined, // Decrypt
             Undefined, // Sign
             Undefined, // Verify
             blink::WebCryptoAlgorithmParamsTypeNone, // Digest
             Undefined, // GenerateKey
             Undefined, // ImportKey
             Undefined, // DeriveKey
             Undefined, // DeriveBits
             Undefined, // WrapKey
             Undefined // UnwrapKey
         }
-    }, { // Index 4
+    }, { // Index 5
         "SHA-256", {
             Undefined, // Encrypt
             Undefined, // Decrypt
             Undefined, // Sign
             Undefined, // Verify
             blink::WebCryptoAlgorithmParamsTypeNone, // Digest
             Undefined, // GenerateKey
             Undefined, // ImportKey
             Undefined, // DeriveKey
             Undefined, // DeriveBits
             Undefined, // WrapKey
             Undefined // UnwrapKey
         }
-    }, { // Index 5
+    }, { // Index 6
         "SHA-384", {
             Undefined, // Encrypt
             Undefined, // Decrypt
             Undefined, // Sign
             Undefined, // Verify
             blink::WebCryptoAlgorithmParamsTypeNone, // Digest
             Undefined, // GenerateKey
             Undefined, // ImportKey
             Undefined, // DeriveKey
             Undefined, // DeriveBits
             Undefined, // WrapKey
             Undefined // UnwrapKey
         }
-    }, { // Index 6
+    }, { // Index 7
         "SHA-512", {
             Undefined, // Encrypt
             Undefined, // Decrypt
             Undefined, // Sign
             Undefined, // Verify
             blink::WebCryptoAlgorithmParamsTypeNone, // Digest
             Undefined, // GenerateKey
             Undefined, // ImportKey
             Undefined, // DeriveKey
             Undefined, // DeriveBits
             Undefined, // WrapKey
             Undefined // UnwrapKey
         }
-    }, { // Index 7
+    }, { // Index 8
         "AES-GCM", {
             blink::WebCryptoAlgorithmParamsTypeAesGcmParams, // Encrypt
             blink::WebCryptoAlgorithmParamsTypeAesGcmParams, // Decrypt
             Undefined, // Sign
             Undefined, // Verify
             Undefined, // Digest
             blink::WebCryptoAlgorithmParamsTypeAesKeyGenParams, // GenerateKey
             blink::WebCryptoAlgorithmParamsTypeNone, // ImportKey
             Undefined, // DeriveKey
             Undefined, // DeriveBits
             blink::WebCryptoAlgorithmParamsTypeAesGcmParams, // WrapKey
             blink::WebCryptoAlgorithmParamsTypeAesGcmParams // UnwrapKey
         }
-    }, { // Index 8
+    }, { // Index 9
         "RSA-OAEP", {
             blink::WebCryptoAlgorithmParamsTypeRsaOaepParams, // Encrypt
             blink::WebCryptoAlgorithmParamsTypeRsaOaepParams, // Decrypt
             Undefined, // Sign
             Undefined, // Verify
             Undefined, // Digest
             blink::WebCryptoAlgorithmParamsTypeRsaHashedKeyGenParams, // GenerateKey
             blink::WebCryptoAlgorithmParamsTypeRsaHashedImportParams, // ImportKey
             Undefined, // DeriveKey
             Undefined, // DeriveBits
             blink::WebCryptoAlgorithmParamsTypeRsaOaepParams, // WrapKey
             blink::WebCryptoAlgorithmParamsTypeRsaOaepParams // UnwrapKey
         }
-    }, { // Index 9
+    }, { // Index 10
         "AES-CTR", {
             blink::WebCryptoAlgorithmParamsTypeAesCtrParams, // Encrypt
             blink::WebCryptoAlgorithmParamsTypeAesCtrParams, // Decrypt
             Undefined, // Sign
             Undefined, // Verify
             Undefined, // Digest
             blink::WebCryptoAlgorithmParamsTypeAesKeyGenParams, // GenerateKey
             blink::WebCryptoAlgorithmParamsTypeNone, // ImportKey
             Undefined, // DeriveKey
             Undefined, // DeriveBits
             blink::WebCryptoAlgorithmParamsTypeAesCtrParams, // WrapKey
             blink::WebCryptoAlgorithmParamsTypeAesCtrParams // UnwrapKey
         }
-    }, { // Index 10
+    }, { // Index 11
         "AES-KW", {
             Undefined, // Encrypt
             Undefined, // Decrypt
             Undefined, // Sign
             Undefined, // Verify
             Undefined, // Digest
             blink::WebCryptoAlgorithmParamsTypeAesKeyGenParams, // GenerateKey
             blink::WebCryptoAlgorithmParamsTypeNone, // ImportKey
             Undefined, // DeriveKey
             Undefined, // DeriveBits
             blink::WebCryptoAlgorithmParamsTypeNone, // WrapKey
             blink::WebCryptoAlgorithmParamsTypeNone // UnwrapKey
         }
     },
 };
 
 // Initializing the algorithmIdToInfo table above depends on knowing the enum
 // values for algorithm IDs. If those ever change, the table will need to be
 // updated.
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesCbc == 0, AesCbc_idDoesntMatch);
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdHmac == 1, Hmac_idDoesntMatch);
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5 == 2, RsaSsaPkcs1v1_5_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha1 == 3, Sha1_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha256 == 4, Sha256_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha384 == 5, Sha384_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha512 == 6, Sha512_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesGcm == 7, AesGcm_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdRsaOaep == 8, RsaOaep_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesCtr == 9, AesCtr_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesKw == 10, AesKw_idDoesntMatch);
-COMPILE_ASSERT(blink::WebCryptoAlgorithmIdLast == 10, Last_idDoesntMatch);
+COMPILE_ASSERT(blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5 == 3, RsaEsPkcs1v1_5_idDoesntMatch);
+COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha1 == 4, Sha1_idDoesntMatch);
+COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha256 == 5, Sha256_idDoesntMatch);
+COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha384 == 6, Sha384_idDoesntMatch);
+COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha512 == 7, Sha512_idDoesntMatch);
+COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesGcm == 8, AesGcm_idDoesntMatch);
+COMPILE_ASSERT(blink::WebCryptoAlgorithmIdRsaOaep == 9, RsaOaep_idDoesntMatch);
+COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesCtr == 10, AesCtr_idDoesntMatch);
+COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesKw == 11, AesKw_idDoesntMatch);
+COMPILE_ASSERT(blink::WebCryptoAlgorithmIdLast == 11, Last_idDoesntMatch);
 COMPILE_ASSERT(10 == LastAlgorithmOperation, UpdateParamsMapping);
 
 #if ASSERT_ENABLED
 
 // Essentially std::is_sorted() (however that function is new to C++11).
 template <typename Iterator>
 bool isSorted(Iterator begin, Iterator end)
 {
     if (begin == end)
         return true;
@@ skipping 421 matching lines @@
     blink::WebCryptoAlgorithm hash;
     if (!parseHash(raw, hash, context, result))
         return false;
 
     params = adoptPtr(new blink::WebCryptoRsaHashedImportParams(hash));
     return true;
 }
 
 // Defined by the WebCrypto spec as:
 //
+//    dictionary RsaKeyGenParams : Algorithm {
+//      unsigned long modulusLength;
+//      BigInteger publicExponent;
+//    };
+bool parseRsaKeyGenParams(const Dictionary& raw, uint32_t& modulusLength, RefPtr<Uint8Array>& publicExponent, const ErrorContext& context, CryptoResult* result)
+{
+    if (!getUint32(raw, "modulusLength", modulusLength, context, result))
+        return false;
+
+    if (!getBigInteger(raw, "publicExponent", publicExponent, context, result))
+        return false;
+
+    return true;
+}
+
+bool parseRsaKeyGenParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, CryptoResult* result)
+{
+    uint32_t modulusLength;
+    RefPtr<Uint8Array> publicExponent;
+    if (!parseRsaKeyGenParams(raw, modulusLength, publicExponent, context, result))
+        return false;
+
+    params = adoptPtr(new blink::WebCryptoRsaKeyGenParams(modulusLength, static_cast<const unsigned char*>(publicExponent->baseAddress()), publicExponent->byteLength()));
+    return true;
+}
+
+// Defined by the WebCrypto spec as:
+//
 //    dictionary RsaHashedKeyGenParams : RsaKeyGenParams {
 //      AlgorithmIdentifier hash;
 //    };
-//
-//    dictionary RsaKeyGenParams : Algorithm {
-//      unsigned long modulusLength;
-//      BigInteger publicExponent;
-//    };
 bool parseRsaHashedKeyGenParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, CryptoResult* result)
 {
     uint32_t modulusLength;
-    if (!getUint32(raw, "modulusLength", modulusLength, context, result))
-        return false;
-
     RefPtr<Uint8Array> publicExponent;
-    if (!getBigInteger(raw, "publicExponent", publicExponent, context, result))
+    if (!parseRsaKeyGenParams(raw, modulusLength, publicExponent, context, result))
         return false;
 
     blink::WebCryptoAlgorithm hash;
     if (!parseHash(raw, hash, context, result))
         return false;
 
     params = adoptPtr(new blink::WebCryptoRsaHashedKeyGenParams(hash, modulusLength, static_cast<const unsigned char*>(publicExponent->baseAddress()), publicExponent->byteLength()));
     return true;
 }
 
@@ skipping 85 matching lines @@
         return parseHmacImportParams(raw, params, context, result);
     case blink::WebCryptoAlgorithmParamsTypeHmacKeyGenParams:
         context.add("HmacKeyGenParams");
         return parseHmacKeyGenParams(raw, params, context, result);
     case blink::WebCryptoAlgorithmParamsTypeRsaHashedKeyGenParams:
         context.add("RsaHashedKeyGenParams");
         return parseRsaHashedKeyGenParams(raw, params, context, result);
     case blink::WebCryptoAlgorithmParamsTypeRsaHashedImportParams:
         context.add("RsaHashedImportParams");
         return parseRsaHashedImportParams(raw, params, context, result);
+    case blink::WebCryptoAlgorithmParamsTypeRsaKeyGenParams:
+        context.add("RsaKeyGenParams");
+        return parseRsaKeyGenParams(raw, params, context, result);
     case blink::WebCryptoAlgorithmParamsTypeAesCtrParams:
         context.add("AesCtrParams");
         return parseAesCtrParams(raw, params, context, result);
     case blink::WebCryptoAlgorithmParamsTypeAesGcmParams:
         context.add("AesGcmParams");
         return parseAesGcmParams(raw, params, context, result);
     case blink::WebCryptoAlgorithmParamsTypeRsaOaepParams:
         context.add("RsaOaepParams");
         return parseRsaOaepParams(raw, params, context, result);
         break;
@@ skipping 81 matching lines @@
 {
     return parseAlgorithm(raw, op, algorithm, ErrorContext(), result);
 }
 
 const char* algorithmIdToName(blink::WebCryptoAlgorithmId id)
 {
     return lookupAlgorithmInfo(id)->name;
 }
 
 } // namespace WebCore