- 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.

diff --git a/ChangeLog b/ChangeLog
index dd31fd63bb32a7133cbdd88b49d4a544a960f10d..a9705ad5b8d0b12796c2e7b65f263e2e5fdda009 100644 (file)
--- 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 8e698c4ae046f07456ae9e9875c65642e636282b..ba569b00a888d1b867e7006b598ac3d550d04df9 100644 (file)
--- 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 9c9879c095d9a84f3177039c71d664409ced76e0..767ec24d6df5c6c030a04cd2193d3070d7b067aa 100644 (file)
--- 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 3a9181bad38e7637f89c557712cbddbc5968a18e..2f368ebe6c86e03a2e61814ca1a47e03f504cb62 100644 (file)
--- 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 9d9a114b421e1d7a11f2d85d1e16a779a55f1a3e..41b3cbb49dc6f97ccf908fa65d5240ba87b965a9 100644 (file)
--- 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 204eebf49b42319fb8e056e4161630d0149f4692..2ce29d0e7f43c6fde01b7a4e3562d554aaffc458 100644 (file)
--- 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 505bc2c81af528c8cde1a90b8047a487cf9350c4..64f63c6f8f417d25969bb78054c01164ad3f9654 100644 (file)
--- 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 d05e0bd004188cfc4037da574abc66c21fe8745c..66fb1b61c67d2d30cec2781564903d90c9086a38 100644 (file)
--- 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 cb9ba982c3bbb22a14d2febc77dd1b504975265c..284bff9d397229a69334fca3a40f33dfb8f86128 100644 (file)
--- 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 c2b6db0e13e9641160514f7a33fe1f5866f21450..54c0b509c1519d997d46312b5bf888bdb91a9b5f 100644 (file)
--- 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 d49abceeaa42fd64d0d298eacc781bc7b8968d8f..a2c15d5ff99608e563ef4eacf64c41a5b49472f2 100644 (file)
--- 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 c26824146bbb90bb7cce5b22d3743485e87ec1d8..0a328090c5c8803da7be8a7937d2a0daa0bdc0a6 100644 (file)
--- 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"