QPQ-AG/enacl
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename AEAD routines from enif_* to enacl_*

Browse Source
This commit is contained in:
Jesper Louis Andersen 2020-01-19 13:32:15 +01:00
parent 3ee5a94caf
commit 4eaef57a76
3 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
c_src/aead.c
View File

@ -8,33 +8,33 @@
* AEAD ChaCha20 Poly1305 * AEAD ChaCha20 Poly1305
*/ */
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_chacha20poly1305_KEYBYTES(ErlNifEnv *env, int argc, enacl_crypto_aead_chacha20poly1305_KEYBYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]) { ERL_NIF_TERM const argv[]) {
return enif_make_int64(env, crypto_aead_chacha20poly1305_ietf_KEYBYTES); return enif_make_int64(env, crypto_aead_chacha20poly1305_ietf_KEYBYTES);
} }
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_chacha20poly1305_NPUBBYTES(ErlNifEnv *env, int argc, enacl_crypto_aead_chacha20poly1305_NPUBBYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]) { ERL_NIF_TERM const argv[]) {
return enif_make_int64(env, crypto_aead_chacha20poly1305_ietf_NPUBBYTES); return enif_make_int64(env, crypto_aead_chacha20poly1305_ietf_NPUBBYTES);
} }
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_chacha20poly1305_ABYTES(ErlNifEnv *env, int argc, enacl_crypto_aead_chacha20poly1305_ABYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]) { ERL_NIF_TERM const argv[]) {
return enif_make_int64(env, crypto_aead_chacha20poly1305_ietf_ABYTES); return enif_make_int64(env, crypto_aead_chacha20poly1305_ietf_ABYTES);
} }
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX(ErlNifEnv *env, int argc, enacl_crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]) { ERL_NIF_TERM const argv[]) {
return enif_make_int64(env, return enif_make_int64(env,
crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX); crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX);
} }
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_chacha20poly1305_encrypt(ErlNifEnv *env, int argc, enacl_crypto_aead_chacha20poly1305_encrypt(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]) { ERL_NIF_TERM const argv[]) {
ERL_NIF_TERM result; ERL_NIF_TERM result;
ErlNifBinary key, nonce, ad, message, ciphertext; ErlNifBinary key, nonce, ad, message, ciphertext;
@ -70,8 +70,8 @@ enif_crypto_aead_chacha20poly1305_encrypt(ErlNifEnv *env, int argc,
} }
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_chacha20poly1305_decrypt(ErlNifEnv *env, int argc, enacl_crypto_aead_chacha20poly1305_decrypt(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]) { ERL_NIF_TERM const argv[]) {
ERL_NIF_TERM result; ERL_NIF_TERM result;
ErlNifBinary key, nonce, ad, message, ciphertext; ErlNifBinary key, nonce, ad, message, ciphertext;
@ -111,33 +111,33 @@ enif_crypto_aead_chacha20poly1305_decrypt(ErlNifEnv *env, int argc,
* AEAD XChaCha20 Poly1305 * AEAD XChaCha20 Poly1305
*/ */
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_xchacha20poly1305_KEYBYTES(ErlNifEnv *env, int argc, enacl_crypto_aead_xchacha20poly1305_KEYBYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]) { ERL_NIF_TERM const argv[]) {
return enif_make_int64(env, crypto_aead_xchacha20poly1305_ietf_KEYBYTES); return enif_make_int64(env, crypto_aead_xchacha20poly1305_ietf_KEYBYTES);
} }
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_xchacha20poly1305_NPUBBYTES(ErlNifEnv *env, int argc, enacl_crypto_aead_xchacha20poly1305_NPUBBYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]) { ERL_NIF_TERM const argv[]) {
return enif_make_int64(env, crypto_aead_xchacha20poly1305_ietf_NPUBBYTES); return enif_make_int64(env, crypto_aead_xchacha20poly1305_ietf_NPUBBYTES);
} }
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_xchacha20poly1305_ABYTES(ErlNifEnv *env, int argc, enacl_crypto_aead_xchacha20poly1305_ABYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]) { ERL_NIF_TERM const argv[]) {
return enif_make_int64(env, crypto_aead_xchacha20poly1305_ietf_ABYTES); return enif_make_int64(env, crypto_aead_xchacha20poly1305_ietf_ABYTES);
} }
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_xchacha20poly1305_MESSAGEBYTES_MAX(ErlNifEnv *env, int argc, enacl_crypto_aead_xchacha20poly1305_MESSAGEBYTES_MAX(
ERL_NIF_TERM const argv[]) { ErlNifEnv *env, int argc, ERL_NIF_TERM const argv[]) {
return enif_make_int64(env, return enif_make_int64(env,
crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX); crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX);
} }
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_xchacha20poly1305_encrypt(ErlNifEnv *env, int argc, enacl_crypto_aead_xchacha20poly1305_encrypt(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]) { ERL_NIF_TERM const argv[]) {
ErlNifBinary key, nonce, ad, message, ciphertext; ErlNifBinary key, nonce, ad, message, ciphertext;
if ((argc != 4) || (!enif_inspect_binary(env, argv[0], &key)) || if ((argc != 4) || (!enif_inspect_binary(env, argv[0], &key)) ||
@ -165,8 +165,8 @@ enif_crypto_aead_xchacha20poly1305_encrypt(ErlNifEnv *env, int argc,
} }
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_xchacha20poly1305_decrypt(ErlNifEnv *env, int argc, enacl_crypto_aead_xchacha20poly1305_decrypt(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]) { ERL_NIF_TERM const argv[]) {
ErlNifBinary key, nonce, ad, message, ciphertext; ErlNifBinary key, nonce, ad, message, ciphertext;
if ((argc != 4) || (!enif_inspect_binary(env, argv[0], &key)) || if ((argc != 4) || (!enif_inspect_binary(env, argv[0], &key)) ||

48
c_src/aead.h
View File

@ -5,42 +5,42 @@
/* AEAD ChaCha20 Poly1305 */ /* AEAD ChaCha20 Poly1305 */
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_chacha20poly1305_KEYBYTES(ErlNifEnv *env, int argc, enacl_crypto_aead_chacha20poly1305_KEYBYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]);
ERL_NIF_TERM
enif_crypto_aead_chacha20poly1305_NPUBBYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]); ERL_NIF_TERM const argv[]);
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_chacha20poly1305_ABYTES(ErlNifEnv *env, int argc, enacl_crypto_aead_chacha20poly1305_NPUBBYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]); ERL_NIF_TERM const argv[]);
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX(ErlNifEnv *env, int argc, enacl_crypto_aead_chacha20poly1305_ABYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]);
ERL_NIF_TERM
enif_crypto_aead_chacha20poly1305_encrypt(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]); ERL_NIF_TERM const argv[]);
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_chacha20poly1305_decrypt(ErlNifEnv *env, int argc, enacl_crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]); ERL_NIF_TERM const argv[]);
ERL_NIF_TERM
enacl_crypto_aead_chacha20poly1305_encrypt(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]);
ERL_NIF_TERM
enacl_crypto_aead_chacha20poly1305_decrypt(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]);
/* AEAD XChaCha20 Poly1305 */ /* AEAD XChaCha20 Poly1305 */
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_xchacha20poly1305_KEYBYTES(ErlNifEnv *env, int argc, enacl_crypto_aead_xchacha20poly1305_KEYBYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]);
ERL_NIF_TERM
enif_crypto_aead_xchacha20poly1305_NPUBBYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]); ERL_NIF_TERM const argv[]);
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_xchacha20poly1305_ABYTES(ErlNifEnv *env, int argc, enacl_crypto_aead_xchacha20poly1305_NPUBBYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]); ERL_NIF_TERM const argv[]);
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_xchacha20poly1305_MESSAGEBYTES_MAX(ErlNifEnv *env, int argc, enacl_crypto_aead_xchacha20poly1305_ABYTES(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]);
ERL_NIF_TERM
enif_crypto_aead_xchacha20poly1305_encrypt(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]); ERL_NIF_TERM const argv[]);
ERL_NIF_TERM ERL_NIF_TERM
enif_crypto_aead_xchacha20poly1305_decrypt(ErlNifEnv *env, int argc, enacl_crypto_aead_xchacha20poly1305_MESSAGEBYTES_MAX(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]); ERL_NIF_TERM const argv[]);
ERL_NIF_TERM
enacl_crypto_aead_xchacha20poly1305_encrypt(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]);
ERL_NIF_TERM
enacl_crypto_aead_xchacha20poly1305_decrypt(ErlNifEnv *env, int argc,
ERL_NIF_TERM const argv[]);
#endif #endif

