← Back to branch summary

~ubuntu-branches/ubuntu/karmic/nss/karmic-updates

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/freebl/camellia.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-10-04 23:18:57 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20101004231857-grfx62qbg6gknih1
Tags: 3.12.8-0ubuntu0.9.10.1
* New upstream release v3.12.8 (NSS_3_12_8_RTM)
  - Fix browser wildcard certificate validation issue
  - Update root certs
  - Fix SSL deadlocks
* Refresh patches:
  - update debian/patches/38_kbsd.patch
  - update debian/patches/97_SSL_RENEGOTIATE_TRANSITIONAL.patch
* Bump minimum nspr version to 4.8.6
  - update debian/control
* Add new API to symbols file
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/freebl/camellia.c
36
36
 * ***** END LICENSE BLOCK ***** */
37
37
 
38
38
/*
39
 
 * $Id: camellia.c,v 1.2 2008/11/18 19:48:22 rrelyea%redhat.com Exp $
 
39
 * $Id: camellia.c,v 1.3 2010/04/30 00:10:53 wtc%google.com Exp $
40
40
 */
41
41
 
42
42
#ifdef FREEBL_NO_DEPEND
72
72
 */
73
73
 
74
74
 
75
 
#if defined(_MSC_VER)
 
75
#if defined(_MSC_VER) && defined(NSS_X86_OR_X64)
 
76
 
 
77
/* require a little-endian CPU that allows unaligned access */
76
78
 
77
79
# define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
78
80
# define GETU32(p) SWAP(*((PRUint32 *)(p)))
79
81
# define PUTU32(ct, st) {*((PRUint32 *)(ct)) = SWAP((st));}
80
82
 
81
 
#else /* not MS-VC */
 
83
#else /* not MSVC or not x86/x64 */
82
84
 
83
85
# define GETU32(pt)                                     \
84
86
    (((PRUint32)(pt)[0] << 24)                          \