Commit 197ff0c9 authored by Gil Bregman's avatar Gil Bregman Committed by Jim Harris
Browse files

nvme: Do not use NULL salt in OpenSSL for TLS-PSK. 



It seems that there is a change in OpenSSL which now fails
EVP_PKEY_CTX_set1_hkdf_salt() when a NULL salt is passed. Passing
an empty string seems to fix it.

Change-Id: I5116fc42d6560f4947177ff21fb6baa80b6d0040
Signed-off-by: default avatarGil Bregman <gbregman@il.ibm.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26169


Reviewed-by: default avatarKonrad Sztyber <ksztyber@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
parent d528e1a6

include/spdk_internal/nvme_tcp.h

+2 −2
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ nvme_tcp_derive_retained_psk(const uint8_t *psk_in, uint64_t psk_in_size, const 
		rc = -ENOBUFS;

		goto end;

	}

	if (EVP_PKEY_CTX_set1_hkdf_salt(ctx, NULL, 0) != 1) {

	if (EVP_PKEY_CTX_set1_hkdf_salt(ctx, "", 0) != 1) {

		SPDK_ERRLOG("Unable to set salt for HKDF!\n");

		rc = -EINVAL;

		goto end;
@@ -776,7 +776,7 @@ nvme_tcp_derive_tls_psk(const uint8_t *psk_in, uint64_t psk_in_size, const char 
		rc = -ENOBUFS;

		goto end;

	}

	if (EVP_PKEY_CTX_set1_hkdf_salt(ctx, NULL, 0) != 1) {

	if (EVP_PKEY_CTX_set1_hkdf_salt(ctx, "", 0) != 1) {

		SPDK_ERRLOG("Unable to set salt for HKDF!\n");

		rc = -EINVAL;

		goto end;