← 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/des.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/des.c
400
400
    temp  = (word ^ (word >> 9)) & 0x00550055; \
401
401
    word ^=  temp | (temp << 9);
402
402
 
403
 
#if defined(__GNUC__) && defined(_X86_)
 
403
#if defined(__GNUC__) && defined(NSS_X86_OR_X64)
404
404
#define BYTESWAP(word, temp) \
405
405
    __asm("bswap        %0" : "+r" (word));
 
406
#elif (_MSC_VER >= 1300) && defined(NSS_X86_OR_X64)
 
407
#include <stdlib.h>
 
408
#pragma intrinsic(_byteswap_ulong)
 
409
#define BYTESWAP(word, temp) \
 
410
    word = _byteswap_ulong(word);
406
411
#else
407
412
#define BYTESWAP(word, temp) \
408
413
    word = (word >> 16) | (word << 16); \
435
440
    int           delta;
436
441
    unsigned int  ls;
437
442
 
438
 
#if defined(_X86_)
 
443
#if defined(NSS_X86_OR_X64)
439
444
    left  = HALFPTR(key)[0]; 
440
445
    right = HALFPTR(key)[1]; 
441
446
    BYTESWAP(left, temp);
586
591
    register HALF left, right;
587
592
    register HALF temp;
588
593
 
589
 
#if defined(_X86_)
 
594
#if defined(NSS_X86_OR_X64)
590
595
    left  = HALFPTR(inbuf)[0]; 
591
596
    right = HALFPTR(inbuf)[1]; 
592
597
    BYTESWAP(left, temp);
657
662
 
658
663
    FP(left, right, temp);
659
664
 
660
 
#if defined(_X86_)
 
665
#if defined(NSS_X86_OR_X64)
661
666
    BYTESWAP(left, temp);
662
667
    BYTESWAP(right, temp);
663
668
    HALFPTR(outbuf)[0]  = left;