diff options
author | Martin Thomson <martin.thomson@gmail.com> | 2017-10-09 11:30:43 +1100 |
---|---|---|
committer | Martin Thomson <martin.thomson@gmail.com> | 2017-10-09 11:30:43 +1100 |
commit | e78fea278cc67fa308ea7b62630c02f8217c3630 (patch) | |
tree | 0d43bcc8af95c8b3c6632571f5121faf4092588c /lib/ssl/sslsnce.c | |
parent | 474f1bcabd34eee91a34831260ea514660162d2f (diff) | |
parent | c21e2ced85ff55b338ea1758179d358126d9204b (diff) | |
download | nss-hg-e78fea278cc67fa308ea7b62630c02f8217c3630.tar.gz |
Merge NSS trunk to NSS_TLS13_DRAFT19_BRANCH
Diffstat (limited to 'lib/ssl/sslsnce.c')
-rw-r--r-- | lib/ssl/sslsnce.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/ssl/sslsnce.c b/lib/ssl/sslsnce.c index cf9b0b424..7b86e074a 100644 --- a/lib/ssl/sslsnce.c +++ b/lib/ssl/sslsnce.c @@ -99,7 +99,9 @@ struct sidCacheEntryStr { /* 2 */ PRUint16 authKeyBits; /* 2 */ PRUint16 keaType; /* 2 */ PRUint16 keaKeyBits; - /* 84 - common header total */ + /* 4 */ PRUint32 signatureScheme; + /* 4 */ PRUint32 keaGroup; + /* 92 - common header total */ union { struct { @@ -117,7 +119,7 @@ struct sidCacheEntryStr { /* force sizeof(sidCacheEntry) to be a multiple of cache line size */ struct { - /*124 */ PRUint8 filler[124]; /* 84+124==208, a multiple of 16 */ + /*112 */ PRUint8 filler[112]; /* 80+112==192, a multiple of 16 */ } forceSize; } u; }; @@ -433,6 +435,8 @@ ConvertFromSID(sidCacheEntry *to, sslSessionID *from) to->authKeyBits = from->authKeyBits; to->keaType = from->keaType; to->keaKeyBits = from->keaKeyBits; + to->keaGroup = from->keaGroup; + to->signatureScheme = from->sigScheme; to->u.ssl3.cipherSuite = from->u.ssl3.cipherSuite; to->u.ssl3.compression = (PRUint16)from->u.ssl3.compression; @@ -543,6 +547,8 @@ ConvertToSID(sidCacheEntry *from, to->authKeyBits = from->authKeyBits; to->keaType = from->keaType; to->keaKeyBits = from->keaKeyBits; + to->keaGroup = from->keaGroup; + to->sigScheme = from->signatureScheme; return to; |