diff options
author | EKR <ekr@rtfm.com> | 2016-09-21 12:05:31 -0700 |
---|---|---|
committer | EKR <ekr@rtfm.com> | 2016-09-21 12:05:31 -0700 |
commit | ab176c950db8acd1cc8e2152a73670f120cb259a (patch) | |
tree | e63fab1935990f22beb373824420460a95398926 | |
parent | cb9959330d8e390e1d29af6ef9cd4f2481794b7a (diff) | |
download | nss-hg-ab176c950db8acd1cc8e2152a73670f120cb259a.tar.gz |
Bug 1304476 - Update RSA-PSS code points. r=mt
Test Plan: None
Differential Revision: https://nss-dev.phacility.com/D14
-rw-r--r-- | external_tests/ssl_gtest/tls_parser.h | 2 | ||||
-rw-r--r-- | lib/ssl/ssl3prot.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/external_tests/ssl_gtest/tls_parser.h b/external_tests/ssl_gtest/tls_parser.h index 743377d42..70e2ab5b9 100644 --- a/external_tests/ssl_gtest/tls_parser.h +++ b/external_tests/ssl_gtest/tls_parser.h @@ -48,7 +48,7 @@ const uint8_t kTlsAlertUnsupportedExtension = 110; const uint8_t kTlsAlertNoApplicationProtocol = 120; const uint16_t kTlsSigSchemeRsaPkcs1Sha1 = 0x0201; -const uint16_t kTlsSigSchemeRsaPssSha256 = 0x0700; +const uint16_t kTlsSigSchemeRsaPssSha256 = 0x0804; const uint8_t kTlsFakeChangeCipherSpec[] = { kTlsChangeCipherSpecType, // Type diff --git a/lib/ssl/ssl3prot.h b/lib/ssl/ssl3prot.h index b4396daef..2c503c5fd 100644 --- a/lib/ssl/ssl3prot.h +++ b/lib/ssl/ssl3prot.h @@ -343,11 +343,11 @@ typedef enum { ssl_sig_ecdsa_secp256r1_sha256 = 0x0403, ssl_sig_ecdsa_secp384r1_sha384 = 0x0503, ssl_sig_ecdsa_secp521r1_sha512 = 0x0603, - ssl_sig_rsa_pss_sha256 = 0x0700, - ssl_sig_rsa_pss_sha384 = 0x0701, - ssl_sig_rsa_pss_sha512 = 0x0702, - ssl_sig_ed25519 = 0x0703, - ssl_sig_ed448 = 0x0704, + ssl_sig_rsa_pss_sha256 = 0x0804, + ssl_sig_rsa_pss_sha384 = 0x0805, + ssl_sig_rsa_pss_sha512 = 0x0806, + ssl_sig_ed25519 = 0x0807, + ssl_sig_ed448 = 0x0808, ssl_sig_dsa_sha1 = 0x0202, ssl_sig_dsa_sha256 = 0x0402, |