main/nss/nss_win.patch

2379  ssl_DecodeResumptionToken(sslSessionID *sid, const PRUint8 *encodedToken,
2388      PORT_Assert(sid);
2409          PORT_Assert(!sid->peerCert);
2417          sid->peerCert = CERT_NewTempCertificate(NULL, /* dbHandle */
2425          SECITEM_AllocArray(NULL, &sid->peerCertStatus, 1);
2426          if (!sid->peerCertStatus.items) {
2436          SECITEM_CopyItem(NULL, &sid->peerCertStatus.items[0], &tempItem);
2444          PORT_Assert(!sid->localCert);
2452          sid->localCert = CERT_NewTempCertificate(NULL, /* dbHandle */
2459 +    sslSessionID *sid;
2463 -    sslSessionID *sid = ss->sec.ci.sid;
2464 +    sid = ss->sec.ci.sid;
2465      PORT_Assert(sid);
2469 -    NewSessionTicket *ticket = &sid->u.ssl3.locked.sessionTicket;
2470 +    ticket = &sid->u.ssl3.locked.sessionTicket;
2476  ssl_EncodeResumptionToken(sslSessionID *sid, sslBuffer *encodedTokenBuf)
2482      PORT_Assert(sid);
2483      if (!sid || !sid->u.ssl3.locked.sessionTicket.ticket.len ||
2497 -    PRUint64 len = sid->peerID ? strlen(sid->peerID) : 0;
2498 +    len = sid->peerID ? strlen(sid->peerID) : 0;
2506 +    sslSessionID *sid;
2510 -    sslSessionID *sid = ss->sec.ci.sid;
2511 +    sid = ss->sec.ci.sid;
2512      PORT_Assert(sid);
2513      PORT_Assert(sid->cached == never_cached);
2516          sid->expirationTime = sid->creationTime + ssl3_sid_timeout;
2521      if (ssl_EncodeResumptionToken(sid, &encodedToken) != SECSuccess) {
2537      if (sec->ci.sid) {
2543  ssl_ServerCacheSessionID(sslSessionID *sid)
2545 -    PORT_Assert(sid);
2551 +    PORT_Assert(sid);
2553      if (sid->u.ssl3.sessionIDLength == 0) {
2658 -    SECStatus rv = ssl_DecodeResumptionToken(ss->sec.ci.sid, token, len);
2659 +    rv = ssl_DecodeResumptionToken(ss->sec.ci.sid, token, len);
2667 +    sslSessionID sid = { 0 };
2675 -    sslSessionID sid = { 0 };
2678      /* Populate sid values */
2679      if (ssl_DecodeResumptionToken(&sid, tokenData, tokenLen) != SECSuccess) {