Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(735)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/third_party/nss/ssl/sslt.h

Issue 1053903002: Update libssl to NSS 3.18 RTM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/third_party/nss/ssl/sslenum.c ('K') | « net/third_party/nss/ssl/sslsock.c ('k') | net/third_party/nss/ssl/sslver.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/ssl/sslt.h
diff --git a/net/third_party/nss/ssl/sslt.h b/net/third_party/nss/ssl/sslt.h
index 566074d7c8c86cb5765d1037bbaef447bbb87329..c36b8c73fd93333ac4160796a09deb23aef72c95 100644
--- a/net/third_party/nss/ssl/sslt.h
+++ b/net/third_party/nss/ssl/sslt.h
@@ -195,7 +195,7 @@ typedef enum {
typedef enum {
ssl_server_name_xtn = 0,
ssl_cert_status_xtn = 5,
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
ssl_elliptic_curves_xtn = 10,
ssl_ec_point_formats_xtn = 11,
#endif
@@ -207,9 +207,10 @@ typedef enum {
ssl_session_ticket_xtn = 35,
ssl_next_proto_nego_xtn = 13172,
ssl_channel_id_xtn = 30032,
- ssl_renegotiation_info_xtn = 0xff01 /* experimental number */
+ ssl_renegotiation_info_xtn = 0xff01,
+ ssl_tls13_draft_version_xtn = 0xff02 /* experimental number */
} SSLExtensionType;
-#define SSL_MAX_EXTENSIONS 12 /* doesn't include ssl_padding_xtn. */
+#define SSL_MAX_EXTENSIONS 13 /* doesn't include ssl_padding_xtn. */
#endif /* __sslt_h_ */
« net/third_party/nss/ssl/sslenum.c ('K') | « net/third_party/nss/ssl/sslsock.c ('k') | net/third_party/nss/ssl/sslver.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698