diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-11 15:20:12 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-11 15:20:12 +0000 |
| commit | a121c90cf3279e6001d0f91472b74b02699e2976 (patch) | |
| tree | 691ab98c9033861131d1f2efe3343b93bc53f611 /net/third_party/nss/ssl/sslt.h | |
| parent | c5b97aac8117ffac51a2cf3cc7a1070ab5ff6e93 (diff) | |
| download | chromium_src-a121c90cf3279e6001d0f91472b74b02699e2976.zip chromium_src-a121c90cf3279e6001d0f91472b74b02699e2976.tar.gz chromium_src-a121c90cf3279e6001d0f91472b74b02699e2976.tar.bz2 | |
Update our copy of libssl from NSS CVS.
http://codereview.chromium.org/596013
BUG=none
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss/ssl/sslt.h')
| -rw-r--r-- | net/third_party/nss/ssl/sslt.h | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/net/third_party/nss/ssl/sslt.h b/net/third_party/nss/ssl/sslt.h index 80f1dc2..f6e0b62 100644 --- a/net/third_party/nss/ssl/sslt.h +++ b/net/third_party/nss/ssl/sslt.h @@ -37,7 +37,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: sslt.h,v 1.13 2009/11/07 18:23:06 wtc%google.com Exp $ */ +/* $Id: sslt.h,v 1.16 2010/02/04 03:21:11 wtc%google.com Exp $ */ #ifndef __sslt_h_ #define __sslt_h_ @@ -189,4 +189,24 @@ typedef struct SSLCipherSuiteInfoStr { } SSLCipherSuiteInfo; +typedef enum { + SSL_sni_host_name = 0, + SSL_sni_type_total +} SSLSniNameType; + +/* Supported extensions. */ +/* Update SSL_MAX_EXTENSIONS whenever a new extension type is added. */ +typedef enum { + ssl_server_name_xtn = 0, +#ifdef NSS_ENABLE_ECC + ssl_elliptic_curves_xtn = 10, + ssl_ec_point_formats_xtn = 11, +#endif + ssl_session_ticket_xtn = 35, + ssl_next_proto_neg_xtn = 13172, + ssl_renegotiation_info_xtn = 0xff01 /* experimental number */ +} SSLExtensionType; + +#define SSL_MAX_EXTENSIONS 6 + #endif /* __sslt_h_ */ |