andy/kunlun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
master
kunlun/dtest/dtest3/kl3_sec_test/test.patch
andy c756587541 初始提交
2024-09-28 14:24:04 +08:00

389 lines
16 KiB
Diff
Raw Permalink Blame History

diff --git a/iotelic/kunlun/Mainline/build/build_dtest_kl3.sh b/iotelic/kunlun/Mainline/build/build_dtest_kl3.sh
index 9f5cd90..525bb60 100755
--- a/iotelic/kunlun/Mainline/build/build_dtest_kl3.sh
+++ b/iotelic/kunlun/Mainline/build/build_dtest_kl3.sh
@@ -25,10 +25,10 @@ export psram_enable=0
set -o errexit
-make -C .. clobber
+#make -C .. clobber
# clean phy lib etc.
-make -C .. dtest_clean
+#make -C .. dtest_clean
# build kl3 dtest
make -C .. dtest opt_build=1
diff --git a/iotelic/kunlun/Mainline/build/env_kunlun3.sh b/iotelic/kunlun/Mainline/build/env_kunlun3.sh
index 8a4eb7e..6a03009 100644
--- a/iotelic/kunlun/Mainline/build/env_kunlun3.sh
+++ b/iotelic/kunlun/Mainline/build/env_kunlun3.sh
@@ -16,6 +16,7 @@ export fatfs_enable=0
export product_line=PLC
export hw_board_id=13
export bbcpu_enable=0
+export build_amp_type=1
export PLATFORM=CHIP
export fpga_image_type=SOC #SOC/AI/BB/A10/AUDIO
diff --git a/iotelic/kunlun/Mainline/dtest/dtest3/Makefile b/iotelic/kunlun/Mainline/dtest/dtest3/Makefile
index 4f6b65e..bbc554b 100644
--- a/iotelic/kunlun/Mainline/dtest/dtest3/Makefile
+++ b/iotelic/kunlun/Mainline/dtest/dtest3/Makefile
@@ -10,12 +10,10 @@ ifeq ($(target), kunlun3)
hw_dep = hw3
endif
-SUB_DIRS = $(TOPDIR)/common $(TOPDIR)/driver $(TOPDIR)/bb_cpu $(TOPDIR)/startup $(TOPDIR)/os $(TOPDIR)/pib $(TOPDIR)/plc
+SUB_DIRS = $(TOPDIR)/common $(TOPDIR)/driver $(TOPDIR)/startup $(TOPDIR)/pib
ifeq ($(target), kunlun3)
-SUB_DIRS += mac_phy mac_rx_test mac_tx_test
-SUB_DIRS += unit_test_sfc rstflag efuse_test spinlock_test fft_test unit_test_cache_ram \
- unit_test_smc rtc_test kl3_os_systick_test kl3_pmp_test kl3_uart_test
+SUB_DIRS += kl3_sec_test
endif
ifeq ($(dtest_only), 1)
diff --git a/iotelic/kunlun/Mainline/inc/compiler/gcc/cpl_types.h b/iotelic/kunlun/Mainline/inc/compiler/gcc/cpl_types.h
index 17c2774..359a16c 100644
--- a/iotelic/kunlun/Mainline/inc/compiler/gcc/cpl_types.h
+++ b/iotelic/kunlun/Mainline/inc/compiler/gcc/cpl_types.h
@@ -26,7 +26,7 @@ extern "C" {
void cpl_utils_init();
#undef snprintf
-#define snprintf iot_snprintf
+//#define snprintf iot_snprintf
#undef strlen
#define strlen iot_strlen
diff --git a/iotelic/kunlun/Mainline/rom/riscv3/rom/src/drv/src/rom_wdg.c b/iotelic/kunlun/Mainline/rom/riscv3/rom/src/drv/src/rom_wdg.c
index 2b6e511..0556afb 100644
--- a/iotelic/kunlun/Mainline/rom/riscv3/rom/src/drv/src/rom_wdg.c
+++ b/iotelic/kunlun/Mainline/rom/riscv3/rom/src/drv/src/rom_wdg.c
@@ -79,7 +79,7 @@ void rom_wdg_set (rom_wdg_e wdg, uint32_t ena)
void rom_wdg_init(void)
{
/* Just enable WDG0. */
- rom_wdg_set(ROM_WDG0, 1);
+ rom_wdg_set(ROM_WDG0, 0);
rom_wdg_set(ROM_WDG1, 0);
rom_wdg_set(ROM_WDG2, 0);
diff --git a/iotelic/kunlun/Mainline/rom/riscv3/rom/src/rom_main.c b/iotelic/kunlun/Mainline/rom/riscv3/rom/src/rom_main.c
index 5ab0e27..05ea04d 100644
--- a/iotelic/kunlun/Mainline/rom/riscv3/rom/src/rom_main.c
+++ b/iotelic/kunlun/Mainline/rom/riscv3/rom/src/rom_main.c
@@ -381,7 +381,7 @@ void rom_main(void)
goto err_out;
}
- if (!g_rom_data.status.fboot) {
+ if (1) {
/*
* This will init uart port & xmodem & disable WDG0(enter download mode).
* WDG0 will not be enabled when !ROM_OK returned.
diff --git a/iotelic/kunlun/Mainline/sp/boot/crypto/test/chacha20poly1305.c b/iotelic/kunlun/Mainline/sp/boot/crypto/test/chacha20poly1305.c
deleted file mode 100644
index b496b3e..0000000
--- a/iotelic/kunlun/Mainline/sp/boot/crypto/test/chacha20poly1305.c
+++ /dev/null
@@ -1,280 +0,0 @@
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-#include "keypair.h"
-#include "log.h"
-#include "randombytes.h"
-
-#include "crypto_aead_chacha20poly1305.h"
-#include "crypto_aead_xchacha20poly1305.h"
-
-uint32_t
-randombytes_uniform(const uint32_t upper_bound)
-{
- uint32_t min;
- uint32_t r;
-
- if (upper_bound < 2) {
- return 0;
- }
- min = (1U + ~upper_bound) % upper_bound;
- do {
- randombytes_buf(&r, 4);
- } while (r < min);
-
- return r % upper_bound;
-}
-
-static bool
-_test_chacha20poly1305()
-{
-#undef MLEN
-#define MLEN 10U
-#undef ADLEN
-#define ADLEN 10U
-#undef CLEN
-#define CLEN (MLEN + crypto_aead_chacha20poly1305_ABYTES)
- static const uint8_t firstkey[crypto_aead_chacha20poly1305_KEYBYTES]
- = { 0x42, 0x90, 0xbc, 0xb1, 0x54, 0x17, 0x35, 0x31, 0xf3, 0x14, 0xaf,
- 0x57, 0xf3, 0xbe, 0x3b, 0x50, 0x06, 0xda, 0x37, 0x1e, 0xce, 0x27,
- 0x2a, 0xfa, 0x1b, 0x5d, 0xbd, 0xd1, 0x10, 0x0a, 0x10, 0x07 };
- static const uint8_t m[MLEN]
- = { 0x86, 0xd0, 0x99, 0x74, 0x84, 0x0b, 0xde, 0xd2, 0xa5, 0xca };
- static const uint8_t nonce[crypto_aead_chacha20poly1305_NPUBBYTES]
- = { 0xcd, 0x7c, 0xf6, 0x7b, 0xe3, 0x9c, 0x79, 0x4a };
- static const uint8_t ad[ADLEN]
- = { 0x87, 0xe2, 0x29, 0xd4, 0x50, 0x08, 0x45, 0xa0, 0x79, 0xc0 };
- uint8_t c[CLEN];
- uint8_t detached_c[MLEN];
- uint8_t mac[crypto_aead_chacha20poly1305_ABYTES];
- uint8_t m2[MLEN];
-
- unsigned long long found_clen;
- unsigned long long found_maclen;
- unsigned long long m2len;
- size_t i;
-
- crypto_aead_chacha20poly1305_encrypt(c, &found_clen, m, MLEN,
- ad, ADLEN,
- NULL, nonce, firstkey);
- if (found_clen != CLEN) {
- printf("found_clen is not properly set\n");
- }
- crypto_aead_chacha20poly1305_encrypt_detached(detached_c,
- mac, &found_maclen,
- m, MLEN, ad, ADLEN,
- NULL, nonce, firstkey);
-
- if (crypto_aead_chacha20poly1305_decrypt(m2, &m2len, NULL, c, CLEN,
- ad, ADLEN,
- nonce, firstkey) != 0) {
- LOG("crypto_aead_chacha20poly1305_decrypt() failed\n");
- return false;
- }
-
- memset(m2, 0, m2len);
- if (crypto_aead_chacha20poly1305_decrypt_detached(m2, NULL,
- c, MLEN, mac,
- ad, ADLEN,
- nonce, firstkey) != 0) {
- LOG("crypto_aead_chacha20poly1305_decrypt_detached() failed\n");
- return false;
- }
- for (i = 0U; i < CLEN; i++) {
- c[i] ^= (i + 1U);
- if (crypto_aead_chacha20poly1305_decrypt(m2, NULL, NULL, c, CLEN,
- ad, ADLEN, nonce, firstkey)
- == 0 || memcmp(m, m2, MLEN) == 0) {
- LOG("message can be forged\n");
- }
- c[i] ^= (i + 1U);
- }
-
- crypto_aead_chacha20poly1305_encrypt(c, &found_clen, m, MLEN,
- NULL, 0U, NULL, nonce, firstkey);
- if (found_clen != CLEN) {
- LOG("found_clen is not properly set (adlen=0)\n");
- return false;
- }
-
- if (crypto_aead_chacha20poly1305_decrypt(m2, &m2len, NULL, c, CLEN,
- NULL, 0U, nonce, firstkey) != 0) {
- LOG("crypto_aead_chacha20poly1305_decrypt() failed (adlen=0)\n");
- return false;
- }
- if (m2len != MLEN) {
- printf("m2len is not properly set (adlen=0)\n");
- }
- if (memcmp(m, m2, MLEN) != 0) return false;
- m2len = 1;
- if (crypto_aead_chacha20poly1305_decrypt(
- m2, &m2len, NULL, NULL,
- randombytes_uniform(crypto_aead_chacha20poly1305_ABYTES),
- NULL, 0U, nonce, firstkey) != -1) {
- LOG("crypto_aead_chacha20poly1305_decrypt() worked with a short "
- "ciphertext\n");
- }
- if (m2len != 0) return false;
- m2len = 1;
- if (crypto_aead_chacha20poly1305_decrypt(m2, &m2len, NULL, c, 0U, NULL, 0U,
- nonce, firstkey) != -1) {
- return false;
- }
- if (m2len != 0) return false;
- memcpy(c, m, MLEN);
- crypto_aead_chacha20poly1305_encrypt(c, &found_clen, c, MLEN,
- NULL, 0U, NULL, nonce, firstkey);
- if (found_clen != CLEN) return false;
- if (crypto_aead_chacha20poly1305_decrypt(c, &m2len, NULL, c, CLEN,
- NULL, 0U, nonce, firstkey) != 0) {
- return false;
- }
-
- if (0 != memcmp(m, c, MLEN)) return false;
- if (0 == crypto_aead_chacha20poly1305_keybytes()) return false;
- if (0 == crypto_aead_chacha20poly1305_npubbytes()) return false;
- if (0 != crypto_aead_chacha20poly1305_nsecbytes()) return false;
-
- return true;
-}
-
-static bool
-_test_x_chacha20poly1305()
-{
-#undef MLEN
-#define MLEN 114U
-#undef ADLEN
-#define ADLEN 12U
-#undef CLEN
-#define CLEN (MLEN + crypto_aead_xchacha20poly1305_ietf_ABYTES)
- static const uint8_t firstkey[crypto_aead_xchacha20poly1305_ietf_KEYBYTES]
- = {
- 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
- 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
- 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
- 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f
- };
-#undef MESSAGE
-#define MESSAGE "Ladies and Gentlemen of the class of '99: If I could offer you " \
-"only one tip for the future, sunscreen would be it."
- uint8_t m[MLEN];
- static const uint8_t nonce[crypto_aead_xchacha20poly1305_ietf_NPUBBYTES]
- = { 0x07, 0x00, 0x00, 0x00, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
- 0x48, 0x49, 0x4a, 0x4b };
- static const uint8_t ad[ADLEN]
- = { 0x50, 0x51, 0x52, 0x53, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7 };
- uint8_t c[CLEN];
- uint8_t detached_c[MLEN];
- uint8_t mac[crypto_aead_xchacha20poly1305_ietf_ABYTES];
- uint8_t m2[MLEN];
- unsigned long long found_clen;
- unsigned long long found_maclen;
- unsigned long long m2len;
- size_t i;
-
- if (sizeof MESSAGE - 1U != MLEN) return false;
- memcpy(m, MESSAGE, MLEN);
- crypto_aead_xchacha20poly1305_ietf_encrypt(c, &found_clen, m, MLEN,
- ad, ADLEN,
- NULL, nonce, firstkey);
- if (found_clen != MLEN + crypto_aead_xchacha20poly1305_ietf_abytes()) {
- LOG("found_clen is not properly set\n");
- }
- crypto_aead_xchacha20poly1305_ietf_encrypt_detached(detached_c,
- mac, &found_maclen,
- m, MLEN,
- ad, ADLEN,
- NULL, nonce, firstkey);
- if (found_maclen != crypto_aead_xchacha20poly1305_ietf_abytes()) {
- LOG("found_maclen is not properly set\n");
- return false;
- }
-
- if (crypto_aead_xchacha20poly1305_ietf_decrypt(m2, &m2len, NULL, c, CLEN, ad,
- ADLEN, nonce, firstkey) != 0) {
- LOG("crypto_aead_xchacha20poly1305_ietf_decrypt() failed\n");
- return false;
- }
- memset(m2, 0, m2len);
- if (crypto_aead_xchacha20poly1305_ietf_decrypt_detached(m2, NULL,
- c, MLEN, mac,
- ad, ADLEN,
- nonce, firstkey) != 0) {
- LOG("crypto_aead_xchacha20poly1305_ietf_decrypt_detached() failed\n");
- return false;
- }
- if (memcmp(m, m2, MLEN) != 0) return false;
-
- for (i = 0U; i < CLEN; i++) {
- c[i] ^= (i + 1U);
- if (crypto_aead_xchacha20poly1305_ietf_decrypt(m2, NULL, NULL, c, CLEN,
- ad, ADLEN, nonce, firstkey)
- == 0 || memcmp(m, m2, MLEN) == 0) {
- LOG("message can be forged\n");
- }
- c[i] ^= (i + 1U);
- }
- crypto_aead_xchacha20poly1305_ietf_encrypt(c, &found_clen, m, MLEN,
- NULL, 0U, NULL, nonce, firstkey);
- if (found_clen != CLEN) return false;
- if (crypto_aead_xchacha20poly1305_ietf_decrypt(m2, &m2len, NULL, c, CLEN,
- NULL, 0U, nonce, firstkey) != 0) {
- LOG("crypto_aead_xchacha20poly1305_ietf_decrypt() failed (adlen=0)\n");
- return false;
- }
- if (m2len != MLEN) return false;
- if (memcmp(m, m2, MLEN) != 0) return false;
- m2len = 1;
- if (crypto_aead_xchacha20poly1305_ietf_decrypt(
- m2, &m2len, NULL, NULL,
- randombytes_uniform(crypto_aead_xchacha20poly1305_ietf_ABYTES),
- NULL, 0U, nonce, firstkey) != -1) {
- LOG("crypto_aead_xchacha20poly1305_ietf_decrypt() worked with a short "
- "ciphertext\n");
- }
- if (m2len != 0) return false;
- m2len = 1;
- if (crypto_aead_xchacha20poly1305_ietf_decrypt(m2, &m2len, NULL, c, 0U, NULL, 0U,
- nonce, firstkey) != -1) {
- LOG("crypto_aead_xchacha20poly1305_ietf_decrypt() worked with an empty "
- "ciphertext\n");
- }
- if (m2len != 0) return false;
-
- memcpy(c, m, MLEN);
- crypto_aead_xchacha20poly1305_ietf_encrypt(c, &found_clen, c, MLEN,
- NULL, 0U, NULL, nonce, firstkey);
- if (found_clen != CLEN) return false;
- if (crypto_aead_xchacha20poly1305_ietf_decrypt(c, &m2len, NULL, c, CLEN,
- NULL, 0U, nonce, firstkey) != 0) {
- LOG("crypto_aead_xchacha20poly1305_ietf_decrypt() failed (adlen=0)\n");
- return false;
- }
- if (m2len != MLEN) return false;
- if (memcmp(m, c, MLEN) != 0) return false;
-
- if (crypto_aead_xchacha20poly1305_ietf_keybytes() != crypto_aead_xchacha20poly1305_ietf_KEYBYTES) return false;
- if (crypto_aead_xchacha20poly1305_ietf_npubbytes() != crypto_aead_xchacha20poly1305_ietf_NPUBBYTES) return false;
- if (crypto_aead_xchacha20poly1305_ietf_nsecbytes() != 0) return false;
- if (crypto_aead_xchacha20poly1305_ietf_nsecbytes() != crypto_aead_xchacha20poly1305_ietf_NSECBYTES) return false;
- if (crypto_aead_xchacha20poly1305_IETF_KEYBYTES != crypto_aead_xchacha20poly1305_ietf_KEYBYTES) return false;
- if (crypto_aead_xchacha20poly1305_IETF_NSECBYTES != crypto_aead_xchacha20poly1305_ietf_NSECBYTES) return false;
- if (crypto_aead_xchacha20poly1305_IETF_NPUBBYTES != crypto_aead_xchacha20poly1305_ietf_NPUBBYTES) return false;
- if (crypto_aead_xchacha20poly1305_IETF_ABYTES != crypto_aead_xchacha20poly1305_ietf_ABYTES) return false;
-
- return true;
-}
-
-bool
-test_chacha20poly1305(void)
-{
- if (!_test_chacha20poly1305()) {
- LOG("ChaCha20_Poly1305 error");
- return false;
- }
- if (!_test_x_chacha20poly1305()) {
- LOG("X ChaCha20_Poly1305 error");
- return false;
- }
- return true;
-}
diff --git a/iotelic/kunlun/Mainline/sp/boot/crypto/test/keypair.c b/iotelic/kunlun/Mainline/sp/boot/crypto/test/keypair.c
index 284cd6d..c8446ac 100644
--- a/iotelic/kunlun/Mainline/sp/boot/crypto/test/keypair.c
+++ b/iotelic/kunlun/Mainline/sp/boot/crypto/test/keypair.c
@@ -56,8 +56,8 @@ test_keypair(void)
if (!_test_create_fail()) return false;
#if (TARGET_VERSION == TARGET_KUNLUN3)
if (!_test_create_key(KEY_SLOT_1, KEYPAIR_RSA_2048)) return false;
- if (!_test_create_key(KEY_SLOT_2, KEYPAIR_RSA_3072)) return false;
- if (!_test_create_key(KEY_SLOT_1, KEYPAIR_RSA_4096)) return false;
+// if (!_test_create_key(KEY_SLOT_2, KEYPAIR_RSA_3072)) return false;
+// if (!_test_create_key(KEY_SLOT_1, KEYPAIR_RSA_4096)) return false;
#endif
return true;
Reference in New Issue View Git Blame Copy Permalink