Skip to content

[v12] fix key generation for dual auths sharing a single YubiHSM2#37305

Merged
nklaassen merged 1 commit intobranch/v12from
nklaassen/v12/fix-shared-yubihsm
Jan 29, 2024
Merged

[v12] fix key generation for dual auths sharing a single YubiHSM2#37305
nklaassen merged 1 commit intobranch/v12from
nklaassen/v12/fix-shared-yubihsm

Conversation

@nklaassen
Copy link
Copy Markdown
Contributor

@nklaassen nklaassen commented Jan 26, 2024

Backport #36899 to branch/v12

The actual fix is a few characters in lib/auth/keystore/pkcs11.go. I'm also backporting changes to test files from #36549 that this PR built on top of, which make it easier to run all HSM unit and integration tests with a connected YubiHSM2 (which I did when putting together this backport).

Instead of merging all changes in the integration tests, I just checked out the state of them from branch/v13 in
#37301

Changelog: Fixed CA key generation when two auth servers share a single YubiHSM2

Backport #36899 to branch/v12

The actual fix is a few characters in lib/auth/keystore/pkcs11.go.
I'm also backporting changes to test files from #36549 that this PR built on
top of, which make it easier to run all HSM unit and integration tests
with a connected YubiHSM2 (which I did when putting together this
backport).

Instead of merging all changes in the integration tests, I just checked
out the state of them from branch/v13 in
#37301

Changelog: fixes CA key generation when two auth servers share a single YubiHSM2
@nklaassen nklaassen added this pull request to the merge queue Jan 29, 2024
Merged via the queue into branch/v12 with commit 1d512f5 Jan 29, 2024
@nklaassen nklaassen deleted the nklaassen/v12/fix-shared-yubihsm branch January 29, 2024 22:28
@camscale camscale mentioned this pull request Feb 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants