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

Side by Side Diff: net/third_party/nss/ssl/ssl.h

Issue 166273026: Implement the encrypt-then-MAC TLS extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Remove nss_ssl_util.cc from the CL Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | net/third_party/nss/ssl/ssl3con.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file contains prototypes for the public SSL functions. 2 * This file contains prototypes for the public SSL functions.
3 * 3 *
4 * This Source Code Form is subject to the terms of the Mozilla Public 4 * This Source Code Form is subject to the terms of the Mozilla Public
5 * License, v. 2.0. If a copy of the MPL was not distributed with this 5 * License, v. 2.0. If a copy of the MPL was not distributed with this
6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 6 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
7 7
8 #ifndef __ssl_h_ 8 #ifndef __ssl_h_
9 #define __ssl_h_ 9 #define __ssl_h_
10 10
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 * specification defines a way to use ALPN during renegotiations. 178 * specification defines a way to use ALPN during renegotiations.
179 * SSL_ENABLE_ALPN is currently disabled by default, but this may change in 179 * SSL_ENABLE_ALPN is currently disabled by default, but this may change in
180 * future versions. 180 * future versions.
181 */ 181 */
182 #define SSL_ENABLE_ALPN 26 182 #define SSL_ENABLE_ALPN 26
183 183
184 /* Request Signed Certificate Timestamps via TLS extension (client) */ 184 /* Request Signed Certificate Timestamps via TLS extension (client) */
185 #define SSL_ENABLE_SIGNED_CERT_TIMESTAMPS 27 185 #define SSL_ENABLE_SIGNED_CERT_TIMESTAMPS 27
186 #define SSL_ENABLE_FALLBACK_SCSV 28 /* Send fallback SCSV in 186 #define SSL_ENABLE_FALLBACK_SCSV 28 /* Send fallback SCSV in
187 * handshakes. */ 187 * handshakes. */
188 #define SSL_ENABLE_ENCRYPT_THEN_MAC 29 /* encrypt then MAC */
188 189
189 #ifdef SSL_DEPRECATED_FUNCTION 190 #ifdef SSL_DEPRECATED_FUNCTION
190 /* Old deprecated function names */ 191 /* Old deprecated function names */
191 SSL_IMPORT SECStatus SSL_Enable(PRFileDesc *fd, int option, PRBool on); 192 SSL_IMPORT SECStatus SSL_Enable(PRFileDesc *fd, int option, PRBool on);
192 SSL_IMPORT SECStatus SSL_EnableDefault(int option, PRBool on); 193 SSL_IMPORT SECStatus SSL_EnableDefault(int option, PRBool on);
193 #endif 194 #endif
194 195
195 /* New function names */ 196 /* New function names */
196 SSL_IMPORT SECStatus SSL_OptionSet(PRFileDesc *fd, PRInt32 option, PRBool on); 197 SSL_IMPORT SECStatus SSL_OptionSet(PRFileDesc *fd, PRInt32 option, PRBool on);
197 SSL_IMPORT SECStatus SSL_OptionGet(PRFileDesc *fd, PRInt32 option, PRBool *on); 198 SSL_IMPORT SECStatus SSL_OptionGet(PRFileDesc *fd, PRInt32 option, PRBool *on);
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 * should continue using the connection. If the application passes a non-zero 1189 * should continue using the connection. If the application passes a non-zero
1189 * value for second argument (error), or if SSL_AuthCertificateComplete returns 1190 * value for second argument (error), or if SSL_AuthCertificateComplete returns
1190 * anything other than SECSuccess, then the application should close the 1191 * anything other than SECSuccess, then the application should close the
1191 * connection. 1192 * connection.
1192 */ 1193 */
1193 SSL_IMPORT SECStatus SSL_AuthCertificateComplete(PRFileDesc *fd, 1194 SSL_IMPORT SECStatus SSL_AuthCertificateComplete(PRFileDesc *fd,
1194 PRErrorCode error); 1195 PRErrorCode error);
1195 SEC_END_PROTOS 1196 SEC_END_PROTOS
1196 1197
1197 #endif /* __ssl_h_ */ 1198 #endif /* __ssl_h_ */
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | net/third_party/nss/ssl/ssl3con.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698