summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEKR <ekr@rtfm.com>2016-12-13 16:09:11 +0100
committerEKR <ekr@rtfm.com>2016-12-13 16:09:11 +0100
commit5493913df772fdfb70343b175da5dbad3aca6713 (patch)
treedd54623fb352532cfbcc64e3c64864e80123d696
parent02b04714f0e034acc025f339d6ece96a9db4950e (diff)
downloadnss-hg-5493913df772fdfb70343b175da5dbad3aca6713.tar.gz
Bug 1320509 - Restore defines for PSK cipher suites. r=mt
-rw-r--r--lib/ssl/sslproto.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/ssl/sslproto.h b/lib/ssl/sslproto.h
index 5dd415c88..70daea0a1 100644
--- a/lib/ssl/sslproto.h
+++ b/lib/ssl/sslproto.h
@@ -209,6 +209,16 @@
#define TLS_AES_256_GCM_SHA384 0x1302
#define TLS_CHACHA20_POLY1305_SHA256 0x1303
+/* PSK cipher suites. NSS doesn't actually support these, but we
+ * exposed them when TLS 1.3 used them so we need to keep them
+ * in the API. */
+#define TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256 0xCCAC
+#define TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256 0xCCAD
+#define TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256 0xD001
+#define TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384 0xD002
+#define TLS_DHE_PSK_WITH_AES_128_GCM_SHA256 0x00AA /* RFC 5487 */
+#define TLS_DHE_PSK_WITH_AES_256_GCM_SHA384 0x00AB /* RFC 5487 */
+
/* DTLS-SRTP cipher suites from RFC 5764 */
/* If you modify this, also modify MAX_DTLS_SRTP_CIPHER_SUITES in sslimpl.h */
#define SRTP_AES128_CM_HMAC_SHA1_80 0x0001