Add Mynewt support for bundled tinycrypt + mbedtls

This commit removes the pseudo tinycrypt package based on symlinks by adding a new pkg.yml to ext/tinycrypt and using it directly. It also uses the new mbed-tls bundled ASN1 parser when EC256 is selected. Signed-off-by: Fabio Utzig <utzig@apache.org>
mcu-tools · Dec 21, 2017 · ac18eec · ac18eec
1 parent ba05f2a
commit ac18eec
Show file tree

Hide file tree

Showing 34 changed files with 129 additions and 33 deletions.
diff --git a/boot/bootutil/pkg.yml b/boot/bootutil/pkg.yml
@@ -34,10 +34,13 @@ pkg.cflags:
 pkg.deps:
     - "@mcuboot/boot/mynewt/mcuboot_config"
     - "@apache-mynewt-core/hw/hal"
-    - "@apache-mynewt-core/crypto/mbedtls"
     - "@apache-mynewt-core/kernel/os"
     - "@apache-mynewt-core/sys/defs"
     - "@apache-mynewt-core/sys/flash_map"
 
+pkg.deps.BOOTUTIL_USE_MBED_TLS:
+    - "@apache-mynewt-core/crypto/mbedtls"
+
 pkg.deps.BOOTUTIL_USE_TINYCRYPT:
