Define crypto_*_primitive() for high-level functions only

src/libsodium/crypto_auth/hmacsha256/auth_hmacsha256_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_auth_hmacsha256_keybytes(void) {
     return crypto_auth_hmacsha256_KEYBYTES;
 }
-
-const char *
-crypto_auth_hmacsha256_primitive(void) {
-    return "hmacsha256";
-}

src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_auth_hmacsha512_keybytes(void) {
     return crypto_auth_hmacsha512_KEYBYTES;
 }
-
-const char *
-crypto_auth_hmacsha512_primitive(void) {
-    return "hmacsha512";
-}

src/libsodium/crypto_auth/hmacsha512256/auth_hmacsha512256_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_auth_hmacsha512256_keybytes(void) {
     return crypto_auth_hmacsha512256_KEYBYTES;
 }
-
-const char *
-crypto_auth_hmacsha512256_primitive(void) {
-    return "hmacsha512256";
-}

src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305_api.c

@@ -34,8 +34,3 @@ size_t
 crypto_box_curve25519xsalsa20poly1305_macbytes(void) {
     return crypto_box_curve25519xsalsa20poly1305_MACBYTES;
 }
-
-const char *
-crypto_box_curve25519xsalsa20poly1305_primitive(void) {
-    return "curve25519xsalsa20poly1305";
-}

src/libsodium/crypto_core/hsalsa20/core_hsalsa20_api.c

@@ -19,8 +19,3 @@ size_t
 crypto_core_hsalsa20_constbytes(void) {
     return crypto_core_hsalsa20_CONSTBYTES;
 }
-
-const char *
-crypto_core_hsalsa20_primitive(void) {
-    return "hsalsa20";
-}

src/libsodium/crypto_core/salsa20/core_salsa20_api.c

@@ -19,8 +19,3 @@ size_t
 crypto_core_salsa20_constbytes(void) {
     return crypto_core_salsa20_CONSTBYTES;
 }
-
-const char *
-crypto_core_salsa20_primitive(void) {
-    return "salsa20";
-}

src/libsodium/crypto_core/salsa2012/core_salsa2012_api.c

@@ -19,8 +19,3 @@ size_t
 crypto_core_salsa2012_constbytes(void) {
     return crypto_core_salsa2012_CONSTBYTES;
 }
-
-const char *
-crypto_core_salsa2012_primitive(void) {
-    return "salsa2012";
-}

src/libsodium/crypto_core/salsa208/core_salsa208_api.c

@@ -19,8 +19,3 @@ size_t
 crypto_core_salsa208_constbytes(void) {
     return crypto_core_salsa208_CONSTBYTES;
 }
-
-const char *
-crypto_core_salsa208_primitive(void) {
-    return "salsa208";
-}

src/libsodium/crypto_generichash/blake2/generichash_blake2_api.c

@@ -39,8 +39,3 @@ size_t
 crypto_generichash_blake2b_personalbytes(void) {
     return crypto_generichash_blake2b_PERSONALBYTES;
 }
-
-const char *
-crypto_generichash_blake2b_blockbytes_primitive(void) {
-    return "blake2b";
-}

src/libsodium/crypto_hash/crypto_hash.c

