Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 275744: SSL_GetChannelInfo needs to set the new compression method

Browse Source 
fields for SSL2, too.  TBR=nelson.


git-svn-id: svn://10.0.0.236/trunk@258921 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com 2009-11-07 22:11:57 +00:00
parent 8768f8435b
commit a2b2156e95
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/security/nss/lib/ssl/sslinfo.c
View File

@ -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;