-    - "@mcuboot/boot/mynewt/tinycrypt"
+    - "@mcuboot/ext/tinycrypt/lib"
+    - "@mcuboot/ext/mbedtls"
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/aes.h b/boot/mynewt/tinycrypt/include/tinycrypt/aes.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/cbc_mode.h b/boot/mynewt/tinycrypt/include/tinycrypt/cbc_mode.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/ccm_mode.h b/boot/mynewt/tinycrypt/include/tinycrypt/ccm_mode.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/cmac_mode.h b/boot/mynewt/tinycrypt/include/tinycrypt/cmac_mode.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/constants.h b/boot/mynewt/tinycrypt/include/tinycrypt/constants.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/ctr_mode.h b/boot/mynewt/tinycrypt/include/tinycrypt/ctr_mode.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/ctr_prng.h b/boot/mynewt/tinycrypt/include/tinycrypt/ctr_prng.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/ecc.h b/boot/mynewt/tinycrypt/include/tinycrypt/ecc.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/ecc_dh.h b/boot/mynewt/tinycrypt/include/tinycrypt/ecc_dh.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/ecc_dsa.h b/boot/mynewt/tinycrypt/include/tinycrypt/ecc_dsa.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/ecc_platform_specific.h b/boot/mynewt/tinycrypt/include/tinycrypt/ecc_platform_specific.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/hmac.h b/boot/mynewt/tinycrypt/include/tinycrypt/hmac.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/hmac_prng.h b/boot/mynewt/tinycrypt/include/tinycrypt/hmac_prng.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/sha256.h b/boot/mynewt/tinycrypt/include/tinycrypt/sha256.h
diff --git a/boot/mynewt/tinycrypt/include/tinycrypt/utils.h b/boot/mynewt/tinycrypt/include/tinycrypt/utils.h
diff --git a/boot/mynewt/tinycrypt/src/aes_decrypt.c b/boot/mynewt/tinycrypt/src/aes_decrypt.c
diff --git a/boot/mynewt/tinycrypt/src/aes_encrypt.c b/boot/mynewt/tinycrypt/src/aes_encrypt.c
diff --git a/boot/mynewt/tinycrypt/src/cbc_mode.c b/boot/mynewt/tinycrypt/src/cbc_mode.c
diff --git a/boot/mynewt/tinycrypt/src/ccm_mode.c b/boot/mynewt/tinycrypt/src/ccm_mode.c
diff --git a/boot/mynewt/tinycrypt/src/cmac_mode.c b/boot/mynewt/tinycrypt/src/cmac_mode.c
diff --git a/boot/mynewt/tinycrypt/src/ctr_mode.c b/boot/mynewt/tinycrypt/src/ctr_mode.c
diff --git a/boot/mynewt/tinycrypt/src/ctr_prng.c b/boot/mynewt/tinycrypt/src/ctr_prng.c
diff --git a/boot/mynewt/tinycrypt/src/ecc.c b/boot/mynewt/tinycrypt/src/ecc.c
diff --git a/boot/mynewt/tinycrypt/src/ecc_dh.c b/boot/mynewt/tinycrypt/src/ecc_dh.c
diff --git a/boot/mynewt/tinycrypt/src/ecc_dsa.c b/boot/mynewt/tinycrypt/src/ecc_dsa.c
diff --git a/boot/mynewt/tinycrypt/src/ecc_platform_specific.c b/boot/mynewt/tinycrypt/src/ecc_platform_specific.c
diff --git a/boot/mynewt/tinycrypt/src/hmac.c b/boot/mynewt/tinycrypt/src/hmac.c
diff --git a/boot/mynewt/tinycrypt/src/hmac_prng.c b/boot/mynewt/tinycrypt/src/hmac_prng.c
diff --git a/boot/mynewt/tinycrypt/src/sha256.c b/boot/mynewt/tinycrypt/src/sha256.c
diff --git a/boot/mynewt/tinycrypt/src/utils.c b/boot/mynewt/tinycrypt/src/utils.c
diff --git a/ext/mbedtls/include/mbedtls/config.h b/ext/mbedtls/include/mbedtls/config.h
@@ -0,0 +1,96 @@
+/**
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#ifndef MBEDTLS_CONFIG_H
+#define MBEDTLS_CONFIG_H
+
+#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+
+//#define MBEDTLS_PLATFORM_MEMORY
+#define MBEDTLS_FS_IO
+//#define MBEDTLS_VERSION_FEATURES
+#define MBEDTLS_ASN1_PARSE_C
+#define MBEDTLS_BASE64_C
+#define MBEDTLS_BIGNUM_C
+#define MBEDTLS_MD_C
+#define MBEDTLS_OID_C
+#define MBEDTLS_PEM_PARSE_C
+
+/**
+ * \def MBEDTLS_PLATFORM_C
+ *
+ * Enable the platform abstraction layer that allows you to re-assign
+ * functions like calloc(), free(), snprintf(), printf(), fprintf(), exit().
+ *
+ * Enabling MBEDTLS_PLATFORM_C enables to use of MBEDTLS_PLATFORM_XXX_ALT
+ * or MBEDTLS_PLATFORM_XXX_MACRO directives, allowing the functions mentioned
+ * above to be specified at runtime or compile time respectively.
+ *
+ * \note This abstraction layer must be enabled on Windows (including MSYS2)
+ * as other module rely on it for a fixed snprintf implementation.
+ *
+ * Module:  library/platform.c
+ * Caller:  Most other .c files
+ *
+ * This module enables abstraction of common (libc) functions.
+ */
+#define MBEDTLS_PLATFORM_C
+
+/**
+ * \def MBEDTLS_TIMING_C
+ *
+ * Enable the semi-portable timing interface.
+ *
+ * \note The provided implementation only works on POSIX/Unix (including Linux,
+ * BSD and OS X) and Windows. On other platforms, you can either disable that
+ * module and provide your own implementations of the callbacks needed by
+ * \c mbedtls_ssl_set_timer_cb() for DTLS, or leave it enabled and provide
+ * your own implementation of the whole module by setting
+ * \c MBEDTLS_TIMING_ALT in the current file.
+ *
+ * \note See also our Knowledge Base article about porting to a new
+ * environment:
+ * https://tls.mbed.org/kb/how-to/how-do-i-port-mbed-tls-to-a-new-environment-OS
+ *
+ * Module:  library/timing.c
+ * Caller:  library/havege.c
+ *
+ * This module is used by the HAVEGE random number generator.
+ */
+#define MBEDTLS_TIMING_C
+
+//#define MBEDTLS_MPI_WINDOW_SIZE            6 /**< Maximum windows size used. */
+//#define MBEDTLS_MPI_MAX_SIZE            1024 /**< Maximum number of bytes for usable MPIs. */
+//#define MBEDTLS_MEMORY_ALIGN_MULTIPLE      4 /**< Align on multiples of this value */
+
+#if defined(TARGET_LIKE_MBED) && defined(YOTTA_CFG_MBEDTLS_TARGET_CONFIG_FILE)
+#include YOTTA_CFG_MBEDTLS_TARGET_CONFIG_FILE
+#endif
+
+#if defined(YOTTA_CFG_MBEDTLS_USER_CONFIG_FILE)
+#include YOTTA_CFG_MBEDTLS_USER_CONFIG_FILE
+#elif defined(MBEDTLS_USER_CONFIG_FILE)
+#include MBEDTLS_USER_CONFIG_FILE
+#endif
+
+#include "check_config.h"
+
+#endif /* MBEDTLS_CONFIG_H */
diff --git a/ext/mbedtls/pkg.yml b/ext/mbedtls/pkg.yml
@@ -0,0 +1,24 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: ext/mbedtls
+pkg.description: "MCUboot's bundled mbed-tls ASN1 parser"
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
diff --git a/boot/mynewt/tinycrypt/pkg.yml → ext/tinycrypt/lib/pkg.yml b/boot/mynewt/tinycrypt/pkg.yml → ext/tinycrypt/lib/pkg.yml
@@ -17,11 +17,14 @@
 # under the License.
 #
 
-pkg.name: boot/mynewt/tinycrypt
+pkg.name: ext/tinycrypt/lib
 pkg.description: "MCUboot's bundled tinycrypt"
 pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
 pkg.homepage: "http://mynewt.apache.org/"
 pkg.keywords:
 
+pkg.src_dirs:
+  - "source"
+
 pkg.cflags:
     - "-std=c99"