diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 00:07:44 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 00:07:44 +0000 |
| commit | 964a1cec1ccccea7c31e467f0fff63fc9d7edb31 (patch) | |
| tree | 8ce17c7d745639d6900f6a38f6cdb4ae72952660 /net/third_party | |
| parent | 933527b65ccdc4bf744abd6f77d3f264e53bf798 (diff) | |
| download | chromium_src-964a1cec1ccccea7c31e467f0fff63fc9d7edb31.zip chromium_src-964a1cec1ccccea7c31e467f0fff63fc9d7edb31.tar.gz chromium_src-964a1cec1ccccea7c31e467f0fff63fc9d7edb31.tar.bz2 | |
Sync NSS to pickup https://bugzilla.mozilla.org/show_bug.cgi?id=531188
This fixes decompression failures with some sites.
R=wtc
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party')
| -rw-r--r-- | net/third_party/nss/README.google | 2 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/ssl3con.c | 28 |
2 files changed, 18 insertions, 12 deletions
diff --git a/net/third_party/nss/README.google b/net/third_party/nss/README.google index 46a905c..fa1e35e 100644 --- a/net/third_party/nss/README.google +++ b/net/third_party/nss/README.google @@ -1,7 +1,7 @@ This directory includes a copy of NSS's libssl from the CVS repo at: :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot -The snapshot was updated at Mon Nov 30 15:41:23 PST 2009 +The snapshot was updated at Wed Dec 2 16:05:49 PST 2009 Patches: diff --git a/net/third_party/nss/ssl/ssl3con.c b/net/third_party/nss/ssl/ssl3con.c index a946d68..0018859 100644 --- a/net/third_party/nss/ssl/ssl3con.c +++ b/net/third_party/nss/ssl/ssl3con.c @@ -39,7 +39,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: ssl3con.c,v 1.125 2009/11/26 01:51:10 wtc%google.com Exp $ */ +/* $Id: ssl3con.c,v 1.126 2009/12/01 17:59:46 wtc%google.com Exp $ */ #include "cert.h" #include "ssl.h" @@ -1296,7 +1296,7 @@ ssl3_MapZlibError(int zlib_error) static SECStatus ssl3_DeflateInit(void *void_context) { - z_stream* context = void_context; + z_stream *context = void_context; context->zalloc = NULL; context->zfree = NULL; context->opaque = NULL; @@ -1307,7 +1307,7 @@ ssl3_DeflateInit(void *void_context) static SECStatus ssl3_InflateInit(void *void_context) { - z_stream* context = void_context; + z_stream *context = void_context; context->zalloc = NULL; context->zfree = NULL; context->opaque = NULL; @@ -1321,7 +1321,13 @@ static SECStatus ssl3_DeflateCompress(void *void_context, unsigned char *out, int *out_len, int maxout, const unsigned char *in, int inlen) { - z_stream* context = void_context; + z_stream *context = void_context; + + if (!inlen) { + *out_len = 0; + return SECSuccess; + } + context->next_in = (unsigned char*) in; context->avail_in = inlen; context->next_out = out; @@ -1344,7 +1350,13 @@ static SECStatus ssl3_DeflateDecompress(void *void_context, unsigned char *out, int *out_len, int maxout, const unsigned char *in, int inlen) { - z_stream* context = void_context; + z_stream *context = void_context; + + if (!inlen) { + *out_len = 0; + return SECSuccess; + } + context->next_in = (unsigned char*) in; context->avail_in = inlen; context->next_out = out; @@ -6090,12 +6102,6 @@ ssl3_HandleClientHello(sslSocket *ss, SSL3Opaque *b, PRUint32 length) goto alert_loser; suite_found: - /* If we are resuming, we use the previous compression algorithm */ - if (sid) { - ss->ssl3.hs.compression = sid->u.ssl3.compression; - goto compression_found; - } - /* Look for a matching compression algorithm. */ for (i = 0; i < comps.len; i++) { for (j = 0; j < compressionMethodsCount; j++) { |