summaryrefslogtreecommitdiffstats
path: root/net/third_party
diff options
context:
space:
mode:
authormdietz@google.com <mdietz@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 01:21:15 +0000
committermdietz@google.com <mdietz@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 01:21:15 +0000
commitd2fac7d97d708c1c4551108ccfe9224183246a45 (patch)
treed3bf04aa87501ac1aaad17b869f2529a4953a099 /net/third_party
parent63984109556550cfef3d50803bff76ea77aca53d (diff)
downloadchromium_src-d2fac7d97d708c1c4551108ccfe9224183246a45.zip
chromium_src-d2fac7d97d708c1c4551108ccfe9224183246a45.tar.gz
chromium_src-d2fac7d97d708c1c4551108ccfe9224183246a45.tar.bz2
Updated ob_cert extension number to match with the change in openssl
BUG=88782 TEST= Review URL: http://codereview.chromium.org/7725004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party')
-rw-r--r--net/third_party/nss/patches/origin_bound_certs.patch2
-rw-r--r--net/third_party/nss/ssl/sslt.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/third_party/nss/patches/origin_bound_certs.patch b/net/third_party/nss/patches/origin_bound_certs.patch
index 825c4b1..99b0105 100644
--- a/net/third_party/nss/patches/origin_bound_certs.patch
+++ b/net/third_party/nss/patches/origin_bound_certs.patch
@@ -243,7 +243,7 @@ index bca7496..907c1dc 100644
ssl_cached_info_xtn = 13173,
- ssl_renegotiation_info_xtn = 0xff01 /* experimental number */
+ ssl_renegotiation_info_xtn = 0xff01, /* experimental number */
-+ ssl_ob_cert_xtn = 0xff0f /* experimental number */
++ ssl_ob_cert_xtn = 13175 /* experimental number */
} SSLExtensionType;
-#define SSL_MAX_EXTENSIONS 8
diff --git a/net/third_party/nss/ssl/sslt.h b/net/third_party/nss/ssl/sslt.h
index 907c1dc..5f852fe 100644
--- a/net/third_party/nss/ssl/sslt.h
+++ b/net/third_party/nss/ssl/sslt.h
@@ -207,7 +207,7 @@ typedef enum {
ssl_next_proto_neg_xtn = 13172,
ssl_cached_info_xtn = 13173,
ssl_renegotiation_info_xtn = 0xff01, /* experimental number */
- ssl_ob_cert_xtn = 0xff0f /* experimental number */
+ ssl_ob_cert_xtn = 13175 /* experimental number */
} SSLExtensionType;
#define SSL_MAX_EXTENSIONS 9