## -*-makefile-*-
##
-## $Id: Makefile.m4,v 1.47 2001/03/03 13:14:13 mdw Exp $
+## $Id: Makefile.m4,v 1.48 2001/04/03 19:36:50 mdw Exp $
##
## Makefile for Catacomb
##
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.m4,v $
+## Revision 1.48 2001/04/03 19:36:50 mdw
+## New block cipher DESX added.
+##
## Revision 1.47 2001/03/03 13:14:13 mdw
## Distribute md2-tab.h
##
## --- Autogenerated source files ---
define(`ciphers', `dnl
-_(des) _(des3) dnl
+_(des) _(desx) _(des3) dnl
_(idea) dnl
_(blowfish) _(twofish) dnl
_(tea) _(xtea) dnl
--- /dev/null
+/* -*-c-*-
+ *
+ * $Id: desx-tab.h,v 1.1 2001/04/03 19:36:50 mdw Exp $
+ *
+ * Tables for DESX
+ *
+ * (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: desx-tab.h,v $
+ * Revision 1.1 2001/04/03 19:36:50 mdw
+ * New block cipher DESX added.
+ *
+ */
+
+#ifndef CATACOMB_DESX_TAB_H
+#define CATACOMB_DESX_TAB_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/*----- S-box table -------------------------------------------------------*/
+
+#define DESX_S { \
+ 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, \
+ 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0, \
+ 0x30, 0x04, 0xb6, 0xdc, 0x7d, 0xdf, 0x32, 0x4b, \
+ 0xf7, 0xcb, 0x45, 0x9b, 0x31, 0xbb, 0x21, 0x5a, \
+ 0x41, 0x9f, 0xe1, 0xd9, 0x4a, 0x4d, 0x9e, 0xda, \
+ 0xa0, 0x68, 0x2c, 0xc3, 0x27, 0x5f, 0x80, 0x36, \
+ 0x3e, 0xee, 0xfb, 0x95, 0x1a, 0xfe, 0xce, 0xa8, \
+ 0x34, 0xa9, 0x13, 0xf0, 0xa6, 0x3f, 0xd8, 0x0c, \
+ 0x78, 0x24, 0xaf, 0x23, 0x52, 0xc1, 0x67, 0x17, \
+ 0xf5, 0x66, 0x90, 0xe7, 0xe8, 0x07, 0xb8, 0x60, \
+ 0x48, 0xe6, 0x1e, 0x53, 0xf3, 0x92, 0xa4, 0x72, \
+ 0x8c, 0x08, 0x15, 0x6e, 0x86, 0x00, 0x84, 0xfa, \
+ 0xf4, 0x7f, 0x8a, 0x42, 0x19, 0xf6, 0xdb, 0xcd, \
+ 0x14, 0x8d, 0x50, 0x12, 0xba, 0x3c, 0x06, 0x4e, \
+ 0xec, 0xb3, 0x35, 0x11, 0xa1, 0x88, 0x8e, 0x2b, \
+ 0x94, 0x99, 0xb7, 0x71, 0x74, 0xd3, 0xe4, 0xbf, \
+ 0x3a, 0xde, 0x96, 0x0e, 0xbc, 0x0a, 0xed, 0x77, \
+ 0xfc, 0x37, 0x6b, 0x03, 0x79, 0x89, 0x62, 0xc6, \
+ 0xd7, 0xc0, 0xd2, 0x7c, 0x6a, 0x8b, 0x22, 0xa3, \
+ 0x5b, 0x05, 0x5d, 0x02, 0x75, 0xd5, 0x61, 0xe3, \
+ 0x18, 0x8f, 0x55, 0x51, 0xad, 0x1f, 0x0b, 0x5e, \
+ 0x85, 0xe5, 0xc2, 0x57, 0x63, 0xca, 0x3d, 0x6c, \
+ 0xb4, 0xc5, 0xcc, 0x70, 0xb2, 0x91, 0x59, 0x0d, \
+ 0x47, 0x20, 0xc8, 0x4f, 0x58, 0xe0, 0x01, 0xe2, \
+ 0x16, 0x38, 0xc4, 0x6f, 0x3b, 0x0f, 0x65, 0x46, \
+ 0xbe, 0x7e, 0x2d, 0x7b, 0x82, 0xf9, 0x40, 0xb5, \
+ 0x1d, 0x73, 0xf8, 0xeb, 0x26, 0xc7, 0x87, 0x97, \
+ 0x25, 0x54, 0xb1, 0x28, 0xaa, 0x98, 0x9d, 0xa5, \
+ 0x64, 0x6d, 0x7a, 0xd4, 0x10, 0x81, 0x44, 0xef, \
+ 0x49, 0xd6, 0xae, 0x2e, 0xdd, 0x76, 0x5c, 0x2f, \
+ 0xa7, 0x1c, 0xc9, 0x09, 0x69, 0x9a, 0x83, 0xcf, \
+ 0x29, 0x39, 0xb9, 0xe9, 0x4c, 0xff, 0x43, 0xab, \
+}
+
+/*----- That's all, folks -------------------------------------------------*/
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif
--- /dev/null
+/* -*-c-*-
+ *
+ * $Id: desx.c,v 1.1 2001/04/03 19:36:50 mdw Exp $
+ *
+ * Implementation of DESX
+ *
+ * (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: desx.c,v $
+ * Revision 1.1 2001/04/03 19:36:50 mdw
+ * New block cipher DESX added.
+ *
+ */
+
+/*----- Header files ------------------------------------------------------*/
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <mLib/bits.h>
+
+#include "blkc.h"
+#include "des-base.h"
+#include "des.h"
+#include "desx.h"
+#include "desx-tab.h"
+#include "gcipher.h"
+
+/*----- Tables ------------------------------------------------------------*/
+
+static octet s[256] = DESX_S;
+
+/*----- Global variables --------------------------------------------------*/
+
+const octet desx_keysz[] = { KSZ_SET, 7, 8, 15, 16, 23, 24, 0 };
+
+/*----- Main code ---------------------------------------------------------*/
+
+/* --- @desx_init@ --- *
+ *
+ * Arguments: @desx_ctx *k@ = pointer to key block
+ * @const void *buf@ = pointer to key buffer
+ * @size_t sz@ = size of key material
+ *
+ * Returns: ---
+ *
+ * Use: Initializes a DESX key buffer. The key buffer contains, in
+ * order, a single-DES key (either 7 or 8 bytes), an optional
+ * 8-byte pre-whitening key, and an optional 8-byte
+ * port-whitening key. If no whitening keys are specified, the
+ * algorithm becomes the same as single-DES.
+ */
+
+static void mangle(octet *b, const octet *p)
+{
+ unsigned i;
+
+ for (i = 0; i < 8; i++)
+ b[i] = *p++ ^ s[b[i] ^ b[(i + 1) & 7u]];
+}
+
+void desx_init(desx_ctx *k, const void *buf, size_t sz)
+{
+ const octet *p = buf, *kk = buf;
+ size_t n;
+
+ KSZ_ASSERT(desx, sz);
+
+ n = sz % 8 == 7 ? 7 : 8;
+ des_init(&k->k, p, n);
+ p += n;
+ sz -= n;
+ if (!sz)
+ k->prea = k->preb = k->posta = k->postb = 0;
+ else {
+ const octet *q = p;
+ k->prea = LOAD32(q + 0);
+ k->preb = LOAD32(q + 4);
+ p += 8;
+ sz -= 8;
+ if (sz) {
+ k->posta = LOAD32(p + 0);
+ k->postb = LOAD32(p + 4);
+ } else {
+ octet b[16];
+
+ if (n == 7) {
+
+ /* --- Expand 7 bits to 8 bits --- *
+ *
+ * Cloned and hacked from @des_init@ to set parity.
+ */
+
+ uint32 x, y, z;
+ x = LOAD32(kk + 0);
+ x = (x & 0xfe000000) | ((x & 0x01fffff0) >> 1);
+ x = (x & 0xfffe0000) | ((x & 0x0001fff8) >> 1);
+ x = (x & 0xfffffe00) | ((x & 0x000001fc) >> 1);
+ z = x; z ^= z >> 4; z ^= z >> 2; z ^= z >> 1;
+ x |= (z & 0x01010101) ^ 0x01010101;
+
+ y = LOAD32(kk + 3) << 1;
+ y = (y & 0x000000fe) | ((y & 0x1fffff00) << 1);
+ y = (y & 0x0000fefe) | ((y & 0x3fff0000) << 1);
+ y = (y & 0x00fefefe) | ((y & 0x7f000000) << 1);
+ z = y; z ^= z >> 4; z ^= z >> 2; z ^= z >> 1;
+ y |= (z & 0x01010101) ^ 0x01010101;
+
+ kk = b + 8;
+ STORE32(kk + 0, x); STORE32(kk + 4, y);
+ }
+
+ memset(b, 0, 8);
+ mangle(b, kk);
+ mangle(b, q);
+ k->posta = LOAD32(b + 0);
+ k->postb = LOAD32(b + 4);
+ }
+ }
+}
+
+/* --- @desx_eblk@, @desx_dblk@ --- *
+ *
+ * Arguments: @const desx_ctx *k@ = pointer to key block
+ * @const uint32 s[2]@ = pointer to source block
+ * @uint32 d[2]@ = pointer to destination block
+ *
+ * Returns: ---
+ *
+ * Use: Low-level block encryption and decryption.
+ */
+
+void desx_eblk(const desx_ctx *k, const uint32 *s, uint32 *d)
+{
+ uint32 x = s[0], y = s[1];
+ x ^= k->prea; y ^= k->preb;
+ DES_IP(x, y);
+ DES_EBLK(k->k.k, x, y, x, y);
+ DES_IPINV(x, y);
+ x ^= k->posta; y ^= k->postb;
+ d[0] = x, d[1] = y;
+}
+
+void desx_dblk(const desx_ctx *k, const uint32 *s, uint32 *d)
+{
+ uint32 x = s[0], y = s[1];
+ x ^= k->posta; y ^= k->postb;
+ DES_IP(x, y);
+ DES_DBLK(k->k.k, x, y, x, y);
+ DES_IPINV(x, y);
+ x ^= k->prea; y ^= k->preb;
+ d[0] = x, d[1] = y;
+}
+
+BLKC_TEST(DESX, desx)
+
+/*----- That's all, folks -------------------------------------------------*/
--- /dev/null
+/* -*-c-*-
+ *
+ * $Id: desx.h,v 1.1 2001/04/03 19:36:50 mdw Exp $
+ *
+ * The DESX algorithm
+ *
+ * (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: desx.h,v $
+ * Revision 1.1 2001/04/03 19:36:50 mdw
+ * New block cipher DESX added.
+ *
+ */
+
+/*----- Notes on DESX -----------------------------------------------------*
+ *
+ * DESX was designed by Ron Rivest in 1986 as a simple and cheap way to
+ * strengthen DES against exhaustive search. It also increases the
+ * difficulty of differential and linear attacks.
+ */
+
+#ifndef CATACOMB_DESX_H
+#define CATACOMB_DESX_H
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+/*----- Header files ------------------------------------------------------*/
+
+#include <stddef.h>
+
+#include <mLib/bits.h>
+
+#ifndef CATACOMB_DES_H
+# include "des.h"
+#endif
+
+/*----- Magical numbers ---------------------------------------------------*/
+
+#define DESX_BLKSZ 8
+#define DESX_KEYSZ 23
+#define DESX_CLASS (N, B, 64)
+
+extern const octet desx_keysz[];
+
+/*----- Data structures ---------------------------------------------------*/
+
+typedef struct desx_ctx {
+ des_ctx k;
+ uint32 prea, preb;
+ uint32 posta, postb;
+} desx_ctx;
+
+/*----- Functions provided ------------------------------------------------*/
+
+/* --- @desx_init@ --- *
+ *
+ * Arguments: @desx_ctx *k@ = pointer to key block
+ * @const void *buf@ = pointer to key buffer
+ * @size_t sz@ = size of key material
+ *
+ * Returns: ---
+ *
+ * Use: Initializes a DESX key buffer. The key buffer contains, in
+ * order, an optional 8-byte pre-whitening key, a single-DES key
+ * (either 7 or 8 bytes), and an optional 8-byte port-whitening
+ * key. If no whitening keys are specified, the algorithm
+ * becomes the same as single-DES.
+ */
+
+extern void desx_init(desx_ctx */*k*/, const void */*buf*/, size_t /*sz*/);
+
+/* --- @desx_eblk@, @desx_dblk@ --- *
+ *
+ * Arguments: @const desx_ctx *k@ = pointer to key block
+ * @const uint32 s[2]@ = pointer to source block
+ * @uint32 d[2]@ = pointer to destination block
+ *
+ * Returns: ---
+ *
+ * Use: Low-level block encryption and decryption.
+ */
+
+extern void desx_eblk(const desx_ctx */*k*/,
+ const uint32 */*s*/, uint32 */*d*/);
+extern void desx_dblk(const desx_ctx */*k*/,
+ const uint32 */*s*/, uint32 */*d*/);
+
+/*----- That's all, folks -------------------------------------------------*/
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif
--- /dev/null
+# Test vectors for DES
+#
+# $Id: desx,v 1.1 2001/04/03 19:36:51 mdw Exp $
+
+desx {
+ # --- From SCAN ---
+
+ 0123456789abcdef1011121314151617
+ 4445535864657378 d8fa5084fad4b35c;
+ 01010101010101010123456789abcdef1011121314151617
+ 94dbe082549a14ef 9011121314151617;
+
+ # --- 7-bit key tests ---
+
+ 004513389573771011121314151617
+ 4445535864657378 d8fa5084fad4b35c;
+ 000000000000000123456789abcdef1011121314151617
+ 94dbe082549a14ef 9011121314151617;
+
+ # --- Equivalence tests ---
+
+ 00451338957377 4e6f772069732074 3fa40e8a984d4815;
+ 0123456789abcdef 4e6f772069732074 3fa40e8a984d4815;
+}
projects / u / mdw / catacomb / commitdiff