Re: [PATCH] crypto: vmx: Remove dubiously licensed crypto code
On Fri, 2017-05-05 at 15:52 +0200, Michal Suchánek wrote: > > So you have an e-mail message from one of the authors of the code. > Andy Polyakov wrote most of the code but there are probably other > contributors who never gave explicit consent for using their code > outside of OpenSSL. The only contributions to that file in OpenSSL that isn't from Andy are a whitespace fix and the addition of the licence :-) If that makes you feel better we could undo the whitespace fix :-) I've checked the other PowerPC related files in there and the situation is identical (aes-ppc.pl does have also a spelling fix in comments). At this point, it's pretty clear that this code is authored solely by Andy who gave permission to use it. Cheers, Ben.
Re: [PATCH] crypto: vmx: Remove dubiously licensed crypto code
Hello, On Thu, 30 Mar 2017 13:30:17 -0300 Paulo Flabiano Smorigowrote: > On 2017-03-29 20:08, Tyrel Datwyler wrote: > > On 03/29/2017 08:13 AM, Michal Suchánek wrote: > >> On Wed, 29 Mar 2017 16:51:35 +0200 > >> Greg Kroah-Hartman wrote: > >> > >>> On Wed, Mar 29, 2017 at 02:56:39PM +0200, Michal Suchanek wrote: > While reviewing commit 11c6e16ee13a ("crypto: vmx - Adding asm > subroutines for XTS") which adds the OpenSSL license header to > drivers/crypto/vmx/aesp8-ppc.pl licensing of this driver came > into qestion. The whole license reads: > > # Licensed under the OpenSSL license (the "License"). You may > not use # this file except in compliance with the License. You > can obtain a # copy > # in the file LICENSE in the source distribution or at > # https://www.openssl.org/source/license.html > > # > # > > # Written by Andy Polyakov for the OpenSSL # > project. The module is, however, dual licensed under OpenSSL and > # CRYPTOGAMS licenses depending on where you obtain it. For > further # details see http://www.openssl.org/~appro/cryptogams/. > # > > > After seeking legal advice it is still not clear that this driver > can be legally used in Linux. In particular the "depending on > where you obtain it" part does not make it clear when you can > apply the GPL and when the OpenSSL license. > > I tried contacting the author of the code for clarification but > did not hear back. In absence of clear licensing the only > solution I see is removing this code. > > > > A quick 'git grep OpenSSL' of the Linux tree returns several other > > crypto files under the ARM architecture that are similarly > > licensed. Namely: > > > > arch/arm/crypto/sha1-armv4-large.S > > arch/arm/crypto/sha256-armv4.pl > > arch/arm/crypto/sha256-core.S_shipped > > arch/arm/crypto/sha512-armv4.pl > > arch/arm/crypto/sha512-core.S_shipped > > arch/arm64/crypto/sha256-core.S_shipped > > arch/arm64/crypto/sha512-armv8.pl > > arch/arm64/crypto/sha512-core.S_shipped > > > > On closer inspection of some of those files have the addendum that > > "Permission to use under GPL terms is granted", but not all of them. > > > > -Tyrel > > In 2015, , the author, replied in this mailing list [1]: > > "I have no problems with reusing assembly modules in kernel context. > The whole idea behind cryptogams initiative was exactly to reuse code > in different contexts." > > [1] https://patchwork.kernel.org/patch/6027481/ > So you have an e-mail message from one of the authors of the code. Andy Polyakov wrote most of the code but there are probably other contributors who never gave explicit consent for using their code outside of OpenSSL. The OpenSSL maintainers made it explicitly clear by stamping the OpenSSL license incompatible with GPL2 on the file that they are not OK with hosting development for Linux kernel code. This Cryptograms project did not seem to get anywhere so there is no source for the code other than the OpenSSL tree. Merging code from OpenSSL into Linux does not look legally feasible. Andy Polyakov is unresponsive in discussions concerning his awesome licensing terms. The MAINTAINERS file has IBM Power VMX Cryptographic instructions M: Leonidas S. Barbosa M: Paulo Flabiano Smorigo L: linux-crypto@vger.kernel.org S: Supported So presumably the maintainers have access to necessary legal advice to determine what steps are necessary to make this driver maintainable legally. I do not expect this will be resolved overnight. However, there is no progress on this issue whatsoever so I suggest removal of the driver. Thanks Michal
Re: [PATCH] crypto: vmx: Remove dubiously licensed crypto code
On Thu, 30 Mar 2017 13:30:17 -0300 Paulo Flabiano Smorigowrote: > On 2017-03-29 20:08, Tyrel Datwyler wrote: > > On 03/29/2017 08:13 AM, Michal Suchánek wrote: > >> On Wed, 29 Mar 2017 16:51:35 +0200 > >> Greg Kroah-Hartman wrote: > >> > >>> On Wed, Mar 29, 2017 at 02:56:39PM +0200, Michal Suchanek wrote: > While reviewing commit 11c6e16ee13a ("crypto: vmx - Adding asm > subroutines for XTS") which adds the OpenSSL license header to > drivers/crypto/vmx/aesp8-ppc.pl licensing of this driver came > into qestion. The whole license reads: > > # Licensed under the OpenSSL license (the "License"). You may > not use # this file except in compliance with the License. You > can obtain a # copy > # in the file LICENSE in the source distribution or at > # https://www.openssl.org/source/license.html > > # > # > > # Written by Andy Polyakov for the OpenSSL # > project. The module is, however, dual licensed under OpenSSL and > # CRYPTOGAMS licenses depending on where you obtain it. For > further # details see http://www.openssl.org/~appro/cryptogams/. > # > > > After seeking legal advice it is still not clear that this driver > can be legally used in Linux. In particular the "depending on > where you obtain it" part does not make it clear when you can > apply the GPL and when the OpenSSL license. > > I tried contacting the author of the code for clarification but > did not hear back. In absence of clear licensing the only > solution I see is removing this code. > > > > A quick 'git grep OpenSSL' of the Linux tree returns several other > > crypto files under the ARM architecture that are similarly > > licensed. Namely: > > > > arch/arm/crypto/sha1-armv4-large.S > > arch/arm/crypto/sha256-armv4.pl > > arch/arm/crypto/sha256-core.S_shipped > > arch/arm/crypto/sha512-armv4.pl > > arch/arm/crypto/sha512-core.S_shipped > > arch/arm64/crypto/sha256-core.S_shipped > > arch/arm64/crypto/sha512-armv8.pl > > arch/arm64/crypto/sha512-core.S_shipped > > > > On closer inspection of some of those files have the addendum that > > "Permission to use under GPL terms is granted", but not all of them. > > > > -Tyrel > > In 2015, Andy Polyakov, the author, replied in this mailing list [1]: > > "I have no problems with reusing assembly modules in kernel context. > The whole idea behind cryptogams initiative was exactly to reuse code > in different contexts." > > [1] https://patchwork.kernel.org/patch/6027481/ > So what? You also got a statement from whoever is relevant from OpenSSL from where this code is obviously merged? Even if you did has the e-mail discussion any value whatsoever? Neither is a replacement for including a proper license statement with the code. Not by reference to an e-mail discussion or a web site. Thanks Michal
Re: [PATCH] crypto: vmx: Remove dubiously licensed crypto code
On 2017-03-29 20:08, Tyrel Datwyler wrote: On 03/29/2017 08:13 AM, Michal Suchánek wrote: On Wed, 29 Mar 2017 16:51:35 +0200 Greg Kroah-Hartmanwrote: On Wed, Mar 29, 2017 at 02:56:39PM +0200, Michal Suchanek wrote: While reviewing commit 11c6e16ee13a ("crypto: vmx - Adding asm subroutines for XTS") which adds the OpenSSL license header to drivers/crypto/vmx/aesp8-ppc.pl licensing of this driver came into qestion. The whole license reads: # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a # copy # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html # # # Written by Andy Polyakov for the OpenSSL # project. The module is, however, dual licensed under OpenSSL and # CRYPTOGAMS licenses depending on where you obtain it. For further # details see http://www.openssl.org/~appro/cryptogams/. # After seeking legal advice it is still not clear that this driver can be legally used in Linux. In particular the "depending on where you obtain it" part does not make it clear when you can apply the GPL and when the OpenSSL license. I tried contacting the author of the code for clarification but did not hear back. In absence of clear licensing the only solution I see is removing this code. A quick 'git grep OpenSSL' of the Linux tree returns several other crypto files under the ARM architecture that are similarly licensed. Namely: arch/arm/crypto/sha1-armv4-large.S arch/arm/crypto/sha256-armv4.pl arch/arm/crypto/sha256-core.S_shipped arch/arm/crypto/sha512-armv4.pl arch/arm/crypto/sha512-core.S_shipped arch/arm64/crypto/sha256-core.S_shipped arch/arm64/crypto/sha512-armv8.pl arch/arm64/crypto/sha512-core.S_shipped On closer inspection of some of those files have the addendum that "Permission to use under GPL terms is granted", but not all of them. -Tyrel In 2015, Andy Polyakov, the author, replied in this mailing list [1]: "I have no problems with reusing assembly modules in kernel context. The whole idea behind cryptogams initiative was exactly to reuse code in different contexts." [1] https://patchwork.kernel.org/patch/6027481/ -- Paulo Flabiano Smorigo IBM Linux Technology Center
Re: [PATCH] crypto: vmx: Remove dubiously licensed crypto code
On 03/29/2017 05:17 PM, Michael Ellerman wrote: > Michal Suchanekwrites: > >> While reviewing commit 11c6e16ee13a ("crypto: vmx - Adding asm >> subroutines for XTS") which adds the OpenSSL license header to >> drivers/crypto/vmx/aesp8-ppc.pl licensing of this driver came into >> qestion. The whole license reads: >> >> # Licensed under the OpenSSL license (the "License"). You may not use >> # this file except in compliance with the License. You can obtain a >> # copy >> # in the file LICENSE in the source distribution or at >> # https://www.openssl.org/source/license.html >> >> # >> # >> # Written by Andy Polyakov for the OpenSSL >> # project. The module is, however, dual licensed under OpenSSL and >> # CRYPTOGAMS licenses depending on where you obtain it. For further >> # details see http://www.openssl.org/~appro/cryptogams/. >> # >> >> After seeking legal advice it is still not clear that this driver can be >> legally used in Linux. In particular the "depending on where you obtain >> it" part does not make it clear when you can apply the GPL and when the >> OpenSSL license. > > It seems pretty clear to me that the intention is that the CRYPTOGAM > license applies. > > If you visit it's URL it includes: > > ALTERNATIVELY, provided that this notice is retained in full, this > product may be distributed under the terms of the GNU General Public > License (GPL), in which case the provisions of the GPL apply INSTEAD OF > those given above. > > > I agree that the text in the file is not sufficiently clear about what > license applies, but I'm unconvinced that there is any code here that is > actually being distributed incorrectly. The original commit message also outlines that the authors collaborated directly with Andy. commit 5c380d623ed30b71a2441fb4f2e053a4e1a50794 Author: Leonidas S. Barbosa Date: Fri Feb 6 14:59:35 2015 -0200 crypto: vmx - Add support for VMS instructions by ASM OpenSSL implements optimized ASM algorithms which support VMX instructions on Power 8 CPU. These scripts generate an endian-agnostic ASM implementation in order to support both big and little-endian. - aesp8-ppc.pl: implements suport for AES instructions implemented by POWER8 processor. - ghashp8-ppc.pl: implements support for GHASH for Power8. - ppc-xlate.pl: ppc assembler distiller. These code has been adopted from OpenSSL project in collaboration with the original author (Andy Polyakov ). Signed-off-by: Leonidas S. Barbosa Signed-off-by: Herbert Xu -Tyrel > > Getting the text in the header changed to be clearer seems like the > obvious solution. > >> I tried contacting the author of the code for clarification but did not >> hear back. In absence of clear licensing the only solution I see is >> removing this code. > > Did you try contacting anyone else? Like perhaps the powerpc or crypto > maintainers, or anyone else who's worked on the driver? > > Sending a patch to delete all the code clearly works to get people's > attention, I'll give you that. >
Re: [PATCH] crypto: vmx: Remove dubiously licensed crypto code
On 03/29/2017 08:13 AM, Michal Suchánek wrote: > On Wed, 29 Mar 2017 16:51:35 +0200 > Greg Kroah-Hartmanwrote: > >> On Wed, Mar 29, 2017 at 02:56:39PM +0200, Michal Suchanek wrote: >>> While reviewing commit 11c6e16ee13a ("crypto: vmx - Adding asm >>> subroutines for XTS") which adds the OpenSSL license header to >>> drivers/crypto/vmx/aesp8-ppc.pl licensing of this driver came into >>> qestion. The whole license reads: >>> >>> # Licensed under the OpenSSL license (the "License"). You may not >>> use # this file except in compliance with the License. You can >>> obtain a # copy >>> # in the file LICENSE in the source distribution or at >>> # https://www.openssl.org/source/license.html >>> >>> # >>> # >>> >>> # Written by Andy Polyakov for the OpenSSL # >>> project. The module is, however, dual licensed under OpenSSL and # >>> CRYPTOGAMS licenses depending on where you obtain it. For further # >>> details see http://www.openssl.org/~appro/cryptogams/. # >>> >>> >>> After seeking legal advice it is still not clear that this driver >>> can be legally used in Linux. In particular the "depending on where >>> you obtain it" part does not make it clear when you can apply the >>> GPL and when the OpenSSL license. >>> >>> I tried contacting the author of the code for clarification but did >>> not hear back. In absence of clear licensing the only solution I >>> see is removing this code. A quick 'git grep OpenSSL' of the Linux tree returns several other crypto files under the ARM architecture that are similarly licensed. Namely: arch/arm/crypto/sha1-armv4-large.S arch/arm/crypto/sha256-armv4.pl arch/arm/crypto/sha256-core.S_shipped arch/arm/crypto/sha512-armv4.pl arch/arm/crypto/sha512-core.S_shipped arch/arm64/crypto/sha256-core.S_shipped arch/arm64/crypto/sha512-armv8.pl arch/arm64/crypto/sha512-core.S_shipped On closer inspection of some of those files have the addendum that "Permission to use under GPL terms is granted", but not all of them. -Tyrel
Re: [PATCH] crypto: vmx: Remove dubiously licensed crypto code
On Wed, 29 Mar 2017 16:51:35 +0200 Greg Kroah-Hartmanwrote: > On Wed, Mar 29, 2017 at 02:56:39PM +0200, Michal Suchanek wrote: > > While reviewing commit 11c6e16ee13a ("crypto: vmx - Adding asm > > subroutines for XTS") which adds the OpenSSL license header to > > drivers/crypto/vmx/aesp8-ppc.pl licensing of this driver came into > > qestion. The whole license reads: > > > > # Licensed under the OpenSSL license (the "License"). You may not > > use # this file except in compliance with the License. You can > > obtain a # copy > > # in the file LICENSE in the source distribution or at > > # https://www.openssl.org/source/license.html > > > > # > > # > > > > # Written by Andy Polyakov for the OpenSSL # > > project. The module is, however, dual licensed under OpenSSL and # > > CRYPTOGAMS licenses depending on where you obtain it. For further # > > details see http://www.openssl.org/~appro/cryptogams/. # > > > > > > After seeking legal advice it is still not clear that this driver > > can be legally used in Linux. In particular the "depending on where > > you obtain it" part does not make it clear when you can apply the > > GPL and when the OpenSSL license. > > > > I tried contacting the author of the code for clarification but did > > not hear back. In absence of clear licensing the only solution I > > see is removing this code. > > > > Signed-off-by: Michal Suchanek > > --- > > MAINTAINERS | 12 - > > drivers/crypto/Kconfig|8 - > > drivers/crypto/Makefile |1 - > > drivers/crypto/vmx/.gitignore |2 - > > drivers/crypto/vmx/Kconfig|9 - > > drivers/crypto/vmx/Makefile | 21 - > > drivers/crypto/vmx/aes.c | 150 -- > > drivers/crypto/vmx/aes_cbc.c | 202 -- > > drivers/crypto/vmx/aes_ctr.c | 191 -- > > drivers/crypto/vmx/aes_xts.c | 190 -- > > drivers/crypto/vmx/aesp8-ppc.h| 25 - > > drivers/crypto/vmx/aesp8-ppc.pl | 3789 > > - > > drivers/crypto/vmx/ghash.c| 227 --- > > drivers/crypto/vmx/ghashp8-ppc.pl | 234 --- > > drivers/crypto/vmx/ppc-xlate.pl | 228 --- > > drivers/crypto/vmx/vmx.c | 88 - 16 files changed, 5377 > > deletions(-) delete mode 100644 drivers/crypto/vmx/.gitignore > > delete mode 100644 drivers/crypto/vmx/Kconfig > > delete mode 100644 drivers/crypto/vmx/Makefile > > delete mode 100644 drivers/crypto/vmx/aes.c > > delete mode 100644 drivers/crypto/vmx/aes_cbc.c > > delete mode 100644 drivers/crypto/vmx/aes_ctr.c > > delete mode 100644 drivers/crypto/vmx/aes_xts.c > > delete mode 100644 drivers/crypto/vmx/aesp8-ppc.h > > delete mode 100644 drivers/crypto/vmx/aesp8-ppc.pl > > delete mode 100644 drivers/crypto/vmx/ghash.c > > delete mode 100644 drivers/crypto/vmx/ghashp8-ppc.pl > > delete mode 100644 drivers/crypto/vmx/ppc-xlate.pl > > delete mode 100644 drivers/crypto/vmx/vmx.c > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 1b0a87ab..fd4cbf046ab4 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -6190,18 +6190,6 @@ T: git > > git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git > > S: Maintained F: arch/ia64/ > > > > -IBM Power VMX Cryptographic instructions > > -M: Leonidas S. Barbosa > > -M: Paulo Flabiano Smorigo > > Any reason why you didn't cc: these maintainers on your patch? > I used get_maintainers.pl with a filter that turns it into a valid e-mail list and did not particularly thoroughly check the output. Removing the maintainers from MAINTAINERS in the patch is probably what causes the omission. Thanks Michal
Re: [PATCH] crypto: vmx: Remove dubiously licensed crypto code
On Wed, Mar 29, 2017 at 02:56:39PM +0200, Michal Suchanek wrote: > While reviewing commit 11c6e16ee13a ("crypto: vmx - Adding asm > subroutines for XTS") which adds the OpenSSL license header to > drivers/crypto/vmx/aesp8-ppc.pl licensing of this driver came into > qestion. The whole license reads: > > # Licensed under the OpenSSL license (the "License"). You may not use > # this file except in compliance with the License. You can obtain a > # copy > # in the file LICENSE in the source distribution or at > # https://www.openssl.org/source/license.html > > # > # > # Written by Andy Polyakovfor the OpenSSL > # project. The module is, however, dual licensed under OpenSSL and > # CRYPTOGAMS licenses depending on where you obtain it. For further > # details see http://www.openssl.org/~appro/cryptogams/. > # > > After seeking legal advice it is still not clear that this driver can be > legally used in Linux. In particular the "depending on where you obtain > it" part does not make it clear when you can apply the GPL and when the > OpenSSL license. > > I tried contacting the author of the code for clarification but did not > hear back. In absence of clear licensing the only solution I see is > removing this code. > > Signed-off-by: Michal Suchanek > --- > MAINTAINERS | 12 - > drivers/crypto/Kconfig|8 - > drivers/crypto/Makefile |1 - > drivers/crypto/vmx/.gitignore |2 - > drivers/crypto/vmx/Kconfig|9 - > drivers/crypto/vmx/Makefile | 21 - > drivers/crypto/vmx/aes.c | 150 -- > drivers/crypto/vmx/aes_cbc.c | 202 -- > drivers/crypto/vmx/aes_ctr.c | 191 -- > drivers/crypto/vmx/aes_xts.c | 190 -- > drivers/crypto/vmx/aesp8-ppc.h| 25 - > drivers/crypto/vmx/aesp8-ppc.pl | 3789 > - > drivers/crypto/vmx/ghash.c| 227 --- > drivers/crypto/vmx/ghashp8-ppc.pl | 234 --- > drivers/crypto/vmx/ppc-xlate.pl | 228 --- > drivers/crypto/vmx/vmx.c | 88 - > 16 files changed, 5377 deletions(-) > delete mode 100644 drivers/crypto/vmx/.gitignore > delete mode 100644 drivers/crypto/vmx/Kconfig > delete mode 100644 drivers/crypto/vmx/Makefile > delete mode 100644 drivers/crypto/vmx/aes.c > delete mode 100644 drivers/crypto/vmx/aes_cbc.c > delete mode 100644 drivers/crypto/vmx/aes_ctr.c > delete mode 100644 drivers/crypto/vmx/aes_xts.c > delete mode 100644 drivers/crypto/vmx/aesp8-ppc.h > delete mode 100644 drivers/crypto/vmx/aesp8-ppc.pl > delete mode 100644 drivers/crypto/vmx/ghash.c > delete mode 100644 drivers/crypto/vmx/ghashp8-ppc.pl > delete mode 100644 drivers/crypto/vmx/ppc-xlate.pl > delete mode 100644 drivers/crypto/vmx/vmx.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index 1b0a87ab..fd4cbf046ab4 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -6190,18 +6190,6 @@ T: git > git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git > S: Maintained > F: arch/ia64/ > > -IBM Power VMX Cryptographic instructions > -M: Leonidas S. Barbosa > -M: Paulo Flabiano Smorigo Any reason why you didn't cc: these maintainers on your patch? thanks, greg k-h
[PATCH] crypto: vmx: Remove dubiously licensed crypto code
While reviewing commit 11c6e16ee13a ("crypto: vmx - Adding asm subroutines for XTS") which adds the OpenSSL license header to drivers/crypto/vmx/aesp8-ppc.pl licensing of this driver came into qestion. The whole license reads: # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a # copy # in the file LICENSE in the source distribution or at # https://www.openssl.org/source/license.html # # # Written by Andy Polyakovfor the OpenSSL # project. The module is, however, dual licensed under OpenSSL and # CRYPTOGAMS licenses depending on where you obtain it. For further # details see http://www.openssl.org/~appro/cryptogams/. # After seeking legal advice it is still not clear that this driver can be legally used in Linux. In particular the "depending on where you obtain it" part does not make it clear when you can apply the GPL and when the OpenSSL license. I tried contacting the author of the code for clarification but did not hear back. In absence of clear licensing the only solution I see is removing this code. Signed-off-by: Michal Suchanek --- MAINTAINERS | 12 - drivers/crypto/Kconfig|8 - drivers/crypto/Makefile |1 - drivers/crypto/vmx/.gitignore |2 - drivers/crypto/vmx/Kconfig|9 - drivers/crypto/vmx/Makefile | 21 - drivers/crypto/vmx/aes.c | 150 -- drivers/crypto/vmx/aes_cbc.c | 202 -- drivers/crypto/vmx/aes_ctr.c | 191 -- drivers/crypto/vmx/aes_xts.c | 190 -- drivers/crypto/vmx/aesp8-ppc.h| 25 - drivers/crypto/vmx/aesp8-ppc.pl | 3789 - drivers/crypto/vmx/ghash.c| 227 --- drivers/crypto/vmx/ghashp8-ppc.pl | 234 --- drivers/crypto/vmx/ppc-xlate.pl | 228 --- drivers/crypto/vmx/vmx.c | 88 - 16 files changed, 5377 deletions(-) delete mode 100644 drivers/crypto/vmx/.gitignore delete mode 100644 drivers/crypto/vmx/Kconfig delete mode 100644 drivers/crypto/vmx/Makefile delete mode 100644 drivers/crypto/vmx/aes.c delete mode 100644 drivers/crypto/vmx/aes_cbc.c delete mode 100644 drivers/crypto/vmx/aes_ctr.c delete mode 100644 drivers/crypto/vmx/aes_xts.c delete mode 100644 drivers/crypto/vmx/aesp8-ppc.h delete mode 100644 drivers/crypto/vmx/aesp8-ppc.pl delete mode 100644 drivers/crypto/vmx/ghash.c delete mode 100644 drivers/crypto/vmx/ghashp8-ppc.pl delete mode 100644 drivers/crypto/vmx/ppc-xlate.pl delete mode 100644 drivers/crypto/vmx/vmx.c diff --git a/MAINTAINERS b/MAINTAINERS index 1b0a87ab..fd4cbf046ab4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6190,18 +6190,6 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git S: Maintained F: arch/ia64/ -IBM Power VMX Cryptographic instructions -M: Leonidas S. Barbosa -M: Paulo Flabiano Smorigo -L: linux-crypto@vger.kernel.org -S: Supported -F: drivers/crypto/vmx/Makefile -F: drivers/crypto/vmx/Kconfig -F: drivers/crypto/vmx/vmx.c -F: drivers/crypto/vmx/aes* -F: drivers/crypto/vmx/ghash* -F: drivers/crypto/vmx/ppc-xlate.pl - IBM Power in-Nest Crypto Acceleration M: Leonidas S. Barbosa M: Paulo Flabiano Smorigo diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 473d31288ad8..9fcd3af1f2f1 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -530,14 +530,6 @@ config CRYPTO_DEV_QCE hardware. To compile this driver as a module, choose M here. The module will be called qcrypto. -config CRYPTO_DEV_VMX - bool "Support for VMX cryptographic acceleration instructions" - depends on PPC64 && VSX - help - Support for VMX cryptographic acceleration instructions. - -source "drivers/crypto/vmx/Kconfig" - config CRYPTO_DEV_IMGTEC_HASH tristate "Imagination Technologies hardware hash accelerator" depends on MIPS || COMPILE_TEST diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index 739609471169..486e57e10e7a 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile @@ -34,5 +34,4 @@ obj-$(CONFIG_CRYPTO_DEV_SUN4I_SS) += sunxi-ss/ obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/ obj-$(CONFIG_CRYPTO_DEV_VIRTIO) += virtio/ -obj-$(CONFIG_CRYPTO_DEV_VMX) += vmx/ obj-$(CONFIG_CRYPTO_DEV_BCM_SPU) += bcm/ diff --git a/drivers/crypto/vmx/.gitignore b/drivers/crypto/vmx/.gitignore deleted file mode 100644 index af4a7ce4738d.. --- a/drivers/crypto/vmx/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -aesp8-ppc.S -ghashp8-ppc.S diff --git