diff --git a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h index 8501f045..dacd79ef 100644 --- a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h +++ b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h @@ -21,25 +21,6 @@ typedef struct crypto_onetimeauth_poly1305_state { unsigned char opaque[136]; } crypto_onetimeauth_poly1305_state; -typedef struct crypto_onetimeauth_poly1305_implementation { - const char *(*implementation_name)(void); - int (*onetimeauth)(unsigned char *out, - const unsigned char *in, - unsigned long long inlen, - const unsigned char *k); - int (*onetimeauth_verify)(const unsigned char *h, - const unsigned char *in, - unsigned long long inlen, - const unsigned char *k); - int (*onetimeauth_init)(crypto_onetimeauth_poly1305_state *state, - const unsigned char *key); - int (*onetimeauth_update)(crypto_onetimeauth_poly1305_state *state, - const unsigned char *in, - unsigned long long inlen); - int (*onetimeauth_final)(crypto_onetimeauth_poly1305_state *state, - unsigned char *out); -} crypto_onetimeauth_poly1305_implementation; - #define crypto_onetimeauth_poly1305_BYTES 16U SODIUM_EXPORT size_t crypto_onetimeauth_poly1305_bytes(void); @@ -48,15 +29,6 @@ size_t crypto_onetimeauth_poly1305_bytes(void); SODIUM_EXPORT size_t crypto_onetimeauth_poly1305_keybytes(void); -SODIUM_EXPORT -const char *crypto_onetimeauth_poly1305_implementation_name(void); - -SODIUM_EXPORT -int crypto_onetimeauth_poly1305_set_implementation(crypto_onetimeauth_poly1305_implementation *impl); - -crypto_onetimeauth_poly1305_implementation * -crypto_onetimeauth_pick_best_implementation(void); - SODIUM_EXPORT int crypto_onetimeauth_poly1305(unsigned char *out, const unsigned char *in, @@ -82,6 +54,33 @@ SODIUM_EXPORT int crypto_onetimeauth_poly1305_final(crypto_onetimeauth_poly1305_state *state, unsigned char *out); +const char *crypto_onetimeauth_poly1305_implementation_name(void); + +/* ------------------------------------------------------------------------- */ + +typedef struct crypto_onetimeauth_poly1305_implementation { + const char *(*implementation_name)(void); + int (*onetimeauth)(unsigned char *out, + const unsigned char *in, + unsigned long long inlen, + const unsigned char *k); + int (*onetimeauth_verify)(const unsigned char *h, + const unsigned char *in, + unsigned long long inlen, + const unsigned char *k); + int (*onetimeauth_init)(crypto_onetimeauth_poly1305_state *state, + const unsigned char *key); + int (*onetimeauth_update)(crypto_onetimeauth_poly1305_state *state, + const unsigned char *in, + unsigned long long inlen); + int (*onetimeauth_final)(crypto_onetimeauth_poly1305_state *state, + unsigned char *out); +} crypto_onetimeauth_poly1305_implementation; + +int crypto_onetimeauth_poly1305_set_implementation(crypto_onetimeauth_poly1305_implementation *impl); + +crypto_onetimeauth_poly1305_implementation *crypto_onetimeauth_pick_best_implementation(void); + #ifdef __cplusplus } #endif