Replace the build system

.gitignore

@@ -38,7 +38,6 @@ m4/lt~obsolete.m4
 man/*.html
 man/Makefile.in
 missing
-src/libnacl/okcompilers/c
-src/libnacl/okcompilers/do
+src/libnacl-ref/include/version.h
 stamp-*
 testing

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ([2.61])
 AC_INIT([libnacl-ref],[0.0.1],[https://github.com/jedisct1/nacl-ref])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([libltdl/config])
-AC_CONFIG_SRCDIR([src/libnacl/PROTOTYPES.c])
+AC_CONFIG_SRCDIR([src/libnacl-ref/randombytes/devurandom.c])
 AC_CONFIG_HEADER([config.h])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
@@ -203,12 +203,8 @@ AH_VERBATIM([NDEBUG], [/* Never ever ignore assertions */
 
 AC_CONFIG_FILES([Makefile
                  src/Makefile
-                 src/libnacl/Makefile
-                 src/libnacl/tests/Makefile
-                 src/libnacl/okcompilers/c
-                 src/libnacl/okcompilers/do])
+                 src/libnacl-ref/Makefile
+                 src/libnacl-ref/include/Makefile
+                 src/libnacl-ref/include/nacl/version.h])
 
 AC_OUTPUT
-
-chmod +x src/libnacl/do
-chmod +x src/libnacl/okcompilers/do

src/Makefile.am

@@ -1,3 +1,3 @@
 
 SUBDIRS = \
-	libnacl
+	libnacl-ref

src/libnacl-ref/Makefile.am

