Add support for RSA-OAEP when using NSS 3.16.2 or later

content/child/webcrypto/jwk.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "jwk.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 
@@ skipping 93 matching lines @@
 //   | "HS384"      | HMAC using SHA-384 hash algorithm                     |
 //   | "HS512"      | HMAC using SHA-512 hash algorithm                     |
 //   | "RS1"        | RSASSA using SHA-1 hash algorithm
 //   | "RS256"      | RSASSA using SHA-256 hash algorithm                   |
 //   | "RS384"      | RSASSA using SHA-384 hash algorithm                   |
 //   | "RS512"      | RSASSA using SHA-512 hash algorithm                   |
 //   +--------------+-------------------------------------------------------|
 //   | Key Management Algorithm                                             |
 //   +--------------+-------------------------------------------------------+
 //   | "RSA1_5"     | RSAES-PKCS1-V1_5 [RFC3447]                            |
 //   | "RSA-OAEP"   | RSAES using Optimal Asymmetric Encryption Padding     |

[eroman, 2014/05/16 20:29:51]

Update this comment.

 //   |              | (OAEP) [RFC3447], with the default parameters         |
 //   |              | specified by RFC3447 in Section A.2.1                 |
 //   | "A128KW"     | Advanced Encryption Standard (AES) Key Wrap Algorithm |
 //   |              | [RFC3394] using 128 bit keys                          |
 //   | "A192KW"     | AES Key Wrap Algorithm using 192 bit keys             |
 //   | "A256KW"     | AES Key Wrap Algorithm using 256 bit keys             |
 //   | "A128GCM"    | AES in Galois/Counter Mode (GCM) [NIST.800-38D] using |
 //   |              | 128 bit keys                                          |
 //   | "A192GCM"    | AES GCM using 192 bit keys                            |
 //   | "A256GCM"    | AES GCM using 256 bit keys                            |
@@ skipping 152 matching lines @@
                                           blink::WebCryptoAlgorithmIdSha384>);
     alg_to_info_["RS512"] =
         JwkAlgorithmInfo(&BindAlgorithmId<CreateRsaSsaImportAlgorithm,
                                           blink::WebCryptoAlgorithmIdSha512>);
     alg_to_info_["RSA1_5"] = JwkAlgorithmInfo(
         &BindAlgorithmId<CreateAlgorithm,
                          blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5>);
     alg_to_info_["RSA-OAEP"] =
         JwkAlgorithmInfo(&BindAlgorithmId<CreateRsaOaepImportAlgorithm,
                                           blink::WebCryptoAlgorithmIdSha1>);
+    alg_to_info_["RSA-OAEP-256"] =
+        JwkAlgorithmInfo(&BindAlgorithmId<CreateRsaOaepImportAlgorithm,
+                                          blink::WebCryptoAlgorithmIdSha256>);
+    alg_to_info_["RSA-OAEP-384"] =
+        JwkAlgorithmInfo(&BindAlgorithmId<CreateRsaOaepImportAlgorithm,
+                                          blink::WebCryptoAlgorithmIdSha384>);
+    alg_to_info_["RSA-OAEP-512"] =
+        JwkAlgorithmInfo(&BindAlgorithmId<CreateRsaOaepImportAlgorithm,
+                                          blink::WebCryptoAlgorithmIdSha512>);
     alg_to_info_["A128KW"] = JwkAlgorithmInfo(
         &BindAlgorithmId<CreateAlgorithm, blink::WebCryptoAlgorithmIdAesKw>,
         128);
     alg_to_info_["A192KW"] = JwkAlgorithmInfo(
         &BindAlgorithmId<CreateAlgorithm, blink::WebCryptoAlgorithmIdAesKw>,
         192);
     alg_to_info_["A256KW"] = JwkAlgorithmInfo(
         &BindAlgorithmId<CreateAlgorithm, blink::WebCryptoAlgorithmIdAesKw>,
         256);
     alg_to_info_["A128GCM"] = JwkAlgorithmInfo(
@@ skipping 261 matching lines @@
       switch (algorithm.id()) {
         case blink::WebCryptoAlgorithmIdRsaEsPkcs1v1_5:
           jwk_dict->SetString("alg", "RSA1_5");
           break;
         default:
           NOTREACHED();
           return Status::ErrorUnexpected();
       }
       break;
     case blink::WebCryptoKeyAlgorithmParamsTypeRsaHashed:
-      switch (algorithm.rsaHashedParams()->hash().id()) {
-        case blink::WebCryptoAlgorithmIdRsaOaep:
-          jwk_dict->SetString("alg", "RSA-OAEP");

[Ryan Sleevi, 2014/05/16 05:17:22]

LULWUT

+      switch (algorithm.id()) {
+        case blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5: {
+          switch (algorithm.rsaHashedParams()->hash().id()) {
+            case blink::WebCryptoAlgorithmIdSha1:
+              jwk_dict->SetString("alg", "RS1");
+              break;
+            case blink::WebCryptoAlgorithmIdSha256:
+              jwk_dict->SetString("alg", "RS256");
+              break;
+            case blink::WebCryptoAlgorithmIdSha384:
+              jwk_dict->SetString("alg", "RS384");
+              break;
+            case blink::WebCryptoAlgorithmIdSha512:
+              jwk_dict->SetString("alg", "RS512");
+              break;
+            default:
+              NOTREACHED();
+              return Status::ErrorUnexpected();
+          }
           break;
-        case blink::WebCryptoAlgorithmIdSha1:
-          jwk_dict->SetString("alg", "RS1");
+        }
+        case blink::WebCryptoAlgorithmIdRsaOaep: {
+          switch (algorithm.rsaHashedParams()->hash().id()) {
+            case blink::WebCryptoAlgorithmIdSha1:
+              jwk_dict->SetString("alg", "RSA-OAEP");
+              break;
+            case blink::WebCryptoAlgorithmIdSha256:
+              jwk_dict->SetString("alg", "RSA-OAEP-256");
+              break;
+            case blink::WebCryptoAlgorithmIdSha384:
+              jwk_dict->SetString("alg", "RSA-OAEP-384");
+              break;
+            case blink::WebCryptoAlgorithmIdSha512:
+              jwk_dict->SetString("alg", "RSA-OAEP-512");
+              break;
+            default:
+              NOTREACHED();
+              return Status::ErrorUnexpected();
+          }
           break;
-        case blink::WebCryptoAlgorithmIdSha256:
-          jwk_dict->SetString("alg", "RS256");
-          break;
-        case blink::WebCryptoAlgorithmIdSha384:
-          jwk_dict->SetString("alg", "RS384");
-          break;
-        case blink::WebCryptoAlgorithmIdSha512:
-          jwk_dict->SetString("alg", "RS512");
-          break;
+        }
         default:
           NOTREACHED();
           return Status::ErrorUnexpected();
       }
       break;
     default:
       return Status::ErrorUnsupported();
   }
   return Status::Success();
 }
@@ skipping 232 matching lines @@
 
   std::string json;
   base::JSONWriter::Write(&jwk_dict, &json);
   buffer->assign(json.data(), json.data() + json.size());
   return Status::Success();
 }
 
 }  // namespace webcrypto
 
 }  // namespace content