Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch pkcs11 submodule to OASIS repository #189

Merged
merged 1 commit into from
Feb 7, 2024
Merged

Switch pkcs11 submodule to OASIS repository #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/memory_statistics_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion pkcsFilePaths.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion source/dependency/3rdparty/pkcs11
Open in desktop
Submodule pkcs11 updated 4 files
+2 −2 README.md
+0 −0 published/2-40-errata-1/pkcs11.h
+0 −0 published/2-40-errata-1/pkcs11f.h
+0 −0 published/2-40-errata-1/pkcs11t.h
2 changes: 1 addition & 1 deletion test/cbmc/proofs/Makefile-project-defines
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
Loading