summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/crypto/gmac.c4
-rw-r--r--sys/crypto/gmac.h4
-rw-r--r--sys/crypto/xform.c11
3 files changed, 12 insertions, 7 deletions
diff --git a/sys/crypto/gmac.c b/sys/crypto/gmac.c
index 3a03599f70b..0ff79c21de4 100644
--- a/sys/crypto/gmac.c
+++ b/sys/crypto/gmac.c
@@ -1,7 +1,7 @@
-/* $OpenBSD: gmac.c,v 1.7 2015/11/07 17:46:07 mikeb Exp $ */
+/* $OpenBSD: gmac.c,v 1.8 2015/11/07 17:46:49 mikeb Exp $ */
/*
- * Copyright (c) 2010 Mike Belopuhov <mike@vantronix.net>
+ * Copyright (c) 2010 Mike Belopuhov
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/sys/crypto/gmac.h b/sys/crypto/gmac.h
index 07a4adb1a54..bae2c80864d 100644
--- a/sys/crypto/gmac.h
+++ b/sys/crypto/gmac.h
@@ -1,7 +1,7 @@
-/* $OpenBSD: gmac.h,v 1.4 2015/11/07 17:46:07 mikeb Exp $ */
+/* $OpenBSD: gmac.h,v 1.5 2015/11/07 17:46:49 mikeb Exp $ */
/*
- * Copyright (c) 2010 Mike Belopuhov <mike@vantronix.net>
+ * Copyright (c) 2010 Mike Belopuhov
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/sys/crypto/xform.c b/sys/crypto/xform.c
index 8c72b067c68..e9650d2acf6 100644
--- a/sys/crypto/xform.c
+++ b/sys/crypto/xform.c
@@ -1,9 +1,10 @@
-/* $OpenBSD: xform.c,v 1.50 2015/11/07 17:46:07 mikeb Exp $ */
+/* $OpenBSD: xform.c,v 1.51 2015/11/07 17:46:49 mikeb Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr),
- * Niels Provos (provos@physnet.uni-hamburg.de) and
- * Damien Miller (djm@mindrot.org).
+ * Niels Provos (provos@physnet.uni-hamburg.de),
+ * Damien Miller (djm@mindrot.org) and
+ * Mike Belopuhov (mikeb@openbsd.org).
*
* This code was written by John Ioannidis for BSD/OS in Athens, Greece,
* in November 1995.
@@ -18,6 +19,8 @@
*
* AES XTS implementation in 2008 by Damien Miller
*
+ * AES-GCM-16 and Chacha20-Poly1305 AEAD modes by Mike Belopuhov.
+ *
* Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis,
* Angelos D. Keromytis and Niels Provos.
*
@@ -25,6 +28,8 @@
*
* Copyright (C) 2008, Damien Miller
*
+ * Copyright (C) 2010, 2015, Mike Belopuhov
+ *
* Permission to use, copy, and modify this software with or without fee
* is hereby granted, provided that this entire notice is included in
* all copies of any software which is or includes a copy or