From d1a6b17e727cd3f6d585db1937b5b22a24257cd3 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 19 Sep 2018 13:36:02 +0200 Subject: crypto: explicitly dual license Suggested-by: Thomas Gleixner Signed-off-by: Jason A. Donenfeld --- src/crypto/zinc/curve25519/curve25519-arm-glue.h | 2 +- src/crypto/zinc/curve25519/curve25519-arm.S | 2 +- src/crypto/zinc/curve25519/curve25519-fiat32.h | 2 +- src/crypto/zinc/curve25519/curve25519-hacl64.h | 2 +- src/crypto/zinc/curve25519/curve25519-x86_64-glue.h | 2 +- src/crypto/zinc/curve25519/curve25519-x86_64.h | 2 +- src/crypto/zinc/curve25519/curve25519.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/crypto/zinc/curve25519') diff --git a/src/crypto/zinc/curve25519/curve25519-arm-glue.h b/src/crypto/zinc/curve25519/curve25519-arm-glue.h index a547732..4682aa0 100644 --- a/src/crypto/zinc/curve25519/curve25519-arm-glue.h +++ b/src/crypto/zinc/curve25519/curve25519-arm-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/curve25519/curve25519-arm.S b/src/crypto/zinc/curve25519/curve25519-arm.S index 51701a2..7e25d50 100644 --- a/src/crypto/zinc/curve25519/curve25519-arm.S +++ b/src/crypto/zinc/curve25519/curve25519-arm.S @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * diff --git a/src/crypto/zinc/curve25519/curve25519-fiat32.h b/src/crypto/zinc/curve25519/curve25519-fiat32.h index 13fe11e..4bf36f1 100644 --- a/src/crypto/zinc/curve25519/curve25519-fiat32.h +++ b/src/crypto/zinc/curve25519/curve25519-fiat32.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2016 The fiat-crypto Authors. * Copyright (C) 2018 Jason A. Donenfeld . All Rights Reserved. diff --git a/src/crypto/zinc/curve25519/curve25519-hacl64.h b/src/crypto/zinc/curve25519/curve25519-hacl64.h index a1dfe6f..d234865 100644 --- a/src/crypto/zinc/curve25519/curve25519-hacl64.h +++ b/src/crypto/zinc/curve25519/curve25519-hacl64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2016-2017 INRIA and Microsoft Corporation. * Copyright (C) 2018 Jason A. Donenfeld . All Rights Reserved. diff --git a/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h b/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h index 1b9b719..cd32593 100644 --- a/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h +++ b/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. */ diff --git a/src/crypto/zinc/curve25519/curve25519-x86_64.h b/src/crypto/zinc/curve25519/curve25519-x86_64.h index 76ba7d9..6fd04d6 100644 --- a/src/crypto/zinc/curve25519/curve25519-x86_64.h +++ b/src/crypto/zinc/curve25519/curve25519-x86_64.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 +/* SPDX-License-Identifier: GPL-2.0 OR LGPL-2.1 * * Copyright (c) 2017 Armando Faz . All Rights Reserved. * Copyright (C) 2018 Jason A. Donenfeld . All Rights Reserved. diff --git a/src/crypto/zinc/curve25519/curve25519.c b/src/crypto/zinc/curve25519/curve25519.c index a02070e..ba9cd92 100644 --- a/src/crypto/zinc/curve25519/curve25519.c +++ b/src/crypto/zinc/curve25519/curve25519.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: MIT +/* SPDX-License-Identifier: GPL-2.0 OR MIT * * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * -- cgit v1.2.3