From 302579f40340d3380d544695d64344a05ae761ea Mon Sep 17 00:00:00 2001
From: Paul Bartell <pbartell@amazon.com>
Date: Wed, 7 Feb 2024 10:33:21 -0800
Subject: [PATCH] Switch pkcs11 submodule to OASIS repository

---
 .github/memory_statistics_config.json     | 2 +-
 .gitmodules                               | 2 +-
 manifest.yml                              | 4 ++--
 pkcsFilePaths.cmake                       | 2 +-
 source/dependency/3rdparty/pkcs11         | 2 +-
 test/cbmc/proofs/Makefile-project-defines | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/memory_statistics_config.json b/.github/memory_statistics_config.json
index 2ffee326..af67fe80 100644
--- 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
index 70986a48..76527016 100644
--- 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
index 633b3c5d..32846bf5 100644
--- 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
index 9df75b07..00278225 100644
--- 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
index 9304ef68..478bfc50 160000
--- a/source/dependency/3rdparty/pkcs11
+++ b/source/dependency/3rdparty/pkcs11
@@ -1 +1 @@
-Subproject commit 9304ef6842d08d881ccd1daa8d3a428f3a9671ee
+Subproject commit 478bfc5077901865993e3a193777c1a9f6516cdf
diff --git a/test/cbmc/proofs/Makefile-project-defines b/test/cbmc/proofs/Makefile-project-defines
index 31ba617a..fd16d616 100644
--- 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 =