← Back to branch summary

~ubuntu-branches/ubuntu/vivid/nettle/vivid-proposed

« back to all changes in this revision

Viewing changes to camellia-crypt-internal.c

  • Committer: Package Import Robot
  • Author(s): Magnus Holmgren
  • Date: 2013-05-04 19:50:28 UTC
  • mfrom: (1.4.6) (3.1.11 experimental)
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: package-import@ubuntu.com-20130504195028-fp6c9fw1tsm5scwa
Tags: 2.7-1
http://bugs.debian.org/706081
* New upstream release (Closes: #706081).
* Include watch file improvements from Bart Martens <bartm@debian.org>
  via the QA system.

Show diffs side-by-side

added added

removed removed

Lines of Context:
camellia-crypt-internal.c
3
3
 * Copyright (C) 2006,2007
4
4
 * NTT (Nippon Telegraph and Telephone Corporation).
5
5
 *
6
 
 * Copyright (C) 2010 Niels M�ller
 
6
 * Copyright (C) 2010 Niels Möller
7
7
 *
8
8
 * This library is free software; you can redistribute it and/or
9
9
 * modify it under the terms of the GNU Lesser General Public
46
46
  __kl = (k) >> 32;                             \
47
47
  __kr = (k) & 0xffffffff;                      \
48
48
  __t = __xl & __kl;                            \
49
 
  __xr ^= ROL32(1, __t);                        \
 
49
  __xr ^= ROTL32(1, __t);                       \
50
50
  __xl ^= (__xr | __kr);                        \
51
51
  (x) = ((uint64_t) __xl << 32) | __xr;         \
52
52
} while (0)
59
59
  __kr = (k) & 0xffffffff;                      \
60
60
  __xl ^= (__xr | __kr);                        \
61
61
  __t = __xl & __kl;                            \
62
 
  __xr ^= ROL32(1, __t);                        \
 
62
  __xr ^= ROTL32(1, __t);                       \
63
63
  (x) = ((uint64_t) __xl << 32) | __xr;         \
64
64
} while (0)
65
65
 
82
82
    /* ir == (t1^t3^t4^t6^t7^t8),(t1^t2^t4^t5^t7^t8),           \
83
83
       (t1^t2^t3^t5^t6^t8),(t2^t3^t4^t5^t6^t7)                  \
84
84
       == y1,y2,y3,y4 */                                        \
85
 
    __il = ROL32(24, __il);                                     \
 
85
    __il = ROTL32(24, __il);                                    \
86
86
    /* il == (t2^t3^t4),(t1^t3^t4),(t1^t2^t4),(t1^t2^t3) */     \
87
87
    __il ^= __ir;                                               \
88
88
    /* il == (t1^t2^t6^t7^t8),(t2^t3^t5^t7^t8),                 \
112
112
    /* ir == (t1^t3^t4^t6^t7^t8),(t1^t2^t4^t5^t7^t8),           \
113
113
       (t1^t2^t3^t5^t6^t8),(t2^t3^t4^t5^t6^t7)                  \
114
114
       == y1,y2,y3,y4 */                                        \
115
 
    __il = ROL32(24, __il);                                     \
 
115
    __il = ROTL32(24, __il);                                    \
116
116
    /* il == (t2^t3^t4),(t1^t3^t4),(t1^t2^t4),(t1^t2^t3) */     \
117
117
    __il ^= __ir;                                               \
118
118
    /* il == (t1^t2^t6^t7^t8),(t2^t3^t5^t7^t8),                 \