From owner-svn-src-all@freebsd.org Wed Dec 18 01:33:21 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 80B471CFC82; Wed, 18 Dec 2019 01:33:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47cyFY2qQZz40xL; Wed, 18 Dec 2019 01:33:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5C1B01ECCA; Wed, 18 Dec 2019 01:33:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBI1XLE5089238; Wed, 18 Dec 2019 01:33:21 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBI1XL47089237; Wed, 18 Dec 2019 01:33:21 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201912180133.xBI1XL47089237@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 18 Dec 2019 01:33:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355872 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 355872 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2019 01:33:21 -0000 Author: jhb Date: Wed Dec 18 01:33:20 2019 New Revision: 355872 URL: https://svnweb.freebsd.org/changeset/base/355872 Log: Add a structure for the AAD used in TLS 1.3. While here, add RFC numbers to comments about nonce and AAD data for TLS 1.2. Reviewed by: gallatin Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D22801 Modified: head/sys/sys/ktls.h Modified: head/sys/sys/ktls.h ============================================================================== --- head/sys/sys/ktls.h Wed Dec 18 01:27:49 2019 (r355871) +++ head/sys/sys/ktls.h Wed Dec 18 01:33:20 2019 (r355872) @@ -50,7 +50,7 @@ struct tls_record_layer { #define TLS_RLTYPE_APP 23 /* - * Nonce for GCM. + * Nonce for GCM for TLS 1.2 per RFC 5288. */ struct tls_nonce_data { uint8_t fixed[TLS_AEAD_GCM_LEN]; @@ -58,7 +58,7 @@ struct tls_nonce_data { } __packed; /* - * AEAD additional data format per RFC. + * AEAD additional data format for TLS 1.2 per RFC 5246. */ struct tls_aead_data { uint64_t seq; /* In network order */ @@ -66,6 +66,16 @@ struct tls_aead_data { uint8_t tls_vmajor; uint8_t tls_vminor; uint16_t tls_length; +} __packed; + +/* + * AEAD additional data format for TLS 1.3 per RFC 8446. + */ +struct tls_aead_data_13 { + uint8_t type; + uint8_t tls_vmajor; + uint8_t tls_vminor; + uint16_t tls_length; } __packed; /*