summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/ssh/blocks.c7
-rw-r--r--usr.bin/ssh/ed25519.c8
-rw-r--r--usr.bin/ssh/fe25519.c8
-rw-r--r--usr.bin/ssh/fe25519.h8
-rw-r--r--usr.bin/ssh/ge25519.c8
-rw-r--r--usr.bin/ssh/ge25519.h8
-rw-r--r--usr.bin/ssh/ge25519_base.data8
-rw-r--r--usr.bin/ssh/hash.c4
-rw-r--r--usr.bin/ssh/sc25519.c8
-rw-r--r--usr.bin/ssh/sc25519.h8
-rw-r--r--usr.bin/ssh/verify.c7
11 files changed, 60 insertions, 22 deletions
diff --git a/usr.bin/ssh/blocks.c b/usr.bin/ssh/blocks.c
index 8e698c4ae04..ba569b00a88 100644
--- a/usr.bin/ssh/blocks.c
+++ b/usr.bin/ssh/blocks.c
@@ -1,6 +1,9 @@
-/* $OpenBSD: blocks.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */
+/* $OpenBSD: blocks.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */
-/* Public Domain, from supercop-20130419/crypto_hashblocks/sha512/ref/blocks.c */
+/*
+ * Public Domain, Author: Daniel J. Bernstein
+ * Copied from nacl-20110221/crypto_hashblocks/sha512/ref/blocks.c
+ */
#include "crypto_api.h"
diff --git a/usr.bin/ssh/ed25519.c b/usr.bin/ssh/ed25519.c
index c7c861bb6ff..f8f069bd870 100644
--- a/usr.bin/ssh/ed25519.c
+++ b/usr.bin/ssh/ed25519.c
@@ -1,6 +1,10 @@
-/* $OpenBSD: ed25519.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */
+/* $OpenBSD: ed25519.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */
-/* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/ed25519.c */
+/*
+ * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange,
+ * Peter Schwabe, Bo-Yin Yang.
+ * Copied from supercop-20130419/crypto_sign/ed25519/ref/ed25519.c
+ */
#include "crypto_api.h"
diff --git a/usr.bin/ssh/fe25519.c b/usr.bin/ssh/fe25519.c
index 3a9181bad38..2f368ebe6c8 100644
--- a/usr.bin/ssh/fe25519.c
+++ b/usr.bin/ssh/fe25519.c
@@ -1,6 +1,10 @@
-/* $OpenBSD: fe25519.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */
+/* $OpenBSD: fe25519.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */
-/* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/fe25519.c */
+/*
+ * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange,
+ * Peter Schwabe, Bo-Yin Yang.
+ * Copied from supercop-20130419/crypto_sign/ed25519/ref/fe25519.c
+ */
#define WINDOWSIZE 1 /* Should be 1,2, or 4 */
#define WINDOWMASK ((1<<WINDOWSIZE)-1)
diff --git a/usr.bin/ssh/fe25519.h b/usr.bin/ssh/fe25519.h
index 9d9a114b421..41b3cbb49dc 100644
--- a/usr.bin/ssh/fe25519.h
+++ b/usr.bin/ssh/fe25519.h
@@ -1,6 +1,10 @@
-/* $OpenBSD: fe25519.h,v 1.2 2013/12/07 00:26:37 djm Exp $ */
+/* $OpenBSD: fe25519.h,v 1.3 2013/12/09 11:03:45 markus Exp $ */
-/* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/fe25519.h */
+/*
+ * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange,
+ * Peter Schwabe, Bo-Yin Yang.
+ * Copied from supercop-20130419/crypto_sign/ed25519/ref/fe25519.h
+ */
#ifndef FE25519_H
#define FE25519_H
diff --git a/usr.bin/ssh/ge25519.c b/usr.bin/ssh/ge25519.c
index 204eebf49b4..2ce29d0e7f4 100644
--- a/usr.bin/ssh/ge25519.c
+++ b/usr.bin/ssh/ge25519.c
@@ -1,6 +1,10 @@
-/* $OpenBSD: ge25519.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */
+/* $OpenBSD: ge25519.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */
-/* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/ge25519.c */
+/*
+ * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange,
+ * Peter Schwabe, Bo-Yin Yang.
+ * Copied from supercop-20130419/crypto_sign/ed25519/ref/ge25519.c
+ */
#include "fe25519.h"
#include "sc25519.h"
diff --git a/usr.bin/ssh/ge25519.h b/usr.bin/ssh/ge25519.h
index 505bc2c81af..64f63c6f8f4 100644
--- a/usr.bin/ssh/ge25519.h
+++ b/usr.bin/ssh/ge25519.h
@@ -1,6 +1,10 @@
-/* $OpenBSD: ge25519.h,v 1.2 2013/12/07 00:26:37 djm Exp $ */
+/* $OpenBSD: ge25519.h,v 1.3 2013/12/09 11:03:45 markus Exp $ */
-/* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/ge25519.h */
+/*
+ * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange,
+ * Peter Schwabe, Bo-Yin Yang.
+ * Copied from supercop-20130419/crypto_sign/ed25519/ref/ge25519.h
+ */
#ifndef GE25519_H
#define GE25519_H
diff --git a/usr.bin/ssh/ge25519_base.data b/usr.bin/ssh/ge25519_base.data
index d05e0bd0041..66fb1b61c67 100644
--- a/usr.bin/ssh/ge25519_base.data
+++ b/usr.bin/ssh/ge25519_base.data
@@ -1,6 +1,10 @@
-/* $OpenBSD: ge25519_base.data,v 1.2 2013/12/07 00:26:37 djm Exp $ */
+/* $OpenBSD: ge25519_base.data,v 1.3 2013/12/09 11:03:45 markus Exp $ */
-/* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/ge25519_base.data */
+/*
+ * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange,
+ * Peter Schwabe, Bo-Yin Yang.
+ * Copied from supercop-20130419/crypto_sign/ed25519/ref/ge25519_base.data
+ */
{{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
{{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
diff --git a/usr.bin/ssh/hash.c b/usr.bin/ssh/hash.c
index cb9ba982c3b..284bff9d397 100644
--- a/usr.bin/ssh/hash.c
+++ b/usr.bin/ssh/hash.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: hash.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */
+/* $OpenBSD: hash.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */
-/* Public Domain, from supercop-20130419/crypto_hash/sha512/ref/hash.c */
+/* Copied from nacl-20110221/crypto_hash/sha512/ref/hash.c */
/*
20080913
diff --git a/usr.bin/ssh/sc25519.c b/usr.bin/ssh/sc25519.c
index c2b6db0e13e..54c0b509c15 100644
--- a/usr.bin/ssh/sc25519.c
+++ b/usr.bin/ssh/sc25519.c
@@ -1,6 +1,10 @@
-/* $OpenBSD: sc25519.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */
+/* $OpenBSD: sc25519.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */
-/* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/sc25519.c */
+/*
+ * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange,
+ * Peter Schwabe, Bo-Yin Yang.
+ * Copied from supercop-20130419/crypto_sign/ed25519/ref/sc25519.c
+ */
#include "sc25519.h"
diff --git a/usr.bin/ssh/sc25519.h b/usr.bin/ssh/sc25519.h
index d49abceeaa4..a2c15d5ff99 100644
--- a/usr.bin/ssh/sc25519.h
+++ b/usr.bin/ssh/sc25519.h
@@ -1,6 +1,10 @@
-/* $OpenBSD: sc25519.h,v 1.2 2013/12/07 00:26:37 djm Exp $ */
+/* $OpenBSD: sc25519.h,v 1.3 2013/12/09 11:03:45 markus Exp $ */
-/* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/sc25519.h */
+/*
+ * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange,
+ * Peter Schwabe, Bo-Yin Yang.
+ * Copied from supercop-20130419/crypto_sign/ed25519/ref/sc25519.h
+ */
#ifndef SC25519_H
#define SC25519_H
diff --git a/usr.bin/ssh/verify.c b/usr.bin/ssh/verify.c
index c26824146bb..0a328090c5c 100644
--- a/usr.bin/ssh/verify.c
+++ b/usr.bin/ssh/verify.c
@@ -1,6 +1,9 @@
-/* $OpenBSD: verify.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */
+/* $OpenBSD: verify.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */
-/* Public Domain, from supercop-20130419/crypto_verify/32/ref/verify.c */
+/*
+ * Public Domain, Author: Daniel J. Bernstein
+ * Copied from nacl-20110221/crypto_verify/32/ref/verify.c
+ */
#include "crypto_api.h"