@@ -0,0 +1,88 @@
+
+lib_LTLIBRARIES = \
+	libnacl.la
+
+libnacl_la_SOURCES = \
+	randombytes/devurandom.c \
+	randombytes/devurandom.h \
+	crypto_core/hsalsa20/ref2/core_hsalsa20.c \
+	crypto_core/hsalsa20/ref2/crypto_core.h \
+	crypto_core/hsalsa20/ref2/crypto_core_hsalsa20.h \
+	crypto_core/salsa20/ref/core_salsa20.c \
+	crypto_core/salsa20/ref/crypto_core.h \
+	crypto_core/salsa20/ref/crypto_core_salsa20.h \
+	crypto_core/salsa2012/ref/core_salsa2012.c \
+	crypto_core/salsa2012/ref/crypto_core.h \
+	crypto_core/salsa2012/ref/crypto_core_salsa2012.h \
+	crypto_core/salsa208/ref/core_salsa208.c \
+	crypto_core/salsa208/ref/crypto_core.h \
+	crypto_core/salsa208/ref/crypto_core_salsa208.h \
+	crypto_scalarmult/curve25519/ref/base.c \
+	crypto_scalarmult/curve25519/ref/crypto_scalarmult.h \
+	crypto_scalarmult/curve25519/ref/crypto_scalarmult_curve25519.h \
+	crypto_scalarmult/curve25519/ref/smult.c \
+	crypto_hashblocks/sha256/ref/blocks_sha256.c \
+	crypto_hashblocks/sha256/ref/crypto_hashblocks.h \
+	crypto_hashblocks/sha256/ref/crypto_hashblocks_sha256.h \
+	crypto_hashblocks/sha512/ref/blocks_sha512.c \
+	crypto_hashblocks/sha512/ref/crypto_hashblocks.h \
+	crypto_hashblocks/sha512/ref/crypto_hashblocks_sha512.h \
+	crypto_hash/sha256/ref/crypto_hash.h \
+	crypto_hash/sha256/ref/hash_sha256.c \
+	crypto_hash/sha512/ref/crypto_hash.h \
+	crypto_hash/sha512/ref/hash_sha512.c \
+	crypto_verify/16/ref/crypto_verify.h \
+	crypto_verify/16/ref/verify_16.c \
+	crypto_verify/32/ref/crypto_verify.h \
+	crypto_verify/32/ref/verify_32.c \
+	crypto_auth/hmacsha256/ref/crypto_auth.h \
+	crypto_auth/hmacsha256/ref/hmac_hmacsha256.c \
+	crypto_auth/hmacsha256/ref/verify_hmacsha256.c \
+	crypto_auth/hmacsha512256/ref/api.h \
+	crypto_auth/hmacsha512256/ref/crypto_auth.h \
+	crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c \
+	crypto_auth/hmacsha512256/ref/verify_hmacsha512256.c \
+	crypto_stream/salsa20/ref/crypto_stream.h \
+	crypto_stream/salsa20/ref/stream_salsa20.c \
+	crypto_stream/salsa20/ref/xor_salsa20.c \
+	crypto_stream/salsa2012/ref/crypto_stream.h \
+	crypto_stream/salsa2012/ref/stream_salsa2012.c \
+	crypto_stream/salsa2012/ref/xor_salsa2012.c \
+	crypto_stream/salsa208/ref/crypto_stream.h \
+	crypto_stream/salsa208/ref/stream_salsa208.c \
+	crypto_stream/salsa208/ref/xor_salsa208.c \
+	crypto_stream/xsalsa20/ref/crypto_stream.h \
+	crypto_stream/xsalsa20/ref/stream_xsalsa20.c \
+	crypto_stream/xsalsa20/ref/xor_xsalsa20.c \
+	crypto_onetimeauth/poly1305/ref/auth_poly1305.c \
+	crypto_onetimeauth/poly1305/ref/crypto_onetimeauth.h \
+	crypto_onetimeauth/poly1305/ref/verify_poly1305.c \
+	crypto_sign/edwards25519sha512batch/ref/crypto_sign.h \
+	crypto_sign/edwards25519sha512batch/ref/fe25519.h \
+	crypto_sign/edwards25519sha512batch/ref/fe25519_edwards25519sha512batch.c \
+	crypto_sign/edwards25519sha512batch/ref/ge25519.h \
+	crypto_sign/edwards25519sha512batch/ref/ge25519_edwards25519sha512batch.c \
+	crypto_sign/edwards25519sha512batch/ref/sc25519.h \
+	crypto_sign/edwards25519sha512batch/ref/sc25519_edwards25519sha512batch.c \
+	crypto_sign/edwards25519sha512batch/ref/sign_edwards25519sha512batch.c \
+	crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c \
+	crypto_secretbox/xsalsa20poly1305/ref/crypto_secretbox.h \
+	crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c \
+	crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c \
+	crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c \
+	crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h \
+	crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c
+
+libnacl_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-avoid-version \
+	-export-dynamic \
+	-module \
+	-no-undefined
+
+libnacl_la_CPPFLAGS = \
+	$(LTDLINCL) \
+	-Iinclude/nacl
+
+SUBDIRS = \
+	include

src/libnacl-ref/crypto_auth/hmacsha256/ref/crypto_auth.h

@@ -0,0 +1,14 @@
+#ifndef crypto_auth_H
+#define crypto_auth_H
+
+#include "crypto_auth_hmacsha256.h"
+
+#define crypto_auth crypto_auth_hmacsha256
+#define crypto_auth_verify crypto_auth_hmacsha256_verify
+#define crypto_auth_BYTES crypto_auth_hmacsha256_BYTES
+#define crypto_auth_KEYBYTES crypto_auth_hmacsha256_KEYBYTES
+#define crypto_auth_PRIMITIVE "hmacsha256"
+#define crypto_auth_IMPLEMENTATION crypto_auth_hmacsha256_IMPLEMENTATION
+#define crypto_auth_VERSION crypto_auth_hmacsha256_VERSION
+
+#endif

src/libnacl-ref/crypto_auth/hmacsha512256/ref/crypto_auth.h

