| Index: net/third_party/nss/ssl/ssl3prot.h
|
| diff --git a/net/third_party/nss/ssl/ssl3prot.h b/net/third_party/nss/ssl/ssl3prot.h
|
| index 78fbcaa02db214298d9e37ceb54b8788d270948b..848bdee7a205e3c87d31ad6126a6af8b95284e12 100644
|
| --- a/net/third_party/nss/ssl/ssl3prot.h
|
| +++ b/net/third_party/nss/ssl/ssl3prot.h
|
| @@ -218,32 +218,6 @@ typedef struct {
|
| } 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_TLSHashAlgorithmToOID. */
|
| -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
|
| -} TLSSignatureAlgorithm;
|
| -
|
| -typedef struct {
|
| - SECOidTag hashAlg;
|
| - TLSSignatureAlgorithm sigAlg;
|
| -} SSL3SignatureAndHashAlgorithm;
|
| -
|
| /* SSL3HashesIndividually contains a combination MD5/SHA1 hash, as used in TLS
|
| * prior to 1.2. */
|
| typedef struct {
|
| @@ -252,11 +226,11 @@ typedef struct {
|
| } SSL3HashesIndividually;
|
|
|
| /* SSL3Hashes contains an SSL hash value. The digest is contained in |u.raw|
|
| - * which, if |hashAlg==SEC_OID_UNKNOWN| is also a SSL3HashesIndividually
|
| + * which, if |hashAlg==ssl_hash_none| is also a SSL3HashesIndividually
|
| * struct. */
|
| typedef struct {
|
| unsigned int len;
|
| - SECOidTag hashAlg;
|
| + SSLHashType hashAlg;
|
| union {
|
| PRUint8 raw[64];
|
| SSL3HashesIndividually s;
|
|
|