summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-12-29 17:46:49 +1100
committerDamien Miller <djm@mindrot.org>2013-12-29 17:46:49 +1100
commit339a48fe7ffb3186d22bbaa9efbbc3a053e602fd (patch)
treecb9ad9a01f88368d05ad41ba551ca2b075ed91cd
parent0b36c83148976c7c8268f4f41497359e2fb26251 (diff)
- djm@cvs.openbsd.org 2013/12/19 22:57:13
[poly1305.c poly1305.h] use full name for author, with his permission
-rw-r--r--ChangeLog3
-rw-r--r--poly1305.c4
-rw-r--r--poly1305.h4
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 604bbbb78..339140fe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@
28 bz#2186: don't crash (NULL deref) when deleting PKCS#11 keys from an agent 28 bz#2186: don't crash (NULL deref) when deleting PKCS#11 keys from an agent
29 that has a mix of normal and PKCS#11 keys; fix from jay AT slushpupie.com; 29 that has a mix of normal and PKCS#11 keys; fix from jay AT slushpupie.com;
30 ok dtucker 30 ok dtucker
31 - djm@cvs.openbsd.org 2013/12/19 22:57:13
32 [poly1305.c poly1305.h]
33 use full name for author, with his permission
31 34
3220131221 3520131221
33 - (dtucker) [regress/keytype.sh] Actually test ecdsa key types. 36 - (dtucker) [regress/keytype.sh] Actually test ecdsa key types.
diff --git a/poly1305.c b/poly1305.c
index 059cc60f7..a5eada498 100644
--- a/poly1305.c
+++ b/poly1305.c
@@ -1,9 +1,9 @@
1/* 1/*
2 * Public Domain poly1305 from Andrew M. 2 * Public Domain poly1305 from Andrew Moon
3 * poly1305-donna-unrolled.c from https://github.com/floodyberry/poly1305-donna 3 * poly1305-donna-unrolled.c from https://github.com/floodyberry/poly1305-donna
4 */ 4 */
5 5
6/* $OpenBSD: poly1305.c,v 1.2 2013/11/21 02:50:00 djm Exp $ */ 6/* $OpenBSD: poly1305.c,v 1.3 2013/12/19 22:57:13 djm Exp $ */
7 7
8#include "includes.h" 8#include "includes.h"
9 9
diff --git a/poly1305.h b/poly1305.h
index a31fb7425..221efc462 100644
--- a/poly1305.h
+++ b/poly1305.h
@@ -1,7 +1,7 @@
1/* $OpenBSD: poly1305.h,v 1.1 2013/11/21 00:45:44 djm Exp $ */ 1/* $OpenBSD: poly1305.h,v 1.2 2013/12/19 22:57:13 djm Exp $ */
2 2
3/* 3/*
4 * Public Domain poly1305 from Andrew M. 4 * Public Domain poly1305 from Andrew Moon
5 * poly1305-donna-unrolled.c from https://github.com/floodyberry/poly1305-donna 5 * poly1305-donna-unrolled.c from https://github.com/floodyberry/poly1305-donna
6 */ 6 */
7 7