diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 15:02:51 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 15:02:51 +0000 |
| commit | 9123652116e1261111cfb2306709ee305ffb5bf2 (patch) | |
| tree | 7f53febadf5e99e225b308c0c843e53e39c63b64 /net/third_party/nss/ssl/sslt.h | |
| parent | 478df839eb3260d4b2602c7e6a8f5d6294213eef (diff) | |
| download | chromium_src-9123652116e1261111cfb2306709ee305ffb5bf2.zip chromium_src-9123652116e1261111cfb2306709ee305ffb5bf2.tar.gz chromium_src-9123652116e1261111cfb2306709ee305ffb5bf2.tar.bz2 | |
Revert 138795 - Revert "nss: revert encrypted and origin bound certificates support."
Cleaning up git-svn mess with drover.
TBR=agl@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10451012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138796 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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/third_party/nss/ssl/sslt.h b/net/third_party/nss/ssl/sslt.h index eddfffd..0636570 100644 --- a/net/third_party/nss/ssl/sslt.h +++ b/net/third_party/nss/ssl/sslt.h @@ -215,11 +215,9 @@ typedef enum { #endif ssl_session_ticket_xtn = 35, ssl_next_proto_nego_xtn = 13172, - ssl_encrypted_client_certs = 13180, /* not IANA assigned. */ - ssl_renegotiation_info_xtn = 0xff01, /* experimental number */ - ssl_ob_cert_xtn = 13175 /* experimental number */ + ssl_renegotiation_info_xtn = 0xff01 /* experimental number */ } SSLExtensionType; -#define SSL_MAX_EXTENSIONS 9 +#define SSL_MAX_EXTENSIONS 7 #endif /* __sslt_h_ */ |