Switch pkcs11 submodule to OASIS repository

FreeRTOS · Feb 7, 2024 · 302579f · 302579f
1 parent cb865c1
commit 302579f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.github/memory_statistics_config.json b/.github/memory_statistics_config.json
@@ -7,7 +7,7 @@
     ],
     "include": [
         "source/include",
-        "source/dependency/3rdparty/pkcs11",
+        "source/dependency/3rdparty/pkcs11/published/2-40-errata-1",
         "build/_deps/mbedtls_2-src/include",
         "source/dependency/3rdparty/mbedtls_utils",
         "test/include"

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "source/dependency/3rdparty/pkcs11"]
 	path = source/dependency/3rdparty/pkcs11
-	url = https://github.com/amazon-freertos/pkcs11.git
+	url = https://github.com/oasis-tcs/pkcs11.git
diff --git a/manifest.yml b/manifest.yml
@@ -5,9 +5,9 @@ license: "MIT"
 
 dependencies:
   - name: "pkcs11"
-    version: "v2.40_errata01"
+    version: "2-40-errata-1"
     license: "OASIS-IPR"
     repository:
       type: "git"
-      url: "https://github.com/amazon-freertos/pkcs11.git"
+      url: "https://github.com/oasis-tcs/pkcs11.git"
       path: "source/dependency/3rdparty/pkcs11"
diff --git a/pkcsFilePaths.cmake b/pkcsFilePaths.cmake
@@ -14,7 +14,7 @@ set( PKCS_SOURCES
 
 # corePKCS11 library public include directories.
 set( PKCS_INCLUDE_PUBLIC_DIRS
-     "${CMAKE_CURRENT_LIST_DIR}/source/dependency/3rdparty/pkcs11"
+     "${CMAKE_CURRENT_LIST_DIR}/source/dependency/3rdparty/pkcs11/published/2-40-errata-1"
      "${CMAKE_CURRENT_LIST_DIR}/source/include"
      )
 

diff --git a/source/dependency/3rdparty/pkcs11 b/source/dependency/3rdparty/pkcs11
diff --git a/test/cbmc/proofs/Makefile-project-defines b/test/cbmc/proofs/Makefile-project-defines
@@ -31,7 +31,7 @@ COMPILE_FLAGS += -DMBEDTLS_CONFIG_FILE="<mbedtls_config.h>"
 # INCLUDES =
 INCLUDES += -I$(SRCDIR)/source/include
 INCLUDES += -I$(CBMC_ROOT)/include
-INCLUDES += -I$(SRCDIR)/source/dependency/3rdparty/pkcs11
+INCLUDES += -I$(SRCDIR)/source/dependency/3rdparty/pkcs11/published/2-40-errata-1
 
 # Preprocessor definitions -D...
 # DEFINES =