From 197a30ce3eb65790d5c46b23394a1dd1387b9ede Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 20 Sep 2018 01:49:47 +0200 Subject: global: put SPDX identifier on its own line The kernel has very specific rules correlating file type with comment type, and also SPDX identifiers can't be merged with other comments. --- src/crypto/zinc/curve25519/curve25519-arm-glue.h | 4 ++-- src/crypto/zinc/curve25519/curve25519-arm.S | 4 ++-- src/crypto/zinc/curve25519/curve25519-fiat32.h | 4 ++-- src/crypto/zinc/curve25519/curve25519-hacl64.h | 4 ++-- src/crypto/zinc/curve25519/curve25519-x86_64-glue.h | 4 ++-- src/crypto/zinc/curve25519/curve25519-x86_64.h | 4 ++-- src/crypto/zinc/curve25519/curve25519.c | 4 ++-- 7 files changed, 14 insertions(+), 14 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 4682aa0..27d387e 100644 --- a/src/crypto/zinc/curve25519/curve25519-arm-glue.h +++ b/src/crypto/zinc/curve25519/curve25519-arm-glue.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 OR 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 7e25d50..01cb4ad 100644 --- a/src/crypto/zinc/curve25519/curve25519-arm.S +++ b/src/crypto/zinc/curve25519/curve25519-arm.S @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 OR MIT - * +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * * Based on public domain code from Daniel J. Bernstein and Peter Schwabe. This diff --git a/src/crypto/zinc/curve25519/curve25519-fiat32.h b/src/crypto/zinc/curve25519/curve25519-fiat32.h index 4bf36f1..c57f6f2 100644 --- a/src/crypto/zinc/curve25519/curve25519-fiat32.h +++ b/src/crypto/zinc/curve25519/curve25519-fiat32.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 OR 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 d234865..3e34de7 100644 --- a/src/crypto/zinc/curve25519/curve25519-hacl64.h +++ b/src/crypto/zinc/curve25519/curve25519-hacl64.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 OR 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 cd32593..00dbfde 100644 --- a/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h +++ b/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 OR 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 6fd04d6..6c895f7 100644 --- a/src/crypto/zinc/curve25519/curve25519-x86_64.h +++ b/src/crypto/zinc/curve25519/curve25519-x86_64.h @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 OR 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. * Copyright (C) 2018 Samuel Neves . All Rights Reserved. diff --git a/src/crypto/zinc/curve25519/curve25519.c b/src/crypto/zinc/curve25519/curve25519.c index ba9cd92..fd46b36 100644 --- a/src/crypto/zinc/curve25519/curve25519.c +++ b/src/crypto/zinc/curve25519/curve25519.c @@ -1,5 +1,5 @@ -/* SPDX-License-Identifier: GPL-2.0 OR MIT - * +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* * Copyright (C) 2015-2018 Jason A. Donenfeld . All Rights Reserved. * * This is an implementation of the Curve25519 ECDH algorithm, using either -- cgit v1.2.3-59-g8ed1b