From a2b2156e9574a5cc636e2aaa04cde464dfd3c25c Mon Sep 17 00:00:00 2001 From: "wtc%google.com" Date: Sat, 7 Nov 2009 22:11:57 +0000 Subject: [PATCH] Bug 275744: SSL_GetChannelInfo needs to set the new compression method fields for SSL2, too. TBR=nelson. git-svn-id: svn://10.0.0.236/trunk@258921 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/ssl/sslinfo.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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;