Skip to content

Fix PKCS#11 struct packing on Windows to match NSS 1-byte alignment #7308

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

Open
mhammond wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

Fix PKCS#11 struct packing on Windows to match NSS 1-byte alignment #7308

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
8 changes: 6 additions & 2 deletions components/support/rc_crypto/nss/nss_sys/src/bindings/pkcs11n.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ pub const CKM_NSS_HKDF_SHA256: u32 = CKM_NSS + 4;
pub const CKM_NSS_HKDF_SHA384: u32 = CKM_NSS + 5;

pub type CK_GCM_PARAMS = CK_GCM_PARAMS_V3;
#[repr(C)]
// On Windows, PKCS#11 structs use 1-byte packing (see pkcs11p.h).
#[cfg_attr(target_os = "windows", repr(C, packed))]
#[cfg_attr(not(target_os = "windows"), repr(C))]
pub struct CK_GCM_PARAMS_V3 {
pub pIv: CK_BYTE_PTR,
pub ulIvLen: CK_ULONG,
Expand All @@ -21,7 +23,9 @@ pub struct CK_GCM_PARAMS_V3 {
pub ulAADLen: CK_ULONG,
pub ulTagBits: CK_ULONG,
}
#[repr(C)]
// On Windows, PKCS#11 structs use 1-byte packing (see pkcs11p.h).
#[cfg_attr(target_os = "windows", repr(C, packed))]
#[cfg_attr(not(target_os = "windows"), repr(C))]
pub struct CK_NSS_HKDFParams {
pub bExtract: CK_BBOOL,
pub pSalt: CK_BYTE_PTR,
Expand Down
4 changes: 3 additions & 1 deletion components/support/rc_crypto/nss/nss_sys/src/bindings/pkcs11t.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ pub type CK_OBJECT_CLASS = CK_ULONG;
pub type CK_KEY_TYPE = CK_ULONG;
pub type CK_ATTRIBUTE_TYPE = CK_ULONG;
pub type CK_FLAGS = CK_ULONG;
#[repr(C)]
// On Windows, PKCS#11 structs use 1-byte packing (see pkcs11p.h).
#[cfg_attr(target_os = "windows", repr(C, packed))]
#[cfg_attr(not(target_os = "windows"), repr(C))]
#[derive(Clone, Copy)]
pub struct CK_ATTRIBUTE {
pub type_: CK_ATTRIBUTE_TYPE,
Expand Down