| Index: components/gcm_driver/crypto/encryption_header_parsers.h
|
| diff --git a/components/gcm_driver/crypto/encryption_header_parsers.h b/components/gcm_driver/crypto/encryption_header_parsers.h
|
| index 4bf77132c0c0752a801f8cdf678888c7ad718350..79fe7d20ca2423fe44242291a4a67f3d120b8406 100644
|
| --- a/components/gcm_driver/crypto/encryption_header_parsers.h
|
| +++ b/components/gcm_driver/crypto/encryption_header_parsers.h
|
| @@ -22,7 +22,7 @@ struct EncryptionHeaderValues {
|
| // Parses |input| following the syntax of the Encryption HTTP header. The parsed
|
| // values will be stored in the |*values| argument.
|
| //
|
| -// https://tools.ietf.org/html/draft-thomson-http-encryption-01#section-3
|
| +// https://tools.ietf.org/html/draft-thomson-http-encryption-02#section-3
|
| //
|
| // This header follows the #list syntax from the extended ABNF syntax
|
| // defined in section 1.2 of RFC 7230:
|
| @@ -35,18 +35,18 @@ struct EncryptionHeaderValues {
|
| bool ParseEncryptionHeader(const std::string& input,
|
| std::vector<EncryptionHeaderValues>* values);
|
|
|
| -// Structure representing the parsed values from the Encryption-Key HTTP header.
|
| -// |key| and |dh| are stored after having been base64url decoded.
|
| -struct EncryptionKeyHeaderValues {
|
| +// Structure representing the parsed values from the Crypto-Key HTTP header.
|
| +// |aesgcm128| and |dh| are stored after having been base64url decoded.
|
| +struct CryptoKeyHeaderValues {
|
| std::string keyid;
|
| - std::string key;
|
| + std::string aesgcm128;
|
| std::string dh;
|
| };
|
|
|
| -// Parses |input| following the syntax of the Encryption-Key HTTP header. The
|
| -// parsed values will be stored in the |*values| argument.
|
| +// Parses |input| following the syntax of the Crypto-Key HTTP header. The parsed
|
| +// values will be stored in the |*values| argument.
|
| //
|
| -// https://tools.ietf.org/html/draft-thomson-http-encryption-01#section-4
|
| +// https://tools.ietf.org/html/draft-thomson-http-encryption-02#section-4
|
| //
|
| // This header follows the #list syntax from the extended ABNF syntax
|
| // defined in section 1.2 of RFC 7230:
|
| @@ -56,8 +56,8 @@ struct EncryptionKeyHeaderValues {
|
| // Returns whether the |input| could be successfully parsed, and the resulting
|
| // values are now available in the |*values| argument. Does not modify |*values|
|
| // unless parsing was successful.
|
| -bool ParseEncryptionKeyHeader(const std::string& input,
|
| - std::vector<EncryptionKeyHeaderValues>* values);
|
| +bool ParseCryptoKeyHeader(const std::string& input,
|
| + std::vector<CryptoKeyHeaderValues>* values);
|
|
|
| } // namespace gcm
|
|
|
|
|