diff --git a/mozilla/security/nss/lib/ssl/sslinfo.c b/mozilla/security/nss/lib/ssl/sslinfo.c index b1a82363435..c457f6d051b 100644 --- a/mozilla/security/nss/lib/ssl/sslinfo.c +++ b/mozilla/security/nss/lib/ssl/sslinfo.c @@ -34,7 +34,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: sslinfo.c,v 1.19 2009-11-07 18:23:06 wtc%google.com Exp $ */ +/* $Id: sslinfo.c,v 1.20 2009-11-07 22:11:57 wtc%google.com Exp $ */ #include "ssl.h" #include "sslimpl.h" #include "sslproto.h" @@ -83,14 +83,15 @@ SSL_GetChannelInfo(PRFileDesc *fd, SSLChannelInfo *info, PRUintn len) 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; } else if (ss->ssl3.initialized) { /* SSL3 and TLS */ ssl_GetSpecReadLock(ss); inf.cipherSuite = ss->ssl3.hs.cipher_suite; inf.compressionMethod = ss->ssl3.crSpec->compression_method; - inf.compressionMethodName = - ssl_GetCompressionMethodName(inf.compressionMethod); ssl_ReleaseSpecReadLock(ss); } + inf.compressionMethodName = + ssl_GetCompressionMethodName(inf.compressionMethod); if (sid) { inf.creationTime = sid->creationTime; inf.lastAccessTime = sid->lastAccessTime;