From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_NEOMUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53E2DC282D7 for ; Wed, 30 Jan 2019 23:21:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F20FB20881 for ; Wed, 30 Jan 2019 23:21:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="F7GB3wZi"; dkim=pass (1024-bit key) header.d=fb.onmicrosoft.com header.i=@fb.onmicrosoft.com header.b="DQwnfHpr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726967AbfA3XVK (ORCPT ); Wed, 30 Jan 2019 18:21:10 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:47642 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725613AbfA3XVK (ORCPT ); Wed, 30 Jan 2019 18:21:10 -0500 Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x0ULw6ZM018459; Wed, 30 Jan 2019 14:00:14 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : content-type : content-id : content-transfer-encoding : mime-version; s=facebook; bh=KI/nx3GuYibUg+OebmT5ttBmTA3TlbuCKVL9bunvWsE=; b=F7GB3wZiux/v8hu7wFY2ZQ9E2FKozPDvT94E1oKZQ4sPZQLO2J+FSJi/p0q5DWW3Dn7X O2dn+s+Tz/lU/HmUu9+jx1D9wWt2sCcOeO6JZv73K9bfdb5ZBJqdFdYfa6I4lto1nI3a khC+fdMrTfCU6D/+UNvWudZTiYG57LZLCKw= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2qbm08g2a6-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 30 Jan 2019 14:00:14 -0800 Received: from prn-hub05.TheFacebook.com (2620:10d:c081:35::129) by prn-hub05.TheFacebook.com (2620:10d:c081:35::129) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.1.1531.3; Wed, 30 Jan 2019 13:58:43 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.1.1531.3 via Frontend Transport; Wed, 30 Jan 2019 13:58:43 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector1-fb-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KI/nx3GuYibUg+OebmT5ttBmTA3TlbuCKVL9bunvWsE=; b=DQwnfHpr1QRkbIWZ9yV20npD+DPI0ywfDqEcN2FRWRUUfrxoOWyfaZ3MPZuYe4GB0AS4/KLgpITHPBstuXY3/ASegJB8W689fzogxd8veTmHqcKek/ZPeyXo3cAdJoDPbs7sveij0CBSVFZy8lyFimeleqxSHdSecaf1BDjJ8v0= Received: from MWHPR15MB1134.namprd15.prod.outlook.com (10.175.2.12) by MWHPR15MB1695.namprd15.prod.outlook.com (10.175.142.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Wed, 30 Jan 2019 21:58:38 +0000 Received: from MWHPR15MB1134.namprd15.prod.outlook.com ([fe80::93f:b6fe:a6e9:80dc]) by MWHPR15MB1134.namprd15.prod.outlook.com ([fe80::93f:b6fe:a6e9:80dc%8]) with mapi id 15.20.1580.017; Wed, 30 Jan 2019 21:58:38 +0000 From: Dave Watson To: "netdev@vger.kernel.org" , Dave Miller CC: Vakul Garg , Boris Pismenny , Aviad Yehezkel , John Fastabend , Daniel Borkmann Subject: [PATCH net-next v2 5/5] net: tls: Add tests for TLS 1.3 Thread-Topic: [PATCH net-next v2 5/5] net: tls: Add tests for TLS 1.3 Thread-Index: AQHUuOb0juta/9oi+kysGggq98oYdQ== Date: Wed, 30 Jan 2019 21:58:37 +0000 Message-ID: <20190130215836.5dsxf332uplhs47f@davejwatson-mba.local> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: NeoMutt/20180716 x-clientproxiedby: MWHPR18CA0046.namprd18.prod.outlook.com (2603:10b6:320:31::32) To MWHPR15MB1134.namprd15.prod.outlook.com (2603:10b6:320:22::12) x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [2620:10d:c090:180::1:7423] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MWHPR15MB1695;20:dExUjph8cvZkhwvISXJiIpTqaipD2ujk7NiHQ88m5bwqfHLqWEYCbTyElgNrO70uDnHUSqmtfXlU6nimp6JfMKhBoKBepihCZNR5qUyv2YHeQj7abrSdmRhWaXA6qK0ruqAdLwAJ3rHlTRgKCGrE5OiXEN3oD3Rx0dB6E6VMrwU= x-ms-office365-filtering-correlation-id: 20914092-94c6-4d0d-5b4b-08d686fe1676 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020);SRVR:MWHPR15MB1695; x-ms-traffictypediagnostic: MWHPR15MB1695: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(396003)(39860400002)(376002)(136003)(346002)(189003)(199004)(386003)(2501003)(25786009)(68736007)(81156014)(6512007)(4326008)(1076003)(53936002)(33896004)(186003)(2906002)(52116002)(6486002)(256004)(14444005)(98436002)(6116002)(6506007)(102836004)(6436002)(39060400002)(7736002)(486006)(8676002)(14454004)(9686003)(105586002)(71200400001)(71190400001)(54906003)(316002)(476003)(86362001)(110136005)(58126008)(97736004)(81166006)(8936002)(305945005)(106356001)(99286004)(46003)(478600001);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHPR15MB1695;H:MWHPR15MB1134.namprd15.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: fb.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: qIgurEvlTQGoBwHczE8ZdaRyIvhrGKhq5TBCW+/g7v/O3C6BqWyPTJ2HpDtwf8KIdFexilky5pzzQ2IcCoLaHFNwd9n8dVW7MbGqoOTSAVHX54A24g9GaOCSjLLSUSm4Mv5m8h/B7/pI0ZApfMPbaziUbfYM9T1iIRmQJByfQ2kuz/hPQUrqpCCwlNQlFtwPR8APAZkXC0qWuyx8YBKUU5cbm9pXNePncOnt5faOwHTYcImfRPQ4w2jDHcDVK0k0rvjMVQydHJehFemAFuZKYzSldfLRHg/1fErA4Z3hPg5PDBOTIxE8S7gNWoqpQltqnBqiUmhUuHMJTd6nqkLT1qlSuCnbZOV4x7SaGCNRaHwxHQhuUdeVID6+g93PaCfzF617Du93gFE1jmmSEg9z2pnYlyTuK6OTimRlT/siapQ= Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 20914092-94c6-4d0d-5b4b-08d686fe1676 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 21:58:37.5343 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR15MB1695 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-30_16:,, signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Change most tests to TLS 1.3, while adding tests for previous TLS 1.2 behavior. Signed-off-by: Dave Watson --- tools/testing/selftests/net/tls.c | 76 ++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/ne= t/tls.c index c356f481de79..4ac50ccb3272 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -42,7 +42,7 @@ FIXTURE_SETUP(tls) len =3D sizeof(addr); =20 memset(&tls12, 0, sizeof(tls12)); - tls12.info.version =3D TLS_1_2_VERSION; + tls12.info.version =3D TLS_1_3_VERSION; tls12.info.cipher_type =3D TLS_CIPHER_AES_GCM_128; =20 addr.sin_family =3D AF_INET; @@ -825,4 +825,78 @@ TEST(keysizes) { close(cfd); } =20 +TEST(tls12) { + int fd, cfd; + bool notls; + + struct tls12_crypto_info_aes_gcm_128 tls12; + struct sockaddr_in addr; + socklen_t len; + int sfd, ret; + + notls =3D false; + len =3D sizeof(addr); + + memset(&tls12, 0, sizeof(tls12)); + tls12.info.version =3D TLS_1_2_VERSION; + tls12.info.cipher_type =3D TLS_CIPHER_AES_GCM_128; + + addr.sin_family =3D AF_INET; + addr.sin_addr.s_addr =3D htonl(INADDR_ANY); + addr.sin_port =3D 0; + + fd =3D socket(AF_INET, SOCK_STREAM, 0); + sfd =3D socket(AF_INET, SOCK_STREAM, 0); + + ret =3D bind(sfd, &addr, sizeof(addr)); + ASSERT_EQ(ret, 0); + ret =3D listen(sfd, 10); + ASSERT_EQ(ret, 0); + + ret =3D getsockname(sfd, &addr, &len); + ASSERT_EQ(ret, 0); + + ret =3D connect(fd, &addr, sizeof(addr)); + ASSERT_EQ(ret, 0); + + ret =3D setsockopt(fd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls")); + if (ret !=3D 0) { + notls =3D true; + printf("Failure setting TCP_ULP, testing without tls\n"); + } + + if (!notls) { + ret =3D setsockopt(fd, SOL_TLS, TLS_TX, &tls12, + sizeof(tls12)); + ASSERT_EQ(ret, 0); + } + + cfd =3D accept(sfd, &addr, &len); + ASSERT_GE(cfd, 0); + + if (!notls) { + ret =3D setsockopt(cfd, IPPROTO_TCP, TCP_ULP, "tls", + sizeof("tls")); + ASSERT_EQ(ret, 0); + + ret =3D setsockopt(cfd, SOL_TLS, TLS_RX, &tls12, + sizeof(tls12)); + ASSERT_EQ(ret, 0); + } + + close(sfd); + + char const *test_str =3D "test_read"; + int send_len =3D 10; + char buf[10]; + + send_len =3D strlen(test_str) + 1; + EXPECT_EQ(send(fd, test_str, send_len, 0), send_len); + EXPECT_NE(recv(cfd, buf, send_len, 0), -1); + EXPECT_EQ(memcmp(buf, test_str, send_len), 0); + + close(fd); + close(cfd); +} + TEST_HARNESS_MAIN --=20 2.17.1