SSL_GetChannelInfo and SSL_GetNegotiatedHostInfo should use

net/third_party/nss/ssl/sslinfo.c

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 79 matching lines @@
         inf.protocolVersion  = ss->version;
         inf.authKeyBits      = ss->sec.authKeyBits;
         inf.keaKeyBits       = ss->sec.keaKeyBits;
         if (ss->version < SSL_LIBRARY_VERSION_3_0) { /* SSL2 */
             inf.cipherSuite           = ss->sec.cipherType | 0xff00;
             inf.compressionMethod     = ssl_compression_null;
             inf.compressionMethodName = "N/A";
         } else if (ss->ssl3.initialized) {      /* SSL3 and TLS */
             ssl_GetSpecReadLock(ss);
             /* XXX  The cipher suite should be in the specs and this
-             * function should get it from crSpec rather than from the "hs".
+             * function should get it from cwSpec rather than from the "hs".
              * See bug 275744 comment 69.
              */
             inf.cipherSuite           = ss->ssl3.hs.cipher_suite;
-            inf.compressionMethod     = ss->ssl3.crSpec->compression_method;
+            inf.compressionMethod     = ss->ssl3.cwSpec->compression_method;
             ssl_ReleaseSpecReadLock(ss);
             inf.compressionMethodName =
                 ssl_GetCompressionMethodName(inf.compressionMethod);
         }
         if (sid) {
             inf.creationTime   = sid->creationTime;
             inf.lastAccessTime = sid->lastAccessTime;
             inf.expirationTime = sid->expirationTime;
             if (ss->version < SSL_LIBRARY_VERSION_3_0) { /* SSL2 */
                 inf.sessionIDLength = SSL2_SESSIONID_BYTES;
@@ skipping 214 matching lines @@
         SSL_DBG(("%d: SSL[%d]: bad socket in SSL_GetNegotiatedHostInfo",
                  SSL_GETPID(), fd));
         return NULL;
     }
 
     if (ss->sec.isServer) {
         if (ss->version > SSL_LIBRARY_VERSION_3_0 &&
             ss->ssl3.initialized) { /* TLS */
             SECItem *crsName;
             ssl_GetSpecReadLock(ss); /*********************************/
-            crsName = &ss->ssl3.crSpec->srvVirtName;
+            crsName = &ss->ssl3.cwSpec->srvVirtName;
             if (crsName->data) {
                 sniName = SECITEM_DupItem(crsName);
             }
             ssl_ReleaseSpecReadLock(ss); /*----------------------------*/
         }
         return sniName;
     } 
     name = SSL_RevealURL(fd);
     if (name) {
         sniName = PORT_ZNew(SECItem);
@@ skipping 73 matching lines @@
         rv = ssl3_TLSPRFWithMasterSecret(ss->ssl3.cwSpec, label, labelLen, val,
                                          valLen, out, outLen);
     }
     ssl_ReleaseSpecReadLock(ss);
     ssl_ReleaseSSL3HandshakeLock(ss);
     ssl_ReleaseRecvBufLock(ss);
 
     PORT_ZFree(val, valLen);
     return rv;
 }