ext: Pull in tinycrypt v0.2.6
Zephyr 1.9 moves to tinycrypt v0.2.7. This introduces a breaking API
change. This makes things challenging for mcuboot, which would like to
be able to work across multiple platforms.
To help with this, bring in the last working version of Tinycrypt v0.2.6
from https://github.com/01org/tinycrypt. Tinycrypt is released under a
3-clause BSD-style license, with parts under the micro-ecc license,
which is a 2-clause license. Please see ext/tinycrypt/LICENSE for
details.
Signed-off-by: David Brown <david.brown@linaro.org>
diff --git a/ext/tinycrypt/tests/test_ecc_utils.c b/ext/tinycrypt/tests/test_ecc_utils.c
new file mode 100644
index 0000000..a635ebe
--- /dev/null
+++ b/ext/tinycrypt/tests/test_ecc_utils.c
@@ -0,0 +1,230 @@
+/* test_ecc_utils.c - TinyCrypt common functions for ECC tests */
+
+/*
+ * Copyright (C) 2015 by Intel Corporation, All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * - 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.
+ *
+ * - Neither the name of Intel Corporation nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER 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.
+ *
+ * test_ecc_utils.c -- Implementation of some common functions for ECC tests.
+ *
+ */
+#include <tinycrypt/ecc.h>
+#include <tinycrypt/ecc_dh.h>
+#include <test_ecc_utils.h>
+#include <tinycrypt/constants.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+extern int randfd;
+
+void getRandomBytes(void *p_dest, unsigned p_size) {
+ if(read(randfd, p_dest, p_size) != (int)p_size) {
+ printf("Failed to get random bytes.\n");
+ }
+}
+
+int hex2int (char hex) {
+ uint8_t dec;
+
+ if ('0' <= hex && hex <= '9') dec = hex - '0';
+ else if ('a' <= hex && hex <= 'f') dec = hex - 'a' + 10;
+ else if ('A' <= hex && hex <= 'F') dec = hex - 'A' + 10;
+ else return -1;
+
+ return dec;
+}
+
+/*
+ * Convert hex string to byte string
+ * Return number of bytes written to buf, or 0 on error
+ */
+int hex2bin(
+ uint8_t *buf,
+ const size_t buflen,
+ const char *hex,
+ const size_t hexlen) {
+
+ int dec;
+
+ if (buflen < hexlen/2 + hexlen%2)
+ return false;
+
+ // if hexlen is uneven, insert leading zero nibble
+ if (hexlen%2) {
+ dec = hex2int(hex[0]);
+ if (dec == -1)
+ return false;
+ buf[0] = dec;
+ buf++;
+ hex++;
+ }
+
+ // regular hex conversion
+ for (size_t i = 0; i<hexlen/2; i++) {
+ dec = hex2int(hex[2*i]);
+ if (dec == -1)
+ return false;
+ buf[i] = dec << 4;
+
+ dec = hex2int(hex[2*i+1]);
+ if (dec == -1)
+ return false;
+ buf[i] += dec;
+ }
+ return hexlen/2 + hexlen%2;
+}
+
+/*
+ * Convert hex string to zero-padded nanoECC scalar
+ */
+void string2scalar(uint32_t * scalar, uint32_t num_word32, char *str) {
+
+ uint32_t num_bytes = 4*num_word32;
+ uint8_t tmp[num_bytes];
+ size_t hexlen = strlen(str);
+
+ int padding;
+
+ if (0 > (padding = 2*num_bytes - strlen(str))) {
+ printf(
+ "Error: 2*num_bytes(%u) < strlen(hex) (%zu)\n",
+ 2*num_bytes,
+ strlen(str));
+ exit(-1);
+ }
+
+ memset(tmp, 0, padding/2);
+
+ if (false == hex2bin(tmp+padding/2, num_bytes, str, hexlen))
+ exit(-1);
+ ecc_bytes2native(scalar, tmp);
+
+}
+
+void vli_print(uint32_t *p_vli, unsigned int p_size) {
+ while(p_size) {
+ printf("%08X ", (unsigned)p_vli[p_size - 1]);
+ --p_size;
+ }
+}
+
+void print_ecc_scalar(
+ const char *label,
+ const uint32_t * p_vli,
+ uint32_t num_word32) {
+ uint32_t i;
+
+ if (label)
+ printf("%s = { ", label);
+
+ for(i=0; i<num_word32-1; ++i)
+ printf("0x%08lX, ", (unsigned long)p_vli[i]);
+ printf("0x%08lX", (unsigned long)p_vli[i]);
+
+ if (label)
+ printf(" };\n");
+}
+
+void check_code(const int num,
+ const char *name,
+ const int expected,
+ const int computed,
+ const int verbose) {
+
+ if (expected != computed) {
+ printf("\n Vector #%02d check %s - FAILURE:\n", num, name);
+ printf("\n Expected: %d, computed: %d\n\n", expected, computed);
+ exit(-1);
+ }
+
+ if (verbose)
+ printf(" Vector #%02d check %s - success (%d=%d)\n",
+ num,
+ name,
+ expected,
+ computed);
+
+}
+
+void check_ecc_result(const int num, const char *name,
+ const uint32_t *expected,
+ const uint32_t *computed,
+ const uint32_t num_word32,
+ const bool verbose) {
+
+ uint32_t num_bytes = 4*num_word32;
+ if (memcmp(computed, expected, num_bytes)) {
+ printf("\n Vector #%02d check %s - FAILURE:\n\n", num, name);
+ print_ecc_scalar("Expected", expected, num_word32);
+ print_ecc_scalar("Computed", computed, num_word32);
+ printf("\n");
+ exit(-1);
+ }
+ if (verbose)
+ printf(" Vector #%02d check %s - success\n", num, name);
+}
+
+/* Test ecc_make_keys, and also as keygen part of other tests */
+EccPoint keygen_vectors(char **d_vec,
+ char **qx_vec,
+ char **qy_vec,
+ int tests,
+ bool verbose) {
+
+ EccPoint pub;
+ uint32_t seed[NUM_ECC_DIGITS * 2];
+ uint32_t prv[NUM_ECC_DIGITS];
+
+ /* expected outputs (converted input vectors) */
+ EccPoint exp_pub;
+ uint32_t exp_prv[NUM_ECC_DIGITS];
+
+ for (int i=0; i<tests; i++) {
+
+ string2scalar(exp_prv, NUM_ECC_DIGITS, d_vec[i]);
+ string2scalar(exp_pub.x, NUM_ECC_DIGITS, qx_vec[i]);
+ string2scalar(exp_pub.y, NUM_ECC_DIGITS, qy_vec[i]);
+
+ /*
+ * Feed prvkey vector as padded random seed into ecc_make_key.
+ * Internal mod-reduction will be zero-op and generate correct prv/pub
+ */
+ memset(seed, 0, NUM_ECC_BYTES * 2);
+ string2scalar(seed, NUM_ECC_DIGITS, d_vec[i]);
+ ecc_make_key(&pub, prv, seed);
+
+ // validate correctness of vector conversion and make_key()
+ check_ecc_result(i, "prv ", exp_prv, prv, NUM_ECC_DIGITS, verbose);
+ check_ecc_result(i, "pub.x", exp_pub.x, pub.x, NUM_ECC_DIGITS, verbose);
+ check_ecc_result(i, "pub.y", exp_pub.y, pub.y, NUM_ECC_DIGITS, verbose);
+
+ }
+ return pub;
+}