From ac48996492864ef6634377678cf3d53b678f6e69 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 31 Mar 2020 12:04:47 +0200 Subject: [PATCH] Remove crypto_core_ed25519_from_hash() Undocumented, was deprecated for a while in stable versions, obsoleted by `_from_string()` and `from_string_ro()`. --- dist-build/emscripten-symbols.def | 1 - src/libsodium/crypto_core/ed25519/core_ed25519.c | 8 -------- src/libsodium/include/sodium/crypto_core_ed25519.h | 4 ---- test/symbols/all-symbols.txt | 1 - 4 files changed, 14 deletions(-) diff --git a/dist-build/emscripten-symbols.def b/dist-build/emscripten-symbols.def index 086d4cde..4079195a 100644 --- a/dist-build/emscripten-symbols.def +++ b/dist-build/emscripten-symbols.def @@ -156,7 +156,6 @@ _crypto_box_seedbytes 1 1 _crypto_box_zerobytes 0 1 _crypto_core_ed25519_add 0 1 _crypto_core_ed25519_bytes 0 1 -_crypto_core_ed25519_from_hash 0 0 _crypto_core_ed25519_from_string 0 1 _crypto_core_ed25519_from_string_ro 0 1 _crypto_core_ed25519_from_uniform 0 1 diff --git a/src/libsodium/crypto_core/ed25519/core_ed25519.c b/src/libsodium/crypto_core/ed25519/core_ed25519.c index 6a0ca839..312685c0 100644 --- a/src/libsodium/crypto_core/ed25519/core_ed25519.c +++ b/src/libsodium/crypto_core/ed25519/core_ed25519.c @@ -72,14 +72,6 @@ crypto_core_ed25519_from_uniform(unsigned char *p, const unsigned char *r) return 0; } -int -crypto_core_ed25519_from_hash(unsigned char *p, const unsigned char *h) -{ - ge25519_from_hash(p, h); - - return 0; -} - #define HASH_BYTES crypto_hash_sha512_BYTES #define HASH_BLOCKBYTES 128U #define HASH_L 48U diff --git a/src/libsodium/include/sodium/crypto_core_ed25519.h b/src/libsodium/include/sodium/crypto_core_ed25519.h index 70887bb8..3aeb538a 100644 --- a/src/libsodium/include/sodium/crypto_core_ed25519.h +++ b/src/libsodium/include/sodium/crypto_core_ed25519.h @@ -46,10 +46,6 @@ SODIUM_EXPORT int crypto_core_ed25519_from_uniform(unsigned char *p, const unsigned char *r) __attribute__ ((nonnull)); -SODIUM_EXPORT -int crypto_core_ed25519_from_hash(unsigned char *p, const unsigned char *h) - __attribute__ ((nonnull)) __attribute__ ((deprecated)); - SODIUM_EXPORT int crypto_core_ed25519_from_string(unsigned char p[crypto_core_ed25519_BYTES], const char *ctx, const unsigned char *msg, diff --git a/test/symbols/all-symbols.txt b/test/symbols/all-symbols.txt index 799faa73..6c9a4087 100644 --- a/test/symbols/all-symbols.txt +++ b/test/symbols/all-symbols.txt @@ -190,7 +190,6 @@ crypto_box_seedbytes crypto_box_zerobytes crypto_core_ed25519_add crypto_core_ed25519_bytes -crypto_core_ed25519_from_hash crypto_core_ed25519_from_string crypto_core_ed25519_from_string_ro crypto_core_ed25519_from_uniform