Skip to content

test/psk: add compat vector for OpenSSL < 3.2 #1059

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

Closed
hreinecke wants to merge 1 commit into from
+42 −0
Closed

test/psk: add compat vector for OpenSSL < 3.2 #1059

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
42 changes: 42 additions & 0 deletions test/psk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <stdlib.h>
#include <errno.h>

#include <openssl/opensslv.h>

#include <ccan/array_size/array_size.h>

#include <libnvme.h>
Expand Down Expand Up @@ -99,6 +101,45 @@
"NVMe1R02 nqn.psk-test-host nqn.psk-test-subsys QhW2+Rp6RzHlNtCslyRxMnwJ11tKKhz8JCAQpQ+XUD8f9td1VeH5h53yz2wKJG1a" },
};

/*
* Older OpenSSL versions have a bug where
* EVP_PKEY_CTX_add1_hkdf_info() will always overwrite
* existing 'info' string. So add the resulting 'compat'
* identity hash vector here to make the tests succeed.
*/
#if ((OPENSSL_VERSION_MINOR == 0 && OPENSSL_VERSION_PATCH < 14) \
|| (OPENSSL_VERSION_MINOR == 1 && OPENSSL_VERSION_PATCH < 4) \

Check failure on line 111 in test/psk.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: please, no spaces at the start of a line

Check failure on line 111 in test/psk.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: please, no spaces at the start of a line
|| (OPENSSL_VERSION_MINOR == 2 && OPENSSL_VERSION_PATCH < 2) \

Check failure on line 112 in test/psk.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: please, no spaces at the start of a line

Check failure on line 112 in test/psk.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: please, no spaces at the start of a line
|| (OPENSSL_VERSION_MINOR == 3 && OPENSSL_VERSION_PATCH < 2))

Check failure on line 113 in test/psk.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: please, no spaces at the start of a line

Check failure on line 113 in test/psk.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: please, no spaces at the start of a line
static struct test_data_identity test_data_identity_compat[] = {
{ { 0x55, 0x12, 0xDB, 0xB6,
0x73, 0x7D, 0x01, 0x06,
0xF6, 0x59, 0x75, 0xB7,
0x73, 0xDF, 0xB0, 0x11,
0xFF, 0xC3, 0x44, 0xBC,
0xF4, 0x42, 0xE2, 0xDD,
0x6D, 0x8B, 0xC4, 0x87,
0x0B, 0x5D, 0x5B, 0x03},
32, 1, NVME_HMAC_ALG_SHA2_256,
"nqn.psk-test-host", "nqn.psk-test-subsys",
"NVMe1R01 nqn.psk-test-host nqn.psk-test-subsys mJUDthe4jhFVFSnaBaydV/EHJK6OvIuw8xap5IkTnG0=" },

Check failure on line 125 in test/psk.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 106 exceeds 100 columns

Check failure on line 125 in test/psk.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 106 exceeds 100 columns
{ { 0x55, 0x12, 0xDB, 0xB6,
0x73, 0x7D, 0x01, 0x06,
0xF6, 0x59, 0x75, 0xB7,
0x73, 0xDF, 0xB0, 0x11,
0xFF, 0xC3, 0x44, 0xBC,
0xF4, 0x42, 0xE2, 0xDD,
0x6D, 0x8B, 0xC4, 0x87,
0x0B, 0x5D, 0x5B, 0x03,
0xFF, 0xC3, 0x44, 0xBC,
0xF4, 0x42, 0xE2, 0xDD,
0x6D, 0x8B, 0xC4, 0x87,
0x0B, 0x5D, 0x5B, 0x03},
48, 1, NVME_HMAC_ALG_SHA2_384,
"nqn.psk-test-host", "nqn.psk-test-subsys",
"NVMe1R02 nqn.psk-test-host nqn.psk-test-subsys J6B5sIVRCNLtZutDfmNnfPeqOFbnewwc8KEkhcOcO0dAWfdJYe/DrMyIC7znu00M" },

Check failure on line 140 in test/psk.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 126 exceeds 100 columns

Check failure on line 140 in test/psk.c

View workflow job for this annotation

GitHub Actions / checkpatch review 

WARNING: line length of 126 exceeds 100 columns
};
#else
static struct test_data_identity test_data_identity_compat[] = {
{ { 0x55, 0x12, 0xDB, 0xB6,
0x73, 0x7D, 0x01, 0x06,
Expand Down Expand Up @@ -127,6 +168,7 @@
"nqn.psk-test-host", "nqn.psk-test-subsys",
"NVMe1R02 nqn.psk-test-host nqn.psk-test-subsys RsKmYJ3nAn1ApjjMloJFbAkLPivONDAX/xW327YBUsn2eGShXSjCZvBaOxscLqmz" },
};
#endif

static void check_str(const char *exp, const char *res)
{
Expand Down
Loading