Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2e415fe authored by Adam Langley's avatar Adam Langley Committed by Herbert Xu
Browse files

crypto: clarify licensing of OpenSSL asm code 



Several source files have been taken from OpenSSL. In some of them a
comment that "permission to use under GPL terms is granted" was
included below a contradictory license statement. In several cases,
there was no indication that the license of the code was compatible
with the GPLv2.

This change clarifies the licensing for all of these files. I've
confirmed with the author (Andy Polyakov) that a) he has licensed the
files with the GPLv2 comment under that license and b) that he's also
happy to license the other files under GPLv2 too. In one case, the
file is already contained in his CRYPTOGAMS bundle, which has a GPLv2
option, and so no special measures are needed.

In all cases, the license status of code has been clarified by making
the GPLv2 license prominent.

The .S files have been regenerated from the updated .pl files.

This is a comment-only change. No code is changed.

Signed-off-by: default avatarAdam Langley <agl@chromium.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2808f173

arch/arm/crypto/sha1-armv4-large.S

+10 −0
Original line number Diff line number Diff line 
#define __ARM_ARCH__ __LINUX_ARM_ARCH__

@ SPDX-License-Identifier: GPL-2.0



@ This code is taken from the OpenSSL project but the author (Andy Polyakov)

@ has relicensed it under the GPLv2. Therefore this program is free software;

@ you can redistribute it and/or modify it under the terms of the GNU General

@ Public License version 2 as published by the Free Software Foundation.

@

@ The original headers, including the original license headers, are

@ included below for completeness.



@ ====================================================================

@ Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL

@ project. The module is, however, dual licensed under OpenSSL and

arch/arm/crypto/sha256-armv4.pl

+9 −2
Original line number Diff line number Diff line 
#!/usr/bin/env perl

# SPDX-License-Identifier: GPL-2.0



# This code is taken from the OpenSSL project but the author (Andy Polyakov)

# has relicensed it under the GPLv2. Therefore this program is free software;

# you can redistribute it and/or modify it under the terms of the GNU General

# Public License version 2 as published by the Free Software Foundation.

#

# The original headers, including the original license headers, are

# included below for completeness.



# ====================================================================

# Written by Andy Polyakov <appro@openssl.org> 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/.

#

# Permission to use under GPL terms is granted.

# ====================================================================



# SHA256 block procedure for ARMv4. May 2007.

arch/arm/crypto/sha256-core.S_shipped

+9 −2
Original line number Diff line number Diff line 
@ SPDX-License-Identifier: GPL-2.0



@ This code is taken from the OpenSSL project but the author (Andy Polyakov)

@ has relicensed it under the GPLv2. Therefore this program is free software;

@ you can redistribute it and/or modify it under the terms of the GNU General

@ Public License version 2 as published by the Free Software Foundation.

@

@ The original headers, including the original license headers, are

@ included below for completeness.



@ ====================================================================

@ Written by Andy Polyakov <appro@openssl.org> 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/.

@

@ Permission to use under GPL terms is granted.

@ ====================================================================



@ SHA256 block procedure for ARMv4. May 2007.

arch/arm/crypto/sha512-armv4.pl

+9 −2
Original line number Diff line number Diff line 
#!/usr/bin/env perl

# SPDX-License-Identifier: GPL-2.0



# This code is taken from the OpenSSL project but the author (Andy Polyakov)

# has relicensed it under the GPLv2. Therefore this program is free software;

# you can redistribute it and/or modify it under the terms of the GNU General

# Public License version 2 as published by the Free Software Foundation.

#

# The original headers, including the original license headers, are

# included below for completeness.



# ====================================================================

# Written by Andy Polyakov <appro@openssl.org> 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/.

#

# Permission to use under GPL terms is granted.

# ====================================================================



# SHA512 block procedure for ARMv4. September 2007.

arch/arm/crypto/sha512-core.S_shipped

+9 −2
Original line number Diff line number Diff line 
@ SPDX-License-Identifier: GPL-2.0



@ This code is taken from the OpenSSL project but the author (Andy Polyakov)

@ has relicensed it under the GPLv2. Therefore this program is free software;

@ you can redistribute it and/or modify it under the terms of the GNU General

@ Public License version 2 as published by the Free Software Foundation.

@

@ The original headers, including the original license headers, are

@ included below for completeness.



@ ====================================================================

@ Written by Andy Polyakov <appro@openssl.org> 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/.

@

@ Permission to use under GPL terms is granted.

@ ====================================================================



@ SHA512 block procedure for ARMv4. September 2007.