Fix.

1 files changed, 53 insertions, 34 deletions

diff --git a/nettle/arctwo.c b/nettle/arctwo.c
index 8a332dae34..2420b1d031 100644
--- a/nettle/arctwo.c
+++ b/nettle/arctwo.c
@@ -40,38 +40,38 @@
 #include "macros.h"
 
 static const uint8_t arctwo_sbox[] = {
-  217, 120, 249, 196,  25, 221, 181, 237,
-   40, 233, 253, 121,  74, 160, 216, 157,
-  198, 126,  55, 131,  43, 118,  83, 142,
-   98,  76, 100, 136,  68, 139, 251, 162,
-   23, 154,  89, 245, 135, 179,  79,  19,
-   97,  69, 109, 141,   9, 129, 125,  50,
-  189, 143,  64, 235, 134, 183, 123,  11,
-  240, 149,  33,  34,  92, 107,  78, 130,
-   84, 214, 101, 147, 206,  96, 178,  28,
-  115,  86, 192,  20, 167, 140, 241, 220,
-   18, 117, 202,  31,  59, 190, 228, 209,
-   66,  61, 212,  48, 163,  60, 182,  38,
-  111, 191,  14, 218,  70, 105,   7,  87,
-   39, 242,  29, 155, 188, 148,  67,   3,
-  248,  17, 199, 246, 144, 239,  62, 231,
-    6, 195, 213,  47, 200, 102,  30, 215,
-    8, 232, 234, 222, 128,  82, 238, 247,
-  132, 170, 114, 172,  53,  77, 106,  42,
-  150,  26, 210, 113,  90,  21,  73, 116,
-   75, 159, 208,  94,   4,  24, 164, 236,
-  194, 224,  65, 110,  15,  81, 203, 204,
-   36, 145, 175,  80, 161, 244, 112,  57,
-  153, 124,  58, 133,  35, 184, 180, 122,
-  252,   2,  54,  91,  37,  85, 151,  49,
-   45,  93, 250, 152, 227, 138, 146, 174,
-    5, 223,  41,  16, 103, 108, 186, 201,
-  211,   0, 230, 207, 225, 158, 168,  44,
-   99,  22,   1,  63,  88, 226, 137, 169,
-   13,  56,  52,  27, 171,  51, 255, 176,
-  187,  72,  12,  95, 185, 177, 205,  46,
-  197, 243, 219,  71, 229, 165, 156, 119,
-   10, 166,  32, 104, 254, 127, 193, 173
+  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
 };
 
 #define rotl16(x,n)   (((x) << ((uint16_t)(n))) | ((x) >> (16 - (uint16_t)(n))))
@@ -199,12 +199,12 @@ setkey_core(struct arctwo_ctx *ctx,
   assert(length >= ARCTWO_MIN_KEY_SIZE);
   assert(length <= ARCTWO_MAX_KEY_SIZE);
 
-  S = (unsigned char *) ctx->S;
+  S = (uint8_t *) ctx->S;
 
   for (i = 0; i < length; i++)
     S[i] = key[i];
 
-  for (i = length; i < 128; i++)
+  for (i = length; i < ARCTWO_MAX_KEY_SIZE; i++)
     S[i] = arctwo_sbox[(S[i - length] + S[i - 1]) & 255];
 
   S[0] = arctwo_sbox[S[0]];
@@ -255,6 +255,14 @@ int main (void)
   struct arctwo_ctx ctx;
   uint8_t scratch[16];
 
+  /* Test vectors from RFC 2268. */
+  static uint8_t key_0[] =
+    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+  static uint8_t plaintext_0[] =
+    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+  static const uint8_t ciphertext_0[] =
+    { 0x27, 0x8b, 0x27, 0xe4, 0x2e, 0x2f, 0x0d, 0x49 };
+
   /* Test vectors from Peter Gutmann's paper. */
   static uint8_t key_1[] =
     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -284,6 +292,17 @@ int main (void)
   static uint8_t ciphertext_3[] =
     { 0x8f, 0xd1, 0x03, 0x89, 0x33, 0x6b, 0xf9, 0x5e };
 
+  /* Zeroth test. */
+  arctwo_set_key (&ctx, sizeof(key_0), key_0);
+  arctwo_encrypt (&ctx, ARCTWO_BLOCK_SIZE, scratch, plaintext_0);
+  if (memcmp (scratch, ciphertext_0, sizeof(ciphertext_0)))
+    puts ("RFC2268 encryption test 1 failed.");
+
+  arctwo_set_key (&ctx, sizeof(key_0), key_0);
+  arctwo_decrypt (&ctx, ARCTWO_BLOCK_SIZE, scratch, scratch);
+  if (memcmp (scratch, plaintext_0, sizeof(plaintext_0)))
+    puts ("RFC2268 decryption test 1 failed.");
+
   /* First test. */
   arctwo_set_key (&ctx, sizeof(key_1), key_1);
   arctwo_encrypt (&ctx, ARCTWO_BLOCK_SIZE, scratch, plaintext_1);