Replace Oasis headers with public domain headers

Headers pulled from https://github.com/latchset/pkcs11-headers Fixes #76 Signed-off-by: Simo Sorce <[email protected]>
latchset · Nov 7, 2023 · 208cc98 · 208cc98
1 parent 2e8c26b
commit 208cc98
Show file tree

Hide file tree

Showing 14 changed files with 2,427 additions and 3,967 deletions.
diff --git a/.clang-format-ignore b/.clang-format-ignore
@@ -1,2 +1,2 @@
 # Leave third party code untouched
-./src/oasis/*
+./src/pkcs11.h
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -37,10 +37,10 @@ jobs:
           run-clang-tidy \
             -checks=-*,readability-braces-around-statements \
             -config "{WarningsAsErrors: '*'}" \
-            -header-filter "src/oasis" \
+            -header-filter "src/pkcs11.h" \
             -quiet
       - name: Check the Style
         run: make check-style || (make check-style-show; exit -1)
       - name: Check spelling
         run: codespell --ignore-words-list="sorce,clen,adin" *.md Makefile.am \
-            configure.ac src tests -S src/oasis
+            configure.ac src tests -S src/pkcs11.h
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -29,11 +29,8 @@ Copyright: (C) 2022 Simo Sorce <[email protected]>
 License: Apache-2.0
 
 #
-# OASIS Open PKCS#11 headers
+# Public Domain PKCS#11 headers
 #
-
-Files: src/oasis/pkcs11.h
-       src/oasis/pkcs11f.h
-       src/oasis/pkcs11t.h
-Copyright: (c) OASIS Open 2016-2019. All Rights Reserved.
-License: LicenseRef-OASIS-IPR
+Files: src/pkcs11.h
+Copyright: 2023 Public Domain
+License: LicenseRef-Public-Domain-PKCS11-Headers
diff --git a/LICENSES/LicenseRef-OASIS-IPR.txt b/LICENSES/LicenseRef-OASIS-IPR.txt
diff --git a/LICENSES/LicenseRef-Public-Domain-PKCS11-Headers.txt b/LICENSES/LicenseRef-Public-Domain-PKCS11-Headers.txt
@@ -0,0 +1,3 @@
+This file is in the Public Domain
+
+See https://github.com/latchset/pkcs11-headers
diff --git a/Makefile.am b/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = src tests docs
 dist_doc_DATA = README.md
 
 check-style:
-	@lines=`git diff -U0 --no-color --relative origin/main | clang-format-diff -p1 |wc -l`; \
+	@lines=`git diff -U0 --no-color --relative origin/main -- ':!src/pkcs11.h' | clang-format-diff -p1 |wc -l`; \
 	if [ "$$lines" != "0" ]; then \
 		echo "Coding Style issues detected"; \
 		exit 1; \
@@ -13,10 +13,10 @@ check-style:
 	fi
 
 check-style-show:
-	git diff -U0 --no-color --relative origin/main | clang-format-diff -p1
+	git diff -U0 --no-color --relative origin/main -- ':!src/pkcs11.h' | clang-format-diff -p1
 
 check-style-fix:
-	git diff -U0 --no-color --relative origin/main | clang-format-diff -i -p1
+	git diff -U0 --no-color --relative origin/main -- ':!src/pkcs11.h' | clang-format-diff -i -p1
 
 generate-code:
 	for pfile in src/*.pre; do \

diff --git a/README.md b/README.md
@@ -3,11 +3,11 @@
 This is an Openssl 3.x provider to access Hardware or Software Tokens
 using the PKCS#11 Cryptographic Token Interface
 
-This code targets version 3.0 of the interface but should be backwards
+This code targets version 3.1 of the interface but should be backwards
 compatible to previous versions as well.
 
 Spec:
-https://docs.oasis-open.org/pkcs11/pkcs11-base/v3.0/os/pkcs11-base-v3.0-os.html
+https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/pkcs11-spec-v3.1.html
 
 See the [wiki](https://github.com/latchset/pkcs11-provider/wiki) for more
 documentation.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -10,9 +10,6 @@ noinst_HEADERS = \
 	kdf.h \
 	keymgmt.h \
 	interface.h \
-	oasis/pkcs11.h \
-	oasis/pkcs11f.h \
-	oasis/pkcs11t.h \
 	objects.h \
 	pkcs11.h \
 	platform/endian.h \

diff --git a/src/debug.c b/src/debug.c
@@ -379,17 +379,11 @@ struct ckmap mechanism_names[] = {
     MECH_ENTRY(CKM_CAST3_MAC),
     MECH_ENTRY(CKM_CAST3_MAC_GENERAL),
     MECH_ENTRY(CKM_CAST3_CBC_PAD),
-    MECH_ENTRY(CKM_CAST5_KEY_GEN),
     MECH_ENTRY(CKM_CAST128_KEY_GEN),
-    MECH_ENTRY(CKM_CAST5_ECB),
     MECH_ENTRY(CKM_CAST128_ECB),
-    MECH_ENTRY(CKM_CAST5_CBC),
     MECH_ENTRY(CKM_CAST128_CBC),
-    MECH_ENTRY(CKM_CAST5_MAC),
     MECH_ENTRY(CKM_CAST128_MAC),
-    MECH_ENTRY(CKM_CAST5_MAC_GENERAL),
     MECH_ENTRY(CKM_CAST128_MAC_GENERAL),
-    MECH_ENTRY(CKM_CAST5_CBC_PAD),
     MECH_ENTRY(CKM_CAST128_CBC_PAD),
     MECH_ENTRY(CKM_RC5_KEY_GEN),
     MECH_ENTRY(CKM_RC5_ECB),
@@ -437,9 +431,7 @@ struct ckmap mechanism_names[] = {
     MECH_ENTRY(CKM_PBE_MD5_DES_CBC),
     MECH_ENTRY(CKM_PBE_MD5_CAST_CBC),
     MECH_ENTRY(CKM_PBE_MD5_CAST3_CBC),
-    MECH_ENTRY(CKM_PBE_MD5_CAST5_CBC),
     MECH_ENTRY(CKM_PBE_MD5_CAST128_CBC),
-    MECH_ENTRY(CKM_PBE_SHA1_CAST5_CBC),
     MECH_ENTRY(CKM_PBE_SHA1_CAST128_CBC),
     MECH_ENTRY(CKM_PBE_SHA1_RC4_128),
     MECH_ENTRY(CKM_PBE_SHA1_RC4_40),
@@ -516,7 +508,6 @@ struct ckmap mechanism_names[] = {
     MECH_ENTRY(CKM_BATON_COUNTER),
     MECH_ENTRY(CKM_BATON_SHUFFLE),
     MECH_ENTRY(CKM_BATON_WRAP),
-    MECH_ENTRY(CKM_ECDSA_KEY_PAIR_GEN),
     MECH_ENTRY(CKM_EC_KEY_PAIR_GEN),
     MECH_ENTRY(CKM_ECDSA),
     MECH_ENTRY(CKM_ECDSA_SHA1),

diff --git a/src/oasis/pkcs11.h b/src/oasis/pkcs11.h