From e8ec97351e2296b1db2cd33bcb188dca51c431b1 Mon Sep 17 00:00:00 2001 From: mdw Date: Sun, 29 Apr 2001 17:39:52 +0000 Subject: [PATCH] Moved big horrible table to a separate header. --- rc2-tab.h | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ rc2.c | 41 +++++------------------------ 2 files changed, 94 insertions(+), 35 deletions(-) create mode 100644 rc2-tab.h diff --git a/rc2-tab.h b/rc2-tab.h new file mode 100644 index 0000000..f08adba --- /dev/null +++ b/rc2-tab.h @@ -0,0 +1,88 @@ +/* -*-c-*- + * + * $Id: rc2-tab.h,v 1.1 2001/04/29 17:39:52 mdw Exp $ + * + * Substitution table for RC2 + * + * (c) 2001 Straylight/Edgeware + */ + +/*----- Licensing notice --------------------------------------------------* + * + * This file is part of Catacomb. + * + * Catacomb is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * Catacomb is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with Catacomb; if not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + * MA 02111-1307, USA. + */ + +/*----- Revision history --------------------------------------------------* + * + * $Log: rc2-tab.h,v $ + * Revision 1.1 2001/04/29 17:39:52 mdw + * Moved big horrible table to a separate header. + * + */ + +#ifndef CATACOMB_RC2_TAB_H +#define CATACOMB_RC2_TAB_H + +#ifdef __cplusplus + extern "C" { +#endif + +/*----- S-box table -------------------------------------------------------*/ + +#define RC2_PI { \ + 0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, \ + 0x28, 0xe9, 0xfd, 0x79, 0x4a, 0xa0, 0xd8, 0x9d, \ + 0xc6, 0x7e, 0x37, 0x83, 0x2b, 0x76, 0x53, 0x8e, \ + 0x62, 0x4c, 0x64, 0x88, 0x44, 0x8b, 0xfb, 0xa2, \ + 0x17, 0x9a, 0x59, 0xf5, 0x87, 0xb3, 0x4f, 0x13, \ + 0x61, 0x45, 0x6d, 0x8d, 0x09, 0x81, 0x7d, 0x32, \ + 0xbd, 0x8f, 0x40, 0xeb, 0x86, 0xb7, 0x7b, 0x0b, \ + 0xf0, 0x95, 0x21, 0x22, 0x5c, 0x6b, 0x4e, 0x82, \ + 0x54, 0xd6, 0x65, 0x93, 0xce, 0x60, 0xb2, 0x1c, \ + 0x73, 0x56, 0xc0, 0x14, 0xa7, 0x8c, 0xf1, 0xdc, \ + 0x12, 0x75, 0xca, 0x1f, 0x3b, 0xbe, 0xe4, 0xd1, \ + 0x42, 0x3d, 0xd4, 0x30, 0xa3, 0x3c, 0xb6, 0x26, \ + 0x6f, 0xbf, 0x0e, 0xda, 0x46, 0x69, 0x07, 0x57, \ + 0x27, 0xf2, 0x1d, 0x9b, 0xbc, 0x94, 0x43, 0x03, \ + 0xf8, 0x11, 0xc7, 0xf6, 0x90, 0xef, 0x3e, 0xe7, \ + 0x06, 0xc3, 0xd5, 0x2f, 0xc8, 0x66, 0x1e, 0xd7, \ + 0x08, 0xe8, 0xea, 0xde, 0x80, 0x52, 0xee, 0xf7, \ + 0x84, 0xaa, 0x72, 0xac, 0x35, 0x4d, 0x6a, 0x2a, \ + 0x96, 0x1a, 0xd2, 0x71, 0x5a, 0x15, 0x49, 0x74, \ + 0x4b, 0x9f, 0xd0, 0x5e, 0x04, 0x18, 0xa4, 0xec, \ + 0xc2, 0xe0, 0x41, 0x6e, 0x0f, 0x51, 0xcb, 0xcc, \ + 0x24, 0x91, 0xaf, 0x50, 0xa1, 0xf4, 0x70, 0x39, \ + 0x99, 0x7c, 0x3a, 0x85, 0x23, 0xb8, 0xb4, 0x7a, \ + 0xfc, 0x02, 0x36, 0x5b, 0x25, 0x55, 0x97, 0x31, \ + 0x2d, 0x5d, 0xfa, 0x98, 0xe3, 0x8a, 0x92, 0xae, \ + 0x05, 0xdf, 0x29, 0x10, 0x67, 0x6c, 0xba, 0xc9, \ + 0xd3, 0x00, 0xe6, 0xcf, 0xe1, 0x9e, 0xa8, 0x2c, \ + 0x63, 0x16, 0x01, 0x3f, 0x58, 0xe2, 0x89, 0xa9, \ + 0x0d, 0x38, 0x34, 0x1b, 0xab, 0x33, 0xff, 0xb0, \ + 0xbb, 0x48, 0x0c, 0x5f, 0xb9, 0xb1, 0xcd, 0x2e, \ + 0xc5, 0xf3, 0xdb, 0x47, 0xe5, 0xa5, 0x9c, 0x77, \ + 0x0a, 0xa6, 0x20, 0x68, 0xfe, 0x7f, 0xc1, 0xad \ +} + +/*----- That's all, folks -------------------------------------------------*/ + +#ifdef __cplusplus + } +#endif + +#endif diff --git a/rc2.c b/rc2.c index 9ced44c..be158f8 100644 --- a/rc2.c +++ b/rc2.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: rc2.c,v 1.1 2000/06/17 11:54:34 mdw Exp $ + * $Id: rc2.c,v 1.2 2001/04/29 17:39:52 mdw Exp $ * * The RC2 block cipher * @@ -30,6 +30,9 @@ /*----- Revision history --------------------------------------------------* * * $Log: rc2.c,v $ + * Revision 1.2 2001/04/29 17:39:52 mdw + * Moved big horrible table to a separate header. + * * Revision 1.1 2000/06/17 11:54:34 mdw * New cipher. * @@ -46,6 +49,7 @@ #include "gcipher.h" #include "paranoia.h" #include "rc2.h" +#include "rc2-tab.h" /*----- Global variables --------------------------------------------------*/ @@ -53,40 +57,7 @@ const octet rc2_keysz[] = { KSZ_RANGE, RC2_KEYSZ, 1, 128, 1 }; /*----- Important tables --------------------------------------------------*/ -static const octet pi[] = { - 0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, - 0x28, 0xe9, 0xfd, 0x79, 0x4a, 0xa0, 0xd8, 0x9d, - 0xc6, 0x7e, 0x37, 0x83, 0x2b, 0x76, 0x53, 0x8e, - 0x62, 0x4c, 0x64, 0x88, 0x44, 0x8b, 0xfb, 0xa2, - 0x17, 0x9a, 0x59, 0xf5, 0x87, 0xb3, 0x4f, 0x13, - 0x61, 0x45, 0x6d, 0x8d, 0x09, 0x81, 0x7d, 0x32, - 0xbd, 0x8f, 0x40, 0xeb, 0x86, 0xb7, 0x7b, 0x0b, - 0xf0, 0x95, 0x21, 0x22, 0x5c, 0x6b, 0x4e, 0x82, - 0x54, 0xd6, 0x65, 0x93, 0xce, 0x60, 0xb2, 0x1c, - 0x73, 0x56, 0xc0, 0x14, 0xa7, 0x8c, 0xf1, 0xdc, - 0x12, 0x75, 0xca, 0x1f, 0x3b, 0xbe, 0xe4, 0xd1, - 0x42, 0x3d, 0xd4, 0x30, 0xa3, 0x3c, 0xb6, 0x26, - 0x6f, 0xbf, 0x0e, 0xda, 0x46, 0x69, 0x07, 0x57, - 0x27, 0xf2, 0x1d, 0x9b, 0xbc, 0x94, 0x43, 0x03, - 0xf8, 0x11, 0xc7, 0xf6, 0x90, 0xef, 0x3e, 0xe7, - 0x06, 0xc3, 0xd5, 0x2f, 0xc8, 0x66, 0x1e, 0xd7, - 0x08, 0xe8, 0xea, 0xde, 0x80, 0x52, 0xee, 0xf7, - 0x84, 0xaa, 0x72, 0xac, 0x35, 0x4d, 0x6a, 0x2a, - 0x96, 0x1a, 0xd2, 0x71, 0x5a, 0x15, 0x49, 0x74, - 0x4b, 0x9f, 0xd0, 0x5e, 0x04, 0x18, 0xa4, 0xec, - 0xc2, 0xe0, 0x41, 0x6e, 0x0f, 0x51, 0xcb, 0xcc, - 0x24, 0x91, 0xaf, 0x50, 0xa1, 0xf4, 0x70, 0x39, - 0x99, 0x7c, 0x3a, 0x85, 0x23, 0xb8, 0xb4, 0x7a, - 0xfc, 0x02, 0x36, 0x5b, 0x25, 0x55, 0x97, 0x31, - 0x2d, 0x5d, 0xfa, 0x98, 0xe3, 0x8a, 0x92, 0xae, - 0x05, 0xdf, 0x29, 0x10, 0x67, 0x6c, 0xba, 0xc9, - 0xd3, 0x00, 0xe6, 0xcf, 0xe1, 0x9e, 0xa8, 0x2c, - 0x63, 0x16, 0x01, 0x3f, 0x58, 0xe2, 0x89, 0xa9, - 0x0d, 0x38, 0x34, 0x1b, 0xab, 0x33, 0xff, 0xb0, - 0xbb, 0x48, 0x0c, 0x5f, 0xb9, 0xb1, 0xcd, 0x2e, - 0xc5, 0xf3, 0xdb, 0x47, 0xe5, 0xa5, 0x9c, 0x77, - 0x0a, 0xa6, 0x20, 0x68, 0xfe, 0x7f, 0xc1, 0xad -}; +static const octet pi[256] = RC2_PI; /*----- Main code ---------------------------------------------------------*/ -- 2.11.0