| OLD | NEW |
| 1 From 56e625df4d443b939c39fa75f907518bf66f6584 Mon Sep 17 00:00:00 2001 | 1 diff -up a/src/net/third_party/nss/ssl/ssl.h b/src/net/third_party/nss/ssl/ssl.h |
| 2 From: Adam Langley <agl@chromium.org> | 2 --- a/src/net/third_party/nss/ssl/ssl.h»2012-02-28 20:34:50.114663722 -0800 |
| 3 Date: Mon, 3 Oct 2011 12:23:01 -0400 | 3 +++ b/src/net/third_party/nss/ssl/ssl.h»2012-02-29 14:37:56.872332622 -0800 |
| 4 Subject: [PATCH] didhandshakeresume.patch | 4 @@ -818,6 +818,9 @@ SSL_IMPORT SECStatus SSL_HandshakeNegoti |
| 5 | |
| 6 --- | |
| 7 mozilla/security/nss/lib/ssl/ssl.def | 1 + | |
| 8 mozilla/security/nss/lib/ssl/ssl.h | 4 ++++ | |
| 9 mozilla/security/nss/lib/ssl/sslsock.c | 14 ++++++++++++++ | |
| 10 3 files changed, 19 insertions(+), 0 deletions(-) | |
| 11 | |
| 12 diff --git a/mozilla/security/nss/lib/ssl/ssl.def b/mozilla/security/nss/lib/ssl
/ssl.def | |
| 13 index 35cc1e3..7ef15db 100644 | |
| 14 --- a/mozilla/security/nss/lib/ssl/ssl.def | |
| 15 +++ b/mozilla/security/nss/lib/ssl/ssl.def | |
| 16 @@ -156,6 +156,7 @@ SSL_SNISocketConfigHook; | |
| 17 ;+ global: | |
| 18 SSL_GetNextProto; | |
| 19 SSL_GetStapledOCSPResponse; | |
| 20 +SSL_HandshakeResumedSession; | |
| 21 SSL_PeerCertificateChain; | |
| 22 SSL_SetNextProtoNego; | |
| 23 ;+ local: | |
| 24 diff --git a/mozilla/security/nss/lib/ssl/ssl.h b/mozilla/security/nss/lib/ssl/s
sl.h | |
| 25 index 3a22b45..c32438d 100644 | |
| 26 --- a/mozilla/security/nss/lib/ssl/ssl.h | |
| 27 +++ b/mozilla/security/nss/lib/ssl/ssl.h | |
| 28 @@ -697,6 +697,10 @@ SSL_IMPORT SECStatus SSL_HandshakeNegotiatedExtension(PRFil
eDesc * socket, | |
| 29 SSLExtensionType extId, | 5 SSLExtensionType extId, |
| 30 PRBool *yes); | 6 PRBool *yes); |
| 31 | 7 |
| 32 +SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd, | 8 +SSL_IMPORT SECStatus SSL_HandshakeResumedSession(PRFileDesc *fd, |
| 33 + PRBool *last_handshake_resumed
); | 9 + PRBool *last_handshake_resumed
); |
| 34 + | 10 + |
| 35 + | 11 /* |
| 36 SEC_END_PROTOS | 12 * Return a boolean that indicates whether the underlying library |
| 37 | 13 * will perform as the caller expects. |
| 38 #endif /* __ssl_h_ */ | 14 diff -up a/src/net/third_party/nss/ssl/sslsock.c b/src/net/third_party/nss/ssl/s
slsock.c |
| 39 diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/s
sl/sslsock.c | 15 --- a/src/net/third_party/nss/ssl/sslsock.c» 2012-02-28 20:34:50.124663860 -0
800 |
| 40 index 3d89d86..11b53da 100644 | 16 +++ b/src/net/third_party/nss/ssl/sslsock.c» 2012-02-29 14:39:13.203415737 -0
800 |
| 41 --- a/mozilla/security/nss/lib/ssl/sslsock.c | 17 @@ -1590,6 +1590,20 @@ SSL_GetStapledOCSPResponse(PRFileDesc *f |
| 42 +++ b/mozilla/security/nss/lib/ssl/sslsock.c | |
| 43 @@ -1507,6 +1507,20 @@ SSL_GetStapledOCSPResponse(PRFileDesc *fd, unsigned char
*out_data, | |
| 44 return SECSuccess; | 18 return SECSuccess; |
| 45 } | 19 } |
| 46 | 20 |
| 47 +SECStatus | 21 +SECStatus |
| 48 +SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) { | 22 +SSL_HandshakeResumedSession(PRFileDesc *fd, PRBool *handshake_resumed) { |
| 49 + sslSocket *ss = ssl_FindSocket(fd); | 23 + sslSocket *ss = ssl_FindSocket(fd); |
| 50 + | 24 + |
| 51 + if (!ss) { | 25 + if (!ss) { |
| 52 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession", | 26 + SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession", |
| 53 + SSL_GETPID(), fd)); | 27 + SSL_GETPID(), fd)); |
| 54 + return SECFailure; | 28 + return SECFailure; |
| 55 + } | 29 + } |
| 56 + | 30 + |
| 57 + *handshake_resumed = ss->ssl3.hs.isResuming; | 31 + *handshake_resumed = ss->ssl3.hs.isResuming; |
| 58 + return SECSuccess; | 32 + return SECSuccess; |
| 59 +} | 33 +} |
| 60 + | 34 + |
| 61 /************************************************************************/ | 35 /************************************************************************/ |
| 62 /* The following functions are the TOP LEVEL SSL functions. | 36 /* The following functions are the TOP LEVEL SSL functions. |
| 63 ** They all get called through the NSPRIOMethods table below. | 37 ** They all get called through the NSPRIOMethods table below. |
| OLD | NEW |