fix importKey signatures

rapropos · rapropos · commit 72c7df4bebbd · 2016-03-23T14:07:54.000-07:00
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -11483,9 +11483,9 @@ interface SubtleCrypto {
     generateKey(algorithm: string, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKeyPair | CryptoKey>;
     generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams | DhKeyGenParams, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKeyPair>;
     generateKey(algorithm: AesKeyGenParams | HmacKeyGenParams | Pbkdf2Params, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    importKey(format: "jwk", keyData: JsonWebKey, algorithm: AlgorithmIdentifier, extractable:boolean, keyUsages: string[]): PromiseLike<ArrayBuffer>;
-    importKey(format: "raw" | "pkcs8" | "spki", keyData: BufferSource, algorithm: AlgorithmIdentifier, extractable:boolean, keyUsages: string[]): PromiseLike<ArrayBuffer>;
-    importKey(format: string, keyData: JsonWebKey | BufferSource, algorithm: AlgorithmIdentifier, extractable:boolean, keyUsages: string[]): PromiseLike<ArrayBuffer>;
+    importKey(format: "jwk", keyData: JsonWebKey, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams, extractable:boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
+    importKey(format: "raw" | "pkcs8" | "spki", keyData: BufferSource, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams, extractable:boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
+    importKey(format: string, keyData: JsonWebKey | BufferSource, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams, extractable:boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
     sign(algorithm: string | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, data: BufferSource): PromiseLike<ArrayBuffer>;
     unwrapKey(format: string, wrappedKey: BufferSource, unwrappingKey: CryptoKey, unwrapAlgorithm: AlgorithmIdentifier, unwrappedKeyAlgorithm: AlgorithmIdentifier, extractable: boolean, keyUsages: string[]): PromiseLike<ArrayBuffer>;
     verify(algorithm: string | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, signature: BufferSource, data: BufferSource): PromiseLike<boolean>;
diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json
@@ -536,9 +536,9 @@
          "interface": "SubtleCrypto",
          "name": "importKey",
          "signatures": [
-             "importKey(format: \"jwk\", keyData: JsonWebKey, algorithm: AlgorithmIdentifier, extractable:boolean, keyUsages: string[]): PromiseLike<ArrayBuffer>",
-             "importKey(format: \"raw\" | \"pkcs8\" | \"spki\", keyData: BufferSource, algorithm: AlgorithmIdentifier, extractable:boolean, keyUsages: string[]): PromiseLike<ArrayBuffer>",
-             "importKey(format: string, keyData: JsonWebKey | BufferSource, algorithm: AlgorithmIdentifier, extractable:boolean, keyUsages: string[]): PromiseLike<ArrayBuffer>"
+             "importKey(format: \"jwk\", keyData: JsonWebKey, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams, extractable:boolean, keyUsages: string[]): PromiseLike<CryptoKey>",
+             "importKey(format: \"raw\" | \"pkcs8\" | \"spki\", keyData: BufferSource, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams, extractable:boolean, keyUsages: string[]): PromiseLike<CryptoKey>",
+             "importKey(format: string, keyData: JsonWebKey | BufferSource, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams, extractable:boolean, keyUsages: string[]): PromiseLike<CryptoKey>"
          ]
      },
      {

Original file line number	Diff line number	Diff line change
`@@ -536,9 +536,9 @@`
`536`	`536`	`"interface": "SubtleCrypto",`
`537`	`537`	`"name": "importKey",`
`538`	`538`	`"signatures": [`
`539`		`- "importKey(format: \"jwk\", keyData: JsonWebKey, algorithm: AlgorithmIdentifier, extractable:boolean, keyUsages: string[]): PromiseLike<ArrayBuffer>",`
`540`		`- "importKey(format: \"raw\" \| \"pkcs8\" \| \"spki\", keyData: BufferSource, algorithm: AlgorithmIdentifier, extractable:boolean, keyUsages: string[]): PromiseLike<ArrayBuffer>",`
`541`		`- "importKey(format: string, keyData: JsonWebKey \| BufferSource, algorithm: AlgorithmIdentifier, extractable:boolean, keyUsages: string[]): PromiseLike<ArrayBuffer>"`
	`539`	`+ "importKey(format: \"jwk\", keyData: JsonWebKey, algorithm: string \| RsaHashedImportParams \| EcKeyImportParams \| HmacImportParams \| DhImportKeyParams, extractable:boolean, keyUsages: string[]): PromiseLike<CryptoKey>",`
	`540`	`+ "importKey(format: \"raw\" \| \"pkcs8\" \| \"spki\", keyData: BufferSource, algorithm: string \| RsaHashedImportParams \| EcKeyImportParams \| HmacImportParams \| DhImportKeyParams, extractable:boolean, keyUsages: string[]): PromiseLike<CryptoKey>",`
	`541`	`+ "importKey(format: string, keyData: JsonWebKey \| BufferSource, algorithm: string \| RsaHashedImportParams \| EcKeyImportParams \| HmacImportParams \| DhImportKeyParams, extractable:boolean, keyUsages: string[]): PromiseLike<CryptoKey>"`
`542`	`542`	`]`
`543`	`543`	`},`
`544`	`544`	`{`