X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/0f00dc4c8eb47e67bc0f148c2dd109f73a451e0a..e5b61a8dec3586f96d25bd3ef454176526ff0f69:/symm/rc2.c diff --git a/symm/rc2.c b/symm/rc2.c index 4ea85b6..df59425 100644 --- a/symm/rc2.c +++ b/symm/rc2.c @@ -36,7 +36,6 @@ #include "gcipher.h" #include "paranoia.h" #include "rc2.h" -#include "rc2-tab.h" /*----- Global variables --------------------------------------------------*/ @@ -44,7 +43,7 @@ const octet rc2_keysz[] = { KSZ_RANGE, RC2_KEYSZ, 1, 128, 1 }; /*----- Important tables --------------------------------------------------*/ -static const octet pi[256] = RC2_PI; +extern const octet rc2_pi[256]; /*----- Main code ---------------------------------------------------------*/ @@ -85,15 +84,15 @@ void rc2_braindamage(rc2_ctx *k, const void *buf, size_t sz, unsigned eb) memcpy(l, buf, sz); for (i = sz; i < sizeof(l); i++) - l[i] = pi[U8(l[i - 1] + l[i - sz])]; + l[i] = rc2_pi[U8(l[i - 1] + l[i - sz])]; /* --- Braindamage the key --- */ i = sizeof(l) - t8; - l[i] = pi[l[i] & tm]; + l[i] = rc2_pi[l[i] & tm]; while (i) { i--; - l[i] = pi[U8(l[i + 1] ^ l[i + t8])]; + l[i] = rc2_pi[U8(l[i + 1] ^ l[i + t8])]; } /* --- Write it to the key block --- */