diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2018-10-16 08:44:26 -0700 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2018-10-16 08:44:26 -0700 |
commit | f0f2c060b404889cf06ff16207e28c5ea46b1e31 (patch) | |
tree | a5205f989ef37a97137f0101167f9f5c3846dc09 | |
parent | 16ea230bb04cc24c8eb30202d7576c55027b44a0 (diff) | |
download | openssl_tpm2_engine-f0f2c060b404889cf06ff16207e28c5ea46b1e31.tar.gz |
LICENCE: tidy up remaining GPLv2 tags and clarify ASN.1 fair use
After the licence switch to LGPL2.1 there were still some stray GPLv2
tags in the code, so swap these for SPDX tags identifying the chosen
LGPL licence.
Additionally, since the key format needs to be standardised, clarify
that the ASN.1 code defining the key format may be copied under fair
use criteria.
Reported-by: Fredrik Ternerot <fredrik.trot@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r-- | create_tpm2_key.c | 2 | ||||
-rw-r--r-- | e_tpm2-ecc.c | 2 | ||||
-rw-r--r-- | e_tpm2-rsa.c | 2 | ||||
-rw-r--r-- | e_tpm2.c | 2 | ||||
-rw-r--r-- | tpm2-asn.h | 6 | ||||
-rw-r--r-- | tpm2-common.c | 2 |
6 files changed, 10 insertions, 6 deletions
diff --git a/create_tpm2_key.c b/create_tpm2_key.c index 5631880..0be8e43 100644 --- a/create_tpm2_key.c +++ b/create_tpm2_key.c @@ -2,7 +2,7 @@ * * Copyright (C) 2016 James Bottomley <James.Bottomley@HansenPartnership.com> * - * GPLv2 + * SPDX-License-Identifier: LGPL-2.1-only */ diff --git a/e_tpm2-ecc.c b/e_tpm2-ecc.c index 833cc0a..e35b730 100644 --- a/e_tpm2-ecc.c +++ b/e_tpm2-ecc.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2017 James.Bottomley@HansenPartnership.com * - * GPLv2 + * SPDX-License-Identifier: LGPL-2.1-only * */ diff --git a/e_tpm2-rsa.c b/e_tpm2-rsa.c index 3177624..50c2cac 100644 --- a/e_tpm2-rsa.c +++ b/e_tpm2-rsa.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2017 James.Bottomley@HansenPartnership.com * - * GPLv2 + * SPDX-License-Identifier: LGPL-2.1-only * */ @@ -2,7 +2,7 @@ /* * Copyright (C) 2016 James.Bottomley@HansenPartnership.com * - * GPLv2 + * SPDX-License-Identifier: LGPL-2.1-only * */ @@ -1,6 +1,10 @@ /* Copyright (C) 2016 James Bottomley <James.Bottomley@HansenPartnership.com> * - * GPLv2 + * SPDX-License-Identifier: LGPL-2.1-only + * + * Note: The ASN.1 defines constitute an interface specification for + * the openssl key format which may be copied by other implementations + * as fair use regardless of licence */ #ifndef _TPM2_ASN_H #define _TPM2_ASN_H diff --git a/tpm2-common.c b/tpm2-common.c index 7bef099..a39c90b 100644 --- a/tpm2-common.c +++ b/tpm2-common.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2016 James Bottomley <James.Bottomley@HansenPartnership.com> * - * GPLv2 + * SPDX-License-Identifier: LGPL-2.1-only */ #include <stdio.h> |