@@ -0,0 +1,14 @@
+#ifndef crypto_auth_H
+#define crypto_auth_H
+
+#include "crypto_auth_hmacsha512256.h"
+
+#define crypto_auth crypto_auth_hmacsha512256
+#define crypto_auth_verify crypto_auth_hmacsha512256_verify
+#define crypto_auth_BYTES crypto_auth_hmacsha512256_BYTES
+#define crypto_auth_KEYBYTES crypto_auth_hmacsha512256_KEYBYTES
+#define crypto_auth_PRIMITIVE "hmacsha512256"
+#define crypto_auth_IMPLEMENTATION crypto_auth_hmacsha512256_IMPLEMENTATION
+#define crypto_auth_VERSION crypto_auth_hmacsha512256_VERSION
+
+#endif

src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h

@@ -0,0 +1,22 @@
+#ifndef crypto_box_H
+#define crypto_box_H
+
+#include "crypto_box_curve25519xsalsa20poly1305.h"
+
+#define crypto_box crypto_box_curve25519xsalsa20poly1305
+#define crypto_box_open crypto_box_curve25519xsalsa20poly1305_open
+#define crypto_box_keypair crypto_box_curve25519xsalsa20poly1305_keypair
+#define crypto_box_beforenm crypto_box_curve25519xsalsa20poly1305_beforenm
+#define crypto_box_afternm crypto_box_curve25519xsalsa20poly1305_afternm
+#define crypto_box_open_afternm crypto_box_curve25519xsalsa20poly1305_open_afternm
+#define crypto_box_PUBLICKEYBYTES crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES
+#define crypto_box_SECRETKEYBYTES crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES
+#define crypto_box_BEFORENMBYTES crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES
+#define crypto_box_NONCEBYTES crypto_box_curve25519xsalsa20poly1305_NONCEBYTES
+#define crypto_box_ZEROBYTES crypto_box_curve25519xsalsa20poly1305_ZEROBYTES
+#define crypto_box_BOXZEROBYTES crypto_box_curve25519xsalsa20poly1305_BOXZEROBYTES
+#define crypto_box_PRIMITIVE "curve25519xsalsa20poly1305"
+#define crypto_box_IMPLEMENTATION crypto_box_curve25519xsalsa20poly1305_IMPLEMENTATION
+#define crypto_box_VERSION crypto_box_curve25519xsalsa20poly1305_VERSION
+
+#endif

src/libnacl-ref/crypto_core/hsalsa20/ref/crypto_core.h

@@ -0,0 +1,15 @@
+#ifndef crypto_core_H
+#define crypto_core_H
+
+#include "crypto_core_hsalsa20.h"
+
+#define crypto_core crypto_core_hsalsa20
+#define crypto_core_OUTPUTBYTES crypto_core_hsalsa20_OUTPUTBYTES
+#define crypto_core_INPUTBYTES crypto_core_hsalsa20_INPUTBYTES
+#define crypto_core_KEYBYTES crypto_core_hsalsa20_KEYBYTES
+#define crypto_core_CONSTBYTES crypto_core_hsalsa20_CONSTBYTES
+#define crypto_core_PRIMITIVE "hsalsa20"
+#define crypto_core_IMPLEMENTATION crypto_core_hsalsa20_IMPLEMENTATION
+#define crypto_core_VERSION crypto_core_hsalsa20_VERSION
+
+#endif

src/libnacl-ref/crypto_core/hsalsa20/ref2/crypto_core.h

@@ -0,0 +1,15 @@
+#ifndef crypto_core_H
+#define crypto_core_H
+
+#include "crypto_core_hsalsa20.h"
+
+#define crypto_core crypto_core_hsalsa20
+#define crypto_core_OUTPUTBYTES crypto_core_hsalsa20_OUTPUTBYTES
+#define crypto_core_INPUTBYTES crypto_core_hsalsa20_INPUTBYTES
+#define crypto_core_KEYBYTES crypto_core_hsalsa20_KEYBYTES
+#define crypto_core_CONSTBYTES crypto_core_hsalsa20_CONSTBYTES
+#define crypto_core_PRIMITIVE "hsalsa20"
+#define crypto_core_IMPLEMENTATION crypto_core_hsalsa20_IMPLEMENTATION
+#define crypto_core_VERSION crypto_core_hsalsa20_VERSION
+
+#endif

