libutil

rc2: Merge libcrypt into lib

Diffstat

5 files changed, 413 insertions, 22 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33abedb..3485d98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,23 +1,27 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
 PROJECT(lib LANGUAGES C)
 
-SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
 SET(CMAKE_STATIC_LIBRARY_PREFIX "")
+SET(CMAKE_SHARED_LIBRARY_PREFIX "")
 
-FILE(GLOB SRC ${CMAKE_SOURCE_DIR}/src/*)
+FILE(GLOB SRC ${PROJECT_SOURCE_DIR}/src/*)
 
-ADD_LIBRARY(lib STATIC ${SRC})
+ADD_LIBRARY(lib_static STATIC ${SRC})
+ADD_LIBRARY(lib_shared SHARED ${SRC})
 
-LINK_LIBRARIES(lib)
+LINK_LIBRARIES(lib_static)
 
-ADD_EXECUTABLE(test_base32 ${CMAKE_SOURCE_DIR}/src/test/test_base32.c)
-ADD_EXECUTABLE(test_base64 ${CMAKE_SOURCE_DIR}/src/test/test_base64.c)
-ADD_EXECUTABLE(test_crypt  ${CMAKE_SOURCE_DIR}/src/test/test_crypt.c)
-ADD_EXECUTABLE(test_endian ${CMAKE_SOURCE_DIR}/src/test/test_endian.c)
-ADD_EXECUTABLE(test_error  ${CMAKE_SOURCE_DIR}/src/test/test_error.c)
-ADD_EXECUTABLE(test_optget ${CMAKE_SOURCE_DIR}/src/test/test_optget.c)
-ADD_EXECUTABLE(test_strtou ${CMAKE_SOURCE_DIR}/src/test/test_strtou.c)
+ADD_EXECUTABLE(test_base32 ${PROJECT_SOURCE_DIR}/src/test/test_base32.c)
+ADD_EXECUTABLE(test_base64 ${PROJECT_SOURCE_DIR}/src/test/test_base64.c)
+ADD_EXECUTABLE(test_crypt  ${PROJECT_SOURCE_DIR}/src/test/test_crypt.c)
+ADD_EXECUTABLE(test_endian ${PROJECT_SOURCE_DIR}/src/test/test_endian.c)
+ADD_EXECUTABLE(test_error  ${PROJECT_SOURCE_DIR}/src/test/test_error.c)
+ADD_EXECUTABLE(test_optget ${PROJECT_SOURCE_DIR}/src/test/test_optget.c)
+ADD_EXECUTABLE(test_rc2    ${PROJECT_SOURCE_DIR}/src/test/test_rc2.c)
+ADD_EXECUTABLE(test_strtou ${PROJECT_SOURCE_DIR}/src/test/test_strtou.c)
 
 ENABLE_TESTING()
 ADD_TEST(NAME test_base32 COMMAND test_base32)
@@ -26,4 +30,5 @@ ADD_TEST(NAME test_crypt  COMMAND test_crypt)
 ADD_TEST(NAME test_endian COMMAND test_endian)
 ADD_TEST(NAME test_error  COMMAND test_error)
 ADD_TEST(NAME test_optget COMMAND test_optget)
+ADD_TEST(NAME test_rc2    COMMAND test_rc2)
 ADD_TEST(NAME test_strtou COMMAND test_strtou)
diff --git a/README.md b/README.md
index d8e43a0..9fa20da 100644
--- a/README.md
+++ b/README.md
@@ -6,16 +6,17 @@ OMKOV lib is a lightweight generic library to be included locally in projects.
 
 ## Components
 
-| Component        | Description                                         |
-| ---------------- | --------------------------------------------------- |
-| base32           | Encode or decode Base32                             |
-| base64           | Encode or decode Base64                             |
-| crypt            | Cryptography functions                              |
-| endian           | Endianness related functions                        |
-| error            | Error reporting functions                           |
-| mode             | Parse numeric or symbolic POSIX modes               |
-| optget           | Parse command line options                          |
-| strconv          | String conversion functions                         |
+| Component        | Description                              | Standard |
+| ---------------- | ---------------------------------------- | -------- |
+| base32           | Encode or decode Base32                  |          |
+| base64           | Encode or decode Base64                  |          |
+| crypt            | Cryptography functions                   |          |
+| endian           | Endianness related functions             |          |
+| error            | Error reporting functions                |          |
+| mode             | Parse numeric or symbolic POSIX modes    |          |
+| optget           | Parse command line options               |          |
+| rc2              | RC2 encryption algorithm                 | RFC 2268 |
+| strconv          | String conversion functions              |          |
 
 ## Build Instructions
 
diff --git a/src/rc2.c b/src/rc2.c
new file mode 100644
index 0000000..7ce26ed
--- /dev/null
+++ b/src/rc2.c
@@ -0,0 +1,154 @@
+// rc2.c
+// RC2 source file for OMKOV libcrypt
+// Copyright (C) 2021, Jakob Wakeling
+// All rights reserved.
+
+/*
+OMKOV Permissive Licence, version 1.0
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimers.
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimers in the documentation and/or
+  other materials provided with the distribution.
+* Neither the names of the copyright holders, nor the names of its contributors
+  may be used to endorse or promote products derived from this Software without
+  specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT
+HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
+*/
+
+#include "rc2.h"
+
+#include "crypt.h"
+#include "endian.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+static inline bool isle() { uint16_t e = 0x00FF; return *(uint8_t *)&e; }
+static inline bool isbe() { uint16_t e = 0xFF00; return *(uint8_t *)&e; }
+
+static const uint8_t RC2[];
+
+/* Expand a user key to a 128-byte RC2 key. */
+void rc2expand(struct rc2 *ctx, const uint8_t *key, int len, int ekl) {
+	assert(len >= 1 && len <= 128); assert(ekl <= 1024);
+	memcpy(ctx->l, key, len);
+	
+	int t8 = (ekl + 7) / 8, tm = 0xFF >> (8 * t8 - ekl);
+	
+	// First key expansion loop
+	for (int i = len; i != 128; ++i) {
+		ctx->l[i] = RC2[(ctx->l[i - 1] + ctx->l[i - len]) & 0xFF];
+	}
+	
+	// Intermediate step
+	ctx->l[128 - t8] = RC2[ctx->l[128 - t8] & tm];
+	
+	// Second key expansion loop
+	for (int i = 128 - t8; i != 0; --i) {
+		ctx->l[i - 1] = RC2[ctx->l[i] ^ ctx->l[i + t8 - 1]];
+	}
+	
+	// If CPU is big-endian, then byte swap key
+	if (isbe()) for (int i = 0; i != 64; ++i) {
+		ctx->k[i] = BSWAP16(ctx->k[i]);
+	}
+	
+	return;
+}
+
+/* Encrypt an 8-byte block using RC2 */
+void rc2encrypt(struct rc2 *ctx, uint8_t *in, uint8_t *out) {
+	uint16_t r0 = LD16LE(in);
+	uint16_t r1 = LD16LE(in + 2);
+	uint16_t r2 = LD16LE(in + 4);
+	uint16_t r3 = LD16LE(in + 6);
+	
+	for (int i = 0; i != 16; ++i) {
+		// Perform mixing round
+		r0 += ctx->k[i * 4]     + (r3 & r2) + (~r3 & r1); r0 = ROL16(r0, 1);
+		r1 += ctx->k[i * 4 + 1] + (r0 & r3) + (~r0 & r2); r1 = ROL16(r1, 2);
+		r2 += ctx->k[i * 4 + 2] + (r1 & r0) + (~r1 & r3); r2 = ROL16(r2, 3);
+		r3 += ctx->k[i * 4 + 3] + (r2 & r1) + (~r2 & r0); r3 = ROL16(r3, 5);
+		
+		// Perform mashing round for rounds 5 and 11
+		if (i == 4 || i == 10) {
+			r0 += ctx->k[r3 & 63]; r1 += ctx->k[r0 & 63];
+			r2 += ctx->k[r1 & 63]; r3 += ctx->k[r2 & 63];
+		}
+	}
+	
+	ST16LE(out, r0);
+	ST16LE(out + 2, r1);
+	ST16LE(out + 4, r2);
+	ST16LE(out + 6, r3);
+}
+
+/* Decrypt an 8-byte block using RC2 */
+void rc2decrypt(struct rc2 *ctx, uint8_t *in, uint8_t *out) {
+	uint16_t r0 = LD16LE(in);
+	uint16_t r1 = LD16LE(in + 2);
+	uint16_t r2 = LD16LE(in + 4);
+	uint16_t r3 = LD16LE(in + 6);
+	
+	for (int i = 15; i >= 0; --i) {
+		// Perform r-mixing round
+		r3 = ROR16(r3, 5); r3 -= ctx->k[i * 4 + 3] + (r2 & r1) + (~r2 & r0);
+		r2 = ROR16(r2, 3); r2 -= ctx->k[i * 4 + 2] + (r1 & r0) + (~r1 & r3);
+		r1 = ROR16(r1, 2); r1 -= ctx->k[i * 4 + 1] + (r0 & r3) + (~r0 & r2);
+		r0 = ROR16(r0, 1); r0 -= ctx->k[i * 4]     + (r3 & r2) + (~r3 & r1);
+		
+		// Perform r-mashing round for rounds 5 and 11
+		if (i == 5 || i == 11) {
+			r3 -= ctx->k[r2 & 63]; r2 -= ctx->k[r1 & 63];
+			r1 -= ctx->k[r0 & 63]; r0 -= ctx->k[r3 & 63];
+		}
+	}
+	
+	ST16LE(out, r0);
+	ST16LE(out + 2, r1);
+	ST16LE(out + 4, r2);
+	ST16LE(out + 6, r3);
+}
+
+static const uint8_t RC2[] = {
+	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
+};
diff --git a/src/rc2.h b/src/rc2.h
new file mode 100644
index 0000000..9818117
--- /dev/null
+++ b/src/rc2.h
@@ -0,0 +1,45 @@
+// rc2.h
+// RC2 header file for OMKOV libcrypt
+// Copyright (C) 2021, Jakob Wakeling
+// All rights reserved.
+
+/*
+OMKOV Permissive Licence, version 1.0
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimers.
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimers in the documentation and/or
+  other materials provided with the distribution.
+* Neither the names of the copyright holders, nor the names of its contributors
+  may be used to endorse or promote products derived from this Software without
+  specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT
+HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
+*/
+
+#ifndef OMKOV_LIBCRYPT_RC2_H_PMXL29JH
+#define OMKOV_LIBCRYPT_RC2_H_PMXL29JH
+
+#include <stdint.h>
+#include <stdlib.h>
+
+struct rc2 { union { uint16_t k[64]; uint8_t l[128]; }; };
+
+extern void rc2expand(struct rc2 *ctx, const uint8_t *key, int len, int ekl);
+extern void rc2encrypt(struct rc2 *ctx, uint8_t *in, uint8_t *out);
+extern void rc2decrypt(struct rc2 *ctx, uint8_t *in, uint8_t *out);
+
+#endif // OMKOV_LIBCRYPT_RC2_H_PMXL29JH
diff --git a/src/test/test_rc2.c b/src/test/test_rc2.c
new file mode 100644
index 0000000..ebd1560
--- /dev/null
+++ b/src/test/test_rc2.c
@@ -0,0 +1,186 @@
+// test_crypt.c
+// Crypt unit test for OMKOV lib
+// Copyright (C) 2021, Jakob Wakeling
+// All rights reserved.
+
+/*
+OMKOV Public Domain Licence, version 1.0
+
+Permission is hereby granted to deal with this software and its associated
+documentation files without restriction.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT
+HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
+*/
+
+#include "../rc2.h"
+#include "unit.h"
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+int main(void) {
+	{
+		uint8_t k[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+		uint8_t p[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+		uint8_t c[] = { 0xEB, 0xB7, 0x73, 0xF9, 0x93, 0x27, 0x8E, 0xFF };
+		struct rc2 ctx; uint8_t r[8] = { 0 };
+		
+		rc2expand(&ctx, k, 8, 63);
+		rc2encrypt(&ctx, p, r);
+		
+		ASSERT("T000 TEST VECTOR 0 ENCRYPT",
+				memcmp(c, r, 8) == 0);
+		
+		rc2decrypt(&ctx, c, r);
+		
+		ASSERT("T001 TEST VECTOR 0 DECRYPT",
+				memcmp(p, r, 8) == 0);
+	}
+	
+	{
+		uint8_t k[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+		uint8_t p[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+		uint8_t c[] = { 0x27, 0x8B, 0x27, 0xE4, 0x2E, 0x2F, 0x0D, 0x49 };
+		struct rc2 ctx; uint8_t r[8] = { 0 };
+		
+		rc2expand(&ctx, k, 8, 64);
+		rc2encrypt(&ctx, p, r);
+		
+		ASSERT("T002 TEST VECTOR 1 ENCRYPT",
+				memcmp(c, r, 8) == 0);
+		
+		rc2decrypt(&ctx, c, r);
+		
+		ASSERT("T003 TEST VECTOR 1 DECRYPT",
+				memcmp(p, r, 8) == 0);
+	}
+	
+	{
+		uint8_t k[] = { 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+		uint8_t p[] = { 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
+		uint8_t c[] = { 0x30, 0x64, 0x9E, 0xDF, 0x9B, 0xE7, 0xD2, 0xC2 };
+		struct rc2 ctx; uint8_t r[8] = { 0 };
+		
+		rc2expand(&ctx, k, 8, 64);
+		rc2encrypt(&ctx, p, r);
+		
+		ASSERT("T004 TEST VECTOR 2 ENCRYPT",
+				memcmp(c, r, 8) == 0);
+		
+		rc2decrypt(&ctx, c, r);
+		
+		ASSERT("T005 TEST VECTOR 2 DECRYPT",
+				memcmp(p, r, 8) == 0);
+	}
+	
+	{
+		uint8_t k[] = { 0x88 };
+		uint8_t p[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+		uint8_t c[] = { 0x61, 0xA8, 0xA2, 0x44, 0xAD, 0xAC, 0xCC, 0xF0 };
+		struct rc2 ctx; uint8_t r[8] = { 0 };
+		
+		rc2expand(&ctx, k, 1, 64);
+		rc2encrypt(&ctx, p, r);
+		
+		ASSERT("T006 TEST VECTOR 3 ENCRYPT",
+				memcmp(c, r, 8) == 0);
+		
+		rc2decrypt(&ctx, c, r);
+		
+		ASSERT("T007 TEST VECTOR 3 DECRYPT",
+				memcmp(p, r, 8) == 0);
+	}
+	
+	{
+		uint8_t k[] = { 0x88, 0xBC, 0xA9, 0x0E, 0x90, 0x87, 0x5A };
+		uint8_t p[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+		uint8_t c[] = { 0x6C, 0xCF, 0x43, 0x08, 0x97, 0x4C, 0x26, 0x7F };
+		struct rc2 ctx; uint8_t r[8] = { 0 };
+		
+		rc2expand(&ctx, k, 7, 64);
+		rc2encrypt(&ctx, p, r);
+		
+		ASSERT("T008 TEST VECTOR 4 ENCRYPT",
+				memcmp(c, r, 8) == 0);
+		
+		rc2decrypt(&ctx, c, r);
+		
+		ASSERT("T009 TEST VECTOR 4 DECRYPT",
+				memcmp(p, r, 8) == 0);
+	}
+	
+	{
+		uint8_t k[] = {
+			0x88, 0xBC, 0xA9, 0x0E, 0x90, 0x87, 0x5A, 0x7F,
+			0x0F, 0x79, 0xC3, 0x84, 0x62, 0x7B, 0xAF, 0xB2
+		};
+		uint8_t p[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+		uint8_t c[] = { 0x1A, 0x80, 0x7D, 0x27, 0x2B, 0xBE, 0x5D, 0xB1 };
+		struct rc2 ctx; uint8_t r[8] = { 0 };
+		
+		rc2expand(&ctx, k, 16, 64);
+		rc2encrypt(&ctx, p, r);
+		
+		ASSERT("T010 TEST VECTOR 5 ENCRYPT",
+				memcmp(c, r, 8) == 0);
+		
+		rc2decrypt(&ctx, c, r);
+		
+		ASSERT("T011 TEST VECTOR 5 DECRYPT",
+				memcmp(p, r, 8) == 0);
+	}
+	
+	{
+		uint8_t k[] = {
+			0x88, 0xBC, 0xA9, 0x0E, 0x90, 0x87, 0x5A, 0x7F,
+			0x0F, 0x79, 0xC3, 0x84, 0x62, 0x7B, 0xAF, 0xB2
+		};
+		uint8_t p[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+		uint8_t c[] = { 0x22, 0x69, 0x55, 0x2A, 0xB0, 0xF8, 0x5C, 0xA6 };
+		struct rc2 ctx; uint8_t r[8] = { 0 };
+		
+		rc2expand(&ctx, k, 16, 128);
+		rc2encrypt(&ctx, p, r);
+		
+		ASSERT("T012 TEST VECTOR 6 ENCRYPT",
+				memcmp(c, r, 8) == 0);
+		
+		rc2decrypt(&ctx, c, r);
+		
+		ASSERT("T013 TEST VECTOR 6 DECRYPT",
+				memcmp(p, r, 8) == 0);
+	}
+	
+	{
+		uint8_t k[] = {
+			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
+		};
+		uint8_t p[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+		uint8_t c[] = { 0x5B, 0x78, 0xD3, 0xA4, 0x3D, 0xFF, 0xF1, 0xF1 };
+		struct rc2 ctx; uint8_t r[8] = { 0 };
+		
+		rc2expand(&ctx, k, 33, 129);
+		rc2encrypt(&ctx, p, r);
+		
+		ASSERT("T014 TEST VECTOR 7 ENCRYPT",
+				memcmp(c, r, 8) == 0);
+		
+		rc2decrypt(&ctx, c, r);
+		
+		ASSERT("T015 TEST VECTOR 7 DECRYPT",
+				memcmp(p, r, 8) == 0);
+	}
+	
+	printf("%d of %d tests passed\n", testspassed, testsrun);
+	return testsfailed;
+}