summaryrefslogtreecommitdiff
path: root/xchacha20poly1305
diff options
context:
space:
mode:
authorMathias Hall-Andersen <mathias@hall-andersen.dk>2018-05-05 02:23:03 +0200
committerMathias Hall-Andersen <mathias@hall-andersen.dk>2018-05-05 02:23:03 +0200
commitedbce6b400250f764d3b9f38ecfc7bb29adbd967 (patch)
tree4b92b85cf66de6ddd7ec420c81c1c9f88805b183 /xchacha20poly1305
parent6db41d5a269c79bd04b18dbfa171cc241a6cdcc9 (diff)
parente1de0f229a8f2cbfc4bb56230de885386a775fd6 (diff)
downloadwireguard-go-edbce6b400250f764d3b9f38ecfc7bb29adbd967.tar.gz
wireguard-go-edbce6b400250f764d3b9f38ecfc7bb29adbd967.zip
Merge branch 'master' of ssh://git.zx2c4.com/wireguard-go
Diffstat (limited to 'xchacha20poly1305')
-rw-r--r--xchacha20poly1305/xchacha20.go8
-rw-r--r--xchacha20poly1305/xchacha20_test.go5
2 files changed, 10 insertions, 3 deletions
diff --git a/xchacha20poly1305/xchacha20.go b/xchacha20poly1305/xchacha20.go
index a6e59f0..bd27f02 100644
--- a/xchacha20poly1305/xchacha20.go
+++ b/xchacha20poly1305/xchacha20.go
@@ -1,6 +1,8 @@
-// Copyright (c) 2016 Andreas Auernhammer. All rights reserved.
-// Use of this source code is governed by a license that can be
-// found in the LICENSE file.
+/* SPDX-License-Identifier: MIT
+ *
+ * Copyright (C) 2016 Andreas Auernhammer. All Rights Reserved.
+ * Copyright (C) 2017-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
package xchacha20poly1305
diff --git a/xchacha20poly1305/xchacha20_test.go b/xchacha20poly1305/xchacha20_test.go
index 5d5b78f..c0d11d7 100644
--- a/xchacha20poly1305/xchacha20_test.go
+++ b/xchacha20poly1305/xchacha20_test.go
@@ -1,3 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2017-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
+
package xchacha20poly1305
import (