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

Side by Side Diff: net/third_party/nss/patches/origin_bound_certs.patch

Issue 7725004: Updated ob_cert extension number to match with the change in openssl (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Applied same change to origin bound certificate patch Created 9 years, 3 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 | « no previous file | net/third_party/nss/ssl/sslt.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 commit b5f89535668edebf59ac8186457d117572c05f2b 1 commit b5f89535668edebf59ac8186457d117572c05f2b
2 Author: Adam Langley <agl@chromium.org> 2 Author: Adam Langley <agl@chromium.org>
3 Date: Thu Jul 21 10:26:36 2011 -0400 3 Date: Thu Jul 21 10:26:36 2011 -0400
4 4
5 obcerts 5 obcerts
6 6
7 diff --git a/mozilla/security/nss/lib/ssl/ssl.h b/mozilla/security/nss/lib/ssl/s sl.h 7 diff --git a/mozilla/security/nss/lib/ssl/ssl.h b/mozilla/security/nss/lib/ssl/s sl.h
8 index 5682d0a..53ca301 100644 8 index 5682d0a..53ca301 100644
9 --- a/mozilla/security/nss/lib/ssl/ssl.h 9 --- a/mozilla/security/nss/lib/ssl/ssl.h
10 +++ b/mozilla/security/nss/lib/ssl/ssl.h 10 +++ b/mozilla/security/nss/lib/ssl/ssl.h
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 diff --git a/mozilla/security/nss/lib/ssl/sslt.h b/mozilla/security/nss/lib/ssl/ sslt.h 236 diff --git a/mozilla/security/nss/lib/ssl/sslt.h b/mozilla/security/nss/lib/ssl/ sslt.h
237 index bca7496..907c1dc 100644 237 index bca7496..907c1dc 100644
238 --- a/mozilla/security/nss/lib/ssl/sslt.h 238 --- a/mozilla/security/nss/lib/ssl/sslt.h
239 +++ b/mozilla/security/nss/lib/ssl/sslt.h 239 +++ b/mozilla/security/nss/lib/ssl/sslt.h
240 @@ -206,9 +206,10 @@ typedef enum { 240 @@ -206,9 +206,10 @@ typedef enum {
241 ssl_session_ticket_xtn = 35, 241 ssl_session_ticket_xtn = 35,
242 ssl_next_proto_neg_xtn = 13172, 242 ssl_next_proto_neg_xtn = 13172,
243 ssl_cached_info_xtn = 13173, 243 ssl_cached_info_xtn = 13173,
244 - ssl_renegotiation_info_xtn = 0xff01 /* experimental number */ 244 - ssl_renegotiation_info_xtn = 0xff01 /* experimental number */
245 + ssl_renegotiation_info_xtn = 0xff01, /* experimental number */ 245 + ssl_renegotiation_info_xtn = 0xff01, /* experimental number */
246 + ssl_ob_cert_xtn = 0xff0f» /* experimental number */ 246 + ssl_ob_cert_xtn = 13175» /* experimental number */
247 } SSLExtensionType; 247 } SSLExtensionType;
248 248
249 -#define SSL_MAX_EXTENSIONS 8 249 -#define SSL_MAX_EXTENSIONS 8
250 +#define SSL_MAX_EXTENSIONS 9 250 +#define SSL_MAX_EXTENSIONS 9
251 251
252 #endif /* __sslt_h_ */ 252 #endif /* __sslt_h_ */
OLDNEW
« no previous file with comments | « no previous file | net/third_party/nss/ssl/sslt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698