From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Fioravante Subject: Re: [PATCH 08/12] add tpmfront, tpm_tis, and tpmback drivers to mini-os Date: Fri, 05 Oct 2012 11:11:43 -0400 Message-ID: <506EF8AF.4080307@jhuapl.edu> References: <1349189903-17524-1-git-send-email-matthew.fioravante@jhuapl.edu> <1349194332.650.102.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4650819707532372201==" Return-path: In-Reply-To: <1349194332.650.102.camel@zakaz.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: "samuel.thibault@ens-lyon.org" , "xen-devel@lists.xen.org" List-Id: xen-devel@lists.xenproject.org This is a cryptographically signed message in MIME format. --===============4650819707532372201== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms060103000306010907080900" This is a cryptographically signed message in MIME format. --------------ms060103000306010907080900 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Wow for some reason I totally missed the rest of your long email response. Anyway, comments below On 10/02/2012 12:12 PM, Ian Campbell wrote: > On Tue, 2012-10-02 at 15:58 +0100, Matthew Fioravante wrote: >> diff --git a/extras/mini-os/include/tpm_tis.h b/extras/mini-os/include= /tpm_tis.h >> new file mode 100644 >> index 0000000..a076a70 >> --- /dev/null >> +++ b/extras/mini-os/include/tpm_tis.h >> @@ -0,0 +1,64 @@ >> +/* >> + * Copyright (c) 2010-2012 United States Government, as represented b= y >> + * the Secretary of Defense. All rights reserved. >> + * >> + * This program is free software; you can redistribute it and/or >> + * modify it under the terms of 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. > Sorry, but the original Linux files don't seem to use the "or (at your > option) any later version" part so I think you must not either. > >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 021= 10-1301, USA. >> + * >> + * Based upon the files: >> + * drivers/char/tpm/tpm_tis.c >> + * drivers/char/tpm/tpm.c >> + * from the Linux kernel, which are Copyright (C) 2006 IBM Corporatio= n >> + */ >> diff --git a/extras/mini-os/include/tpmback.h b/extras/mini-os/include= /tpmback.h >> new file mode 100644 >> index 0000000..4315e55 >> --- /dev/null >> +++ b/extras/mini-os/include/tpmback.h >> @@ -0,0 +1,96 @@ >> +/* >> + * Copyright (c) 2010-2012 United States Government, as represented b= y >> + * the Secretary of Defense. All rights reserved. >> + * >> + * This program is free software; you can redistribute it and/or >> + * modify it under the terms of 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. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 021= 10-1301, USA. >> + * >> + * Based upon the files: >> + * drivers/xen/tpmbk.c > Where can I find this file? I looked in upstream Linux and > linux-2.6.18-xen.hg. In the internal tree I was using which was based off of xen linux 2.6.18, it was located there. It looks the current mercurial tree its been moved to drivers/xen/tpmback.c. >> diff --git a/extras/mini-os/include/tpmfront.h b/extras/mini-os/includ= e/tpmfront.h >> new file mode 100644 >> index 0000000..7e3d357 >> --- /dev/null >> +++ b/extras/mini-os/include/tpmfront.h >> @@ -0,0 +1,97 @@ >> +/* >> + * Copyright (c) 2010-2012 United States Government, as represented b= y >> + * the Secretary of Defense. All rights reserved. >> + * >> + * This program is free software; you can redistribute it and/or >> + * modify it under the terms of 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. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 021= 10-1301, USA. >> + * >> + >> + * >> + * Based upon the files: >> + * drivers/char/tpm/tpm_vtpm.c > This one is GPLv2 only (not or later) also. > >> + * drivers/char/tpm/tpm_xen.c > This one does actually have the MIT alternative but given that you have= > combined it with the above it makes sense to omit that. > >> + * from the Linux kernel, which are Copyright (C) 2006 IBM Corporatio= n > tpm_xen.c also has "Copyright (c) 2002-2004, K A Fraser", not just IBM > and that needs to be retained I think. > >> diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os/tpm_tis.c >> new file mode 100644 >> index 0000000..d94f798 >> --- /dev/null >> +++ b/extras/mini-os/tpm_tis.c >> @@ -0,0 +1,1345 @@ >> +/* >> + * Copyright (c) 2010-2012 United States Government, as represented b= y >> + * the Secretary of Defense. All rights reserved. >> + * >> + * This program is free software; you can redistribute it and/or >> + * modify it under the terms of 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. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 021= 10-1301, USA. >> + * >> + * Based upon the files: >> + * drivers/char/tpm/tpm_tis.c >> + * drivers/char/tpm/tpm.c >> + * from the Linux kernel, which are Copyright (C) 2006 IBM Corporatio= n > You seem to have copied this 2006 date from one source and applied it t= o > all these files even though the files which they are derived from have > differing dates. > e.g. drivers/char/tpm/tpm.c says "Copyright (C) 2004 IBM Corporation" > while drivers/char/tpm/tpm_tis.c says "Copyright (C) 2005, 2006 IBM > Corporation". > > I think it is important legally to retain the precise copyright for the= > code from which you have derived. I'm afraid this is going to > re-checking against all the files you have derived from. > > You also need to retain any other copyrights, such as Keir's. > > I think this would be far less error prone if you were to copy the exac= t > bits from each file. e.g. > > * Based upon the files: > * =3D=3D=3D=3D=3D=3D=3D=3D > * drivers/char/tpm/tpm_tis.c: > * > * =3D=3D=3D=3D=3D=3D=3D > * drivers/char/tpm/tpm.c: > * > */ > > And do this for every file which from which you have derived code. > > I'm sorry this is so tedious but it is important to get things like > licensing and copyright ownership correct. I was lazy to not pay attention to this more carefully, and for that I apologize. A new patch will be coming with fixes. > >> diff --git a/extras/mini-os/tpmback.c b/extras/mini-os/tpmback.c >> new file mode 100644 >> index 0000000..03bd20c >> --- /dev/null >> +++ b/extras/mini-os/tpmback.c >> @@ -0,0 +1,1115 @@ >> +/* >> + * Copyright (c) 2010-2012 United States Government, as represented b= y >> + * the Secretary of Defense. All rights reserved. >> + * >> + * This program is free software; you can redistribute it and/or >> + * modify it under the terms of 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. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 021= 10-1301, USA. >> + * >> + * Based upon the files: >> + * drivers/xen/tpmbk.c > Do you mean ./drivers/xen/tpmback/tpmback.c ? See comment above > >> + * from the Linux kernel, which are Copyright (C) 2006 IBM Corporatio= n >> + */ > [...] >> diff --git a/extras/mini-os/tpmfront.c b/extras/mini-os/tpmfront.c >> new file mode 100644 >> index 0000000..84fc6af >> --- /dev/null >> +++ b/extras/mini-os/tpmfront.c >> @@ -0,0 +1,607 @@ >> +/* >> + * Copyright (c) 2010-2012 United States Government, as represented b= y >> + * the Secretary of Defense. All rights reserved. >> + * >> + * This program is free software; you can redistribute it and/or >> + * modify it under the terms of 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. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 021= 10-1301, USA. >> + * >> + * Based upon the files: >> + * drivers/char/tpm/tpm_vtpm.c >> + * drivers/char/tpm/tpm_xen.c >> + * from the Linux kernel, which are Copyright (C) 2006 IBM Corporatio= n > Again not "...or later". > > Ian. > --------------ms060103000306010907080900 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIDyjCC A8YwggMvoAMCAQICBD/xyf0wDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTEwMDYxMTE4MjIwNloXDTEzMDYxMTE4 NTIwNlowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnpbwVSP6o1Nb5lcW7dd3yTo9iBJdi7qz 4nANOMFPK7JOy5npKN1iiousl28U/scUJES55gPwAWYJK3uVyQAsA4adgDKi5DoD1UHDQEwp bY7iHLJeq0NPr4BqYNqnCFPbE6HC8zSJrr4qKn+gVUQT39SIFqdiIPJwZL8FYTRQ/zsCAwEA AaOCAbYwggGyMAsGA1UdDwQEAwIHgDArBgNVHRAEJDAigA8yMDEwMDYxMTE4MjIwNlqBDzIw MTIwNzE3MjI1MjA2WjAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsGDSsGAQQBsyUL AwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRlIGtleSBjb3Jy ZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBleHBvcnRlZC4w KAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYDVR0fBEswSTBH oEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RD QTEOMAwGA1UEAxMFQ1JMNTYwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJMB1yqeswHQYD VR0OBBYEFO6LYxg6r9wHZ+zdQtBHn1dZ/YTNMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAww ChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAJO9HQh4YNChVLzuZqK5ARJARD8JoujGZ fdo75quvg2jXFQe2sEjvLnxJZgm/pv8fdZakq48CWwjYHKuvIp7sDjTEsQfo+y7SpN/N2NvJ WU5SqfK1VgYtNLRRoGJUB5Q1aZ+Dg95g3kqpyfpUMISJL8IKVLtJVfN4fggFVUYZ9wwxggGr MIIBpwIBATA3MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJ U0RDQQIEP/HJ/TAJBgUrDgMCGgUAoIHLMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ KoZIhvcNAQkFMQ8XDTEyMTAwNTE1MTE0M1owIwYJKoZIhvcNAQkEMRYEFJh5JZ9fzT8S1nVW zIcDe+hDfJCZMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYACGOgaCbSi1lnp2VW3625136CqBeh9/cUO PKEhn8wF7VJRYIGupD41H9D8maYsNEbxoJIa7OZGJGBEod8u7xYttegswLT6P3t+hSgyXK/p izgsgqW2Xn9UTRV7Gw/qlORLH5/p6kOV75lWHy+LDclchp6y/BC0X+eYmU9dM2BHGAAAAAAA AA== --------------ms060103000306010907080900-- --===============4650819707532372201== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4650819707532372201==--