|
 |
1b6f66 |
diff --git a/lib/ssl/sslinfo.c b/lib/ssl/sslinfo.c
|
|
|
1b6f66 |
--- a/lib/ssl/sslinfo.c
|
|
|
1b6f66 |
+++ b/lib/ssl/sslinfo.c
|
|
|
1b6f66 |
@@ -62,17 +62,17 @@ SSL_GetChannelInfo(PRFileDesc *fd, SSLCh
|
|
|
1b6f66 |
ssl_ReleaseSpecReadLock(ss);
|
|
|
1b6f66 |
inf.compressionMethodName =
|
|
|
1b6f66 |
ssl_GetCompressionMethodName(inf.compressionMethod);
|
|
|
1b6f66 |
}
|
|
|
1b6f66 |
if (sid) {
|
|
|
1b6f66 |
inf.creationTime = sid->creationTime;
|
|
|
1b6f66 |
inf.lastAccessTime = sid->lastAccessTime;
|
|
|
1b6f66 |
inf.expirationTime = sid->expirationTime;
|
|
|
1b6f66 |
- inf.extendedMasterSecretUsed = sid->u.ssl3.keys.extendedMasterSecretUsed;
|
|
|
1b6f66 |
+ inf.reservedNotSupported = PR_FALSE;
|
|
|
1b6f66 |
|
|
|
1b6f66 |
if (ss->version < SSL_LIBRARY_VERSION_3_0) { /* SSL2 */
|
|
|
1b6f66 |
inf.sessionIDLength = SSL2_SESSIONID_BYTES;
|
|
|
1b6f66 |
memcpy(inf.sessionID, sid->u.ssl2.sessionID,
|
|
|
1b6f66 |
SSL2_SESSIONID_BYTES);
|
|
|
1b6f66 |
} else {
|
|
|
1b6f66 |
unsigned int sidLen = sid->u.ssl3.sessionIDLength;
|
|
|
1b6f66 |
sidLen = PR_MIN(sidLen, sizeof inf.sessionID);
|
|
|
1b6f66 |
diff --git a/lib/ssl/sslt.h b/lib/ssl/sslt.h
|
|
|
1b6f66 |
--- a/lib/ssl/sslt.h
|
|
|
1b6f66 |
+++ b/lib/ssl/sslt.h
|
|
|
1b6f66 |
@@ -145,17 +145,17 @@ typedef struct SSLChannelInfoStr {
|
|
|
1b6f66 |
/* compression method info */
|
|
|
1b6f66 |
const char * compressionMethodName;
|
|
|
1b6f66 |
SSLCompressionMethod compressionMethod;
|
|
|
1b6f66 |
|
|
|
1b6f66 |
/* The following fields are added in NSS 3.21.
|
|
|
1b6f66 |
* This field only has meaning in TLS < 1.3 and will be set to
|
|
|
1b6f66 |
* PR_FALSE in TLS 1.3.
|
|
|
1b6f66 |
*/
|
|
|
1b6f66 |
- PRBool extendedMasterSecretUsed;
|
|
|
1b6f66 |
+ PRBool reservedNotSupported; /* don't use */
|
|
|
1b6f66 |
} SSLChannelInfo;
|
|
|
1b6f66 |
|
|
|
1b6f66 |
/* Preliminary channel info */
|
|
|
1b6f66 |
#define ssl_preinfo_version (1U << 0)
|
|
|
1b6f66 |
#define ssl_preinfo_cipher_suite (1U << 1)
|
|
|
1b6f66 |
#define ssl_preinfo_all (ssl_preinfo_version|ssl_preinfo_cipher_suite)
|
|
|
1b6f66 |
|
|
|
1b6f66 |
typedef struct SSLPreliminaryChannelInfoStr {
|