Skip to content

Commit 0ac8c1b

Browse files
authored
Make return types of SubtleCrypto methods more specific (#388)
Also, reformat the WebIDL.
1 parent 90feb1e commit 0ac8c1b

File tree

1 file changed

+71
-46
lines changed

1 file changed

+71
-46
lines changed

spec/Overview.html

Lines changed: 71 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,52 +1231,77 @@ <h2>SubtleCrypto interface</h2>
12311231

12321232
[SecureContext,Exposed=(Window,Worker)]
12331233
interface SubtleCrypto {
1234-
Promise&lt;any> encrypt(AlgorithmIdentifier algorithm,
1235-
CryptoKey key,
1236-
BufferSource data);
1237-
Promise&lt;any> decrypt(AlgorithmIdentifier algorithm,
1238-
CryptoKey key,
1239-
BufferSource data);
1240-
Promise&lt;any> sign(AlgorithmIdentifier algorithm,
1241-
CryptoKey key,
1242-
BufferSource data);
1243-
Promise&lt;any> verify(AlgorithmIdentifier algorithm,
1244-
CryptoKey key,
1245-
BufferSource signature,
1246-
BufferSource data);
1247-
Promise&lt;any> digest(AlgorithmIdentifier algorithm,
1248-
BufferSource data);
1249-
1250-
Promise&lt;any> generateKey(AlgorithmIdentifier algorithm,
1251-
boolean extractable,
1252-
sequence&lt;KeyUsage> keyUsages );
1253-
Promise&lt;any> deriveKey(AlgorithmIdentifier algorithm,
1254-
CryptoKey baseKey,
1255-
AlgorithmIdentifier derivedKeyType,
1256-
boolean extractable,
1257-
sequence&lt;KeyUsage> keyUsages );
1258-
Promise&lt;ArrayBuffer> deriveBits(AlgorithmIdentifier algorithm,
1259-
CryptoKey baseKey,
1260-
optional unsigned long? length = null);
1261-
1262-
Promise&lt;CryptoKey> importKey(KeyFormat format,
1263-
(BufferSource or JsonWebKey) keyData,
1264-
AlgorithmIdentifier algorithm,
1265-
boolean extractable,
1266-
sequence&lt;KeyUsage> keyUsages );
1267-
Promise&lt;any> exportKey(KeyFormat format, CryptoKey key);
1268-
1269-
Promise&lt;any> wrapKey(KeyFormat format,
1270-
CryptoKey key,
1271-
CryptoKey wrappingKey,
1272-
AlgorithmIdentifier wrapAlgorithm);
1273-
Promise&lt;CryptoKey> unwrapKey(KeyFormat format,
1274-
BufferSource wrappedKey,
1275-
CryptoKey unwrappingKey,
1276-
AlgorithmIdentifier unwrapAlgorithm,
1277-
AlgorithmIdentifier unwrappedKeyAlgorithm,
1278-
boolean extractable,
1279-
sequence&lt;KeyUsage> keyUsages );
1234+
Promise&lt;ArrayBuffer> encrypt(
1235+
AlgorithmIdentifier algorithm,
1236+
CryptoKey key,
1237+
BufferSource data
1238+
);
1239+
Promise&lt;ArrayBuffer> decrypt(
1240+
AlgorithmIdentifier algorithm,
1241+
CryptoKey key,
1242+
BufferSource data
1243+
);
1244+
Promise&lt;ArrayBuffer> sign(
1245+
AlgorithmIdentifier algorithm,
1246+
CryptoKey key,
1247+
BufferSource data
1248+
);
1249+
Promise&lt;boolean> verify(
1250+
AlgorithmIdentifier algorithm,
1251+
CryptoKey key,
1252+
BufferSource signature,
1253+
BufferSource data
1254+
);
1255+
Promise&lt;ArrayBuffer> digest(
1256+
AlgorithmIdentifier algorithm,
1257+
BufferSource data
1258+
);
1259+
1260+
Promise&lt;(CryptoKey or CryptoKeyPair)> generateKey(
1261+
AlgorithmIdentifier algorithm,
1262+
boolean extractable,
1263+
sequence&lt;KeyUsage> keyUsages
1264+
);
1265+
Promise&lt;CryptoKey> deriveKey(
1266+
AlgorithmIdentifier algorithm,
1267+
CryptoKey baseKey,
1268+
AlgorithmIdentifier derivedKeyType,
1269+
boolean extractable,
1270+
sequence&lt;KeyUsage> keyUsages
1271+
);
1272+
Promise&lt;ArrayBuffer> deriveBits(
1273+
AlgorithmIdentifier algorithm,
1274+
CryptoKey baseKey,
1275+
optional unsigned long? length = null
1276+
);
1277+
1278+
Promise&lt;CryptoKey> importKey(
1279+
KeyFormat format,
1280+
(BufferSource or JsonWebKey) keyData,
1281+
AlgorithmIdentifier algorithm,
1282+
boolean extractable,
1283+
sequence&lt;KeyUsage> keyUsages
1284+
);
1285+
Promise&lt;(ArrayBuffer or JsonWebKey)> exportKey(
1286+
KeyFormat format,
1287+
CryptoKey key
1288+
);
1289+
1290+
Promise&lt;ArrayBuffer> wrapKey(
1291+
KeyFormat format,
1292+
CryptoKey key,
1293+
CryptoKey wrappingKey,
1294+
AlgorithmIdentifier wrapAlgorithm
1295+
);
1296+
Promise&lt;CryptoKey> unwrapKey(
1297+
KeyFormat format,
1298+
BufferSource wrappedKey,
1299+
CryptoKey unwrappingKey,
1300+
AlgorithmIdentifier unwrapAlgorithm,
1301+
AlgorithmIdentifier unwrappedKeyAlgorithm,
1302+
boolean extractable,
1303+
sequence&lt;KeyUsage> keyUsages
1304+
);
12801305
};
12811306
</pre>
12821307
<div class=note>

0 commit comments

Comments
 (0)