← 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/freebl/rijndael.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/freebl/rijndael.c
33
33
 * the terms of any one of the MPL, the GPL or the LGPL.
34
34
 *
35
35
 * ***** END LICENSE BLOCK ***** */
36
 
/* $Id: rijndael.c,v 1.24 2008/12/04 18:16:31 rrelyea%redhat.com Exp $ */
 
36
/* $Id: rijndael.c,v 1.25 2009/04/09 22:11:07 julien.pierre.boogz%sun.com Exp $ */
37
37
 
38
38
#ifdef FREEBL_NO_DEPEND
39
39
#include "stubs.h"
563
563
    PRUint32 *roundkeyw;
564
564
    rijndael_state state;
565
565
    PRUint32 C0, C1, C2, C3;
566
 
#if defined(_X86_)
 
566
#if defined(NSS_X86_OR_X64)
567
567
#define pIn input
568
568
#define pOut output
569
569
#else
639
639
    *((PRUint32 *)(pOut + 4))  = C1;
640
640
    *((PRUint32 *)(pOut + 8))  = C2;
641
641
    *((PRUint32 *)(pOut + 12)) = C3;
642
 
#if defined(_X86_)
 
642
#if defined(NSS_X86_OR_X64)
643
643
#undef pIn
644
644
#undef pOut
645
645
#else
659
659
    PRUint32 *roundkeyw;
660
660
    rijndael_state state;
661
661
    PRUint32 C0, C1, C2, C3;
662
 
#if defined(_X86_)
 
662
#if defined(NSS_X86_OR_X64)
663
663
#define pIn input
664
664
#define pOut output
665
665
#else
731
731
    *((PRUint32 *)(pOut +  8)) ^= *roundkeyw--;
732
732
    *((PRUint32 *)(pOut +  4)) ^= *roundkeyw--;
733
733
    *((PRUint32 *) pOut      ) ^= *roundkeyw--;
734
 
#if defined(_X86_)
 
734
#if defined(NSS_X86_OR_X64)
735
735
#undef pIn
736
736
#undef pOut
737
737
#else