diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2015-09-15 11:03:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-15 16:54:21 -0400 |
| commit | 09a77a885233e2a20dac2635a79c83ccf50a26a1 (patch) | |
| tree | e42b3e9655919fa2e1ce6dccc40af3e0fd8c3a1c | |
| parent | d25ed277fbd4c20247286fda2014ae6a2b88316b (diff) | |
modsign: Fix GPL/OpenSSL licence incompatibility
The GPL does not permit us to link against the OpenSSL library. Use
LGPL for sign-file and extract-file instead.
[ The whole "openssl isn't compatible with gpl" is really just
fear-mongering, but there's no reason not to make modsign LGPL, so
nobody cares. - Linus ]
Reported-by: Julian Andres Klode <jak@jak-linux.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Julian Andres Klode <jak@jak-linux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | scripts/extract-cert.c | 10 | ||||
| -rwxr-xr-x | scripts/sign-file.c | 13 |
2 files changed, 13 insertions, 10 deletions
diff --git a/scripts/extract-cert.c b/scripts/extract-cert.c index 10d23ca9f617..6ce5945a0b89 100644 --- a/scripts/extract-cert.c +++ b/scripts/extract-cert.c | |||
| @@ -1,15 +1,15 @@ | |||
| 1 | /* Extract X.509 certificate in DER form from PKCS#11 or PEM. | 1 | /* Extract X.509 certificate in DER form from PKCS#11 or PEM. |
| 2 | * | 2 | * |
| 3 | * Copyright © 2014 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright © 2014-2015 Red Hat, Inc. All Rights Reserved. |
| 4 | * Copyright © 2015 Intel Corporation. | 4 | * Copyright © 2015 Intel Corporation. |
| 5 | * | 5 | * |
| 6 | * Authors: David Howells <dhowells@redhat.com> | 6 | * Authors: David Howells <dhowells@redhat.com> |
| 7 | * David Woodhouse <dwmw2@infradead.org> | 7 | * David Woodhouse <dwmw2@infradead.org> |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
| 10 | * modify it under the terms of the GNU General Public Licence | 10 | * modify it under the terms of the GNU Lesser General Public License |
| 11 | * as published by the Free Software Foundation; either version | 11 | * as published by the Free Software Foundation; either version 2.1 |
| 12 | * 2 of the Licence, or (at your option) any later version. | 12 | * of the licence, or (at your option) any later version. |
| 13 | */ | 13 | */ |
| 14 | #define _GNU_SOURCE | 14 | #define _GNU_SOURCE |
| 15 | #include <stdio.h> | 15 | #include <stdio.h> |
diff --git a/scripts/sign-file.c b/scripts/sign-file.c index 058bba3103e2..c3899ca4811c 100755 --- a/scripts/sign-file.c +++ b/scripts/sign-file.c | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | /* Sign a module file using the given key. | 1 | /* Sign a module file using the given key. |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2014 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright © 2014-2015 Red Hat, Inc. All Rights Reserved. |
| 4 | * Written by David Howells (dhowells@redhat.com) | 4 | * Copyright © 2015 Intel Corporation. |
| 5 | * | ||
| 6 | * Authors: David Howells <dhowells@redhat.com> | ||
| 7 | * David Woodhouse <dwmw2@infradead.org> | ||
| 5 | * | 8 | * |
| 6 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
| 7 | * modify it under the terms of the GNU General Public Licence | 10 | * modify it under the terms of the GNU Lesser General Public License |
| 8 | * as published by the Free Software Foundation; either version | 11 | * as published by the Free Software Foundation; either version 2.1 |
| 9 | * 2 of the Licence, or (at your option) any later version. | 12 | * of the licence, or (at your option) any later version. |
| 10 | */ | 13 | */ |
| 11 | #define _GNU_SOURCE | 14 | #define _GNU_SOURCE |
| 12 | #include <stdio.h> | 15 | #include <stdio.h> |