24
c_src/enacl_nif.c
View File

@ -1701,34 +1701,34 @@ static ErlNifFunc nif_funcs[] = {
{"scramble_block_16", 2, enif_scramble_block_16}, {"scramble_block_16", 2, enif_scramble_block_16},
{"crypto_aead_chacha20poly1305_KEYBYTES", 0, {"crypto_aead_chacha20poly1305_KEYBYTES", 0,
enif_crypto_aead_chacha20poly1305_KEYBYTES}, enacl_crypto_aead_chacha20poly1305_KEYBYTES},
{"crypto_aead_chacha20poly1305_NPUBBYTES", 0, {"crypto_aead_chacha20poly1305_NPUBBYTES", 0,
enif_crypto_aead_chacha20poly1305_NPUBBYTES}, enacl_crypto_aead_chacha20poly1305_NPUBBYTES},
{"crypto_aead_chacha20poly1305_ABYTES", 0, {"crypto_aead_chacha20poly1305_ABYTES", 0,
enif_crypto_aead_chacha20poly1305_ABYTES}, enacl_crypto_aead_chacha20poly1305_ABYTES},
{"crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX", 0, {"crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX", 0,
enif_crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX}, enacl_crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX},
erl_nif_dirty_job_cpu_bound_macro( erl_nif_dirty_job_cpu_bound_macro(
"crypto_aead_chacha20poly1305_encrypt", 4, "crypto_aead_chacha20poly1305_encrypt", 4,
enif_crypto_aead_chacha20poly1305_encrypt), enacl_crypto_aead_chacha20poly1305_encrypt),
erl_nif_dirty_job_cpu_bound_macro( erl_nif_dirty_job_cpu_bound_macro(
"crypto_aead_chacha20poly1305_decrypt", 4, "crypto_aead_chacha20poly1305_decrypt", 4,
enif_crypto_aead_chacha20poly1305_decrypt), enacl_crypto_aead_chacha20poly1305_decrypt),
{"crypto_aead_xchacha20poly1305_KEYBYTES", 0, {"crypto_aead_xchacha20poly1305_KEYBYTES", 0,
enif_crypto_aead_xchacha20poly1305_KEYBYTES}, enacl_crypto_aead_xchacha20poly1305_KEYBYTES},
{"crypto_aead_xchacha20poly1305_NPUBBYTES", 0, {"crypto_aead_xchacha20poly1305_NPUBBYTES", 0,
enif_crypto_aead_xchacha20poly1305_NPUBBYTES}, enacl_crypto_aead_xchacha20poly1305_NPUBBYTES},
{"crypto_aead_xchacha20poly1305_ABYTES", 0, {"crypto_aead_xchacha20poly1305_ABYTES", 0,
enif_crypto_aead_xchacha20poly1305_ABYTES}, enacl_crypto_aead_xchacha20poly1305_ABYTES},
{"crypto_aead_xchacha20poly1305_MESSAGEBYTES_MAX", 0, {"crypto_aead_xchacha20poly1305_MESSAGEBYTES_MAX", 0,
enif_crypto_aead_xchacha20poly1305_MESSAGEBYTES_MAX}, enacl_crypto_aead_xchacha20poly1305_MESSAGEBYTES_MAX},
erl_nif_dirty_job_cpu_bound_macro( erl_nif_dirty_job_cpu_bound_macro(
"crypto_aead_xchacha20poly1305_encrypt", 4, "crypto_aead_xchacha20poly1305_encrypt", 4,
enif_crypto_aead_xchacha20poly1305_encrypt), enacl_crypto_aead_xchacha20poly1305_encrypt),
erl_nif_dirty_job_cpu_bound_macro( erl_nif_dirty_job_cpu_bound_macro(
"crypto_aead_xchacha20poly1305_decrypt", 4, "crypto_aead_xchacha20poly1305_decrypt", 4,
enif_crypto_aead_xchacha20poly1305_decrypt), enacl_crypto_aead_xchacha20poly1305_decrypt),
{"crypto_generichash_BYTES", 0, enif_crypto_generichash_BYTES}, {"crypto_generichash_BYTES", 0, enif_crypto_generichash_BYTES},
{"crypto_generichash_BYTES_MIN", 0, enif_crypto_generichash_BYTES_MIN}, {"crypto_generichash_BYTES_MIN", 0, enif_crypto_generichash_BYTES_MIN},