diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | blocks.c | 7 | ||||
-rw-r--r-- | ed25519.c | 8 | ||||
-rw-r--r-- | fe25519.c | 8 | ||||
-rw-r--r-- | fe25519.h | 8 | ||||
-rw-r--r-- | ge25519.c | 8 | ||||
-rw-r--r-- | ge25519.h | 8 | ||||
-rw-r--r-- | ge25519_base.data | 8 | ||||
-rw-r--r-- | hash.c | 4 | ||||
-rw-r--r-- | sc25519.c | 8 | ||||
-rw-r--r-- | sc25519.h | 8 | ||||
-rw-r--r-- | verify.c | 7 |
12 files changed, 68 insertions, 22 deletions
@@ -10,6 +10,14 @@ | |||
10 | - dtucker@cvs.openbsd.org 2013/12/08 09:53:27 | 10 | - dtucker@cvs.openbsd.org 2013/12/08 09:53:27 |
11 | [sshd_config.5] | 11 | [sshd_config.5] |
12 | Use a literal for the default value of KEXAlgorithms. ok deraadt jmc | 12 | Use a literal for the default value of KEXAlgorithms. ok deraadt jmc |
13 | - markus@cvs.openbsd.org 2013/12/09 11:03:45 | ||
14 | [blocks.c ed25519.c fe25519.c fe25519.h ge25519.c ge25519.h] | ||
15 | [ge25519_base.data hash.c sc25519.c sc25519.h verify.c] | ||
16 | Add Authors for the public domain ed25519/nacl code. | ||
17 | see also http://nacl.cr.yp.to/features.html | ||
18 | All of the NaCl software is in the public domain. | ||
19 | and http://ed25519.cr.yp.to/software.html | ||
20 | The Ed25519 software is in the public domain. | ||
13 | 21 | ||
14 | 20131208 | 22 | 20131208 |
15 | - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna | 23 | - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna |
@@ -1,6 +1,9 @@ | |||
1 | /* $OpenBSD: blocks.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */ | 1 | /* $OpenBSD: blocks.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */ |
2 | 2 | ||
3 | /* Public Domain, from supercop-20130419/crypto_hashblocks/sha512/ref/blocks.c */ | 3 | /* |
4 | * Public Domain, Author: Daniel J. Bernstein | ||
5 | * Copied from nacl-20110221/crypto_hashblocks/sha512/ref/blocks.c | ||
6 | */ | ||
4 | 7 | ||
5 | #include "crypto_api.h" | 8 | #include "crypto_api.h" |
6 | 9 | ||
@@ -1,6 +1,10 @@ | |||
1 | /* $OpenBSD: ed25519.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */ | 1 | /* $OpenBSD: ed25519.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */ |
2 | 2 | ||
3 | /* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/ed25519.c */ | 3 | /* |
4 | * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange, | ||
5 | * Peter Schwabe, Bo-Yin Yang. | ||
6 | * Copied from supercop-20130419/crypto_sign/ed25519/ref/ed25519.c | ||
7 | */ | ||
4 | 8 | ||
5 | #include "includes.h" | 9 | #include "includes.h" |
6 | #include "crypto_api.h" | 10 | #include "crypto_api.h" |
@@ -1,6 +1,10 @@ | |||
1 | /* $OpenBSD: fe25519.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */ | 1 | /* $OpenBSD: fe25519.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */ |
2 | 2 | ||
3 | /* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/fe25519.c */ | 3 | /* |
4 | * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange, | ||
5 | * Peter Schwabe, Bo-Yin Yang. | ||
6 | * Copied from supercop-20130419/crypto_sign/ed25519/ref/fe25519.c | ||
7 | */ | ||
4 | 8 | ||
5 | #define WINDOWSIZE 1 /* Should be 1,2, or 4 */ | 9 | #define WINDOWSIZE 1 /* Should be 1,2, or 4 */ |
6 | #define WINDOWMASK ((1<<WINDOWSIZE)-1) | 10 | #define WINDOWMASK ((1<<WINDOWSIZE)-1) |
@@ -1,6 +1,10 @@ | |||
1 | /* $OpenBSD: fe25519.h,v 1.2 2013/12/07 00:26:37 djm Exp $ */ | 1 | /* $OpenBSD: fe25519.h,v 1.3 2013/12/09 11:03:45 markus Exp $ */ |
2 | 2 | ||
3 | /* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/fe25519.h */ | 3 | /* |
4 | * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange, | ||
5 | * Peter Schwabe, Bo-Yin Yang. | ||
6 | * Copied from supercop-20130419/crypto_sign/ed25519/ref/fe25519.h | ||
7 | */ | ||
4 | 8 | ||
5 | #ifndef FE25519_H | 9 | #ifndef FE25519_H |
6 | #define FE25519_H | 10 | #define FE25519_H |
@@ -1,6 +1,10 @@ | |||
1 | /* $OpenBSD: ge25519.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */ | 1 | /* $OpenBSD: ge25519.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */ |
2 | 2 | ||
3 | /* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/ge25519.c */ | 3 | /* |
4 | * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange, | ||
5 | * Peter Schwabe, Bo-Yin Yang. | ||
6 | * Copied from supercop-20130419/crypto_sign/ed25519/ref/ge25519.c | ||
7 | */ | ||
4 | 8 | ||
5 | #include "fe25519.h" | 9 | #include "fe25519.h" |
6 | #include "sc25519.h" | 10 | #include "sc25519.h" |
@@ -1,6 +1,10 @@ | |||
1 | /* $OpenBSD: ge25519.h,v 1.2 2013/12/07 00:26:37 djm Exp $ */ | 1 | /* $OpenBSD: ge25519.h,v 1.3 2013/12/09 11:03:45 markus Exp $ */ |
2 | 2 | ||
3 | /* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/ge25519.h */ | 3 | /* |
4 | * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange, | ||
5 | * Peter Schwabe, Bo-Yin Yang. | ||
6 | * Copied from supercop-20130419/crypto_sign/ed25519/ref/ge25519.h | ||
7 | */ | ||
4 | 8 | ||
5 | #ifndef GE25519_H | 9 | #ifndef GE25519_H |
6 | #define GE25519_H | 10 | #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 @@ | |||
1 | /* $OpenBSD: ge25519_base.data,v 1.2 2013/12/07 00:26:37 djm Exp $ */ | 1 | /* $OpenBSD: ge25519_base.data,v 1.3 2013/12/09 11:03:45 markus Exp $ */ |
2 | 2 | ||
3 | /* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/ge25519_base.data */ | 3 | /* |
4 | * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange, | ||
5 | * Peter Schwabe, Bo-Yin Yang. | ||
6 | * Copied from supercop-20130419/crypto_sign/ed25519/ref/ge25519_base.data | ||
7 | */ | ||
4 | 8 | ||
5 | {{{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}}, | 9 | {{{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}}, |
6 | {{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}}}, | 10 | {{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}}}, |
@@ -1,6 +1,6 @@ | |||
1 | /* $OpenBSD: hash.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */ | 1 | /* $OpenBSD: hash.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */ |
2 | 2 | ||
3 | /* Public Domain, from supercop-20130419/crypto_hash/sha512/ref/hash.c */ | 3 | /* Copied from nacl-20110221/crypto_hash/sha512/ref/hash.c */ |
4 | 4 | ||
5 | /* | 5 | /* |
6 | 20080913 | 6 | 20080913 |
@@ -1,6 +1,10 @@ | |||
1 | /* $OpenBSD: sc25519.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */ | 1 | /* $OpenBSD: sc25519.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */ |
2 | 2 | ||
3 | /* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/sc25519.c */ | 3 | /* |
4 | * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange, | ||
5 | * Peter Schwabe, Bo-Yin Yang. | ||
6 | * Copied from supercop-20130419/crypto_sign/ed25519/ref/sc25519.c | ||
7 | */ | ||
4 | 8 | ||
5 | #include "sc25519.h" | 9 | #include "sc25519.h" |
6 | 10 | ||
@@ -1,6 +1,10 @@ | |||
1 | /* $OpenBSD: sc25519.h,v 1.2 2013/12/07 00:26:37 djm Exp $ */ | 1 | /* $OpenBSD: sc25519.h,v 1.3 2013/12/09 11:03:45 markus Exp $ */ |
2 | 2 | ||
3 | /* Public Domain, from supercop-20130419/crypto_sign/ed25519/ref/sc25519.h */ | 3 | /* |
4 | * Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange, | ||
5 | * Peter Schwabe, Bo-Yin Yang. | ||
6 | * Copied from supercop-20130419/crypto_sign/ed25519/ref/sc25519.h | ||
7 | */ | ||
4 | 8 | ||
5 | #ifndef SC25519_H | 9 | #ifndef SC25519_H |
6 | #define SC25519_H | 10 | #define SC25519_H |
@@ -1,6 +1,9 @@ | |||
1 | /* $OpenBSD: verify.c,v 1.2 2013/12/07 00:26:37 djm Exp $ */ | 1 | /* $OpenBSD: verify.c,v 1.3 2013/12/09 11:03:45 markus Exp $ */ |
2 | 2 | ||
3 | /* Public Domain, from supercop-20130419/crypto_verify/32/ref/verify.c */ | 3 | /* |
4 | * Public Domain, Author: Daniel J. Bernstein | ||
5 | * Copied from nacl-20110221/crypto_verify/32/ref/verify.c | ||
6 | */ | ||
4 | 7 | ||
5 | #include "crypto_api.h" | 8 | #include "crypto_api.h" |
6 | 9 | ||