diff --git a/spec/Overview.html b/spec/Overview.html index dce7373..06ada9a 100644 --- a/spec/Overview.html +++ b/spec/Overview.html @@ -750,14 +750,6 @@

Terminology

-

- When this specification states to supply the - contents of an ArrayBuffer named |data| to an underlying cryptographic - implementation, the User Agent shall supply a contiguous sequence of bytes that is equal - to the result of - [= get a copy of the buffer source | getting a copy of the bytes =] - held |data|. -

When this specification says to calculate the usage intersection of two sequences, |a| and |b| the result shall be a @@ -1402,7 +1394,7 @@

The encrypt method

Let |data| be the result of [= get a copy of the buffer source | - getting a copy of the bytes =] held by the `data` parameter passed to the + getting a copy of the bytes held by =] the `data` parameter passed to the {{SubtleCrypto/encrypt()}} method.

@@ -1500,7 +1492,7 @@

The decrypt method

  • Let |algorithm| and |key| be the - `algorithm` and `key`parameters + `algorithm` and `key` parameters passed to the {{SubtleCrypto/decrypt()}} method, respectively.

    @@ -3943,7 +3935,7 @@

    Operations

  • Perform the signature generation operation defined in Section 8.2 of [[RFC3447]] with the key represented by the {{CryptoKey/[[handle]]}} internal slot of |key| - as the signer's private key and the contents of |message| as + as the signer's private key and |message| as |M| and using the hash function specified in the {{RsaHashedKeyAlgorithm/hash}} attribute of the {{CryptoKey/[[algorithm]]}} internal slot of |key| as the Hash option for the EMSA-PKCS1-v1_5 encoding method.

    @@ -3983,7 +3975,7 @@

    Operations

    Perform the signature verification operation defined in Section 8.2 of [[RFC3447]] with the key represented by the {{CryptoKey/[[handle]]}} internal slot of - |key| as the signer's RSA public key and the contents of |message| as + |key| as the signer's RSA public key and |message| as |M| and the contents of |signature| as |S| and using the hash function specified in the {{RsaHashedKeyAlgorithm/hash}} attribute of the @@ -4972,7 +4964,7 @@

    Operations

  • Perform the signature generation operation defined in Section 8.1 of [[RFC3447]] with the key represented by the {{CryptoKey/[[handle]]}} internal slot of |key| - as the signer's private key, |K|, and the contents of |message| as + as the signer's private key, |K|, and |message| as the message to be signed, |M|, and using the hash function specified by the {{RsaHashedKeyAlgorithm/hash}} attribute of the {{CryptoKey/[[algorithm]]}} internal slot of @@ -5016,7 +5008,7 @@

    Operations

    Perform the signature verification operation defined in Section 8.1 of [[RFC3447]] with the key represented by the {{CryptoKey/[[handle]]}} internal slot of - |key| as the signer's RSA public key and the contents of |message| as + |key| as the signer's RSA public key and |message| as |M| and the contents of |signature| as |S| and using the hash function specified by the {{RsaHashedKeyAlgorithm/hash}} attribute of the @@ -5989,7 +5981,7 @@

    Operations

  • - Let |label| be the contents of the {{RsaOaepParams/label}} member of + Let |label| be the {{RsaOaepParams/label}} member of |normalizedAlgorithm| or the empty octet string if the {{RsaOaepParams/label}} member of |normalizedAlgorithm| is not present. @@ -5998,7 +5990,7 @@

    Operations

  • Perform the encryption operation defined in Section 7.1 of [[RFC3447]] with the key represented by |key| - as the recipient's RSA public key, the contents of |plaintext| + as the recipient's RSA public key, |plaintext| as the message to be encrypted, |M| and |label| as the label, |L|, and with the hash function specified by the {{RsaHashedKeyAlgorithm/hash}} @@ -6040,7 +6032,7 @@

    Operations

  • - Let |label| be the contents of the {{RsaOaepParams/label}} member of + Let |label| be the {{RsaOaepParams/label}} member of |normalizedAlgorithm| or the empty octet string if the {{RsaOaepParams/label}} member of |normalizedAlgorithm| is not present. @@ -6049,7 +6041,7 @@

    Operations

  • Perform the decryption operation defined in Section 7.1 of [[RFC3447]] with the key represented by |key| - as the recipient's RSA private key, the contents of |ciphertext| + as the recipient's RSA private key, |ciphertext| as the ciphertext to be decrypted, C, and |label| as the label, |L|, and with the hash function specified by the {{RsaHashedKeyAlgorithm/hash}} @@ -12079,7 +12071,7 @@

    Operations

  • Let |ciphertext| be the result of performing the CTR Encryption - operation described in Section 6.5 of [[NIST-SP800-38A]] using AES as the block cipher, the contents of the {{AesCtrParams/counter}} member of + operation described in Section 6.5 of [[NIST-SP800-38A]] using AES as the block cipher, the {{AesCtrParams/counter}} member of |normalizedAlgorithm| as the initial value of the counter block, the {{AesCtrParams/length}} member of |normalizedAlgorithm| as the input parameter |m| to the @@ -12119,7 +12111,7 @@

    Operations

  • Let |plaintext| be the result of performing the CTR Decryption - operation described in Section 6.5 of [[NIST-SP800-38A]] using AES as the block cipher, the contents of the {{AesCtrParams/counter}} member of + operation described in Section 6.5 of [[NIST-SP800-38A]] using AES as the block cipher, the {{AesCtrParams/counter}} member of |normalizedAlgorithm| as the initial value of the counter block, the {{AesCtrParams/length}} member of |normalizedAlgorithm| as the input parameter |m| to the @@ -12610,7 +12602,7 @@

    Operations

  • Let |paddedPlaintext| be the result of adding padding octets to - the contents of |plaintext| + |plaintext| according to the procedure defined in Section 10.3 of [[RFC2315]], step 2, with a value of |k| of 16. @@ -12619,7 +12611,7 @@

    Operations

  • Let |ciphertext| be the result of performing the CBC Encryption - operation described in Section 6.2 of [[NIST-SP800-38A]] using AES as the block cipher, the contents of the {{AesCbcParams/iv}} member of |normalizedAlgorithm| as + operation described in Section 6.2 of [[NIST-SP800-38A]] using AES as the block cipher, the {{AesCbcParams/iv}} member of |normalizedAlgorithm| as the |IV| input parameter and |paddedPlaintext| as the input plaintext.

    @@ -12646,7 +12638,7 @@

    Operations

  • Let |paddedPlaintext| be the result of performing the CBC Decryption - operation described in Section 6.2 of [[NIST-SP800-38A]] using AES as the block cipher, the contents of the {{AesCbcParams/iv}} member of |normalizedAlgorithm| as + operation described in Section 6.2 of [[NIST-SP800-38A]] using AES as the block cipher, the {{AesCbcParams/iv}} member of |normalizedAlgorithm| as the |IV| input parameter and the contents of |ciphertext| as the input ciphertext.

    @@ -13179,7 +13171,7 @@

    Operations

  • - Let |additionalData| be the contents of the {{AesGcmParams/additionalData}} member of + Let |additionalData| be the {{AesGcmParams/additionalData}} member of |normalizedAlgorithm| if present or the empty octet string otherwise.

    @@ -13188,7 +13180,7 @@

    Operations

    Let |C| and |T| be the outputs that result from performing the Authenticated Encryption Function described in Section 7.1 of - [[NIST-SP800-38D]] using AES as the block cipher, the contents of the {{AesGcmParams/iv}} member of |normalizedAlgorithm| as + [[NIST-SP800-38D]] using AES as the block cipher, the {{AesGcmParams/iv}} member of |normalizedAlgorithm| as the |IV| input parameter, the contents of |additionalData| as the |A| input parameter, |tagLength| as the |t| pre-requisite and the contents of @@ -13268,7 +13260,7 @@

    Operations

  • - Let |additionalData| be the contents of the {{AesGcmParams/additionalData}} member of + Let |additionalData| be the {{AesGcmParams/additionalData}} member of |normalizedAlgorithm| if present or the empty octet string otherwise.

    @@ -13277,11 +13269,11 @@

    Operations

    Perform the Authenticated Decryption Function described in Section 7.2 of [[NIST-SP800-38D]] using AES as the block cipher, - the contents of the {{AesGcmParams/iv}} member of |normalizedAlgorithm| as + the {{AesGcmParams/iv}} member of |normalizedAlgorithm| as the |IV| input parameter, the contents of |additionalData| as the |A| input parameter, |tagLength| as the |t| pre-requisite, the contents of - |actualCiphertext| as the input ciphertext, |C| and the contents of |tag| as + |actualCiphertext| as the input ciphertext, |C| and |tag| as the authentication tag, |T|.

    @@ -15096,13 +15088,13 @@

    Operations

  • - the contents of the {{HkdfParams/salt}} member of + the {{HkdfParams/salt}} member of |normalizedAlgorithm| as |salt|,

  • - the contents of the {{HkdfParams/info}} member of + the {{HkdfParams/info}} member of |normalizedAlgorithm| as |info|,