- markus@cvs.openbsd.org 2013/12/09 11:03:45

     [blocks.c ed25519.c fe25519.c fe25519.h ge25519.c ge25519.h]
     [ge25519_base.data hash.c sc25519.c sc25519.h verify.c]
     Add Authors for the public domain ed25519/nacl code.
     see also http://nacl.cr.yp.to/features.html
        All of the NaCl software is in the public domain.
     and http://ed25519.cr.yp.to/software.html
        The Ed25519 software is in the public domain.

12 files changed, 68 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index dd31fd63b..a9705ad5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,14 @@
    - dtucker@cvs.openbsd.org 2013/12/08 09:53:27
      [sshd_config.5]
      Use a literal for the default value of KEXAlgorithms.  ok deraadt jmc
+   - markus@cvs.openbsd.org 2013/12/09 11:03:45
+     [blocks.c ed25519.c fe25519.c fe25519.h ge25519.c ge25519.h]
+     [ge25519_base.data hash.c sc25519.c sc25519.h verify.c]
+     Add Authors for the public domain ed25519/nacl code.
+     see also http://nacl.cr.yp.to/features.html
+        All of the NaCl software is in the public domain.
+     and http://ed25519.cr.yp.to/software.html
+        The Ed25519 software is in the public domain.
 
 20131208
  - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna
diff --git a/blocks.c b/blocks.c
index 8e698c4ae..ba569b00a 100644
--- a/blocks.c
+++ b/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/ed25519.c b/ed25519.c
index 9c9879c09..767ec24d6 100644
--- a/ed25519.c
+++ b/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 "includes.h"
 #include "crypto_api.h"
diff --git a/fe25519.c b/fe25519.c
index 3a9181bad..2f368ebe6 100644
--- a/fe25519.c
+++ b/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/fe25519.h b/fe25519.h
index 9d9a114b4..41b3cbb49 100644
--- a/fe25519.h
+++ b/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/ge25519.c b/ge25519.c
index 204eebf49..2ce29d0e7 100644
--- a/ge25519.c
+++ b/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/ge25519.h b/ge25519.h
index 505bc2c81..64f63c6f8 100644
--- a/ge25519.h
+++ b/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/ge25519_base.data b/ge25519_base.data
index d05e0bd00..66fb1b61c 100644
--- a/ge25519_base.data
+++ b/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/hash.c b/hash.c
index cb9ba982c..284bff9d3 100644
--- a/hash.c
+++ b/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/sc25519.c b/sc25519.c
index c2b6db0e1..54c0b509c 100644
--- a/sc25519.c
+++ b/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/sc25519.h b/sc25519.h
index d49abceea..a2c15d5ff 100644
--- a/sc25519.h
+++ b/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/verify.c b/verify.c
index c26824146..0a328090c 100644
--- a/verify.c
+++ b/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"