Commit Graph

339 Commits

Author SHA1 Message Date
Stephen Touset
2a0f3d040f Fix definition of crypto_box_curve25519xsalsa20poly1305_macbytes
This function definition was created by an automated script that
incorrectly handled a corner case.
2013-05-16 15:27:28 -07:00
Stephen Touset
8eea4a3f74 Add functions exposing constants for all operation/primitive pairs
Wrappers for other languages can't access constants defined by C
preprocessor macros, so they must be exposed as functions. This was
already done for the "default" implementation of each operation, but
this commit adds functions for (almost) all of the underlying
primitives.

A few are currently excluded due to problems with the automated script
used to generated this commit. They are:

  * crypto_onetimeauth_poly1305
  * crypto_generichash_blake2b
  * crypto_verify16
  * crypto_verify32
2013-05-16 13:17:18 -07:00
Frank Denis
81d604c70c Add crypto_generichash_keybytes() and crypto_generichash_bytes()
to provide a default key/output size.
2013-05-16 11:45:19 -07:00
Frank Denis
4d147466bc Bump generichash minimum key and output size to 128 bits.
People who know what they are doing and who need a truncated output or a
shorter key can still do it.
But we should keep the chance for users to shoot themselves in the foot down
to a minimum.
2013-05-16 11:25:33 -07:00
Frank Denis
9578af69d2 Use crypto_generichash_state for crypto_generichash_*() wrappers. 2013-05-15 21:21:39 -07:00
Jeroen Habraken
fcc7df0e54 Trivial cleanup of crypto_generichash.h 2013-05-15 22:29:21 -05:00
Frank Denis
a8d4c24e42 <stdlib.h> -> <stddef.h> for size_t 2013-05-15 19:57:07 -07:00
Frank Denis
6988a02e4f Remove trailing whitespaces 2013-05-13 17:00:56 -07:00
Frank Denis
ab2e1ab140 hmac/256 -> hmac512/256 in randombytes_salsa20_random_stir() to make code smaller. 2013-05-13 16:59:57 -07:00
Frank Denis
210de1570a Add --disable-asm option to disable assembly implementations.
Check that fesetenv() and fegetenv() are available. If they aren't, still
compile the floating-point implementation of poly1305, but never pick it
in sodium_init().

