← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring-security

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/ssl/sslgathr.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-25 13:46:06 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100325134606-bl6liuok2w9l7snv
Tags: 3.12.6-0ubuntu1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/ssl/sslgathr.c
36
36
 * the terms of any one of the MPL, the GPL or the LGPL.
37
37
 *
38
38
 * ***** END LICENSE BLOCK ***** */
39
 
/* $Id: sslgathr.c,v 1.9 2007/07/06 03:16:54 julien.pierre.bugs%sun.com Exp $ */
 
39
/* $Id: sslgathr.c,v 1.10 2009/10/16 17:45:35 wtc%google.com Exp $ */
40
40
#include "cert.h"
41
41
#include "ssl.h"
42
42
#include "sslimpl.h"
309
309
 
310
310
            ssl_ReleaseSpecReadLock(ss);  /******************************/
311
311
 
312
 
            if (PORT_Memcmp(mac, pBuf, macLen) != 0) {
 
312
            if (NSS_SecureMemcmp(mac, pBuf, macLen) != 0) {
313
313
                /* MAC's didn't match... */
314
314
                SSL_DBG(("%d: SSL[%d]: mac check failed, seq=%d",
315
315
                         SSL_GETPID(), ss->fd, ss->sec.rcvSequence));