src/libnacl-ref/crypto_core/salsa20/ref/crypto_core.h

@@ -0,0 +1,15 @@
+#ifndef crypto_core_H
+#define crypto_core_H
+
+#include "crypto_core_salsa20.h"
+
+#define crypto_core crypto_core_salsa20
+#define crypto_core_OUTPUTBYTES crypto_core_salsa20_OUTPUTBYTES
+#define crypto_core_INPUTBYTES crypto_core_salsa20_INPUTBYTES
+#define crypto_core_KEYBYTES crypto_core_salsa20_KEYBYTES
+#define crypto_core_CONSTBYTES crypto_core_salsa20_CONSTBYTES
+#define crypto_core_PRIMITIVE "salsa20"
+#define crypto_core_IMPLEMENTATION crypto_core_salsa20_IMPLEMENTATION
+#define crypto_core_VERSION crypto_core_salsa20_VERSION
+
+#endif

src/libnacl-ref/crypto_core/salsa2012/ref/crypto_core.h

@@ -0,0 +1,15 @@
+#ifndef crypto_core_H
+#define crypto_core_H
+
+#include "crypto_core_salsa2012.h"
+
+#define crypto_core crypto_core_salsa2012
+#define crypto_core_OUTPUTBYTES crypto_core_salsa2012_OUTPUTBYTES
+#define crypto_core_INPUTBYTES crypto_core_salsa2012_INPUTBYTES
+#define crypto_core_KEYBYTES crypto_core_salsa2012_KEYBYTES
+#define crypto_core_CONSTBYTES crypto_core_salsa2012_CONSTBYTES
+#define crypto_core_PRIMITIVE "salsa2012"
+#define crypto_core_IMPLEMENTATION crypto_core_salsa2012_IMPLEMENTATION
+#define crypto_core_VERSION crypto_core_salsa2012_VERSION
+
+#endif

src/libnacl-ref/crypto_core/salsa208/ref/crypto_core.h

@@ -0,0 +1,15 @@
+#ifndef crypto_core_H
+#define crypto_core_H
+
+#include "crypto_core_salsa208.h"
+
+#define crypto_core crypto_core_salsa208
+#define crypto_core_OUTPUTBYTES crypto_core_salsa208_OUTPUTBYTES
+#define crypto_core_INPUTBYTES crypto_core_salsa208_INPUTBYTES
+#define crypto_core_KEYBYTES crypto_core_salsa208_KEYBYTES
+#define crypto_core_CONSTBYTES crypto_core_salsa208_CONSTBYTES
+#define crypto_core_PRIMITIVE "salsa208"
+#define crypto_core_IMPLEMENTATION crypto_core_salsa208_IMPLEMENTATION
+#define crypto_core_VERSION crypto_core_salsa208_VERSION
+
+#endif

src/libnacl-ref/crypto_hash/sha256/ref/crypto_hash.h

@@ -0,0 +1,12 @@
+#ifndef crypto_hash_H
+#define crypto_hash_H
+
+#include "crypto_hash_sha256.h"
+
+#define crypto_hash crypto_hash_sha256
+#define crypto_hash_BYTES crypto_hash_sha256_BYTES
+#define crypto_hash_PRIMITIVE "sha256"
+#define crypto_hash_IMPLEMENTATION crypto_hash_sha256_IMPLEMENTATION
+#define crypto_hash_VERSION crypto_hash_sha256_VERSION
+
+#endif

src/libnacl-ref/crypto_hash/sha512/ref/crypto_hash.h