This helps libsodium compile and work on Emscripten and on environments with
an incomplete libc.
2013-04-28 09:44:23 -07:00
Frank Denis
013cca7087 Remove crypto_stream_salsa20.h for the distfiles. 2013-04-27 11:17:33 -07:00
Frank Denis
808d1807dc Add optimized salsa20 amd64 assembly implementation 2013-04-27 10:21:32 -07:00
Frank Denis
ffb1e24ef1 Make the crypto_stream_salsa20 implementation switchable at compile-time 2013-04-27 09:12:26 -07:00
Frank Denis
5b09876c95 DRY 2013-04-27 09:03:31 -07:00
Frank Denis
cfe3f24964 sizes are unsigned. 2013-04-27 04:41:34 -07:00
Frank Denis
9a35ba5bfd crypto_stream_(before|after)nm is not implemented for salsa20* stream ciphers
Adding this interface is trivial, but until it's done, remove references to it.
2013-04-27 04:34:53 -07:00
Frank Denis
e1a0faee7f Move force_inline to beginning of declarations. 2013-04-26 23:21:46 -07:00
Frank Denis
c9fe802b9b Remove/ignore unused vars, use unsigned long long to iterate over sizes 2013-04-26 23:16:30 -07:00
Frank Denis
a5e9dc8467 Don't doit() 2013-04-26 23:10:47 -07:00
Frank Denis
81be9738ef More int vs unsigned long long 2013-04-26 23:07:27 -07:00
Frank Denis
f3b7ad8817 Remove doit() from onetimeauth_poly1305_try.c - we're not benchmarking for now 2013-04-26 23:05:58 -07:00
Frank Denis
ef1273126e Try a simple verification in onetimeauth_poly1305_try 2013-04-26 23:03:38 -07:00
Frank Denis
c2b6529577 In crypto_hash() lengths are ULL, so dont loop using and int value 2013-04-26 23:00:51 -07:00
Frank Denis
6ec9828b9f Reindent 2013-04-26 22:19:24 -07:00
Frank Denis
0f68434d68 Visual C++ compat is neat, except when it breaks everything else. 2013-04-26 21:59:31 -07:00
Frank Denis
73f68e27ca Add missing return in crypto_stream_aes256estream_beforenm() 2013-04-26 21:55:10 -07:00
Frank Denis
1706d63d65 More Visual C++ compat 2013-04-26 21:48:05 -07:00
Frank Denis
7f7eaf76b0 Missing #include "randombytes.h" 2013-04-26 21:47:19 -07:00
Frank Denis
330fb494e1 More Visual C++ compat 2013-04-26 21:46:57 -07:00
Frank Denis
65a30e52d4 Make ECRYPT_ctx non-anonymous 2013-04-26 21:43:20 -07:00
Frank Denis
ad44ec5b15 Don't use C99isms on Visual C++. 2013-04-26 21:41:32 -07:00
Frank Denis
47bb35cb8b Make struct crypto_generichash_blake2b_state non-anonymous 2013-04-26 21:29:53 -07:00
Frank Denis
bd6fb7e03c style 2013-04-26 21:14:12 -07:00
Frank Denis
57a4552eb1 + aes256estream 2013-04-26 21:06:34 -07:00
Frank Denis
edc5faffd6 Add more information about thread safety until we provide a thread-safe API. 2013-04-26 17:27:55 -07:00
Frank Denis
1b87626e9f Move randombytes_stir() before returning sodium_init(). 2013-04-26 17:05:23 -07:00
Frank Denis
8de0ae0e73 Call randombytes_stir() in sodium_init(). 2013-04-26 17:03:50 -07:00
Frank Denis
076eb56e24 Set initialized=1 when everything has actually been initialized 2013-04-26 17:02:53 -07:00
Frank Denis
efb3d9919f randombytes_buf() returns void. 2013-04-26 16:55:01 -07:00
Frank Denis
1e7fccf806 Sort 2013-04-26 11:26:37 -07:00
Frank Denis
6df4c3a1f3 Explicitly include sodium/crypto_scalarmult_curve25519.h.in in dist files 2013-04-26 11:25:58 -07:00
Frank Denis
65e1b792dc Don't forget SODIUM_EXPORT in version.h.in 2013-04-25 21:43:31 -07:00
Frank Denis
f0d71f9df0 Check allocate() return code. 2013-04-25 15:54:25 -07:00
Jeroen Habraken
eeab6bd2ce The "__attribute__((always_inline))" attribute does not replace "inline", they need to be used togher. This fixes the "warning: always_inline function might not be inlinable [-Wattributes]" warnings emitted by GCC 4.7. 2013-04-24 13:58:35 -05:00
Frank Denis
18369c960f Don't forget exporting symbols from crypto_scalarmult_curve25519 2013-04-24 08:40:43 -07:00
Frank Denis
b381f42d17 Move blake2 own functions to the crypto_generichash_blake2b namespace 2013-04-24 08:10:15 -07:00
Frank Denis
30909a7dea Fix DISTCLEANFILES 2013-04-23 22:57:05 -07:00
Frank Denis
f41677ef2e Remove extra leading spaces 2013-04-23 22:54:14 -07:00
Frank Denis
655a9589b8 Output .DEF file on Win32 2013-04-23 21:24:35 -07:00
Frank Denis
60e8d3c6da No need to define crypto_hash_sha512 as a macro, it's a real function. 2013-04-23 20:38:39 -07:00
Frank Denis
0b4affc436 Add a big fat warning to crypto_stream* 2013-04-23 14:28:51 -07:00
Frank Denis
51fb0f4c64 Add sodium_memcmp() 2013-04-23 11:56:10 -07:00
Frank Denis
313e440209 crypto_verify compat 2013-04-23 11:34:56 -07:00
Frank Denis
6777368185 crypto_stream_xsalsa20 compat 2013-04-23 11:32:15 -07:00
Frank Denis
44ad99f7f6 crypto_sign_ed25519_ref compat 2013-04-23 08:31:57 -07:00
Frank Denis
5e0193b8a1 Export sodium_library_version_*() not sodium_version_*() as intended. 2013-04-23 04:55:42 -07:00
Frank Denis
03120406e3 crypto_hash compat 2013-04-22 22:49:53 -07:00
Frank Denis
db8e3dc472 crypto_box compat 2013-04-22 22:34:36 -07:00
Frank Denis
977c4e8c70 Add crypto_scalarmult compat 2013-04-22 22:26:48 -07:00
Frank Denis
393aa1a229 crypto_box_curve25519xsalsa20poly1305_ref compat 2013-04-22 22:15:19 -07:00
Frank Denis
cb7c294cb8 Start a compat layer 2013-04-22 22:03:16 -07:00
Frank Denis
1b0328610f Remaining changes to export primitives, not implementations. 2013-04-22 17:22:40 -07:00
Frank Denis
6e3e997faa Export the primitive themselves, not the implementations. 2013-04-22 17:18:19 -07:00
Frank Denis
e144f9d40d crypto_hash_sha(256|512) are the exported functions that have to be exported.
_ref are implementations, that shouldn't be exported.
2013-04-22 16:30:31 -07:00
Frank Denis
7356770dbe Another random() -> rand() 2013-04-22 13:13:31 -07:00
Frank Denis
c4f75c4896 random() doesn't exist on Win32. Just use rand() 2013-04-22 13:10:11 -07:00
Frank Denis
b50e6fb5e7 Don't protect api.h against double inclusion, it's useless.
Plus, we need to use dedicated macros for that.
2013-04-22 12:47:32 -07:00
Frank Denis
b146c5150a Improve Visual C++ compat. 2013-04-22 12:35:59 -07:00
Frank Denis
c21c7eb3f7 indent 2013-04-22 11:50:20 -07:00
Frank Denis
e11c852ab3 Fix bad typo in the crypto_box wrapper 2013-04-22 11:20:45 -07:00
Frank Denis
0f3f3f8b92 No more arithmetic needed 2013-04-21 17:32:10 -07:00
Frank Denis
019064e663 Use HAVE_TI_MODE for the macro and HAVE_TI_MODE_V for the substitution 2013-04-21 17:32:10 -07:00
Frank Denis
08e08c966b Wrap crypto_onetimeauth 2013-04-21 17:32:10 -07:00
Frank Denis
61c4f21c97 Add SODIUM_EXPORT to all functions that need to be visible. 2013-04-21 17:32:10 -07:00
Frank Denis
6db3177585 Include export.h everywhere. 2013-04-21 17:32:10 -07:00
Frank Denis
f44c1e477f And finally, wrap crypto_stream macros 2013-04-21 17:32:10 -07:00
Frank Denis
765cad9146 Wrap crypto_sign macros 2013-04-21 17:32:10 -07:00
Frank Denis
d689a92c17 Wrap crypto_shorthash macros 2013-04-21 17:32:10 -07:00
Frank Denis
6dd19c1665 Wrap crypto_secretbox macros 2013-04-21 17:32:10 -07:00
Frank Denis
4a9a9ffeb8 Wrap crypto_scalarmult macros. 2013-04-21 17:32:10 -07:00
Frank Denis
98da611f98 Explicitly include <stdlib.h> in crypto_generichash.h for size_t 2013-04-21 17:32:09 -07:00
Frank Denis
fa7ed1faad Add macros for crypto_hash block size 2013-04-21 17:32:09 -07:00
Frank Denis
7c67c81444 Add wrappers around crypto_generichash macros 2013-04-21 17:32:09 -07:00
Frank Denis
b52f513f90 Untab, remove trailing spaces and other no-ops. 2013-04-21 17:32:09 -07:00
Frank Denis
4d953b1d97 Add missing extern "C" 2013-04-21 17:32:09 -07:00
Frank Denis
b3a1d6b967 Add function wrappers around macros, for crypto_auth and crypto_box 2013-04-21 17:32:09 -07:00
Frank Denis
9459a4b5ff Change the generichash API to better match other NaCl APIs
i.e. give a size right after the pointer.
2013-04-21 17:32:09 -07:00
Frank Denis
5e748bbc8c Add a streaming interface to crypto_generichash 2013-04-21 17:32:09 -07:00
Frank Denis
76cb00d56f Add export.h to define SODIUM_EXPORT 2013-04-21 17:32:09 -07:00
Frank Denis
0426aa28da Welcome, Blake2 2013-04-21 17:32:08 -07:00
Frank Denis
ec38ca745d Wrap crypto_generichash() and add necessary macros.
The streaming API will be wrapped next.
2013-04-21 17:32:08 -07:00
Frank Denis
2bf7fb85bf Nits 2013-04-21 17:32:08 -07:00
Frank Denis
3f13a1e9d0 Turn crypto_verify macros to functions.
No wrappers since there isn't going to be alternative implementations anytime
soon.
2013-04-21 17:32:08 -07:00
Frank Denis
3ffdfd2b3d crypto_stream macros -> functions 2013-04-21 17:32:08 -07:00
Frank Denis
55d0b9f486 Shave some lines in crypto_sign_keypair(), reintroduce @bascule's original code 2013-04-21 17:32:08 -07:00
Frank Denis
5ca15fa3e8 Change some crypto_sign macros to functions. 2013-04-21 17:32:08 -07:00
Frank Denis
a821eae055 Reintroduce crypto_sign_seed_keypair 2013-04-21 17:32:08 -07:00
Frank Denis
83a3892209 Wrap crypto_shorthash 2013-04-21 17:32:08 -07:00
Frank Denis
c46e08585b Wrap crypto_secretbox 2013-04-21 17:32:08 -07:00
Frank Denis
fade3b640c crypto_scalarmult wrappers 2013-04-21 17:32:08 -07:00
Frank Denis
25c18b66e5 Make crypto_hash a real function. 2013-04-21 17:32:07 -07:00
Frank Denis
7d916fb0b1 Make crypto_box functions actual functions, not macros. 2013-04-21 17:32:07 -07:00
Frank Denis
1cbe55f9bd Sort filenames 2013-04-21 17:32:07 -07:00
Frank Denis
8a5165bf06 Start replacing macros with real functions. First candidate: crypto_auth 2013-04-21 17:32:07 -07:00
Frank Denis
1da604d27d Allow building in a separate directory 2013-04-21 17:32:07 -07:00
Frank Denis
2b2b9846a6 Only compile curve25519_ref or curve25519_donna_c64 2013-04-21 17:32:07 -07:00
Frank Denis
2916224650 Use curve25519_donna_c64 instead of curve25519_ref if supported. 2013-04-21 17:32:07 -07:00
Frank Denis
7139def69f HAVE_MODE_TI -> HAVE_TI_MODE 2013-04-21 17:32:07 -07:00
Frank Denis
9626bbeb44 (re)import curve25519_donna_c64 2013-04-21 17:32:07 -07:00
Frank Denis
1f596a0966 Add crypto_scalarmult.h 2013-04-21 17:32:07 -07:00
Frank Denis
ba13e40ad1 Update Makefile.am 2013-04-21 17:32:07 -07:00
Frank Denis
280ff25f52 Avoid duplicate crypto_verify.h 2013-04-21 17:32:07 -07:00
Frank Denis
b86a933ba5 Link aes128ctr 2013-04-21 17:32:06 -07:00
Frank Denis
7844b905d4 Avoid duplicate crypto_stream.h 2013-04-21 17:32:06 -07:00
Frank Denis
83842a73c8 Avoid duplicate crypto_sign.h 2013-04-21 17:32:06 -07:00
Frank Denis
8da4cb057c Avoid duplicate crypto_shorthash.h 2013-04-21 17:32:06 -07:00
Frank Denis
d6636dbc7a Avoid duplicate crypto_secretbox.h 2013-04-21 17:32:06 -07:00
Frank Denis
195df90524 Avoid duplicate crypto_scalarmult.h 2013-04-21 17:32:06 -07:00
Frank Denis
bb2af7396e Avoid duplicate crypto_hashblocks.h 2013-04-21 17:32:06 -07:00
Frank Denis
32c2d620a9 Import missing api.h files 2013-04-21 17:32:06 -07:00
Frank Denis
c1c3ecd80a Avoid duplicate crypto_hash.h 2013-04-21 17:32:06 -07:00
Frank Denis
34731d9717 Rename crypto_generichash.h 2013-04-21 17:32:06 -07:00
Frank Denis
24bd4137e9 Avoid duplicate crypto_core.h definitions 2013-04-21 17:32:06 -07:00
Frank Denis
03196c9550 Avoid duplicate crypto_box.h files 2013-04-21 17:32:05 -07:00
Frank Denis
1a86716acf Avoid duplicate crypto_auth.h 2013-04-21 17:32:05 -07:00
Frank Denis
54d96dd417 rename crypto_onetimeauth local defines. 2013-04-21 17:32:05 -07:00
Frank Denis
fc98102f2a sodium_reinit() and sodium_shutdown() are gone. 2013-04-21 17:32:05 -07:00
Frank Denis
05f45575bb sodium_init() is not thread-safe. Roll your own locks if you need that. 2013-04-21 17:32:05 -07:00
Frank Denis
48d4b5ab1e Rename curve25519 files so that we can introduce the donna_c64 version later. 2013-04-21 17:32:05 -07:00
Frank Denis
6f5f793195 Remove crypto_onetimeauth/poly1305/checksum 2013-04-21 17:32:05 -07:00
Frank Denis
e29d92347b Remove crypto_onetimeauth/try.c 2013-04-21 17:32:05 -07:00
Frank Denis
03b82780fd Import missing onetimeauth_poly1305_try.c 2013-04-21 17:32:05 -07:00
Frank Denis
3b57f77262 Pick the best working poly1305 implementation at runtime. 2013-04-21 17:32:05 -07:00
Frank Denis
aa6488dbe9 Include <stdint.h> when we need SIZE_MAX 2013-04-21 17:32:05 -07:00
Frank Denis
98a87d8ea7 Add _sodium_alignedcalloc() 2013-04-21 17:32:05 -07:00
Frank Denis
c3d9659fc6 80 columns whenever possible 2013-04-21 17:32:04 -07:00
Frank Denis
7e2ccbe5ed No more options 2013-04-21 17:32:04 -07:00
Frank Denis
47bc0aab79 sodium_init() doesn't take any options any more. 2013-04-21 17:32:04 -07:00
Frank Denis
8e7bb5d0ce Move sodium-specific files to a dedicated directory 2013-04-21 17:32:04 -07:00
Frank Denis
98a58ff3f9 Fix sodium_init() 2013-04-21 17:32:04 -07:00
Frank Denis
dd45e3824f Declare the sodium_options anon struct. 2013-04-21 17:32:04 -07:00
Frank Denis
b8bfcb7bd6 Link core.c 2013-04-21 17:32:04 -07:00
Frank Denis
363ff0bdc5 Import src/libsodium/include/sodium/crypto_onetimeauth_poly1305_53.h 2013-04-21 17:32:04 -07:00
Frank Denis
fe909c674f Link the floating point implementation of poly1305 2013-04-21 17:32:04 -07:00
Frank Denis
ca781f4837 Include core.[ch] 2013-04-21 17:32:04 -07:00
Frank Denis
02cea61336 Add sodium_init(), sodium_reinit() and sodium_shutdown() 2013-04-21 17:32:03 -07:00
Frank Denis
232702ca83 Include randombytes implementations in sodium.h 2013-04-21 17:32:03 -07:00
Frank Denis
9f1fd2a71d Turn implementation definitions to globals. 2013-04-21 17:32:03 -07:00
Frank Denis
7aa057dcd8 Make the randombytes interface consistent with crypto_onetimeauth 2013-04-21 17:32:03 -07:00
Frank Denis
5ba6aef1da Export randombytes implementation structs 2013-04-21 17:32:03 -07:00