Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests/tls: fix TLS tests with CONFIG_TLS=n

Build bot reports some recent TLS tests are failing
with CONFIG_TLS=n. Correct the expected return code
and skip TLS installation if not supported.

Tested with CONFIG_TLS=n and CONFIG_TLS=m.

Reported-by: kernel test robot <rong.a.chen@intel.com>
Fixes: cf32526c8842 ("selftests/tls: add a test for ULP but no keys")
Fixes: 65d41fb317c6 ("selftests/tls: add a bidirectional test")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jakub Kicinski and committed by
David S. Miller
e29903c4 d8a1de3d

+14 -9
+14 -9
tools/testing/selftests/net/tls.c
··· 69 69 70 70 ret = setsockopt(self->fd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls")); 71 71 if (ret != 0) { 72 - ASSERT_EQ(errno, ENOTSUPP); 72 + ASSERT_EQ(errno, ENOENT); 73 73 self->notls = true; 74 74 printf("Failure setting TCP_ULP, testing without tls\n"); 75 75 return; ··· 696 696 697 697 TEST_F(tls, bidir) 698 698 { 699 - struct tls12_crypto_info_aes_gcm_128 tls12; 700 699 char const *test_str = "test_read"; 701 700 int send_len = 10; 702 701 char buf[10]; 703 702 int ret; 704 703 705 - memset(&tls12, 0, sizeof(tls12)); 706 - tls12.info.version = TLS_1_3_VERSION; 707 - tls12.info.cipher_type = TLS_CIPHER_AES_GCM_128; 704 + if (!self->notls) { 705 + struct tls12_crypto_info_aes_gcm_128 tls12; 708 706 709 - ret = setsockopt(self->fd, SOL_TLS, TLS_RX, &tls12, sizeof(tls12)); 710 - ASSERT_EQ(ret, 0); 707 + memset(&tls12, 0, sizeof(tls12)); 708 + tls12.info.version = TLS_1_3_VERSION; 709 + tls12.info.cipher_type = TLS_CIPHER_AES_GCM_128; 711 710 712 - ret = setsockopt(self->cfd, SOL_TLS, TLS_TX, &tls12, sizeof(tls12)); 713 - ASSERT_EQ(ret, 0); 711 + ret = setsockopt(self->fd, SOL_TLS, TLS_RX, &tls12, 712 + sizeof(tls12)); 713 + ASSERT_EQ(ret, 0); 714 + 715 + ret = setsockopt(self->cfd, SOL_TLS, TLS_TX, &tls12, 716 + sizeof(tls12)); 717 + ASSERT_EQ(ret, 0); 718 + } 714 719 715 720 ASSERT_EQ(strlen(test_str) + 1, send_len); 716 721