nss/mozilla/security/nss/lib/freebl/mpi/mp_gf2m.c - Issue 10919163: Add GCM, CTR, and CTS modes to AES.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: nss/mozilla/security/nss/lib/freebl/mpi/mp_gf2m.c

Issue 10919163: Add GCM, CTR, and CTS modes to AES. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/

Patch Set: Fix comments as rsleevi suggested, fix a 32-bit bug and miscellaneous issues Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« nss/mozilla/security/nss/lib/freebl/ReviewComments ('K') | « nss/mozilla/security/nss/lib/freebl/gcm.c ('k') | nss/mozilla/security/nss/lib/freebl/mpi/mp_gf2m-priv.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: nss/mozilla/security/nss/lib/freebl/mpi/mp_gf2m.c

===================================================================

--- nss/mozilla/security/nss/lib/freebl/mpi/mp_gf2m.c (revision 155503)

+++ nss/mozilla/security/nss/lib/freebl/mpi/mp_gf2m.c (working copy)

@@ -359,7 +359,8 @@

z = MP_DIGITS(r);

/* start reduction */

- dN = p[0] / MP_DIGIT_BITS;

+ /*dN = p[0] / MP_DIGIT_BITS; */

+ dN = p[0] >> MP_DIGIT_BITS_LOG_2;

used = MP_USED(r);

for (j = used - 1; j > dN;) {

@@ -373,9 +374,11 @@

for (k = 1; p[k] > 0; k++) {

/* reducing component t^p[k] */

n = p[0] - p[k];

- d0 = n % MP_DIGIT_BITS;

+ /*d0 = n % MP_DIGIT_BITS; */

+ d0 = n & MP_DIGIT_BITS_MASK;

d1 = MP_DIGIT_BITS - d0;

- n /= MP_DIGIT_BITS;

+ /*n /= MP_DIGIT_BITS; */

+ n >>= MP_DIGIT_BITS_LOG_2;

z[j-n] ^= (zz>>d0);

if (d0)

z[j-n-1] ^= (zz<<d1);

@@ -383,7 +386,8 @@

/* reducing component t^0 */

n = dN;

- d0 = p[0] % MP_DIGIT_BITS;

+ /*d0 = p[0] % MP_DIGIT_BITS;*/

+ d0 = p[0] & MP_DIGIT_BITS_MASK;

d1 = MP_DIGIT_BITS - d0;

z[j-n] ^= (zz >> d0);

if (d0)

@@ -394,19 +398,26 @@

/* final round of reduction */

while (j == dN) {

- d0 = p[0] % MP_DIGIT_BITS;

+ /* d0 = p[0] % MP_DIGIT_BITS; */

+ d0 = p[0] & MP_DIGIT_BITS_MASK;

zz = z[dN] >> d0;

if (zz == 0) break;

d1 = MP_DIGIT_BITS - d0;

/* clear up the top d1 bits */

- if (d0) z[dN] = (z[dN] << d1) >> d1;

+ if (d0) {

+ z[dN] = (z[dN] << d1) >> d1;

+ } else {

+ z[dN] = 0;

+ }

*z ^= zz; /* reduction t^0 component */

for (k = 1; p[k] > 0; k++) {

/* reducing component t^p[k]*/

- n = p[k] / MP_DIGIT_BITS;

- d0 = p[k] % MP_DIGIT_BITS;

+ /* n = p[k] / MP_DIGIT_BITS; */

+ n = p[k] >> MP_DIGIT_BITS_LOG_2;

+ /* d0 = p[k] % MP_DIGIT_BITS; */

+ d0 = p[k] & MP_DIGIT_BITS_MASK;

d1 = MP_DIGIT_BITS - d0;

z[n] ^= (zz << d0);

tmp = zz >> d1;