| OLD | NEW |
| 1 commit aa046eb9a2f5bd6fb027a1a516c01ec2a093d287 | 1 commit aa046eb9a2f5bd6fb027a1a516c01ec2a093d287 |
| 2 Author: Adam Langley <agl@chromium.org> | 2 Author: Adam Langley <agl@chromium.org> |
| 3 Date: Mon Nov 22 16:40:05 2010 -0500 | 3 Date: Mon Nov 22 16:40:05 2010 -0500 |
| 4 | 4 |
| 5 nss: add support for OCSP stapling. | 5 nss: add support for OCSP stapling. |
| 6 | 6 |
| 7 This patch adds support in libssl for requesting and storing OCSP | 7 This patch adds support in libssl for requesting and storing OCSP |
| 8 stapled responses. | 8 stapled responses. |
| 9 | 9 |
| 10 BUG=none | 10 BUG=none |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 + certificate_status = 22, | 337 + certificate_status = 22, |
| 338 next_proto = 67 | 338 next_proto = 67 |
| 339 } SSL3HandshakeType; | 339 } SSL3HandshakeType; |
| 340 | 340 |
| 341 diff --git a/net/third_party/nss/ssl/sslerr.h b/net/third_party/nss/ssl/sslerr.h | 341 diff --git a/net/third_party/nss/ssl/sslerr.h b/net/third_party/nss/ssl/sslerr.h |
| 342 index bd72f97..eb56ea9 100644 | 342 index bd72f97..eb56ea9 100644 |
| 343 --- a/net/third_party/nss/ssl/sslerr.h | 343 --- a/net/third_party/nss/ssl/sslerr.h |
| 344 +++ b/net/third_party/nss/ssl/sslerr.h | 344 +++ b/net/third_party/nss/ssl/sslerr.h |
| 345 @@ -203,6 +203,8 @@ SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD = (SSL_ERROR_BAS
E + 114), | 345 @@ -203,6 +203,8 @@ SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD = (SSL_ERROR_BAS
E + 114), |
| 346 | 346 |
| 347 SSL_ERROR_WEAK_SERVER_KEY = (SSL_ERROR_BASE + 115), | 347 SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY = (SSL_ERROR_BASE + 115), |
| 348 | 348 |
| 349 +SSL_ERROR_RX_UNEXPECTED_CERT_STATUS = (SSL_ERROR_BASE + 116), | 349 +SSL_ERROR_RX_UNEXPECTED_CERT_STATUS = (SSL_ERROR_BASE + 116), |
| 350 + | 350 + |
| 351 SSL_ERROR_END_OF_LIST /* let the c compiler determine the value of this. */ | 351 SSL_ERROR_END_OF_LIST /* let the c compiler determine the value of this. */ |
| 352 } SSLErrorCodes; | 352 } SSLErrorCodes; |
| 353 #endif /* NO_SECURITY_ERROR_ENUM */ | 353 #endif /* NO_SECURITY_ERROR_ENUM */ |
| 354 diff --git a/net/third_party/nss/ssl/sslimpl.h b/net/third_party/nss/ssl/sslimpl
.h | 354 diff --git a/net/third_party/nss/ssl/sslimpl.h b/net/third_party/nss/ssl/sslimpl
.h |
| 355 index b84511b..c656f65 100644 | 355 index b84511b..c656f65 100644 |
| 356 --- a/net/third_party/nss/ssl/sslimpl.h | 356 --- a/net/third_party/nss/ssl/sslimpl.h |
| 357 +++ b/net/third_party/nss/ssl/sslimpl.h | 357 +++ b/net/third_party/nss/ssl/sslimpl.h |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 ssl_ec_point_formats_xtn = 11, | 499 ssl_ec_point_formats_xtn = 11, |
| 500 @@ -208,7 +209,7 @@ typedef enum { | 500 @@ -208,7 +209,7 @@ typedef enum { |
| 501 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */ | 501 ssl_renegotiation_info_xtn = 0xff01 /* experimental number */ |
| 502 } SSLExtensionType; | 502 } SSLExtensionType; |
| 503 | 503 |
| 504 -#define SSL_MAX_EXTENSIONS 7 | 504 -#define SSL_MAX_EXTENSIONS 7 |
| 505 +#define SSL_MAX_EXTENSIONS 8 | 505 +#define SSL_MAX_EXTENSIONS 8 |
| 506 | 506 |
| 507 typedef enum { | 507 typedef enum { |
| 508 /* No Snap Start handshake was attempted. */ | 508 /* No Snap Start handshake was attempted. */ |
| OLD | NEW |