@@ -0,0 +1,12 @@
+#ifndef crypto_hash_H
+#define crypto_hash_H
+
+#include "crypto_hash_sha512.h"
+
+#define crypto_hash crypto_hash_sha512
+#define crypto_hash_BYTES crypto_hash_sha512_BYTES
+#define crypto_hash_PRIMITIVE "sha512"
+#define crypto_hash_IMPLEMENTATION crypto_hash_sha512_IMPLEMENTATION
+#define crypto_hash_VERSION crypto_hash_sha512_VERSION
+
+#endif

src/libnacl-ref/crypto_hashblocks/sha256/ref/crypto_hashblocks.h

@@ -0,0 +1,13 @@
+#ifndef crypto_hashblocks_H
+#define crypto_hashblocks_H
+
+#include "crypto_hashblocks_sha256.h"
+
+#define crypto_hashblocks crypto_hashblocks_sha256
+#define crypto_hashblocks_STATEBYTES crypto_hashblocks_sha256_STATEBYTES
+#define crypto_hashblocks_BLOCKBYTES crypto_hashblocks_sha256_BLOCKBYTES
+#define crypto_hashblocks_PRIMITIVE "sha256"
+#define crypto_hashblocks_IMPLEMENTATION crypto_hashblocks_sha256_IMPLEMENTATION
+#define crypto_hashblocks_VERSION crypto_hashblocks_sha256_VERSION
+
+#endif

src/libnacl-ref/crypto_hashblocks/sha512/ref/crypto_hashblocks.h

@@ -0,0 +1,13 @@
+#ifndef crypto_hashblocks_H
+#define crypto_hashblocks_H
+
+#include "crypto_hashblocks_sha512.h"
+
+#define crypto_hashblocks crypto_hashblocks_sha512
+#define crypto_hashblocks_STATEBYTES crypto_hashblocks_sha512_STATEBYTES
+#define crypto_hashblocks_BLOCKBYTES crypto_hashblocks_sha512_BLOCKBYTES
+#define crypto_hashblocks_PRIMITIVE "sha512"
+#define crypto_hashblocks_IMPLEMENTATION crypto_hashblocks_sha512_IMPLEMENTATION
+#define crypto_hashblocks_VERSION crypto_hashblocks_sha512_VERSION
+
+#endif

src/libnacl-ref/crypto_onetimeauth/poly1305/ref/crypto_onetimeauth.h

@@ -0,0 +1,14 @@
+#ifndef crypto_onetimeauth_H
+#define crypto_onetimeauth_H
+
+#include "crypto_onetimeauth_poly1305.h"
+
+#define crypto_onetimeauth crypto_onetimeauth_poly1305
+#define crypto_onetimeauth_verify crypto_onetimeauth_poly1305_verify
+#define crypto_onetimeauth_BYTES crypto_onetimeauth_poly1305_BYTES
+#define crypto_onetimeauth_KEYBYTES crypto_onetimeauth_poly1305_KEYBYTES
+#define crypto_onetimeauth_PRIMITIVE "poly1305"
+#define crypto_onetimeauth_IMPLEMENTATION crypto_onetimeauth_poly1305_IMPLEMENTATION
+#define crypto_onetimeauth_VERSION crypto_onetimeauth_poly1305_VERSION
+
+#endif

src/libnacl-ref/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h

@@ -0,0 +1,14 @@
+#ifndef crypto_scalarmult_H
+#define crypto_scalarmult_H
+
+#include "crypto_scalarmult_curve25519.h"
+
+#define crypto_scalarmult crypto_scalarmult_curve25519
+#define crypto_scalarmult_base crypto_scalarmult_curve25519_base
+#define crypto_scalarmult_BYTES crypto_scalarmult_curve25519_BYTES
+#define crypto_scalarmult_SCALARBYTES crypto_scalarmult_curve25519_SCALARBYTES
+#define crypto_scalarmult_PRIMITIVE "curve25519"
+#define crypto_scalarmult_IMPLEMENTATION crypto_scalarmult_curve25519_IMPLEMENTATION
+#define crypto_scalarmult_VERSION crypto_scalarmult_curve25519_VERSION
+
+#endif