| Index: net/third_party/nss/ssl/ssl.h
|
| diff --git a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h
|
| index 51b557a7354ace846a5083a0b9601283c55e6e1a..57771cd5b9803fa6412d1b20dce6feb496a8abd0 100644
|
| --- a/net/third_party/nss/ssl/ssl.h
|
| +++ b/net/third_party/nss/ssl/ssl.h
|
| @@ -163,29 +163,37 @@ SSL_IMPORT PRFileDesc *DTLS_ImportFD(PRFileDesc *model, PRFileDesc *fd);
|
| #define SSL_ENABLE_OCSP_STAPLING 24 /* Request OCSP stapling (client) */
|
|
|
| /* SSL_ENABLE_NPN controls whether the NPN extension is enabled for the initial
|
| - * handshake when protocol negotiation is used. SSL_SetNextProtoCallback
|
| - * or SSL_SetNextProtoNego must be used to control the protocol negotiation;
|
| - * otherwise, the NPN extension will not be negotiated. SSL_ENABLE_NPN is
|
| - * currently enabled by default but this may change in future versions.
|
| + * handshake when application layer protocol negotiation is used.
|
| + * SSL_SetNextProtoCallback or SSL_SetNextProtoNego must be used to control the
|
| + * application layer protocol negotiation; otherwise, the NPN extension will
|
| + * not be negotiated. SSL_ENABLE_NPN is currently enabled by default but this
|
| + * may change in future versions.
|
| */
|
| #define SSL_ENABLE_NPN 25
|
|
|
| /* SSL_ENABLE_ALPN controls whether the ALPN extension is enabled for the
|
| - * initial handshake when protocol negotiation is used. SSL_SetNextProtoNego
|
| - * (not SSL_SetNextProtoCallback) must be used to control the protocol
|
| - * negotiation; otherwise, the ALPN extension will not be negotiated. ALPN is
|
| - * not negotiated for renegotiation handshakes, even though the ALPN
|
| - * specification defines a way to use ALPN during renegotiations.
|
| - * SSL_ENABLE_ALPN is currently disabled by default, but this may change in
|
| - * future versions.
|
| + * initial handshake when application layer protocol negotiation is used.
|
| + * SSL_SetNextProtoNego (not SSL_SetNextProtoCallback) must be used to control
|
| + * the application layer protocol negotiation; otherwise, the ALPN extension
|
| + * will not be negotiated. ALPN is not negotiated for renegotiation handshakes,
|
| + * even though the ALPN specification defines a way to use ALPN during
|
| + * renegotiations. SSL_ENABLE_ALPN is currently disabled by default, but this
|
| + * may change in future versions.
|
| */
|
| #define SSL_ENABLE_ALPN 26
|
|
|
| -/* Request Signed Certificate Timestamps via TLS extension (client) */
|
| -#define SSL_ENABLE_SIGNED_CERT_TIMESTAMPS 27
|
| +/* SSL_REUSE_SERVER_ECDHE_KEY controls whether the ECDHE server key is
|
| + * reused for multiple handshakes or generated each time.
|
| + * SSL_REUSE_SERVER_ECDHE_KEY is currently enabled by default.
|
| + */
|
| +#define SSL_REUSE_SERVER_ECDHE_KEY 27
|
| +
|
| #define SSL_ENABLE_FALLBACK_SCSV 28 /* Send fallback SCSV in
|
| * handshakes. */
|
|
|
| +/* Request Signed Certificate Timestamps via TLS extension (client) */
|
| +#define SSL_ENABLE_SIGNED_CERT_TIMESTAMPS 29
|
| +
|
| #ifdef SSL_DEPRECATED_FUNCTION
|
| /* Old deprecated function names */
|
| SSL_IMPORT SECStatus SSL_Enable(PRFileDesc *fd, int option, PRBool on);
|
|
|