| OLD | NEW |
| 1 Index: net/third_party/nss/ssl/SSLerrs.h | 1 Index: net/third_party/nss/ssl/SSLerrs.h |
| 2 =================================================================== | 2 =================================================================== |
| 3 --- net/third_party/nss/ssl/SSLerrs.h (revision 127709) | 3 --- net/third_party/nss/ssl/SSLerrs.h (revision 127709) |
| 4 +++ net/third_party/nss/ssl/SSLerrs.h (working copy) | 4 +++ net/third_party/nss/ssl/SSLerrs.h (working copy) |
| 5 @@ -423,3 +423,9 @@ | 5 @@ -423,3 +423,9 @@ |
| 6 | 6 |
| 7 ER3(SSL_ERROR_RX_UNEXPECTED_CERT_STATUS, (SSL_ERROR_BASE + 121), | 7 ER3(SSL_ERROR_RX_UNEXPECTED_CERT_STATUS, (SSL_ERROR_BASE + 121), |
| 8 "SSL received an unexpected Certificate Status handshake message.") | 8 "SSL received an unexpected Certificate Status handshake message.") |
| 9 + | 9 + |
| 10 +ER3(SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST, (SSL_ERROR_BASE + 122), | 10 +ER3(SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST, (SSL_ERROR_BASE + 122), |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 ** | 30 ** |
| 31 ** SSL_SECURITY: | 31 ** SSL_SECURITY: |
| 32 @@ -942,6 +948,14 @@ | 32 @@ -942,6 +948,14 @@ |
| 33 PRBool *last_handshake_resumed
); | 33 PRBool *last_handshake_resumed
); |
| 34 | 34 |
| 35 /* | 35 /* |
| 36 +** How long should we wait before retransmitting the next flight of | 36 +** How long should we wait before retransmitting the next flight of |
| 37 +** the DTLS handshake? Returns SECFailure if not DTLS or not in a | 37 +** the DTLS handshake? Returns SECFailure if not DTLS or not in a |
| 38 +** handshake. | 38 +** handshake. |
| 39 +*/ | 39 +*/ |
| 40 +SSL_IMPORT SECStatus DTLS_GetTimeout(PRFileDesc *socket, | 40 +SSL_IMPORT SECStatus DTLS_GetHandshakeTimeout(PRFileDesc *socket, |
| 41 + PRIntervalTime *timeout); | 41 + PRIntervalTime *timeout); |
| 42 + | 42 + |
| 43 +/* | 43 +/* |
| 44 * Return a boolean that indicates whether the underlying library | 44 * Return a boolean that indicates whether the underlying library |
| 45 * will perform as the caller expects. | 45 * will perform as the caller expects. |
| 46 * | 46 * |
| 47 Index: net/third_party/nss/ssl/ssl3gthr.c | 47 Index: net/third_party/nss/ssl/ssl3gthr.c |
| 48 =================================================================== | 48 =================================================================== |
| 49 --- net/third_party/nss/ssl/ssl3gthr.c (revision 127709) | 49 --- net/third_party/nss/ssl/ssl3gthr.c (revision 127709) |
| 50 +++ net/third_party/nss/ssl/ssl3gthr.c (working copy) | 50 +++ net/third_party/nss/ssl/ssl3gthr.c (working copy) |
| 51 @@ -50,7 +50,7 @@ | 51 @@ -50,7 +50,7 @@ |
| (...skipping 3193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3245 + records->right = new_right; | 3245 + records->right = new_right; |
| 3246 + records->left = new_left; | 3246 + records->left = new_left; |
| 3247 + } | 3247 + } |
| 3248 + | 3248 + |
| 3249 + offset = seq % DTLS_RECVD_RECORDS_WINDOW; | 3249 + offset = seq % DTLS_RECVD_RECORDS_WINDOW; |
| 3250 + | 3250 + |
| 3251 + records->data[offset / 8] |= (1 << (offset % 8)); | 3251 + records->data[offset / 8] |= (1 << (offset % 8)); |
| 3252 +} | 3252 +} |
| 3253 + | 3253 + |
| 3254 +SECStatus | 3254 +SECStatus |
| 3255 +DTLS_GetTimeout(PRFileDesc *socket, PRIntervalTime *timeout) | 3255 +DTLS_GetHandshakeTimeout(PRFileDesc *socket, PRIntervalTime *timeout) |
| 3256 +{ | 3256 +{ |
| 3257 + sslSocket * ss = NULL; | 3257 + sslSocket * ss = NULL; |
| 3258 + PRIntervalTime elapsed; | 3258 + PRIntervalTime elapsed; |
| 3259 + PRIntervalTime desired; | 3259 + PRIntervalTime desired; |
| 3260 + | 3260 + |
| 3261 + ss = ssl_FindSocket(socket); | 3261 + ss = ssl_FindSocket(socket); |
| 3262 + | 3262 + |
| 3263 + if (!ss) | 3263 + if (!ss) |
| 3264 + return SECFailure; | 3264 + return SECFailure; |
| 3265 + | 3265 + |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3313 @@ -190,7 +190,8 @@ | 3313 @@ -190,7 +190,8 @@ |
| 3314 } SSLCipherSuiteInfo; | 3314 } SSLCipherSuiteInfo; |
| 3315 | 3315 |
| 3316 typedef enum { | 3316 typedef enum { |
| 3317 - ssl_variant_stream = 0 | 3317 - ssl_variant_stream = 0 |
| 3318 + ssl_variant_stream = 0, | 3318 + ssl_variant_stream = 0, |
| 3319 + ssl_variant_datagram = 1 | 3319 + ssl_variant_datagram = 1 |
| 3320 } SSLProtocolVariant; | 3320 } SSLProtocolVariant; |
| 3321 | 3321 |
| 3322 typedef struct SSLVersionRangeStr { | 3322 typedef struct SSLVersionRangeStr { |
| OLD | NEW |