@@ -16,5 +16,5 @@ crypto_hash(unsigned char *out, const unsigned char *in,
 
 const char *
 crypto_hash_primitive(void) {
-    return crypto_hash_sha512_primitive();
+    return crypto_hash_PRIMITIVE;
 }

src/libsodium/crypto_hash/sha256/hash_sha256_api.c

@@ -4,8 +4,3 @@ size_t
 crypto_hash_sha256_bytes(void) {
     return crypto_hash_sha256_BYTES;
 }
-
-const char *
-crypto_hash_sha256_primitive(void) {
-    return "sha256";
-}

src/libsodium/crypto_hash/sha512/hash_sha512_api.c

@@ -4,8 +4,3 @@ size_t
 crypto_hash_sha512_bytes(void) {
     return crypto_hash_sha512_BYTES;
 }
-
-const char *
-crypto_hash_sha512_primitive(void) {
-    return "sha512";
-}

src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_onetimeauth_poly1305_keybytes(void) {
     return crypto_onetimeauth_poly1305_KEYBYTES;
 }
-
-const char *
-crypto_onetimeauth_poly1305_primitive(void) {
-    return "poly1305";
-}

src/libsodium/crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305_api.c

@@ -24,8 +24,3 @@ size_t
 crypto_secretbox_xsalsa20poly1305_macbytes(void) {
     return crypto_secretbox_xsalsa20poly1305_MACBYTES;
 }
-
-const char *
-crypto_secretbox_xsalsa20poly1305_primitive(void) {
-    return "xsalsa20poly1305";
-}

src/libsodium/crypto_shorthash/siphash24/shorthash_siphash24_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_shorthash_siphash24_keybytes(void) {
     return crypto_shorthash_siphash24_KEYBYTES;
 }
-
-const char *
-crypto_shorthash_siphash24_primitive(void) {
-    return "siphash24";
-}

src/libsodium/crypto_sign/ed25519/sign_ed25519_api.c

@@ -19,8 +19,3 @@ size_t
 crypto_sign_ed25519_secretkeybytes(void) {
     return crypto_sign_ed25519_SECRETKEYBYTES;
 }
-
-const char *
-crypto_sign_ed25519_primitive(void) {
-    return "ed25519";
-}

src/libsodium/crypto_sign/edwards25519sha512batch/sign_edwards25519sha512batch_api.c

@@ -14,8 +14,3 @@ size_t
 crypto_sign_edwards25519sha512batch_secretkeybytes(void) {
     return crypto_sign_edwards25519sha512batch_SECRETKEYBYTES;
 }
-
-const char *
-crypto_sign_edwards25519sha512batch_primitive(void) {
-    return "edwards25519sha512batch";
-}

src/libsodium/crypto_stream/aes128ctr/stream_aes128ctr_api.c

@@ -14,8 +14,3 @@ size_t
 crypto_stream_aes128ctr_beforenmbytes(void) {
     return crypto_stream_aes128ctr_BEFORENMBYTES;
 }
-
-const char *
-crypto_stream_aes128ctr_primitive(void) {
-    return "aes128ctr";
-}

src/libsodium/crypto_stream/aes256estream/stream_aes256estream_api.c

@@ -14,8 +14,3 @@ size_t
 crypto_stream_aes256estream_beforenmbytes(void) {
     return crypto_stream_aes256estream_BEFORENMBYTES;
 }
-
-const char *
-crypto_stream_aes256estream_primitive(void) {
-    return "aes256estream";
-}

src/libsodium/crypto_stream/salsa20/stream_salsa20_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_stream_salsa20_noncebytes(void) {
     return crypto_stream_salsa20_NONCEBYTES;
 }
-
-const char *
-crypto_stream_salsa20_primitive(void) {
-    return "salsa20";
-}

src/libsodium/crypto_stream/salsa2012/stream_salsa2012_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_stream_salsa2012_noncebytes(void) {
     return crypto_stream_salsa2012_NONCEBYTES;
 }
-
-const char *
-crypto_stream_salsa2012_primitive(void) {
-    return "salsa2012";
-}

src/libsodium/crypto_stream/salsa208/stream_salsa208_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_stream_salsa208_noncebytes(void) {
     return crypto_stream_salsa208_NONCEBYTES;
 }
-
-const char *
-crypto_stream_salsa208_primitive(void) {
-    return "salsa208";
-}

src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20_api.c

@@ -9,8 +9,3 @@ size_t
 crypto_stream_xsalsa20_noncebytes(void) {
     return crypto_stream_xsalsa20_NONCEBYTES;
 }
-
-const char *
-crypto_stream_xsalsa20_primitive(void) {
-    return "xsalsa20";
-}

src/libsodium/include/sodium/crypto_auth_hmacsha256.h

@@ -25,9 +25,6 @@ size_t crypto_auth_hmacsha256_bytes(void);
 SODIUM_EXPORT
 size_t crypto_auth_hmacsha256_keybytes(void);
 
-SODIUM_EXPORT
-const char * crypto_auth_hmacsha256_primitive(void);
-
 SODIUM_EXPORT
 int crypto_auth_hmacsha256(unsigned char *out,
                            const unsigned char *in,

src/libsodium/include/sodium/crypto_auth_hmacsha512.h

@@ -25,9 +25,6 @@ size_t crypto_auth_hmacsha512_bytes(void);
 SODIUM_EXPORT
 size_t crypto_auth_hmacsha512_keybytes(void);
 
-SODIUM_EXPORT
-const char * crypto_auth_hmacsha512_primitive(void);
-
 SODIUM_EXPORT
 int crypto_auth_hmacsha512(unsigned char *out,
                            const unsigned char *in,

src/libsodium/include/sodium/crypto_auth_hmacsha512256.h

@@ -22,9 +22,6 @@ size_t crypto_auth_hmacsha512256_bytes(void);
 SODIUM_EXPORT
 size_t crypto_auth_hmacsha512256_keybytes(void);
 
-SODIUM_EXPORT
-const char * crypto_auth_hmacsha512256_primitive(void);
-
 SODIUM_EXPORT
 int crypto_auth_hmacsha512256(unsigned char *out, const unsigned char *in,
                               unsigned long long inlen,const unsigned char *k);

src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h

@@ -41,9 +41,6 @@ size_t crypto_box_curve25519xsalsa20poly1305_boxzerobytes(void);
 SODIUM_EXPORT
 size_t crypto_box_curve25519xsalsa20poly1305_macbytes(void);
 
-SODIUM_EXPORT
-const char * crypto_box_curve25519xsalsa20poly1305_primitive(void);
-
 SODIUM_EXPORT
 int crypto_box_curve25519xsalsa20poly1305(unsigned char *c,
                                           const unsigned char *m,

src/libsodium/include/sodium/crypto_core_hsalsa20.h

@@ -24,9 +24,6 @@ size_t crypto_core_hsalsa20_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_core_hsalsa20_constbytes(void);
 
-SODIUM_EXPORT
-const char * crypto_core_hsalsa20_primitive(void);
-
 SODIUM_EXPORT
 int crypto_core_hsalsa20(unsigned char *out, const unsigned char *in,
                          const unsigned char *k, const unsigned char *c);

src/libsodium/include/sodium/crypto_core_salsa20.h

@@ -24,9 +24,6 @@ size_t crypto_core_salsa20_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_core_salsa20_constbytes(void);
 
-SODIUM_EXPORT
-const char * crypto_core_salsa20_primitive(void);
-
 SODIUM_EXPORT
 int crypto_core_salsa20(unsigned char *out, const unsigned char *in,
                         const unsigned char *k, const unsigned char *c);

src/libsodium/include/sodium/crypto_core_salsa2012.h

@@ -24,9 +24,6 @@ size_t crypto_core_salsa2012_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_core_salsa2012_constbytes(void);
 
-SODIUM_EXPORT
-const char * crypto_core_salsa2012_primitive(void);
-
 SODIUM_EXPORT
 int crypto_core_salsa2012(unsigned char *out, const unsigned char *in,
                           const unsigned char *k, const unsigned char *c);

src/libsodium/include/sodium/crypto_core_salsa208.h

@@ -24,9 +24,6 @@ size_t crypto_core_salsa208_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_core_salsa208_constbytes(void);
 
-SODIUM_EXPORT
-const char * crypto_core_salsa208_primitive(void);
-
 SODIUM_EXPORT
 int crypto_core_salsa208(unsigned char *out, const unsigned char *in,
                          const unsigned char *k, const unsigned char *c);

src/libsodium/include/sodium/crypto_generichash_blake2b.h

@@ -63,9 +63,6 @@ size_t crypto_generichash_blake2b_saltbytes(void);
 SODIUM_EXPORT
 size_t crypto_generichash_blake2b_personalbytes(void);
 
-SODIUM_EXPORT
-const char * crypto_generichash_blake2b_blockbytes_primitive(void);
-
 SODIUM_EXPORT
 int crypto_generichash_blake2b(unsigned char *out, size_t outlen,
                                const unsigned char *in,

src/libsodium/include/sodium/crypto_hash_sha256.h

@@ -24,9 +24,6 @@ typedef struct crypto_hash_sha256_state {
 SODIUM_EXPORT
 size_t crypto_hash_sha256_bytes(void);
 
-SODIUM_EXPORT
-const char * crypto_hash_sha256_primitive(void);
-
 SODIUM_EXPORT
 int crypto_hash_sha256(unsigned char *out, const unsigned char *in,
                        unsigned long long inlen);

src/libsodium/include/sodium/crypto_hash_sha512.h

@@ -24,9 +24,6 @@ typedef struct crypto_hash_sha512_state {
 SODIUM_EXPORT
 size_t crypto_hash_sha512_bytes(void);
 
-SODIUM_EXPORT
-const char * crypto_hash_sha512_primitive(void);
-
 SODIUM_EXPORT
 int crypto_hash_sha512(unsigned char *out, const unsigned char *in,
                        unsigned long long inlen);

src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h

@@ -36,9 +36,6 @@ size_t crypto_onetimeauth_poly1305_bytes(void);
 SODIUM_EXPORT
 size_t crypto_onetimeauth_poly1305_keybytes(void);
 
-SODIUM_EXPORT
-const char * crypto_onetimeauth_poly1305_primitive(void);
-
 SODIUM_EXPORT
 const char *crypto_onetimeauth_poly1305_implementation_name(void);
 

src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h

@@ -33,9 +33,6 @@ size_t crypto_secretbox_xsalsa20poly1305_boxzerobytes(void);
 SODIUM_EXPORT
 size_t crypto_secretbox_xsalsa20poly1305_macbytes(void);
 
-SODIUM_EXPORT
-const char * crypto_secretbox_xsalsa20poly1305_primitive(void);
-
 SODIUM_EXPORT
 int crypto_secretbox_xsalsa20poly1305(unsigned char *c,
                                       const unsigned char *m,

src/libsodium/include/sodium/crypto_shorthash_siphash24.h

@@ -19,9 +19,6 @@ size_t crypto_shorthash_siphash24_bytes(void);
 SODIUM_EXPORT
 size_t crypto_shorthash_siphash24_keybytes(void);
 
-SODIUM_EXPORT
-const char * crypto_shorthash_siphash24_primitive(void);
-
 SODIUM_EXPORT
 int crypto_shorthash_siphash24(unsigned char *out, const unsigned char *in,
                                unsigned long long inlen, const unsigned char *k);

src/libsodium/include/sodium/crypto_sign_ed25519.h

@@ -27,9 +27,6 @@ size_t crypto_sign_ed25519_publickeybytes(void);
 SODIUM_EXPORT
 size_t crypto_sign_ed25519_secretkeybytes(void);
 
-SODIUM_EXPORT
-const char * crypto_sign_ed25519_primitive(void);
-
 SODIUM_EXPORT
 int crypto_sign_ed25519(unsigned char *sm, unsigned long long *smlen,
                         const unsigned char *m, unsigned long long mlen,

src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h

@@ -23,9 +23,6 @@ size_t crypto_sign_edwards25519sha512batch_publickeybytes(void);
 SODIUM_EXPORT
 size_t crypto_sign_edwards25519sha512batch_secretkeybytes(void);
 
-SODIUM_EXPORT
-const char * crypto_sign_edwards25519sha512batch_primitive(void);
-
 SODIUM_EXPORT
 int crypto_sign_edwards25519sha512batch(unsigned char *sm,
                                         unsigned long long *smlen,

src/libsodium/include/sodium/crypto_stream_aes128ctr.h

@@ -31,9 +31,6 @@ size_t crypto_stream_aes128ctr_noncebytes(void);
 SODIUM_EXPORT
 size_t crypto_stream_aes128ctr_beforenmbytes(void);
 
-SODIUM_EXPORT
-const char * crypto_stream_aes128ctr_primitive(void);
-
 SODIUM_EXPORT
 int crypto_stream_aes128ctr(unsigned char *out, unsigned long long outlen,
                             const unsigned char *n, const unsigned char *k);

src/libsodium/include/sodium/crypto_stream_aes256estream.h

@@ -32,9 +32,6 @@ size_t crypto_stream_aes256estream_noncebytes(void);
 SODIUM_EXPORT
 size_t crypto_stream_aes256estream_beforenmbytes(void);
 
-SODIUM_EXPORT
-const char * crypto_stream_aes256estream_primitive(void);
-
 SODIUM_EXPORT
 int crypto_stream_aes256estream(unsigned char *out, unsigned long long len,
                                 const unsigned char *nonce, const unsigned char *c);

src/libsodium/include/sodium/crypto_stream_salsa20.h

@@ -27,9 +27,6 @@ size_t crypto_stream_salsa20_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_stream_salsa20_noncebytes(void);
 
-SODIUM_EXPORT
-const char * crypto_stream_salsa20_primitive(void);
-
 SODIUM_EXPORT
 int crypto_stream_salsa20(unsigned char *c, unsigned long long clen,
                           const unsigned char *n, const unsigned char *k);

src/libsodium/include/sodium/crypto_stream_salsa2012.h

@@ -27,9 +27,6 @@ size_t crypto_stream_salsa2012_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_stream_salsa2012_noncebytes(void);
 
-SODIUM_EXPORT
-const char * crypto_stream_salsa2012_primitive(void);
-
 SODIUM_EXPORT
 int crypto_stream_salsa2012(unsigned char *c, unsigned long long clen,
                             const unsigned char *n, const unsigned char *k);

src/libsodium/include/sodium/crypto_stream_salsa208.h

@@ -27,9 +27,6 @@ size_t crypto_stream_salsa208_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_stream_salsa208_noncebytes(void);
 
-SODIUM_EXPORT
-const char * crypto_stream_salsa208_primitive(void);
-
 SODIUM_EXPORT
 int crypto_stream_salsa208(unsigned char *c, unsigned long long clen,
                            const unsigned char *n, const unsigned char *k);

src/libsodium/include/sodium/crypto_stream_xsalsa20.h

@@ -27,9 +27,6 @@ size_t crypto_stream_xsalsa20_keybytes(void);
 SODIUM_EXPORT
 size_t crypto_stream_xsalsa20_noncebytes(void);
 
-SODIUM_EXPORT
-const char * crypto_stream_xsalsa20_primitive(void);
-
 SODIUM_EXPORT
 int crypto_stream_xsalsa20(unsigned char *c, unsigned long long clen,
                            const unsigned char *n, const unsigned char *k);