From 1606cff72cc9f4ac90a2fe5fd2e59302fc333924 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Mon, 1 Jul 2024 18:35:28 +0200 Subject: [PATCH] Move everest and p256-m Signed-off-by: Ronald Cron --- 3rdparty/CMakeLists.txt | 2 -- 3rdparty/Makefile.inc | 3 --- {3rdparty => tf-psa-crypto/drivers}/everest/.gitignore | 0 {3rdparty => tf-psa-crypto/drivers}/everest/CMakeLists.txt | 0 {3rdparty => tf-psa-crypto/drivers}/everest/Makefile.inc | 0 {3rdparty => tf-psa-crypto/drivers}/everest/README.md | 0 .../drivers}/everest/include/everest/Hacl_Curve25519.h | 0 .../drivers}/everest/include/everest/everest.h | 0 .../drivers}/everest/include/everest/kremlib.h | 0 .../drivers}/everest/include/everest/kremlib/FStar_UInt128.h | 0 .../FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.h | 0 .../drivers}/everest/include/everest/kremlin/c_endianness.h | 0 .../everest/include/everest/kremlin/internal/builtin.h | 0 .../everest/include/everest/kremlin/internal/callconv.h | 0 .../drivers}/everest/include/everest/kremlin/internal/compat.h | 0 .../drivers}/everest/include/everest/kremlin/internal/debug.h | 0 .../drivers}/everest/include/everest/kremlin/internal/target.h | 0 .../drivers}/everest/include/everest/kremlin/internal/types.h | 0 .../everest/include/everest/kremlin/internal/wasmsupport.h | 0 .../drivers}/everest/include/everest/vs2013/Hacl_Curve25519.h | 0 .../drivers}/everest/include/everest/vs2013/inttypes.h | 0 .../drivers}/everest/include/everest/vs2013/stdbool.h | 0 .../drivers}/everest/include/everest/x25519.h | 0 .../drivers}/everest/library/Hacl_Curve25519.c | 0 .../drivers}/everest/library/Hacl_Curve25519_joined.c | 0 {3rdparty => tf-psa-crypto/drivers}/everest/library/everest.c | 0 .../drivers}/everest/library/kremlib/FStar_UInt128_extracted.c | 0 .../FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c | 0 .../drivers}/everest/library/legacy/Hacl_Curve25519.c | 0 {3rdparty => tf-psa-crypto/drivers}/everest/library/x25519.c | 0 {3rdparty => tf-psa-crypto/drivers}/p256-m/.gitignore | 0 {3rdparty => tf-psa-crypto/drivers}/p256-m/CMakeLists.txt | 0 {3rdparty => tf-psa-crypto/drivers}/p256-m/Makefile.inc | 0 {3rdparty => tf-psa-crypto/drivers}/p256-m/README.md | 0 {3rdparty => tf-psa-crypto/drivers}/p256-m/p256-m/README.md | 0 {3rdparty => tf-psa-crypto/drivers}/p256-m/p256-m/p256-m.c | 0 {3rdparty => tf-psa-crypto/drivers}/p256-m/p256-m/p256-m.h | 0 .../drivers}/p256-m/p256-m_driver_entrypoints.c | 0 .../drivers}/p256-m/p256-m_driver_entrypoints.h | 0 39 files changed, 5 deletions(-) delete mode 100644 3rdparty/CMakeLists.txt delete mode 100644 3rdparty/Makefile.inc rename {3rdparty => tf-psa-crypto/drivers}/everest/.gitignore (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/CMakeLists.txt (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/Makefile.inc (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/README.md (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/Hacl_Curve25519.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/everest.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/kremlib.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/kremlib/FStar_UInt128.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/kremlin/c_endianness.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/kremlin/internal/builtin.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/kremlin/internal/callconv.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/kremlin/internal/compat.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/kremlin/internal/debug.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/kremlin/internal/target.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/kremlin/internal/types.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/kremlin/internal/wasmsupport.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/vs2013/Hacl_Curve25519.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/vs2013/inttypes.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/vs2013/stdbool.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/include/everest/x25519.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/library/Hacl_Curve25519.c (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/library/Hacl_Curve25519_joined.c (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/library/everest.c (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/library/kremlib/FStar_UInt128_extracted.c (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/library/legacy/Hacl_Curve25519.c (100%) rename {3rdparty => tf-psa-crypto/drivers}/everest/library/x25519.c (100%) rename {3rdparty => tf-psa-crypto/drivers}/p256-m/.gitignore (100%) rename {3rdparty => tf-psa-crypto/drivers}/p256-m/CMakeLists.txt (100%) rename {3rdparty => tf-psa-crypto/drivers}/p256-m/Makefile.inc (100%) rename {3rdparty => tf-psa-crypto/drivers}/p256-m/README.md (100%) rename {3rdparty => tf-psa-crypto/drivers}/p256-m/p256-m/README.md (100%) rename {3rdparty => tf-psa-crypto/drivers}/p256-m/p256-m/p256-m.c (100%) rename {3rdparty => tf-psa-crypto/drivers}/p256-m/p256-m/p256-m.h (100%) rename {3rdparty => tf-psa-crypto/drivers}/p256-m/p256-m_driver_entrypoints.c (100%) rename {3rdparty => tf-psa-crypto/drivers}/p256-m/p256-m_driver_entrypoints.h (100%) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt deleted file mode 100644 index fa149bdecf..0000000000 --- a/3rdparty/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(everest) -add_subdirectory(p256-m) diff --git a/3rdparty/Makefile.inc b/3rdparty/Makefile.inc deleted file mode 100644 index 70f316b0c8..0000000000 --- a/3rdparty/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -THIRDPARTY_DIR := $(dir $(lastword $(MAKEFILE_LIST))) -include $(THIRDPARTY_DIR)/everest/Makefile.inc -include $(THIRDPARTY_DIR)/p256-m/Makefile.inc diff --git a/3rdparty/everest/.gitignore b/tf-psa-crypto/drivers/everest/.gitignore similarity index 100% rename from 3rdparty/everest/.gitignore rename to tf-psa-crypto/drivers/everest/.gitignore diff --git a/3rdparty/everest/CMakeLists.txt b/tf-psa-crypto/drivers/everest/CMakeLists.txt similarity index 100% rename from 3rdparty/everest/CMakeLists.txt rename to tf-psa-crypto/drivers/everest/CMakeLists.txt diff --git a/3rdparty/everest/Makefile.inc b/tf-psa-crypto/drivers/everest/Makefile.inc similarity index 100% rename from 3rdparty/everest/Makefile.inc rename to tf-psa-crypto/drivers/everest/Makefile.inc diff --git a/3rdparty/everest/README.md b/tf-psa-crypto/drivers/everest/README.md similarity index 100% rename from 3rdparty/everest/README.md rename to tf-psa-crypto/drivers/everest/README.md diff --git a/3rdparty/everest/include/everest/Hacl_Curve25519.h b/tf-psa-crypto/drivers/everest/include/everest/Hacl_Curve25519.h similarity index 100% rename from 3rdparty/everest/include/everest/Hacl_Curve25519.h rename to tf-psa-crypto/drivers/everest/include/everest/Hacl_Curve25519.h diff --git a/3rdparty/everest/include/everest/everest.h b/tf-psa-crypto/drivers/everest/include/everest/everest.h similarity index 100% rename from 3rdparty/everest/include/everest/everest.h rename to tf-psa-crypto/drivers/everest/include/everest/everest.h diff --git a/3rdparty/everest/include/everest/kremlib.h b/tf-psa-crypto/drivers/everest/include/everest/kremlib.h similarity index 100% rename from 3rdparty/everest/include/everest/kremlib.h rename to tf-psa-crypto/drivers/everest/include/everest/kremlib.h diff --git a/3rdparty/everest/include/everest/kremlib/FStar_UInt128.h b/tf-psa-crypto/drivers/everest/include/everest/kremlib/FStar_UInt128.h similarity index 100% rename from 3rdparty/everest/include/everest/kremlib/FStar_UInt128.h rename to tf-psa-crypto/drivers/everest/include/everest/kremlib/FStar_UInt128.h diff --git a/3rdparty/everest/include/everest/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.h b/tf-psa-crypto/drivers/everest/include/everest/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.h similarity index 100% rename from 3rdparty/everest/include/everest/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.h rename to tf-psa-crypto/drivers/everest/include/everest/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.h diff --git a/3rdparty/everest/include/everest/kremlin/c_endianness.h b/tf-psa-crypto/drivers/everest/include/everest/kremlin/c_endianness.h similarity index 100% rename from 3rdparty/everest/include/everest/kremlin/c_endianness.h rename to tf-psa-crypto/drivers/everest/include/everest/kremlin/c_endianness.h diff --git a/3rdparty/everest/include/everest/kremlin/internal/builtin.h b/tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/builtin.h similarity index 100% rename from 3rdparty/everest/include/everest/kremlin/internal/builtin.h rename to tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/builtin.h diff --git a/3rdparty/everest/include/everest/kremlin/internal/callconv.h b/tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/callconv.h similarity index 100% rename from 3rdparty/everest/include/everest/kremlin/internal/callconv.h rename to tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/callconv.h diff --git a/3rdparty/everest/include/everest/kremlin/internal/compat.h b/tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/compat.h similarity index 100% rename from 3rdparty/everest/include/everest/kremlin/internal/compat.h rename to tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/compat.h diff --git a/3rdparty/everest/include/everest/kremlin/internal/debug.h b/tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/debug.h similarity index 100% rename from 3rdparty/everest/include/everest/kremlin/internal/debug.h rename to tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/debug.h diff --git a/3rdparty/everest/include/everest/kremlin/internal/target.h b/tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/target.h similarity index 100% rename from 3rdparty/everest/include/everest/kremlin/internal/target.h rename to tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/target.h diff --git a/3rdparty/everest/include/everest/kremlin/internal/types.h b/tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/types.h similarity index 100% rename from 3rdparty/everest/include/everest/kremlin/internal/types.h rename to tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/types.h diff --git a/3rdparty/everest/include/everest/kremlin/internal/wasmsupport.h b/tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/wasmsupport.h similarity index 100% rename from 3rdparty/everest/include/everest/kremlin/internal/wasmsupport.h rename to tf-psa-crypto/drivers/everest/include/everest/kremlin/internal/wasmsupport.h diff --git a/3rdparty/everest/include/everest/vs2013/Hacl_Curve25519.h b/tf-psa-crypto/drivers/everest/include/everest/vs2013/Hacl_Curve25519.h similarity index 100% rename from 3rdparty/everest/include/everest/vs2013/Hacl_Curve25519.h rename to tf-psa-crypto/drivers/everest/include/everest/vs2013/Hacl_Curve25519.h diff --git a/3rdparty/everest/include/everest/vs2013/inttypes.h b/tf-psa-crypto/drivers/everest/include/everest/vs2013/inttypes.h similarity index 100% rename from 3rdparty/everest/include/everest/vs2013/inttypes.h rename to tf-psa-crypto/drivers/everest/include/everest/vs2013/inttypes.h diff --git a/3rdparty/everest/include/everest/vs2013/stdbool.h b/tf-psa-crypto/drivers/everest/include/everest/vs2013/stdbool.h similarity index 100% rename from 3rdparty/everest/include/everest/vs2013/stdbool.h rename to tf-psa-crypto/drivers/everest/include/everest/vs2013/stdbool.h diff --git a/3rdparty/everest/include/everest/x25519.h b/tf-psa-crypto/drivers/everest/include/everest/x25519.h similarity index 100% rename from 3rdparty/everest/include/everest/x25519.h rename to tf-psa-crypto/drivers/everest/include/everest/x25519.h diff --git a/3rdparty/everest/library/Hacl_Curve25519.c b/tf-psa-crypto/drivers/everest/library/Hacl_Curve25519.c similarity index 100% rename from 3rdparty/everest/library/Hacl_Curve25519.c rename to tf-psa-crypto/drivers/everest/library/Hacl_Curve25519.c diff --git a/3rdparty/everest/library/Hacl_Curve25519_joined.c b/tf-psa-crypto/drivers/everest/library/Hacl_Curve25519_joined.c similarity index 100% rename from 3rdparty/everest/library/Hacl_Curve25519_joined.c rename to tf-psa-crypto/drivers/everest/library/Hacl_Curve25519_joined.c diff --git a/3rdparty/everest/library/everest.c b/tf-psa-crypto/drivers/everest/library/everest.c similarity index 100% rename from 3rdparty/everest/library/everest.c rename to tf-psa-crypto/drivers/everest/library/everest.c diff --git a/3rdparty/everest/library/kremlib/FStar_UInt128_extracted.c b/tf-psa-crypto/drivers/everest/library/kremlib/FStar_UInt128_extracted.c similarity index 100% rename from 3rdparty/everest/library/kremlib/FStar_UInt128_extracted.c rename to tf-psa-crypto/drivers/everest/library/kremlib/FStar_UInt128_extracted.c diff --git a/3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c b/tf-psa-crypto/drivers/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c similarity index 100% rename from 3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c rename to tf-psa-crypto/drivers/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c diff --git a/3rdparty/everest/library/legacy/Hacl_Curve25519.c b/tf-psa-crypto/drivers/everest/library/legacy/Hacl_Curve25519.c similarity index 100% rename from 3rdparty/everest/library/legacy/Hacl_Curve25519.c rename to tf-psa-crypto/drivers/everest/library/legacy/Hacl_Curve25519.c diff --git a/3rdparty/everest/library/x25519.c b/tf-psa-crypto/drivers/everest/library/x25519.c similarity index 100% rename from 3rdparty/everest/library/x25519.c rename to tf-psa-crypto/drivers/everest/library/x25519.c diff --git a/3rdparty/p256-m/.gitignore b/tf-psa-crypto/drivers/p256-m/.gitignore similarity index 100% rename from 3rdparty/p256-m/.gitignore rename to tf-psa-crypto/drivers/p256-m/.gitignore diff --git a/3rdparty/p256-m/CMakeLists.txt b/tf-psa-crypto/drivers/p256-m/CMakeLists.txt similarity index 100% rename from 3rdparty/p256-m/CMakeLists.txt rename to tf-psa-crypto/drivers/p256-m/CMakeLists.txt diff --git a/3rdparty/p256-m/Makefile.inc b/tf-psa-crypto/drivers/p256-m/Makefile.inc similarity index 100% rename from 3rdparty/p256-m/Makefile.inc rename to tf-psa-crypto/drivers/p256-m/Makefile.inc diff --git a/3rdparty/p256-m/README.md b/tf-psa-crypto/drivers/p256-m/README.md similarity index 100% rename from 3rdparty/p256-m/README.md rename to tf-psa-crypto/drivers/p256-m/README.md diff --git a/3rdparty/p256-m/p256-m/README.md b/tf-psa-crypto/drivers/p256-m/p256-m/README.md similarity index 100% rename from 3rdparty/p256-m/p256-m/README.md rename to tf-psa-crypto/drivers/p256-m/p256-m/README.md diff --git a/3rdparty/p256-m/p256-m/p256-m.c b/tf-psa-crypto/drivers/p256-m/p256-m/p256-m.c similarity index 100% rename from 3rdparty/p256-m/p256-m/p256-m.c rename to tf-psa-crypto/drivers/p256-m/p256-m/p256-m.c diff --git a/3rdparty/p256-m/p256-m/p256-m.h b/tf-psa-crypto/drivers/p256-m/p256-m/p256-m.h similarity index 100% rename from 3rdparty/p256-m/p256-m/p256-m.h rename to tf-psa-crypto/drivers/p256-m/p256-m/p256-m.h diff --git a/3rdparty/p256-m/p256-m_driver_entrypoints.c b/tf-psa-crypto/drivers/p256-m/p256-m_driver_entrypoints.c similarity index 100% rename from 3rdparty/p256-m/p256-m_driver_entrypoints.c rename to tf-psa-crypto/drivers/p256-m/p256-m_driver_entrypoints.c diff --git a/3rdparty/p256-m/p256-m_driver_entrypoints.h b/tf-psa-crypto/drivers/p256-m/p256-m_driver_entrypoints.h similarity index 100% rename from 3rdparty/p256-m/p256-m_driver_entrypoints.h rename to tf-psa-crypto/drivers/p256-m/p256-m_driver_entrypoints.h