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=-7.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 D3762C433E0 for ; Thu, 16 Jul 2020 13:41:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AD61820760 for ; Thu, 16 Jul 2020 13:41:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728087AbgGPNlk (ORCPT ); Thu, 16 Jul 2020 09:41:40 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:56750 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725975AbgGPNlj (ORCPT ); Thu, 16 Jul 2020 09:41:39 -0400 Received: from mail-qv1-f72.google.com ([209.85.219.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jw48m-0001hU-5S for linux-crypto@vger.kernel.org; Thu, 16 Jul 2020 13:41:36 +0000 Received: by mail-qv1-f72.google.com with SMTP id ed5so3440949qvb.9 for ; Thu, 16 Jul 2020 06:41:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=QVlI3rci+r/xlese2y87UcmmkhlpeVmDkSEy6RblO0s=; b=SF4JeF1KVrnB39i9j+ORso+Jn0VavJK/REbcECUsHLa+3U8aIml1v3XWkNm+S2vJCZ K1zc6wsuL/q2QeJVl9eMtq5syl7gtTbPw6ONvDtI66t3hMlz25q915bG/DV2KNNA0Ki+ 65tfjgd3jMvcrokIKZ9VX/hhucy6JlhDoZGoPuARrLtoXbGTGujy4daEQN801up+9AeI Wb8Q2PsTLXL4DxNpcTj3KM43oeeIuS4xuFfQtIyBLp3cfc9UREeokzG+szBwL0SV90xw VlUV5ez/PSW4pV3xqwkPlG7FwLKrHTkg9eREEe5D9ODPpE01jQx0i6/8V+Nxu4eABsbS Vq7g== X-Gm-Message-State: AOAM5328TCvS3tvxYvVQfjWEWRqc6yHSSwu34vdFdpJ0S2/+2YBm2hvw y8qaUA2IEkTevd/UqRSErRjtAejGPuLpHz5kIxMYVt5H3MrucDa6KyCGIturgD7cvQDeF03+k02 Lb+af+LEYHcM/OQu+zVi+Nf6aGhKLbdOayBWKFfWL X-Received: by 2002:ae9:f119:: with SMTP id k25mr4064282qkg.388.1594906895042; Thu, 16 Jul 2020 06:41:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWKdwwCpMVphZyVxaQYWoDM6dmp3alWvdX091RtYssfr/uKJ/Vrxr3yRP8Qg9hHwSOqDJwgQ== X-Received: by 2002:ae9:f119:: with SMTP id k25mr4064227qkg.388.1594906894406; Thu, 16 Jul 2020 06:41:34 -0700 (PDT) Received: from valinor ([2804:14c:4e6:18:554f:9c7b:d140:fe0d]) by smtp.gmail.com with ESMTPSA id d53sm7662283qtc.47.2020.07.16.06.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2020 06:41:32 -0700 (PDT) Date: Thu, 16 Jul 2020 10:41:28 -0300 From: Marcelo Henrique Cerri To: Ard Biesheuvel Cc: Herbert Xu , Stephan =?utf-8?Q?M=C3=BCller?= , Linux Crypto Mailing List , Tianjia Zhang , Ard Biesheuvel , nhorman@redhat.com, simo@redhat.com Subject: Re: [PATCH v2 2/5] lib/mpi: Add mpi_sub_ui() Message-ID: <20200716134128.7br6npd2nsck33qm@valinor> References: <2543601.mvXUDI8C0e@positron.chronox.de> <5722559.lOV4Wx5bFT@positron.chronox.de> <4650810.GXAFRqVoOG@positron.chronox.de> <20200716073032.GA28173@gondor.apana.org.au> <20200716125002.oxr7yyeehz74mgq4@valinor> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="a5wlw46pxgf7axvk" Content-Disposition: inline In-Reply-To: Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org --a5wlw46pxgf7axvk Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 16, 2020 at 04:09:39PM +0300, Ard Biesheuvel wrote: > On Thu, 16 Jul 2020 at 15:50, Marcelo Henrique Cerri > wrote: > > > > No. The code is really based on Gnu MP. I used the header from > > lib/mpi/mpi-pow.c as reference and that's source of the mention to > > GnuPG that went unnoticed by me. > > >=20 > So where did the file lib/mpi/mpi-sub-ui.c come from? From GnuPG or > from GnuMP? Did you modify the license statement? Because as proposed, > this patch clearly is not acceptable from GPL compliance point of > view. Sorry for the confusion. The code is from Gnu MP (not GnuPG). Gnu MP is distributed under either LGPLv3 or later or GPLv2 or later (check their license statement on the aors_ui.h file below). For mpi-sub-ui.h I added a SPDX identifier for GPLv2 or later and I kept the FSF copyright line. I also used the header from mpi-powm.c as a reference basically to inform the code was changed from its original form. Here lies my mistake, I didn't notice that part was referring to GnuPG instead of Gnu MP. So mpi-sub-ui.h header was actually intended to be: // SPDX-License-Identifier: GPL-2.0-or-later /* mpi-sub-ui.c - MPI functions * Copyright 1991, 1993, 1994, 1996, 1999-2002, 2004, 2012, 2013, = 2015 * Free Software Foundation, Inc. * * This file is part of Gnu MP. * * Note: This code is heavily based on the GNU MP Library. * Actually it's the same code with only minor changes in the * way the data is stored; this is to support the abstraction * of an optional secure memory allocation which may be used * to avoid revealing of sensitive data due to paging etc. * The GNU MP Library itself is published under the LGPL; * however I decided to publish this code under the plain GPL. */ Or maybe instead of "This file is part of Gnu MP.", "This file is based on Gnu MP" might be more appropriate. Do you have any license concerns considering this updated header? >=20 >=20 >=20 > > You can find the original Gnu MP source that I used as reference in > > the file gmp-6.2.0/mpz/aors_ui.h from: > > > > https://gmplib.org/download/gmp/gmp-6.2.0.tar.lz > > > > I'm pasting the contents of gmp-6.2.0/mpz/aors_ui.h below for > > reference. Do you think we should use or adapt the original header > > instead? > > > > That said, assuming the patch set submitted by Tianjia is updated to > > ensure that mpi_sub_ui() and other functions are returning allocation > > errors, we could drop this patch in favor of that patch set that is > > more extensive and also provides an implementation to mpi_sub_ui(). > > > > > > --->8--- > > /* mpz_add_ui, mpz_sub_ui -- Add or subtract an mpz_t and an unsigned > > one-word integer. > > > > Copyright 1991, 1993, 1994, 1996, 1999-2002, 2004, 2012, 2013, 2015 > > Free Software Foundation, Inc. > > Gnu MP license -. V > > This file is part of the GNU MP Library. > > > > The GNU MP Library is free software; you can redistribute it and/or mod= ify > > it under the terms of either: > > > > * the GNU Lesser General Public License as published by the Free > > Software Foundation; either version 3 of the License, or (at your > > option) any later version. > > > > or > > > > * the GNU General Public License as published by the Free Software > > Foundation; either version 2 of the License, or (at your option) any > > later version. > > > > or both in parallel, as here. > > > > The GNU MP Library is distributed in the hope that it will be useful, b= ut > > WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABIL= ITY > > or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License > > for more details. > > > > You should have received copies of the GNU General Public License and t= he > > GNU Lesser General Public License along with the GNU MP Library. If no= t, > > see https://www.gnu.org/licenses/. */ > > > > #include "gmp-impl.h" > > > > > > #ifdef OPERATION_add_ui > > #define FUNCTION mpz_add_ui > > #define FUNCTION2 mpz_add > > #define VARIATION_CMP >=3D > > #define VARIATION_NEG > > #define VARIATION_UNNEG - > > #endif > > > > #ifdef OPERATION_sub_ui > > #define FUNCTION mpz_sub_ui > > #define FUNCTION2 mpz_sub > > #define VARIATION_CMP < > > #define VARIATION_NEG - > > #define VARIATION_UNNEG > > #endif > > > > #ifndef FUNCTION > > Error, need OPERATION_add_ui or OPERATION_sub_ui > > #endif > > > > > > void > > FUNCTION (mpz_ptr w, mpz_srcptr u, unsigned long int vval) > > { > > mp_srcptr up; > > mp_ptr wp; > > mp_size_t usize, wsize; > > mp_size_t abs_usize; > > > > #if BITS_PER_ULONG > GMP_NUMB_BITS /* avoid warnings about shift amoun= t */ > > if (vval > GMP_NUMB_MAX) > > { > > mpz_t v; > > mp_limb_t vl[2]; > > PTR(v) =3D vl; > > vl[0] =3D vval & GMP_NUMB_MASK; > > vl[1] =3D vval >> GMP_NUMB_BITS; > > SIZ(v) =3D 2; > > FUNCTION2 (w, u, v); > > return; > > } > > #endif > > > > usize =3D SIZ (u); > > if (usize =3D=3D 0) > > { > > MPZ_NEWALLOC (w, 1)[0] =3D vval; > > SIZ (w) =3D VARIATION_NEG (vval !=3D 0); > > return; > > } > > > > abs_usize =3D ABS (usize); > > > > /* If not space for W (and possible carry), increase space. */ > > wp =3D MPZ_REALLOC (w, abs_usize + 1); > > > > /* These must be after realloc (U may be the same as W). */ > > up =3D PTR (u); > > > > if (usize VARIATION_CMP 0) > > { > > mp_limb_t cy; > > cy =3D mpn_add_1 (wp, up, abs_usize, (mp_limb_t) vval); > > wp[abs_usize] =3D cy; > > wsize =3D VARIATION_NEG (abs_usize + cy); > > } > > else > > { > > /* The signs are different. Need exact comparison to determine > > which operand to subtract from which. */ > > if (abs_usize =3D=3D 1 && up[0] < vval) > > { > > wp[0] =3D vval - up[0]; > > wsize =3D VARIATION_NEG 1; > > } > > else > > { > > mpn_sub_1 (wp, up, abs_usize, (mp_limb_t) vval); > > /* Size can decrease with at most one limb. */ > > wsize =3D VARIATION_UNNEG (abs_usize - (wp[abs_usize - 1] =3D= =3D 0)); > > } > > } > > > > SIZ (w) =3D wsize; > > } > > --->*--- > > > > > > > > On Thu, Jul 16, 2020 at 11:41:17AM +0300, Ard Biesheuvel wrote: > > > On Thu, 16 Jul 2020 at 10:30, Herbert Xu wrote: > > > > > > > > On Sun, Jul 12, 2020 at 06:39:54PM +0200, Stephan M=FCller wrote: > > > > > > > > > > diff --git a/lib/mpi/mpi-sub-ui.c b/lib/mpi/mpi-sub-ui.c > > > > > new file mode 100644 > > > > > index 000000000000..fa6b085bac36 > > > > > --- /dev/null > > > > > +++ b/lib/mpi/mpi-sub-ui.c > > > > > @@ -0,0 +1,60 @@ > > > > > +// SPDX-License-Identifier: GPL-2.0-or-later > > > > > +/* mpi-sub-ui.c - MPI functions > > > > > + * Copyright 1991, 1993, 1994, 1996, 1999-2002, 2004, 2012,= 2013, 2015 > > > > > + * Free Software Foundation, Inc. > > > > > + * > > > > > + * This file is part of GnuPG. > > > > > + * > > > > > + * Note: This code is heavily based on the GNU MP Library. > > > > > + * Actually it's the same code with only minor changes in the > > > > > + * way the data is stored; this is to support the abstraction > > > > > + * of an optional secure memory allocation which may be used > > > > > + * to avoid revealing of sensitive data due to paging etc. > > > > > + * The GNU MP Library itself is published under the LGPL; > > > > > + * however I decided to publish this code under the plain GPL. > > > > > + */ > > > > > > > > Hmm, you said that this code is from GNU MP. But this notice clear= ly > > > > says that it's part of GnuPG and is under GPL. Though it doesn't > > > > clarify what version of GPL it is. Can you please clarify this with > > > > the author? > > > > > > > > > > GnuPG was relicensed under GPLv3 in ~2007, IIRC, so given the > > > copyright years and the explicit statements that the file is part of > > > GnuPG and not under the original LGPL license, there is no way we can > > > take this code under the kernel's GPLv2 license. > > > > -- > > Regards, > > Marcelo > > --=20 Regards, Marcelo --a5wlw46pxgf7axvk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEExJjLjAfVL0XbfEr56e82LoessAkFAl8QWQgACgkQ6e82Loes sAlaSQwAgbpRPv2SfGQKazNjbtJYQCViDbsPFeaeBqOAvyR2AiG256EkK0Xh1hh3 0mX9WENBXWMe+Tubq3I2INRfx4qVOeBe5bMtHM+/V5r0ocvzh8/ABZUQg0YlpDL2 yMWUj8cPlGTSpVIhaCTV1EmOcEtdLdXgjjjVYBgSzv6UsdOtWIKc2kXF86QbKi9I toDbAfRRo1uQj8NMDF45b7UIy6FemOJF0lkZHxtI759S1G/D6udS6qzK/ZRf6L/U KopvJcW2nUAL+94Efb5wnRryMo3us+Afvxu5pRcNEyVudQX9b3HYuaxB979mQ7H1 kWoBOIXOpync4P+pzwZbuq8aA9LgUftBx/aehI5raiUGUrYqlzqHX76vga43a6km repD1e+VqOWEPAC4MSoLOMQbJ2yKmXMQ6CkKSb+sB5IIH6znEBs7vpv84yuDmBb0 NGL2dlKxSMfLAhipxx4f9/x0nvYWnwY+ZtkM//0Jfg0DmwjIqXXNPOAXRG2+yu27 2nTP7QY5 =PxMO -----END PGP SIGNATURE----- --a5wlw46pxgf7axvk--