diff options
| author | Hans Nilsson <[email protected]> | 2019-04-05 12:43:16 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-04-05 12:43:16 +0200 |
| commit | 9acc1eb1c76050ba76732e3904e2030abf80376e (patch) | |
| tree | 294bda157a0c30d5655c1cab951b7d13b5021608 /lib/crypto/c_src/crypto.c | |
| parent | c0989dcede812c47290f1c61d39e46caa0edf547 (diff) | |
| parent | 4334d5c6107d6b6380b61e9200471c28d6c63110 (diff) | |
| download | otp-9acc1eb1c76050ba76732e3904e2030abf80376e.tar.gz otp-9acc1eb1c76050ba76732e3904e2030abf80376e.tar.bz2 otp-9acc1eb1c76050ba76732e3904e2030abf80376e.zip | |
Merge branch 'hans/crypto/polish_new_api/OTP-15644'
* hans/crypto/polish_new_api/OTP-15644:
crypto: Fix valgrind error for api_ng.c
ssh: Use new crypto function names
crypto: Fixup lots of tests
crypto: Rename new api and rework the typing
crypto: Misc C-changes,
Diffstat (limited to 'lib/crypto/c_src/crypto.c')
| -rw-r--r-- | lib/crypto/c_src/crypto.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c index 4aed06a489..a8014745c8 100644 --- a/lib/crypto/c_src/crypto.c +++ b/lib/crypto/c_src/crypto.c @@ -81,7 +81,7 @@ static ErlNifFunc nif_funcs[] = { {"ng_crypto_init_nif", 4, ng_crypto_init_nif, 0}, {"ng_crypto_update_nif", 2, ng_crypto_update_nif, 0}, {"ng_crypto_update_nif", 3, ng_crypto_update_nif, 0}, - {"ng_crypto_one_shot_nif", 5, ng_crypto_one_shot_nif, 0}, + {"ng_crypto_one_time_nif", 5, ng_crypto_one_time_nif, 0}, {"strong_rand_bytes_nif", 1, strong_rand_bytes_nif, 0}, {"strong_rand_range_nif", 1, strong_rand_range_nif, 0}, {"rand_uniform_nif", 2, rand_uniform_nif, 0}, @@ -105,8 +105,7 @@ static ErlNifFunc nif_funcs[] = { {"rand_seed_nif", 1, rand_seed_nif, 0}, - {"aead_encrypt", 6, aead_encrypt, 0}, - {"aead_decrypt", 6, aead_decrypt, 0}, + {"aead_cipher", 7, aead_cipher, 0}, {"poly1305_nif", 2, poly1305_nif, 0}, |