Add a table-driven test for RC2 in ECB mode to replace the old one.

From Joshua Sing

3 files changed, 296 insertions, 140 deletions

diff --git a/regress/lib/libcrypto/rc2/Makefile b/regress/lib/libcrypto/rc2/Makefile
index 99e7c748d7f..3bd92fc3087 100644
--- a/regress/lib/libcrypto/rc2/Makefile
+++ b/regress/lib/libcrypto/rc2/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.3 2014/07/08 15:53:53 jsing Exp $
+#	$OpenBSD: Makefile,v 1.4 2022/09/06 15:36:25 tb Exp $
 
-PROG=	rc2test
+PROG=	rc2_test
 LDADD=	-lcrypto
 DPADD=	${LIBCRYPTO}
 WARNINGS=	Yes
diff --git a/regress/lib/libcrypto/rc2/rc2_test.c b/regress/lib/libcrypto/rc2/rc2_test.c
new file mode 100644
index 00000000000..e82d675db12
--- /dev/null
+++ b/regress/lib/libcrypto/rc2/rc2_test.c
@@ -0,0 +1,294 @@
+/*	$OpenBSD: rc2_test.c,v 1.1 2022/09/06 15:36:25 tb Exp $ */
+/*
+ * Copyright (c) 2022 Joshua Sing <joshua@hypera.dev>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <openssl/evp.h>
+#include <openssl/rc2.h>
+
+#include <stdint.h>
+#include <string.h>
+
+struct rc2_test {
+	const int mode;
+	const uint8_t key[64];
+	const int key_len;
+	const int key_bits;
+	const int len;
+	const uint8_t in[8];
+	const uint8_t out[8];
+};
+
+static const struct rc2_test rc2_tests[] = {
+	/* ECB (Test vectors from RFC 2268) */
+	{
+		.mode = NID_rc2_ecb,
+		.key = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.key_len = 8,
+		.key_bits = 63,
+		.len = 8,
+		.in = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.out = {
+			0xeb, 0xb7, 0x73, 0xf9, 0x93, 0x27, 0x8e, 0xff,
+		},
+	},
+	{
+		.mode = NID_rc2_ecb,
+		.key = {
+			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		},
+		.key_len = 8,
+		.key_bits = 64,
+		.len = 8,
+		.in = {
+			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		},
+		.out = {
+			0x27, 0x8b, 0x27, 0xe4, 0x2e, 0x2f, 0x0d, 0x49,
+		},
+	},
+	{
+		.mode = NID_rc2_ecb,
+		.key = {
+			0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.key_len = 8,
+		.key_bits = 64,
+		.len = 8,
+		.in = {
+			0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+		},
+		.out = {
+			0x30, 0x64, 0x9e, 0xdf, 0x9b, 0xe7, 0xd2, 0xc2,
+		},
+	},
+	{
+		.mode = NID_rc2_ecb,
+		.key = {
+			0x88,
+		},
+		.key_len = 1,
+		.key_bits = 64,
+		.len = 8,
+		.in = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.out = {
+			0x61, 0xa8, 0xa2, 0x44, 0xad, 0xac, 0xcc, 0xf0,
+		},
+	},
+	{
+		.mode = NID_rc2_ecb,
+		.key = {
+			0x88, 0xbc, 0xa9, 0x0e, 0x90, 0x87, 0x5a,
+		},
+		.key_len = 7,
+		.key_bits = 64,
+		.len = 8,
+		.in = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.out = {
+			0x6c, 0xcf, 0x43, 0x08, 0x97, 0x4c, 0x26, 0x7f,
+		},
+	},
+	{
+		.mode = NID_rc2_ecb,
+		.key = {
+			0x88, 0xbc, 0xa9, 0x0e, 0x90, 0x87, 0x5a, 0x7f,
+			0x0f, 0x79, 0xc3, 0x84, 0x62, 0x7b, 0xaf, 0xb2,
+		},
+		.key_len = 16,
+		.key_bits = 64,
+		.len = 8,
+		.in = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.out = {
+			0x1a, 0x80, 0x7d, 0x27, 0x2b, 0xbe, 0x5d, 0xb1,
+		},
+	},
+	{
+		.mode = NID_rc2_ecb,
+		.key = {
+			0x88, 0xbc, 0xa9, 0x0e, 0x90, 0x87, 0x5a, 0x7f,
+			0x0f, 0x79, 0xc3, 0x84, 0x62, 0x7b, 0xaf, 0xb2,
+		},
+		.key_len = 16,
+		.key_bits = 128,
+		.len = 8,
+		.in = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.out = {
+			0x22, 0x69, 0x55, 0x2a, 0xb0, 0xf8, 0x5c, 0xa6,
+		},
+	},
+	{
+		.mode = NID_rc2_ecb,
+		.key = {
+			0x88, 0xbc, 0xa9, 0x0e, 0x90, 0x87, 0x5a, 0x7f,
+			0x0f, 0x79, 0xc3, 0x84, 0x62, 0x7b, 0xaf, 0xb2,
+			0x16, 0xf8, 0x0a, 0x6f, 0x85, 0x92, 0x05, 0x84,
+			0xc4, 0x2f, 0xce, 0xb0, 0xbe, 0x25, 0x5d, 0xaf,
+			0x1e,
+		},
+		.key_len = 33,
+		.key_bits = 129,
+		.len = 8,
+		.in = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.out = {
+			0x5b, 0x78, 0xd3, 0xa4, 0x3d, 0xff, 0xf1, 0xf1,
+		},
+	},
+
+	/* ECB (Test vectors from http://websites.umich.edu/~x509/ssleay/rrc2.html) */
+	{
+		.mode = NID_rc2_ecb,
+		.key = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.key_len = 16,
+		.len = 8,
+		.in = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.out = {
+			0x1c, 0x19, 0x8a, 0x83, 0x8d, 0xf0, 0x28, 0xb7,
+		},
+	},
+	{
+		.mode = NID_rc2_ecb,
+		.key = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+		},
+		.key_len = 16,
+		.len = 8,
+		.in = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.out = {
+			0x21, 0x82, 0x9C, 0x78, 0xA9, 0xF9, 0xC0, 0x74,
+		},
+	},
+	{
+		.mode = NID_rc2_ecb,
+		.key = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.key_len = 16,
+		.len = 8,
+		.in = {
+			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		},
+		.out = {
+			0x13, 0xdb, 0x35, 0x17, 0xd3, 0x21, 0x86, 0x9e,
+		},
+	},
+	{
+		.mode = NID_rc2_ecb,
+		.key = {
+			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+			0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+		},
+		.key_len = 16,
+		.len = 8,
+		.in = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		},
+		.out = {
+			0x50, 0xdc, 0x01, 0x62, 0xbd, 0x75, 0x7f, 0x31,
+		},
+	},
+};
+
+#define N_RC2_TESTS (sizeof(rc2_tests) / sizeof(rc2_tests[0]))
+
+static int
+rc2_ecb_test(size_t test_number, const struct rc2_test *rt)
+{
+	RC2_KEY key;
+	uint8_t out[8];
+
+	/* Encryption */
+	memset(out, 0, sizeof(out));
+	RC2_set_key(&key, rt->key_len, rt->key, rt->key_bits);
+	RC2_ecb_encrypt(rt->in, out, &key, 1);
+
+	if (memcmp(rt->out, out, rt->len) != 0) {
+		fprintf(stderr, "FAIL (%s:%zu): encryption mismatch\n",
+		    SN_rc2_ecb, test_number);
+		return 0;
+	}
+
+	/* Decryption */
+	memset(out, 0, sizeof(out));
+	RC2_set_key(&key, rt->key_len, rt->key, rt->key_bits);
+	RC2_ecb_encrypt(rt->out, out, &key, 0);
+
+	if (memcmp(rt->in, out, rt->len) != 0) {
+		fprintf(stderr, "FAIL (%s:%zu): decryption mismatch\n",
+		    SN_rc2_ecb, test_number);
+		return 0;
+	}
+
+	return 1;
+}
+
+static int
+rc2_test(void)
+{
+	const struct rc2_test *rt;
+	size_t i;
+	int failed = 1;
+
+	for (i = 0; i < N_RC2_TESTS; i++) {
+		rt = &rc2_tests[i];
+		switch (rt->mode) {
+		case NID_rc2_ecb:
+			if (!rc2_ecb_test(i, rt))
+				goto failed;
+			break;
+		default:
+			fprintf(stderr, "FAIL: unknown mode (%d)\n",
+			    rt->mode);
+			goto failed;
+		}
+	}
+
+	failed = 0;
+
+ failed:
+	return failed;
+}
+
+int
+main(int argc, char **argv)
+{
+	int failed = 0;
+
+	failed |= rc2_test();
+
+	return failed;
+}
diff --git a/regress/lib/libcrypto/rc2/rc2test.c b/regress/lib/libcrypto/rc2/rc2test.c
deleted file mode 100644
index a8d33077dd1..00000000000
--- a/regress/lib/libcrypto/rc2/rc2test.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*	$OpenBSD: rc2test.c,v 1.2 2018/07/17 17:06:49 tb Exp $	*/
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* This has been a quickly hacked 'ideatest.c'.  When I add tests for other
- * RC2 modes, more of the code will be uncommented. */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/rc2.h>
-
-static unsigned char RC2key[4][16]={
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01},
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	{0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	 0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F},
-	};
-
-static unsigned char RC2plain[4][8]={
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
-	{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-	};
-
-static unsigned char RC2cipher[4][8]={
-	{0x1C,0x19,0x8A,0x83,0x8D,0xF0,0x28,0xB7},
-	{0x21,0x82,0x9C,0x78,0xA9,0xF9,0xC0,0x74},
-	{0x13,0xDB,0x35,0x17,0xD3,0x21,0x86,0x9E},
-	{0x50,0xDC,0x01,0x62,0xBD,0x75,0x7F,0x31},
-	};
-/************/
-
-int main(int argc, char *argv[])
-	{
-	int i,n,err=0;
-	RC2_KEY key; 
-	unsigned char buf[8],buf2[8];
-
-	for (n=0; n<4; n++)
-		{
-		RC2_set_key(&key,16,&(RC2key[n][0]),0 /* or 1024 */);
-
-		RC2_ecb_encrypt(&(RC2plain[n][0]),buf,&key,RC2_ENCRYPT);
-		if (memcmp(&(RC2cipher[n][0]),buf,8) != 0)
-			{
-			printf("ecb rc2 error encrypting\n");
-			printf("got     :");
-			for (i=0; i<8; i++)
-				printf("%02X ",buf[i]);
-			printf("\n");
-			printf("expected:");
-			for (i=0; i<8; i++)
-				printf("%02X ",RC2cipher[n][i]);
-			err=20;
-			printf("\n");
-			}
-
-		RC2_ecb_encrypt(buf,buf2,&key,RC2_DECRYPT);
-		if (memcmp(&(RC2plain[n][0]),buf2,8) != 0)
-			{
-			printf("ecb RC2 error decrypting\n");
-			printf("got     :");
-			for (i=0; i<8; i++)
-				printf("%02X ",buf[i]);
-			printf("\n");
-			printf("expected:");
-			for (i=0; i<8; i++)
-				printf("%02X ",RC2plain[n][i]);
-			printf("\n");
-			err=3;
-			}
-		}
-
-	if (err == 0) printf("ecb RC2 ok\n");
-
-	exit(err);
-	}