summaryrefslogtreecommitdiffhomepage
path: root/src/crypto
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-09-20 01:49:47 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-09-20 19:41:22 +0200
commitc49fb7ea293e66e1efb068999cca040fa21dec31 (patch)
tree00a6f2bdc8fa00b6a82d9588df9e423306ca19ef /src/crypto
parenta9c625a9ad963f70fd68c61c714d517ffba2b88b (diff)
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. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/crypto')
-rw-r--r--src/crypto/include/zinc/blake2s.h4
-rw-r--r--src/crypto/include/zinc/chacha20.h4
-rw-r--r--src/crypto/include/zinc/chacha20poly1305.h4
-rw-r--r--src/crypto/include/zinc/curve25519.h4
-rw-r--r--src/crypto/include/zinc/poly1305.h4
-rw-r--r--src/crypto/zinc.h4
-rw-r--r--src/crypto/zinc/blake2s/blake2s-x86_64-glue.h4
-rw-r--r--src/crypto/zinc/blake2s/blake2s-x86_64.S4
-rw-r--r--src/crypto/zinc/blake2s/blake2s.c4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-arm-glue.h4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-arm.S4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-arm64.S4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-mips-glue.h4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-mips.S4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-x86_64-glue.h4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-x86_64.S4
-rw-r--r--src/crypto/zinc/chacha20/chacha20.c4
-rw-r--r--src/crypto/zinc/chacha20poly1305.c4
-rw-r--r--src/crypto/zinc/curve25519/curve25519-arm-glue.h4
-rw-r--r--src/crypto/zinc/curve25519/curve25519-arm.S4
-rw-r--r--src/crypto/zinc/curve25519/curve25519-fiat32.h4
-rw-r--r--src/crypto/zinc/curve25519/curve25519-hacl64.h4
-rw-r--r--src/crypto/zinc/curve25519/curve25519-x86_64-glue.h4
-rw-r--r--src/crypto/zinc/curve25519/curve25519-x86_64.h4
-rw-r--r--src/crypto/zinc/curve25519/curve25519.c4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-arm-glue.h4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-arm.S4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-arm64.S4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-donna32.h4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-donna64.h4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-mips-glue.h4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-mips.S4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-mips64.S4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-x86_64-glue.h4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-x86_64.S4
-rw-r--r--src/crypto/zinc/poly1305/poly1305.c4
-rw-r--r--src/crypto/zinc/selftest/blake2s.h4
-rw-r--r--src/crypto/zinc/selftest/chacha20.h4
-rw-r--r--src/crypto/zinc/selftest/chacha20poly1305.h4
-rw-r--r--src/crypto/zinc/selftest/curve25519.h4
-rw-r--r--src/crypto/zinc/selftest/poly1305.h4
41 files changed, 82 insertions, 82 deletions
diff --git a/src/crypto/include/zinc/blake2s.h b/src/crypto/include/zinc/blake2s.h
index c553c55..f14230e 100644
--- a/src/crypto/include/zinc/blake2s.h
+++ b/src/crypto/include/zinc/blake2s.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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/include/zinc/chacha20.h b/src/crypto/include/zinc/chacha20.h
index c3e4303..455c431 100644
--- a/src/crypto/include/zinc/chacha20.h
+++ b/src/crypto/include/zinc/chacha20.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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/include/zinc/chacha20poly1305.h b/src/crypto/include/zinc/chacha20poly1305.h
index 89e144c..50b2be9 100644
--- a/src/crypto/include/zinc/chacha20poly1305.h
+++ b/src/crypto/include/zinc/chacha20poly1305.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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/include/zinc/curve25519.h b/src/crypto/include/zinc/curve25519.h
index 65afebc..ac5979c 100644
--- a/src/crypto/include/zinc/curve25519.h
+++ b/src/crypto/include/zinc/curve25519.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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/include/zinc/poly1305.h b/src/crypto/include/zinc/poly1305.h
index 6d8b94a..13fe0e5 100644
--- a/src/crypto/include/zinc/poly1305.h
+++ b/src/crypto/include/zinc/poly1305.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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc.h b/src/crypto/zinc.h
index 6862e7f..319b71d 100644
--- a/src/crypto/zinc.h
+++ b/src/crypto/zinc.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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h
index 506d1df..ffbdc1b 100644
--- a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h
+++ b/src/crypto/zinc/blake2s/blake2s-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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/blake2s/blake2s-x86_64.S b/src/crypto/zinc/blake2s/blake2s-x86_64.S
index c199e67..1407a5f 100644
--- a/src/crypto/zinc/blake2s/blake2s-x86_64.S
+++ b/src/crypto/zinc/blake2s/blake2s-x86_64.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 <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2017 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/blake2s/blake2s.c b/src/crypto/zinc/blake2s/blake2s.c
index 4b1cd46..a797524 100644
--- a/src/crypto/zinc/blake2s/blake2s.c
+++ b/src/crypto/zinc/blake2s/blake2s.c
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT
- *
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
* Copyright (C) 2012 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved.
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/chacha20/chacha20-arm-glue.h b/src/crypto/zinc/chacha20/chacha20-arm-glue.h
index d5327bf..9ec2cd8 100644
--- a/src/crypto/zinc/chacha20/chacha20-arm-glue.h
+++ b/src/crypto/zinc/chacha20/chacha20-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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/chacha20/chacha20-arm.S b/src/crypto/zinc/chacha20/chacha20-arm.S
index 9280d71..3f9cfe0 100644
--- a/src/crypto/zinc/chacha20/chacha20-arm.S
+++ b/src/crypto/zinc/chacha20/chacha20-arm.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/chacha20/chacha20-arm64.S b/src/crypto/zinc/chacha20/chacha20-arm64.S
index 1be1d90..ba82286 100644
--- a/src/crypto/zinc/chacha20/chacha20-arm64.S
+++ b/src/crypto/zinc/chacha20/chacha20-arm64.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/chacha20/chacha20-mips-glue.h b/src/crypto/zinc/chacha20/chacha20-mips-glue.h
index c4bee4b..2458e41 100644
--- a/src/crypto/zinc/chacha20/chacha20-mips-glue.h
+++ b/src/crypto/zinc/chacha20/chacha20-mips-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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/chacha20/chacha20-mips.S b/src/crypto/zinc/chacha20/chacha20-mips.S
index b52e9a6..2ff4e55 100644
--- a/src/crypto/zinc/chacha20/chacha20-mips.S
+++ b/src/crypto/zinc/chacha20/chacha20-mips.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT
- *
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/*
* Copyright (C) 2016-2018 René van Dorst <opensource@vdorst.com>. All Rights Reserved.
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/chacha20/chacha20-x86_64-glue.h b/src/crypto/zinc/chacha20/chacha20-x86_64-glue.h
index a14d73f..46fe24c 100644
--- a/src/crypto/zinc/chacha20/chacha20-x86_64-glue.h
+++ b/src/crypto/zinc/chacha20/chacha20-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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/chacha20/chacha20-x86_64.S b/src/crypto/zinc/chacha20/chacha20-x86_64.S
index 637f5c9..3d10c7f 100644
--- a/src/crypto/zinc/chacha20/chacha20-x86_64.S
+++ b/src/crypto/zinc/chacha20/chacha20-x86_64.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2017 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved.
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
diff --git a/src/crypto/zinc/chacha20/chacha20.c b/src/crypto/zinc/chacha20/chacha20.c
index 03e8cad..b843a73 100644
--- a/src/crypto/zinc/chacha20/chacha20.c
+++ b/src/crypto/zinc/chacha20/chacha20.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 <Jason@zx2c4.com>. All Rights Reserved.
*
* Implementation of the ChaCha20 stream cipher.
diff --git a/src/crypto/zinc/chacha20poly1305.c b/src/crypto/zinc/chacha20poly1305.c
index 3ac6cf9..2003cb1 100644
--- a/src/crypto/zinc/chacha20poly1305.c
+++ b/src/crypto/zinc/chacha20poly1305.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 <Jason@zx2c4.com>. All Rights Reserved.
*
* This is an implementation of the ChaCha20Poly1305 AEAD construction.
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 <Jason@zx2c4.com>. 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 <Jason@zx2c4.com>. 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 <Jason@zx2c4.com>. 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 <Jason@zx2c4.com>. 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 <Jason@zx2c4.com>. 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 <armfazh@ic.unicamp.br>. All Rights Reserved.
* Copyright (C) 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2018 Samuel Neves <sneves@dei.uc.pt>. 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 <Jason@zx2c4.com>. All Rights Reserved.
*
* This is an implementation of the Curve25519 ECDH algorithm, using either
diff --git a/src/crypto/zinc/poly1305/poly1305-arm-glue.h b/src/crypto/zinc/poly1305/poly1305-arm-glue.h
index 8a1f87c..1dfd549 100644
--- a/src/crypto/zinc/poly1305/poly1305-arm-glue.h
+++ b/src/crypto/zinc/poly1305/poly1305-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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/poly1305/poly1305-arm.S b/src/crypto/zinc/poly1305/poly1305-arm.S
index 41cd176..84c96c3 100644
--- a/src/crypto/zinc/poly1305/poly1305-arm.S
+++ b/src/crypto/zinc/poly1305/poly1305-arm.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/poly1305/poly1305-arm64.S b/src/crypto/zinc/poly1305/poly1305-arm64.S
index 2494cca..4ccd3d5 100644
--- a/src/crypto/zinc/poly1305/poly1305-arm64.S
+++ b/src/crypto/zinc/poly1305/poly1305-arm64.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/poly1305/poly1305-donna32.h b/src/crypto/zinc/poly1305/poly1305-donna32.h
index f449b28..2e7565d 100644
--- a/src/crypto/zinc/poly1305/poly1305-donna32.h
+++ b/src/crypto/zinc/poly1305/poly1305-donna32.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 <Jason@zx2c4.com>. All Rights Reserved.
*
* This is based in part on Andrew Moon's poly1305-donna, which is in the
diff --git a/src/crypto/zinc/poly1305/poly1305-donna64.h b/src/crypto/zinc/poly1305/poly1305-donna64.h
index bea0a2e..7850e0a 100644
--- a/src/crypto/zinc/poly1305/poly1305-donna64.h
+++ b/src/crypto/zinc/poly1305/poly1305-donna64.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 <Jason@zx2c4.com>. All Rights Reserved.
*
* This is based in part on Andrew Moon's poly1305-donna, which is in the
diff --git a/src/crypto/zinc/poly1305/poly1305-mips-glue.h b/src/crypto/zinc/poly1305/poly1305-mips-glue.h
index 866b022..eb38cd5 100644
--- a/src/crypto/zinc/poly1305/poly1305-mips-glue.h
+++ b/src/crypto/zinc/poly1305/poly1305-mips-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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/poly1305/poly1305-mips.S b/src/crypto/zinc/poly1305/poly1305-mips.S
index 26c0f1f..128b60c 100644
--- a/src/crypto/zinc/poly1305/poly1305-mips.S
+++ b/src/crypto/zinc/poly1305/poly1305-mips.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT
- *
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/*
* Copyright (C) 2016-2018 René van Dorst <opensource@vdorst.com> All Rights Reserved.
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/poly1305/poly1305-mips64.S b/src/crypto/zinc/poly1305/poly1305-mips64.S
index 6f8166f..5662b1b 100644
--- a/src/crypto/zinc/poly1305/poly1305-mips64.S
+++ b/src/crypto/zinc/poly1305/poly1305-mips64.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h b/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h
index 2359e5b..4926d27 100644
--- a/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h
+++ b/src/crypto/zinc/poly1305/poly1305-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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/poly1305/poly1305-x86_64.S b/src/crypto/zinc/poly1305/poly1305-x86_64.S
index e4951c5..3c3f2b4 100644
--- a/src/crypto/zinc/poly1305/poly1305-x86_64.S
+++ b/src/crypto/zinc/poly1305/poly1305-x86_64.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2017 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved.
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
diff --git a/src/crypto/zinc/poly1305/poly1305.c b/src/crypto/zinc/poly1305/poly1305.c
index a261751..f64b501 100644
--- a/src/crypto/zinc/poly1305/poly1305.c
+++ b/src/crypto/zinc/poly1305/poly1305.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 <Jason@zx2c4.com>. All Rights Reserved.
*
* Implementation of the Poly1305 message authenticator.
diff --git a/src/crypto/zinc/selftest/blake2s.h b/src/crypto/zinc/selftest/blake2s.h
index 3b6f330..dea18f4 100644
--- a/src/crypto/zinc/selftest/blake2s.h
+++ b/src/crypto/zinc/selftest/blake2s.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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/selftest/chacha20.h b/src/crypto/zinc/selftest/chacha20.h
index 15f4a4b..4a0e9b8 100644
--- a/src/crypto/zinc/selftest/chacha20.h
+++ b/src/crypto/zinc/selftest/chacha20.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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/selftest/chacha20poly1305.h b/src/crypto/zinc/selftest/chacha20poly1305.h
index 4d0fe61..100344a 100644
--- a/src/crypto/zinc/selftest/chacha20poly1305.h
+++ b/src/crypto/zinc/selftest/chacha20poly1305.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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/selftest/curve25519.h b/src/crypto/zinc/selftest/curve25519.h
index 68052e5..5d3f268 100644
--- a/src/crypto/zinc/selftest/curve25519.h
+++ b/src/crypto/zinc/selftest/curve25519.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 <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/selftest/poly1305.h b/src/crypto/zinc/selftest/poly1305.h
index c195df1..e806ab2 100644
--- a/src/crypto/zinc/selftest/poly1305.h
+++ b/src/crypto/zinc/selftest/poly1305.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 <Jason@zx2c4.com>. All Rights Reserved.
*/