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

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

Issue 9252029: SPDY - default to SPDY/2.1 protocol in unittests (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: small comment fix to ssl.h Created 8 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
« net/spdy/spdy_session.cc ('K') | « net/spdy/spdy_session.cc ('k') | no next file » | 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 * ***** BEGIN LICENSE BLOCK ***** 4 * ***** BEGIN LICENSE BLOCK *****
5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 5 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
6 * 6 *
7 * The contents of this file are subject to the Mozilla Public License Version 7 * The contents of this file are subject to the Mozilla Public License Version
8 * 1.1 (the "License"); you may not use this file except in compliance with 8 * 1.1 (the "License"); you may not use this file except in compliance with
9 * the License. You may obtain a copy of the License at 9 * the License. You may obtain a copy of the License at
10 * http://www.mozilla.org/MPL/ 10 * http://www.mozilla.org/MPL/
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 SSLNextProtoCallback callback, 179 SSLNextProtoCallback callback,
180 void *arg); 180 void *arg);
181 181
182 /* SSL_SetNextProtoNego can be used as an alternative to 182 /* SSL_SetNextProtoNego can be used as an alternative to
183 * SSL_SetNextProtoCallback. It also causes a client to advertise NPN and 183 * SSL_SetNextProtoCallback. It also causes a client to advertise NPN and
184 * installs a default callback function which selects the first supported 184 * installs a default callback function which selects the first supported
185 * protocol in server-preference order. If no matching protocol is found it 185 * protocol in server-preference order. If no matching protocol is found it
186 * selects the first supported protocol. 186 * selects the first supported protocol.
187 * 187 *
188 * The supported protocols are specified in |data| in wire-format (8-bit 188 * The supported protocols are specified in |data| in wire-format (8-bit
189 * length-prefixed). For example: "\010http/1.1\006spdy/2". */ 189 * length-prefixed). For example: "\008http/1.1\006spdy/2". */
wtc 2012/01/26 22:03:25 BUG: please undo this change. \0dd is in octal no
ramant (doing other things) 2012/01/26 22:39:21 Done.
190 SSL_IMPORT SECStatus SSL_SetNextProtoNego(PRFileDesc *fd, 190 SSL_IMPORT SECStatus SSL_SetNextProtoNego(PRFileDesc *fd,
191 const unsigned char *data, 191 const unsigned char *data,
192 unsigned int length); 192 unsigned int length);
193 /* SSL_GetNextProto can be used after a handshake on a socket where 193 /* SSL_GetNextProto can be used after a handshake on a socket where
194 * SSL_SetNextProtoNego was called to retrieve the result of the Next Protocol 194 * SSL_SetNextProtoNego was called to retrieve the result of the Next Protocol
195 * negotiation. 195 * negotiation.
196 * 196 *
197 * state is set to one of the SSL_NEXT_PROTO_* constants. The negotiated 197 * state is set to one of the SSL_NEXT_PROTO_* constants. The negotiated
198 * protocol, if any, is written into buf, which must be at least buf_len bytes 198 * protocol, if any, is written into buf, which must be at least buf_len bytes
199 * long. If the negotiated protocol is longer than this, it is truncated. The 199 * long. If the negotiated protocol is longer than this, it is truncated. The
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 ** SSL_GetClientAuthDataHook callback, and will return NULL if called at any 805 ** SSL_GetClientAuthDataHook callback, and will return NULL if called at any
806 ** other time. The returned value is valid only until the callback returns, and 806 ** other time. The returned value is valid only until the callback returns, and
807 ** should not be freed. 807 ** should not be freed.
808 */ 808 */
809 SSL_IMPORT const SECItem * 809 SSL_IMPORT const SECItem *
810 SSL_GetRequestedClientCertificateTypes(PRFileDesc *fd); 810 SSL_GetRequestedClientCertificateTypes(PRFileDesc *fd);
811 811
812 SEC_END_PROTOS 812 SEC_END_PROTOS
813 813
814 #endif /* __ssl_h_ */ 814 #endif /* __ssl_h_ */
OLDNEW
« net/spdy/spdy_session.cc ('K') | « net/spdy/spdy_session.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698