Skip to content

Fix CK struct packing for Windows builds #209

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

Merged
dgarske merged 3 commits into from
Aug 7, 2026
+15 −3
Merged

Fix CK struct packing for Windows builds #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d98347
Install options.h from cmake install
holtrop-wolfssl Aug 3, 2026
5d6a7b3
Fix CK struct packing for Windows builds
holtrop-wolfssl Aug 3, 2026
70dea43
Fix github workflow step names
holtrop-wolfssl Aug 4, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
run: |
./configure --enable-cryptocb --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-md5 \
--enable-mldsa --enable-lms=verify-only --enable-xmss=verify-only C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
- name: wolfssl make install
- name: wolfssl make
working-directory: ./wolfssl
run: make
- name: wolfssl make install
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
working-directory: ./wolftpm
run: |
./configure --enable-swtpm
- name: wolftpm make install
- name: wolftpm make
working-directory: ./wolftpm
run: make
- name: wolftpm make install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wolfssl-v5.6.6-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
run: |
./configure --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt \
C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
- name: wolfssl make install
- name: wolfssl make
if: steps.cache-wolfssl.outputs.cache-hit != 'true'
working-directory: ./wolfssl
run: make
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,4 +1003,6 @@ if(WOLFPKCS11_INSTALL)
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wolfpkcs11
FILES_MATCHING PATTERN "*.h"
REGEX ${EXCLUDED_HEADERS_REGEX} EXCLUDE)
install(FILES ${OPTION_FILE}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/wolfpkcs11)
endif()
10 changes: 10 additions & 0 deletions wolfpkcs11/pkcs11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,12 @@ typedef CK_ULONG CK_CERTIFICATE_TYPE;
typedef CK_ULONG CK_RV;


/* PKCS#11 on Windows uses 1-byte struct packing; see issue 208. */
#if defined(_WIN32) && !defined(WOLFPKCS11_NO_PACKED_STRUCTS)
#pragma pack(push, 1)
#endif


typedef struct CK_VERSION {
CK_BYTE major;
CK_BYTE minor;
Expand Down Expand Up @@ -1941,6 +1947,10 @@ struct CK_FUNCTION_LIST_3_2 {
CK_ULONG ulID, CK_BYTE_PTR pData, CK_ULONG ulData);
};

#if defined(_WIN32) && !defined(WOLFPKCS11_NO_PACKED_STRUCTS)
#pragma pack(pop)
#endif

/* Debug control functions */
#ifdef DEBUG_WOLFPKCS11
WP11_API void wolfPKCS11_Debugging_On(void);
Expand Down
Loading