From nobody Tue Jun 06 10:19:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qb60H5MQTz4Zrsc; Tue, 6 Jun 2023 10:19:27 +0000 (UTC) (envelope-from markm@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qb60H4d3zz4K0q; Tue, 6 Jun 2023 10:19:27 +0000 (UTC) (envelope-from markm@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686046767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6zcCTVRN5K8bpbsy1RnDB/geLJ9YC5tVb+jGgdUAjm0=; b=n9jJFfIH7vc94vYB53HvwmjhOe9IrOoVfgfIkb3nqVxGSGZHo507SivYRjf6O3DNq248PL MySZCjcKDXBsVlijOJEQUTm5xomF9z0rZ/3Eax90cG+76MZ6P1VWZndD8mGzgsq5JD9DL0 Y04+DHbSa+7dbtRHxfS2TxKvzSdMholXgwA4AEfeFkEQhWmVEwaA0XQHeEFsRYNV4UNfK0 zPELAlFC8ibL7KZuUwr8LgwGEigOhav1v+1nHbmhHv9ZCugw65p0DA9Eg5gcjb6Y7X0+9x zcbdVxRRZGSAaIaGqX0b2Lx3CQKnrEW19jWhQm9MhWWN3IHUATnQ7MLHazV7Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686046767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6zcCTVRN5K8bpbsy1RnDB/geLJ9YC5tVb+jGgdUAjm0=; b=we/v5DfAjWNKiDPvV6rXnZTHuW5EueYy4MOyDIy9VcYqdcOdbX39yl+b9TdHcRSH6XSXth QJQcjvR8esosSMyBC7U7KZCT+rz2wHTurR6pE9mnpdb5RNV3sbCXrs3qq9TwR46Hv2hddu gAFHO/Zbv7XMOQIEGFOXG7JJccOBU63fMqw4eJYehIOx/T19Xq/Ttj39Mau+KiaJPC+02q SyRq6cJEihJBzZMIQRFQAZp0DHZQX42nJNPBRVf8lnN8+lguBEcb2bLU3yLjq/ueG6Llee ZToWMkOZe2NzDFPm62ML2tusn9cUiATU6fHdFYpO3ZkKKBinE0BtFJlBZRZ+4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686046767; a=rsa-sha256; cv=none; b=p812SU/thDYOHSAm/FAGRp+/Fd5IQJTX8yCLXvypM5akZ9nTy3tyehRzkseT1u8mOZ59Ta QAOBFPzSRj4QMz+vdTDbfKLNfwcoI1+gAtcEXx5LS8abMVk2bLTxx65QANrSP032eEtk+D oaKOPMJhTivBX97km5UypakOa9Q8uPwgnyX0YVOqwwr85Iz8Y8e5YTEQdc34SLBeP10eyj 0Go54ONj/UAT83uzbqlS2ykOirp/DzvgN6vvRqREbQwxgQkAcL6ygBHqCRxOoZ/DR8IUok OSB9cGB7cIu67YkJyvbGqokYmJsOu5iJP61tYDdK0tjrcv2QXLTJCmNN8YYUvQ== Received: from smtpclient.apple (unknown [IPv6:2a02:8011:300b:42:3df6:911e:8c5f:d52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: markm) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Qb60G75Qvzh04; Tue, 6 Jun 2023 10:19:26 +0000 (UTC) (envelope-from markm@FreeBSD.org) Content-Type: multipart/signed; boundary="Apple-Mail=_07A87620-5DF6-48E5-A683-167AF465984F"; protocol="application/pgp-signature"; micalg=pgp-sha512 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 9d5a47e13c17 - main - ossl: Provide a fallback definition of __uint128_t when needed From: Mark Murray In-Reply-To: <202306041639.354Gdu2O043884@gitrepo.freebsd.org> Date: Tue, 6 Jun 2023 11:19:11 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: <0D94F493-2C78-4604-A6B4-422741929862@FreeBSD.org> References: <202306041639.354Gdu2O043884@gitrepo.freebsd.org> To: Mark Johnston X-Mailer: Apple Mail (2.3731.600.7) X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail=_07A87620-5DF6-48E5-A683-167AF465984F Content-Type: multipart/alternative; boundary="Apple-Mail=_D2FA5B17-A905-46C3-A53A-3D16FA44BD37" --Apple-Mail=_D2FA5B17-A905-46C3-A53A-3D16FA44BD37 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Hi I see some duplication here; in sys/dev/random/uint128.h I solved the = same problem, except I needed some very basic functionality as well. = Maybe we combine these two somehow? M -- Mark R V Murray > On 4 Jun 2023, at 17:39, Mark Johnston wrote: >=20 > The branch main has been updated by markj: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D9d5a47e13c175adf7486956847c3d060= fe059f2c >=20 > commit 9d5a47e13c175adf7486956847c3d060fe059f2c > Author: Mark Johnston > AuthorDate: 2023-06-02 22:18:05 +0000 > Commit: Mark Johnston > CommitDate: 2023-06-04 16:39:44 +0000 >=20 > ossl: Provide a fallback definition of __uint128_t when needed >=20 > This is required on i386. The patch has no functional change, = since > AES-GCM isn't implemented for that platform. >=20 > Fixes: 9a3444d91c70 ("ossl: Add a VAES-based AES-GCM = implementation for amd64") > Reported by: Jenkins > --- > sys/crypto/openssl/ossl_aes_gcm.h | 4 ++++ > 1 file changed, 4 insertions(+) >=20 > diff --git a/sys/crypto/openssl/ossl_aes_gcm.h = b/sys/crypto/openssl/ossl_aes_gcm.h > index 9ce8ee193483..cd0c1e324354 100644 > --- a/sys/crypto/openssl/ossl_aes_gcm.h > +++ b/sys/crypto/openssl/ossl_aes_gcm.h > @@ -49,6 +49,10 @@ struct ossl_aes_gcm_ops { > size_t len); > }; >=20 > +#ifndef __SIZEOF_INT128__ > +typedef struct { uint64_t v[2]; } __uint128_t; > +#endif > + > struct ossl_gcm_context { > struct { > union { >=20 -- Mark R V Murray --Apple-Mail=_D2FA5B17-A905-46C3-A53A-3D16FA44BD37 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii Hi

I see some duplication here; = in sys/dev/random/uint128.h I solved the same problem, except I needed = some very basic functionality as well. Maybe we combine these two = somehow?

M
-- 
Mark R V = Murray



On 4 Jun 2023, at 17:39, = Mark Johnston <markj@FreeBSD.org> wrote:

The branch main has been = updated by markj:

URL: = https://cgit.FreeBSD.org/src/commit/?id=3D9d5a47e13c175adf7486956847c3d060= fe059f2c

commit = 9d5a47e13c175adf7486956847c3d060fe059f2c
Author: =     Mark Johnston = <markj@FreeBSD.org>
AuthorDate: 2023-06-02 22:18:05 = +0000
Commit:     Mark Johnston = <markj@FreeBSD.org>
CommitDate: 2023-06-04 16:39:44 = +0000

   ossl: Provide a fallback definition of = __uint128_t when needed

   This is required on = i386.  The patch has no functional change, since
=    AES-GCM isn't implemented for that platform.

=    Fixes:  9a3444d91c70 ("ossl: Add a VAES-based = AES-GCM implementation for amd64")
   Reported by: =    Jenkins
---
sys/crypto/openssl/ossl_aes_gcm.h | = 4 ++++
1 file changed, 4 insertions(+)

diff --git = a/sys/crypto/openssl/ossl_aes_gcm.h = b/sys/crypto/openssl/ossl_aes_gcm.h
index 9ce8ee193483..cd0c1e324354 = 100644
--- a/sys/crypto/openssl/ossl_aes_gcm.h
+++ = b/sys/crypto/openssl/ossl_aes_gcm.h
@@ -49,6 +49,10 @@ struct = ossl_aes_gcm_ops {
   size_t = len);
};

+#ifndef __SIZEOF_INT128__
+typedef struct { = uint64_t v[2]; } __uint128_t;
+#endif
+
struct = ossl_gcm_context {
struct {
union = {




-- 
Mark R V Murray

= --Apple-Mail=_D2FA5B17-A905-46C3-A53A-3D16FA44BD37-- --Apple-Mail=_07A87620-5DF6-48E5-A683-167AF465984F Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 Comment: GPGTools - http://gpgtools.org iQEzBAEBCgAdFiEEyzPHvybPbOpU9MCxQlsJDh9CUqAFAmR/CB8ACgkQQlsJDh9C UqBl7gf/Z4/jvJuJ5NKDTmYCotcZU5iwP8+bTkj4FmOnC75+UZZtIz7JbtzTIH6u qzGWtqe3Mej3xC5rRa0Kyqrr3x9IiPqsbf3eo77z+d4xhP0v9E5INp4WLBJDTouH AkKtNW766wWO+WQQCwQu8rwWXJgBatV/x9th4M2HVz5OpfM6nLY/Bs0QSHibLmRF ca/eew3boMRtUSFCcCczAUJraTWvmaUrcOj3BKx+Zm0k2o0+bi9xm7haHl3p0On2 SAkL0noz2uXlArNixaD9NTDJZruFnQVPJL5rKyFxtL1UsDeTW6ybVUdGfMIQ4UwV gXab/9b6rwTDKHj1v62ojH8Fw4+jTw== =2XBq -----END PGP SIGNATURE----- --Apple-Mail=_07A87620-5DF6-48E5-A683-167AF465984F--