Merge pull request #4832 from OpenNuvoton/nuvoton

NUC472/M453: Fix several startup and hal bugs

Author: theotherjimmy

features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/mbedtls_device.h

@@ -0,0 +1,30 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2015-2016 Nuvoton
+ *
+ * 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.
+ */
+#ifndef MBEDTLS_DEVICE_H
+#define MBEDTLS_DEVICE_H
+
+#define MBEDTLS_DES_ALT
+
+#define MBEDTLS_SHA1_ALT
+#define MBEDTLS_SHA256_ALT
+
+#define MBEDTLS_AES_ALT
+#define MBEDTLS_AES_SETKEY_ENC_ALT
+#define MBEDTLS_AES_SETKEY_DEC_ALT
+#define MBEDTLS_AES_ENCRYPT_ALT
+#define MBEDTLS_AES_DECRYPT_ALT
+
+#endif /* MBEDTLS_DEVICE_H */

targets/TARGET_NUVOTON/TARGET_NUC472/crypto/aes/aes_alt.c renamed to features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c

@@ -21,9 +21,6 @@
  *  http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
  */
 
-/* Compatible with mbed OS 2 which doesn't support mbedtls */
-#if MBED_CONF_RTOS_PRESENT
-
 #if !defined(MBEDTLS_CONFIG_FILE)
 #include "mbedtls/config.h"
 #else
@@ -591,5 +588,3 @@ int mbedtls_aes_crypt_ctr( mbedtls_aes_context *ctx,
 
 
 #endif /* MBEDTLS_AES_C */
-
-#endif /* MBED_CONF_RTOS_PRESENT */

targets/TARGET_NUVOTON/TARGET_NUC472/crypto/aes/aes_alt.h renamed to features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.h

@@ -21,6 +21,16 @@
  *  This file is part of mbed TLS (https://tls.mbed.org)
  */
 
+#ifndef MBEDTLS_AES_ALT_H
+#define MBEDTLS_AES_ALT_H
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_AES_C)
 #if defined(MBEDTLS_AES_ALT)
 // Regular implementation
 //
@@ -270,5 +280,6 @@ void mbedtls_aes_decrypt( mbedtls_aes_context *ctx,
 
 
 #endif /* MBEDTLS_AES_ALT */
+#endif /* MBEDTLS_AES_C */
 
-
+#endif /* aes_alt.h */

targets/TARGET_NUVOTON/TARGET_NUC472/crypto/crypto-misc.c renamed to features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/crypto-misc.c

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/* Compatible with mbed OS 2 which doesn't support mbedtls */
-#if MBED_CONF_RTOS_PRESENT
-
 #if !defined(MBEDTLS_CONFIG_FILE)
 #include "mbedtls/config.h"
 #else
@@ -348,7 +345,7 @@ static int mbedtls_des_docrypt(uint16_t keyopt, uint8_t key[3][MBEDTLS_DES_KEY_S
 
     uint32_t rmn = length;
     const unsigned char *in_pos = input;
-    const unsigned char *out_pos = output;
+    unsigned char *out_pos = output;
 
     while (rmn) {
         uint32_t data_len = (rmn <= MAXSIZE_DMABUF) ? rmn : MAXSIZE_DMABUF;
@@ -411,5 +408,3 @@ static int mbedtls_des_docrypt(uint16_t keyopt, uint8_t key[3][MBEDTLS_DES_KEY_S
 
 #endif /* MBEDTLS_DES_ALT */
 #endif /* MBEDTLS_DES_C */
-
-#endif /* MBED_CONF_RTOS_PRESENT */

targets/TARGET_NUVOTON/TARGET_NUC472/crypto/crypto-misc.h renamed to features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/crypto-misc.h

@@ -23,6 +23,7 @@
 #include MBEDTLS_CONFIG_FILE
 #endif
 
+#if defined(MBEDTLS_DES_C)
 #if defined(MBEDTLS_DES_ALT)
 
 #include <stddef.h>
@@ -276,5 +277,6 @@ void mbedtls_des_setkey( uint32_t SK[32],
 #endif
 
 #endif /* MBEDTLS_DES_ALT */
+#endif /* MBEDTLS_DES_C */
 
 #endif /* des_alt.h */

targets/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt.c renamed to features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/des/des_alt.c

@@ -25,9 +25,6 @@
  *  http://csrc.nist.gov/publications/fips/fips46-3/fips46-3.pdf
  */
 
-/* Compatible with mbed OS 2 which doesn't support mbedtls */
-#if MBED_CONF_RTOS_PRESENT
-
 #if !defined(MBEDTLS_CONFIG_FILE)
 #include "mbedtls/config.h"
 #else
@@ -798,5 +795,3 @@ int mbedtls_des3_sw_crypt_cbc( mbedtls_des3_sw_context *ctx,
 
 #endif /* MBEDTLS_DES_ALT */
 #endif /* MBEDTLS_DES_C */
-
-#endif /* MBED_CONF_RTOS_PRESENT */

targets/TARGET_NUVOTON/TARGET_NUC472/crypto/des/des_alt.h renamed to features/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/des/des_alt.h

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/* Compatible with mbed OS 2 which doesn't support mbedtls */
-#if MBED_CONF_RTOS_PRESENT
-
 #if !defined(MBEDTLS_CONFIG_FILE)
 #include "mbedtls/config.h"
 #else
@@ -139,5 +136,3 @@ void mbedtls_sha1_process(mbedtls_sha1_context *ctx, const unsigned char data[64
 
 #endif /* MBEDTLS_SHA1_ALT */
 #endif /* MBEDTLS_SHA1_C */
-
-#endif /* MBED_CONF_RTOS_PRESENT */