diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 02:29:14 +0000 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-09-25 02:29:14 +0000 |
| commit | b8494591d1b1a143f3b192d845c238bbf3bc629d (patch) | |
| tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /src/crypto/des/internal.h | |
| parent | a04d78d392463df4e69a64360c952ffa5abd22f7 (diff) | |
| download | external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.zip external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.gz external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.bz2 | |
Revert "Revert "external/boringssl: sync with upstream.""
This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7.
Underlying issue was fixed.
Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88
Diffstat (limited to 'src/crypto/des/internal.h')
| -rw-r--r-- | src/crypto/des/internal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/crypto/des/internal.h b/src/crypto/des/internal.h index d3a5cec..91559ff 100644 --- a/src/crypto/des/internal.h +++ b/src/crypto/des/internal.h @@ -183,13 +183,13 @@ how to use xors :-) I got it to its final state. PERM_OP(l, r, tt, 4, 0x0f0f0f0fL); \ } -#define LOAD_DATA(R, S, u, t, E0, E1) \ - u = R ^ s[S]; \ - t = R ^ s[S + 1] +#define LOAD_DATA(ks, R, S, u, t, E0, E1) \ + u = R ^ ks->subkeys[S][0]; \ + t = R ^ ks->subkeys[S][1] -#define D_ENCRYPT(LL, R, S) \ +#define D_ENCRYPT(ks, LL, R, S) \ { \ - LOAD_DATA(R, S, u, t, E0, E1); \ + LOAD_DATA(ks, R, S, u, t, E0, E1); \ t = ROTATE(t, 4); \ LL ^= \ DES_SPtrans[0][(u >> 2L) & 0x3f] ^ DES_SPtrans[2][(u >> 10L) & 0x3f] ^ \ |