From owner-svn-src-head@freebsd.org Wed Apr 15 18:24:30 2020 Return-Path: Delivered-To: svn-src-head@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 D1B5A2BDE84; Wed, 15 Apr 2020 18:24:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 492W3L59JHz4BtC; Wed, 15 Apr 2020 18:24:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-164.local (unknown [IPv6:2601:648:8881:1e90:210f:6a88:db52:ac0b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 28D0018C07; Wed, 15 Apr 2020 18:24:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r359945 - in head: lib/geom/eli sys/geom/eli To: Kyle Evans Cc: src-committers , svn-src-all , svn-src-head References: <202004150014.03F0EpQt039761@repo.freebsd.org> From: John Baldwin Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: Date: Wed, 15 Apr 2020 11:24:28 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2020 18:24:30 -0000 On 4/15/20 10:55 AM, Kyle Evans wrote: > On Tue, Apr 14, 2020 at 7:15 PM John Baldwin wrote: >> >> Author: jhb >> Date: Wed Apr 15 00:14:50 2020 >> New Revision: 359945 >> URL: https://svnweb.freebsd.org/changeset/base/359945 >> >> Log: >> Remove support for geli(4) algorithms deprecated in r348206. >> >> This removes support for reading and writing volumes using the >> following algorithms: >> >> - Triple DES >> - Blowfish >> - MD5 HMAC integrity >> >> In addition, this commit adds an explicit whitelist of supported >> algorithms to give a better error message when an invalid or >> unsupported algorithm is used by an existing volume. >> >> Reviewed by: cem >> Sponsored by: Chelsio Communications >> Differential Revision: https://reviews.freebsd.org/D24343 >> >> Modified: >> head/lib/geom/eli/geli.8 >> head/lib/geom/eli/geom_eli.c >> head/sys/geom/eli/g_eli.c >> head/sys/geom/eli/g_eli.h >> head/sys/geom/eli/g_eli_crypto.c >> head/sys/geom/eli/g_eli_ctl.c >> >> [... snip ...] >> @@ -522,6 +506,36 @@ eli_metadata_dump(const struct g_eli_metadata *md) >> printf(" MD5 hash: %s\n", str); >> } >> >> +#ifdef _KERNEL >> +static bool >> +eli_metadata_crypto_supported(const struct g_eli_metadata *md) >> +{ >> + >> + switch (md->md_ealgo) { >> + case CRYPTO_NULL_CBC: >> + case CRYPTO_AES_CBC: >> + case CRYPTO_CAMELLIA_CBC: >> + case CRYPTO_AES_XTS: >> + break; >> + default: >> + return (false); >> + } >> + if (md->md_flags & G_ELI_FLAG_AUTH) { >> + switch (md->md_aalgo) { >> + case CRYPTO_SHA1_HMAC: >> + case CRYPTO_RIPEMD160_HMAC: >> + case CRYPTO_SHA2_256_HMAC: >> + case CRYPTO_SHA2_384_HMAC: >> + case CRYPTO_SHA2_512_HMAC: >> + break; >> + default: >> + return (false); >> + } >> + } >> + return (true); >> +} >> +#endif >> + >> static __inline u_int >> g_eli_keylen(u_int algo, u_int keylen) >> { >> [... snip ...] > > eli_metadata_crypto_supported is defined here, but unused in most > compilation units that include g_eli.h, resulting in some amount of > noise: > > In file included from /usr/src/sys/geom/eli/g_eli_crypto.c:46: > /usr/src/sys/geom/eli/g_eli.h:511:1: warning: unused function > 'eli_metadata_crypto_supported' [-Wunused-function] > eli_metadata_crypto_supported(const struct g_eli_metadata *md) > > (repeat for g_eli_hmac.c, g_eli_integrity.c, g_eli_key.c, > g_eli_key_cache.c, g_eli_privacy.c, pkcs5v2.c) > > Given that it's probably not in danger of silently going away and not > getting removed, any objection to marking it __unused to squelch the warnings? Oh, rather, I should mark it __inline. There are several other functions in g_eli.h that are similarly not always used, but they are marked __inline which is how they avoid the warning. -- John Baldwin