Skip to content

Commit

Permalink
Replace Oasis headers with public domain headers
Browse files Browse the repository at this point in the history
Headers pulled from https://github.com/latchset/pkcs11-headers

Fixes latchset#76

Signed-off-by: Simo Sorce <simo@redhat.com>
  • Loading branch information
simo5 committed Nov 6, 2023
1 parent 2e8c26b commit 57e09ad
Show file tree
Hide file tree
Showing 14 changed files with 2,427 additions and 3,967 deletions.
2 changes: 1 addition & 1 deletion .clang-format-ignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Leave third party code untouched
./src/oasis/*
./src/pkcs11.h
4 changes: 2 additions & 2 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 4 additions & 7 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,8 @@ Copyright: (C) 2022 Simo Sorce <simo@redhat.com>
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
27 changes: 0 additions & 27 deletions LICENSES/LicenseRef-OASIS-IPR.txt

This file was deleted.

3 changes: 3 additions & 0 deletions LICENSES/LicenseRef-Public-Domain-PKCS11-Headers.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This file is in the Public Domain

See https://github.com/latchset/pkcs11-headers
6 changes: 3 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
3 changes: 0 additions & 3 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
9 changes: 0 additions & 9 deletions src/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
243 changes: 0 additions & 243 deletions src/oasis/pkcs11.h

This file was deleted.

Loading

0 comments on commit 57e09ad

Please sign in to comment.