Bug 1499732 - add expiration time to tokenInfo, r=mt

Differential Revision: https://phabricator.services.mozilla.com/D9510

2 files changed, 2 insertions, 0 deletions

diff --git a/lib/ssl/sslexp.h b/lib/ssl/sslexp.h
index 15adba4d8..f450e528d 100644
--- a/lib/ssl/sslexp.h
+++ b/lib/ssl/sslexp.h
@@ -367,6 +367,7 @@ typedef struct SSLResumptionTokenInfoStr {
     PRUint8 *alpnSelection;
     PRUint32 alpnSelectionLen;
     PRUint32 maxEarlyDataSize;
+    PRTime expirationTime; /* added in NSS 3.41 */
 } SSLResumptionTokenInfo;
 
 /*
diff --git a/lib/ssl/sslsock.c b/lib/ssl/sslsock.c
index e51da197f..ae904e29b 100644
--- a/lib/ssl/sslsock.c
+++ b/lib/ssl/sslsock.c
@@ -4222,6 +4222,7 @@ SSLExp_GetResumptionTokenInfo(const PRUint8 *tokenData, unsigned int tokenLen,
     } else {
         token.maxEarlyDataSize = 0;
     }
+    token.expirationTime = sid.expirationTime;
 
     token.length = PR_MIN(sizeof(SSLResumptionTokenInfo), len);
     PORT_Memcpy(tokenOut, &token, token.length);