| Index: net/third_party/nss/ssl/ssl3prot.h
|
| ===================================================================
|
| --- net/third_party/nss/ssl/ssl3prot.h (revision 199250)
|
| +++ net/third_party/nss/ssl/ssl3prot.h (working copy)
|
| @@ -212,11 +212,51 @@
|
| } u;
|
| } SSL3ServerParams;
|
|
|
| +/* This enum reflects HashAlgorithm enum from
|
| + * https://tools.ietf.org/html/rfc5246#section-7.4.1.4.1
|
| + *
|
| + * When updating, be sure to also update ssl3_TLSHashFunctionToOID */
|
| +enum {
|
| + tls_hash_md5 = 1,
|
| + tls_hash_sha1 = 2,
|
| + tls_hash_sha224 = 3,
|
| + tls_hash_sha256 = 4,
|
| + tls_hash_sha384 = 5,
|
| + tls_hash_sha512 = 6
|
| +};
|
| +
|
| +/* This enum reflects SignatureAlgorithm enum from
|
| + * https://tools.ietf.org/html/rfc5246#section-7.4.1.4.1 */
|
| +typedef enum {
|
| + tls_sig_rsa = 1,
|
| + tls_sig_dsa = 2,
|
| + tls_sig_ecdsa = 3
|
| +} TLS12SignatureAlgorithm;
|
| +
|
| typedef struct {
|
| + SECOidTag hashAlg;
|
| + TLS12SignatureAlgorithm sigAlg;
|
| +} SSL3SignatureAndHashAlgorithm;
|
| +
|
| +/* SSL3HashesIndividually contains a combination MD5/SHA1 hash, as used in TLS
|
| + * prior to 1.2. */
|
| +struct SSL3HashesIndividually {
|
| uint8 md5[16];
|
| uint8 sha[20];
|
| +};
|
| +
|
| +/* SSL3Hashes contains an SSL hash value. The digest is contained in |u.raw|
|
| + * which, if |hashAlg==SEC_OID_UNKNOWN| is also a SSL3HashesIndividually
|
| + * struct. */
|
| +typedef struct {
|
| + unsigned int len;
|
| + SECOidTag hashAlg;
|
| + union {
|
| + PRUint8 raw[32];
|
| + struct SSL3HashesIndividually s;
|
| + } u;
|
| } SSL3Hashes;
|
| -
|
| +
|
| typedef struct {
|
| union {
|
| SSL3Opaque anonymous;
|
|
|