fix: 修复bsp/emulator编译错误,并引用crypto组件

bsp/emulator/CMakeLists.txt

@@ -22,6 +22,7 @@ include_directories(${TOPROOT}/lua/include
 
 include_directories(${TOPROOT}/luat/packages/lfs
                     ${TOPROOT}/components/cjson
+                    ${TOPROOT}/components/qrcode
 )
 
 aux_source_directory(./port PORT_SRCS)
@@ -29,6 +30,7 @@ aux_source_directory(./remotem REMOTEM_SRCS)
 aux_source_directory(${TOPROOT}/lua/src LUA_SRCS)
 aux_source_directory(${TOPROOT}/luat/packages/lua-cjson CJSON_SRCS)
 aux_source_directory(${TOPROOT}/components/cjson CJSON2_SRCS)
+aux_source_directory(${TOPROOT}/components/qrcode QRCODE_SRCS)
 
 # add_library(freertos10 ${PORT_SRCS} ${RTOS_SRCS} ${RTOS_PORT_SRCS} ${MM_SRCS} ${MM2_SRCS})
 add_library(lua ${LUA_SRCS})
@@ -52,10 +54,7 @@ add_library(luat ${TOPROOT}/luat/modules/luat_main.c
                  ${TOPROOT}/components/sfd/luat_lib_sfd.c
                  ${TOPROOT}/components/sfd/luat_sfd_mem.c
                  ${TOPROOT}/components/sfd/luat_sfd_w25q.c
-                 ${TOPROOT}/components/luf/luat_lib_luf.c
-                 ${TOPROOT}/components/luf/luat_luf_dump.c
-                 ${TOPROOT}/components/luf/luat_luf_undump.c
-                 ${TOPROOT}/components/luf/luat_luf_cmp.c
+                 ${TOPROOT}/components/crypto/luat_crypto_mbedtls.c
                  ${TOPROOT}/luat/modules/crc.c
                  ${TOPROOT}/luat/vfs/luat_vfs.c
                  ${TOPROOT}/luat/vfs/luat_fs_luadb.c
@@ -64,11 +63,13 @@ add_library(luat ${TOPROOT}/luat/modules/luat_main.c
                  ${TOPROOT}/luat/vfs/luat_fs_onefile.c
                  ${TOPROOT}/luat/vfs/luat_luadb_inline.c
                  ${TOPROOT}/luat/vfs/luat_luadb_inline_sys.c
+                 ${TOPROOT}/luat/vfs/luat_inline_libs.c
                  ${TOPROOT}/luat/vfs/luat_inline_sys.c
                  ${TOPROOT}/luat/packages/lfs/lfs_sfd.c
                  ${TOPROOT}/luat/packages/lfs/lfs_util.c
                  ${TOPROOT}/luat/packages/lfs/lfs.c
                  ${TOPROOT}/luat/packages/lfs/luat_lib_lfs2.c
+                 ${QRCODE_SRCS}
                #   ${LCD_SRCS}
             )
 

bsp/emulator/port/luat_crypto_emulator.c

@@ -1,409 +1,14 @@
 
 #include "luat_base.h"
 #include "luat_crypto.h"
-
-
-
 #define LUAT_LOG_TAG "crypto"
 #include "luat_log.h"
+#include <stdlib.h>
 
-#define PKG_USING_MBEDTLS
-
-#ifdef PKG_USING_MBEDTLS
-#include "mbedtls/cipher.h"
-#endif
-
-int l_crypto_cipher_xxx(lua_State *L, uint8_t flags) {
-    size_t cipher_size = 0;
-    size_t pad_size = 0;
-    size_t str_size = 0;
-    size_t key_size = 0;
-    size_t iv_size = 0;
-    const char* cipher = luaL_optlstring(L, 1, "AES-128-ECB", &cipher_size);
-    const char* pad = luaL_optlstring(L, 2, "PKCS7", &pad_size);
-    const char* str = luaL_checklstring(L, 3, &str_size);
-    const char* key = luaL_checklstring(L, 4, &key_size);
-    const char* iv = luaL_optlstring(L, 5, "", &iv_size);
-
-    int ret = 0;
-
-    unsigned char output[32] = {0};
-    size_t input_size = 0;
-    size_t output_size = 0;
-    size_t block_size = 0;
-    
-    luaL_Buffer buff;
-
-#ifdef PKG_USING_MBEDTLS
-    mbedtls_cipher_context_t ctx;
-    mbedtls_cipher_init(&ctx);
-
-
-
-    const mbedtls_cipher_info_t * _cipher = mbedtls_cipher_info_from_string(cipher);
-    if (_cipher == NULL) {
-        lua_pushstring(L, "bad cipher name");
-        lua_error(L);
-        return 0;
-    }
-
-
-	ret = mbedtls_cipher_setup(&ctx, _cipher);
-    if (ret) {
-        LLOGE("mbedtls_cipher_setup fail %ld", ret);
-        goto _exit;
-    }
-    ret = mbedtls_cipher_setkey(&ctx, key, key_size * 8, flags & 0x1);
-    if (ret) {
-        LLOGE("mbedtls_cipher_setkey fail %ld", ret);
-        goto _exit;
-    }
-    // TODO 设置padding mode
-    // mbedtls_cipher_set_padding_mode
-    if (iv_size) {
-        ret = mbedtls_cipher_set_iv(&ctx, iv, iv_size);
-        if (ret) {
-            LLOGE("mbedtls_cipher_set_iv fail %ld", ret);
-            goto _exit;
-        }
-    }
-
-    mbedtls_cipher_reset(&ctx);
-
-    //mbedtls_cipher_set_padding_mode(&ctx, MBEDTLS_PADDING_PKCS7);
-
-    // 开始注入数据
-    luaL_buffinit(L, &buff);
-    block_size = mbedtls_cipher_get_block_size(&ctx);
-    for (size_t i = 0; i < str_size; i+=block_size) {
-        input_size = str_size - i;
-        if (input_size > block_size)
-            input_size = block_size;
-        ret = mbedtls_cipher_update(&ctx, str+i, input_size, output, &output_size);
-        if (ret) {
-            LLOGE("mbedtls_cipher_update fail %ld", ret);
-            goto _exit;
-        }
-        //else LLOGD("mbedtls_cipher_update, output size=%ld", output_size);
-        if (output_size > 0)
-            luaL_addlstring(&buff, output, output_size);
-        output_size = 0;
-    }
-    ret = mbedtls_cipher_finish(&ctx, output, &output_size);
-    if (ret) {
-        LLOGE("mbedtls_cipher_finish fail %ld", ret);
-        goto _exit;
-    }
-    //else LLOGD("mbedtls_cipher_finish, output size=%ld", output_size);
-    if (output_size > 0)
-        luaL_addlstring(&buff, output, output_size);
-
-_exit:
-    mbedtls_cipher_free(&ctx);
-    luaL_pushresult(&buff);
-    return 1;
-#else
-    return 0;
-#endif
-}
-
-
-#ifdef PKG_USING_MBEDTLS
-
-#if !defined(MBEDTLS_CONFIG_FILE)
-#include "mbedtls/config.h"
-#else
-#include MBEDTLS_CONFIG_FILE
-#endif
-
-#include "mbedtls/sha1.h"
-#include "mbedtls/sha256.h"
-#ifdef MBEDTLS_SHA512_C
-#include "mbedtls/sha512.h"
-#endif
-#include "mbedtls/md5.h"
-
-#define LUAT_LOG_TAG "crypto"
-#include "luat_log.h"
-
-void luat_crypto_HmacSha1(const unsigned char *input, int ilen, unsigned char *output,const unsigned char *key, int keylen);
-void luat_crypto_HmacSha256(const unsigned char *input, int ilen, unsigned char *output,const unsigned char *key, int keylen);
-void luat_crypto_HmacSha512(const unsigned char *input, int ilen, unsigned char *output,const unsigned char *key, int keylen);
-void luat_crypto_HmacMd5(const unsigned char *input, int ilen, unsigned char *output,const unsigned char *key, int keylen);
-
-#ifndef LUAT_CRYPTO_MD5
-#define LUAT_CRYPTO_MD5
-int luat_crypto_md5_simple(const char* str, size_t str_size, void* out_ptr) {
-    mbedtls_md5_context ctx;
-    mbedtls_md5_init(&ctx);
-
-    mbedtls_md5_starts(&ctx);
-    mbedtls_md5_update(&ctx, (const unsigned char *)str, str_size);
-    mbedtls_md5_finish(&ctx, (unsigned char *)out_ptr);
-    mbedtls_md5_free(&ctx);
-    return 0;
-}
-#endif
-#ifndef LUAT_CRYPTO_SHA1
-#define LUAT_CRYPTO_SHA1
-int luat_crypto_sha1_simple(const char* str, size_t str_size, void* out_ptr) {
-    mbedtls_sha1_context ctx;
-    mbedtls_sha1_init(&ctx);
-
-    mbedtls_sha1_starts(&ctx);
-    mbedtls_sha1_update(&ctx, (const unsigned char *)str, str_size);
-    mbedtls_sha1_finish(&ctx, (unsigned char *)out_ptr);
-    mbedtls_sha1_free(&ctx);
-    return 0;
-}
-#endif
-
-int luat_crypto_sha256_simple(const char* str, size_t str_size, void* out_ptr) {
-    mbedtls_sha256_context ctx;
-    mbedtls_sha256_init(&ctx);
-
-    mbedtls_sha256_starts(&ctx, 0);
-    mbedtls_sha256_update(&ctx, (const unsigned char *)str, str_size);
-    mbedtls_sha256_finish(&ctx, (unsigned char *)out_ptr);
-    mbedtls_sha256_free(&ctx);
-    return 0;
-}
-#ifdef MBEDTLS_SHA512_C
-int luat_crypto_sha512_simple(const char* str, size_t str_size, void* out_ptr) {
-    mbedtls_sha512_context ctx;
-    mbedtls_sha512_init(&ctx);
-
-    mbedtls_sha512_starts(&ctx, 0);
-    mbedtls_sha512_update(&ctx, (const unsigned char *)str, str_size);
-    mbedtls_sha512_finish(&ctx, (unsigned char *)out_ptr);
-    mbedtls_sha512_free(&ctx);
-    return 0;
-}
-#endif
-
-#ifndef LUAT_CRYPTO_MD5
-#define LUAT_CRYPTO_MD5
-int luat_crypto_hmac_md5_simple(const char* str, size_t str_size, const char* mac, size_t mac_size, void* out_ptr) {
-    luat_crypto_HmacMd5((const unsigned char *)str, str_size, (unsigned char *)out_ptr, (const unsigned char *)mac, mac_size);
-    return 0;
-}
-#endif
-#ifndef LUAT_CRYPTO_SHA1
-#define LUAT_CRYPTO_SHA1
-int luat_crypto_hmac_sha1_simple(const char* str, size_t str_size, const char* mac, size_t mac_size, void* out_ptr) {
-    luat_crypto_HmacSha1((const unsigned char *)str, str_size, (unsigned char *)out_ptr, (const unsigned char *)mac, mac_size);
-    return 0;
-}
-#endif
-
-int luat_crypto_hmac_sha256_simple(const char* str, size_t str_size, const char* mac, size_t mac_size, void* out_ptr) {
-    luat_crypto_HmacSha256((const unsigned char *)str, str_size, (unsigned char *)out_ptr, (const unsigned char *)mac, mac_size);
-    return 0;
-}
-#ifdef MBEDTLS_SHA512_C
-int luat_crypto_hmac_sha512_simple(const char* str, size_t str_size, const char* mac, size_t mac_size, void* out_ptr) {
-    luat_crypto_HmacSha512((const unsigned char *)str, str_size, (unsigned char *)out_ptr, (const unsigned char *)mac, mac_size);
-    return 0;
-}
-#endif
-
-
-///----------------------------
-
-#define ALI_SHA1_KEY_IOPAD_SIZE (64)
-#define ALI_SHA1_DIGEST_SIZE    (20)
-
-#define ALI_SHA256_KEY_IOPAD_SIZE   (64)
-#define ALI_SHA256_DIGEST_SIZE      (32)
-
-#define ALI_SHA512_KEY_IOPAD_SIZE   (128)
-#define ALI_SHA512_DIGEST_SIZE      (64)
-
-#define ALI_MD5_KEY_IOPAD_SIZE  (64)
-#define ALI_MD5_DIGEST_SIZE     (16)
-
-// char atHb2Hex(unsigned char hb)
-// {
-//     hb = hb&0xF;
-//     return (char)(hb<10 ? '0'+hb : hb-10+'a');
-// }
-
-
-/*
- * output = SHA-1( input buffer )
- */
-void luat_crypto_HmacSha1(const unsigned char *input, int ilen, unsigned char *output,const unsigned char *key, int keylen)
-{
-    int i;
-    mbedtls_sha1_context ctx;
-    unsigned char k_ipad[ALI_SHA1_KEY_IOPAD_SIZE] = {0};
-    unsigned char k_opad[ALI_SHA1_KEY_IOPAD_SIZE] = {0};
-    unsigned char tempbuf[ALI_SHA1_DIGEST_SIZE];
-
-    memset(k_ipad, 0x36, ALI_SHA1_KEY_IOPAD_SIZE);
-    memset(k_opad, 0x5C, ALI_SHA1_KEY_IOPAD_SIZE);
-
-    for(i=0; i<keylen; i++)
-    {
-        if(i>=ALI_SHA1_KEY_IOPAD_SIZE)
-        {
-            break;
-        }
-        k_ipad[i] ^=key[i];
-        k_opad[i] ^=key[i];
-    }
-    mbedtls_sha1_init(&ctx);
-
-    mbedtls_sha1_starts(&ctx);
-    mbedtls_sha1_update(&ctx, k_ipad, ALI_SHA1_KEY_IOPAD_SIZE);
-    mbedtls_sha1_update(&ctx, input, ilen);
-    mbedtls_sha1_finish(&ctx, tempbuf);
-
-    mbedtls_sha1_starts(&ctx);
-    mbedtls_sha1_update(&ctx, k_opad, ALI_SHA1_KEY_IOPAD_SIZE);
-    mbedtls_sha1_update(&ctx, tempbuf, ALI_SHA1_DIGEST_SIZE);
-    mbedtls_sha1_finish(&ctx, tempbuf);
-
-    // for(i=0; i<ALI_SHA1_DIGEST_SIZE; ++i)
-    // {
-    //     output[i*2] = atHb2Hex(tempbuf[i]>>4);
-    //     output[i*2+1] = atHb2Hex(tempbuf[i]);
-    // }
-    memcpy(output, tempbuf, ALI_SHA1_DIGEST_SIZE);
-
-    mbedtls_sha1_free(&ctx);
-}
-/*
- * output = SHA-256( input buffer )
- */
-void luat_crypto_HmacSha256(const unsigned char *input, int ilen, unsigned char *output,const unsigned char *key, int keylen)
-{
-    int i;
-    mbedtls_sha256_context ctx;
-    unsigned char k_ipad[ALI_SHA256_KEY_IOPAD_SIZE] = {0};
-    unsigned char k_opad[ALI_SHA256_KEY_IOPAD_SIZE] = {0};
-
-    memset(k_ipad, 0x36, 64);
-    memset(k_opad, 0x5C, 64);
-
-    if ((NULL == input) || (NULL == key) || (NULL == output)) {
-        return;
-    }
-
-    if (keylen > ALI_SHA256_KEY_IOPAD_SIZE) {
-        return;
-    }
-
-    for(i=0; i<keylen; i++)
-    {
-        if(i>=ALI_SHA256_KEY_IOPAD_SIZE)
-        {
-            break;
-        }
-        k_ipad[i] ^=key[i];
-        k_opad[i] ^=key[i];
-    }
-    mbedtls_sha256_init(&ctx);
-
-    mbedtls_sha256_starts(&ctx, 0);
-    mbedtls_sha256_update(&ctx, k_ipad, ALI_SHA256_KEY_IOPAD_SIZE);
-    mbedtls_sha256_update(&ctx, input, ilen);
-    mbedtls_sha256_finish(&ctx, output);
-
-    mbedtls_sha256_starts(&ctx, 0);
-    mbedtls_sha256_update(&ctx, k_opad, ALI_SHA256_KEY_IOPAD_SIZE);
-    mbedtls_sha256_update(&ctx, output, ALI_SHA256_DIGEST_SIZE);
-    mbedtls_sha256_finish(&ctx, output);
-
-    mbedtls_sha256_free(&ctx);
-}
-#ifdef MBEDTLS_SHA512_C
-/*
- * output = SHA-512( input buffer )
- */
-void luat_crypto_HmacSha512(const unsigned char *input, int ilen, unsigned char *output,const unsigned char *key, int keylen)
-{
-    int i;
-    mbedtls_sha512_context ctx;
-    unsigned char k_ipad[ALI_SHA512_KEY_IOPAD_SIZE] = {0};
-    unsigned char k_opad[ALI_SHA512_KEY_IOPAD_SIZE] = {0};
-
-    memset(k_ipad, 0x36, ALI_SHA512_KEY_IOPAD_SIZE);
-    memset(k_opad, 0x5C, ALI_SHA512_KEY_IOPAD_SIZE);
-
-    if ((NULL == input) || (NULL == key) || (NULL == output)) {
-        return;
-    }
-
-    if (keylen > ALI_SHA512_KEY_IOPAD_SIZE) {
-        return;
-    }
-
-    for(i=0; i<keylen; i++)
+int luat_crypto_trng(char* buff, size_t len) {
+    for (size_t i = 0; i < len; i++)
     {
-        if(i>=ALI_SHA512_KEY_IOPAD_SIZE)
-        {
-            break;
-        }
-        k_ipad[i] ^=key[i];
-        k_opad[i] ^=key[i];
+        buff[i] = (char) rand();
     }
-    mbedtls_sha512_init(&ctx);
-
-    mbedtls_sha512_starts(&ctx, 0);
-    mbedtls_sha512_update(&ctx, k_ipad, ALI_SHA512_KEY_IOPAD_SIZE);
-    mbedtls_sha512_update(&ctx, input, ilen);
-    mbedtls_sha512_finish(&ctx, output);
-
-    mbedtls_sha512_starts(&ctx, 0);
-    mbedtls_sha512_update(&ctx, k_opad, ALI_SHA512_KEY_IOPAD_SIZE);
-    mbedtls_sha512_update(&ctx, output, ALI_SHA512_DIGEST_SIZE);
-    mbedtls_sha512_finish(&ctx, output);
-
-    mbedtls_sha512_free(&ctx);
-}
-#endif
-/*
- * output = MD-5( input buffer )
- */
-void luat_crypto_HmacMd5(const unsigned char *input, int ilen, unsigned char *output,const unsigned char *key, int keylen)
-{
-    int i;
-    mbedtls_md5_context ctx;
-    unsigned char k_ipad[ALI_MD5_KEY_IOPAD_SIZE] = {0};
-    unsigned char k_opad[ALI_MD5_KEY_IOPAD_SIZE] = {0};
-    unsigned char tempbuf[ALI_MD5_DIGEST_SIZE];
-
-    memset(k_ipad, 0x36, ALI_MD5_KEY_IOPAD_SIZE);
-    memset(k_opad, 0x5C, ALI_MD5_KEY_IOPAD_SIZE);
-
-    for(i=0; i<keylen; i++)
-    {
-        if(i>=ALI_MD5_KEY_IOPAD_SIZE)
-        {
-            break;
-        }
-        k_ipad[i] ^=key[i];
-        k_opad[i] ^=key[i];
-    }
-    mbedtls_md5_init(&ctx);
-
-    mbedtls_md5_starts(&ctx);
-    mbedtls_md5_update(&ctx, k_ipad, ALI_MD5_KEY_IOPAD_SIZE);
-    mbedtls_md5_update(&ctx, input, ilen);
-    mbedtls_md5_finish(&ctx, tempbuf);
-
-    mbedtls_md5_starts(&ctx);
-    mbedtls_md5_update(&ctx, k_opad, ALI_MD5_KEY_IOPAD_SIZE);
-    mbedtls_md5_update(&ctx, tempbuf, ALI_MD5_DIGEST_SIZE);
-    mbedtls_md5_finish(&ctx, tempbuf);
-
-    // for(i=0; i<ALI_MD5_DIGEST_SIZE; ++i)
-    // {
-    //     output[i*2] = atHb2Hex(tempbuf[i]>>4);
-    //     output[i*2+1] = atHb2Hex(tempbuf[i]);
-    // }
-    memcpy(output, tempbuf, ALI_MD5_DIGEST_SIZE);
-    mbedtls_md5_free(&ctx);
+    return 0;
 }
-#endif

components/lvgl/binding/luat_lib_lvgl7.c

@@ -52,7 +52,7 @@ int luat_lv_init(lua_State *L) {
     }
 
     extern void emulator_lvgl_init(int w, int h);
-    emulator_lvgl_init(WINDOW_HOR_RES, WINDOW_VER_RES);
+    emulator_lvgl_init(w, h);
     return 0;
 }
 #elif defined(LUA_USE_WINDOWS)