diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 00:44:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 00:44:37 +0000 |
| commit | e246de8f184e644debf965ecdca552f006b56881 (patch) | |
| tree | dc62c249d595198e0d99e43890019d21e901fbec /src/crypto/des/internal.h | |
| parent | c737bc23bc868fff21e5c1b95940813f709ea550 (diff) | |
| parent | 00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872 (diff) | |
| download | external_boringssl-e246de8f184e644debf965ecdca552f006b56881.zip external_boringssl-e246de8f184e644debf965ecdca552f006b56881.tar.gz external_boringssl-e246de8f184e644debf965ecdca552f006b56881.tar.bz2 | |
am 00bc53f6: am a04d78d3: Revert "external/boringssl: sync with upstream."
* commit '00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872':
Revert "external/boringssl: sync with upstream."
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 91559ff..d3a5cec 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(ks, R, S, u, t, E0, E1) \ - u = R ^ ks->subkeys[S][0]; \ - t = R ^ ks->subkeys[S][1] +#define LOAD_DATA(R, S, u, t, E0, E1) \ + u = R ^ s[S]; \ + t = R ^ s[S + 1] -#define D_ENCRYPT(ks, LL, R, S) \ +#define D_ENCRYPT(LL, R, S) \ { \ - LOAD_DATA(ks, R, S, u, t, E0, E1); \ + LOAD_DATA(R, S, u, t, E0, E1); \ t = ROTATE(t, 4); \ LL ^= \ DES_SPtrans[0][(u >> 2L) & 0x3f] ^ DES_SPtrans[2][(u >> 10L) & 0x3f] ^ \ |