From fd24e1905b479dcdea58b9445fc4c837df908df7 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Mon, 17 Sep 2018 20:41:20 +0200
Subject: crypto: turn Zinc into individual modules

---
 src/crypto/include/zinc/blake2s.h          | 6 ------
 src/crypto/include/zinc/chacha20.h         | 2 --
 src/crypto/include/zinc/chacha20poly1305.h | 4 ----
 src/crypto/include/zinc/curve25519.h       | 6 ------
 src/crypto/include/zinc/poly1305.h         | 6 ------
 5 files changed, 24 deletions(-)

(limited to 'src/crypto/include/zinc')

diff --git a/src/crypto/include/zinc/blake2s.h b/src/crypto/include/zinc/blake2s.h
index 373c09e..9512815 100644
--- a/src/crypto/include/zinc/blake2s.h
+++ b/src/crypto/include/zinc/blake2s.h
@@ -92,10 +92,4 @@ static inline void blake2s(u8 *out, const u8 *in, const u8 *key,
 void blake2s_hmac(u8 *out, const u8 *in, const u8 *key, const size_t outlen,
 		  const size_t inlen, const size_t keylen);
 
-void blake2s_fpu_init(void);
-
-#ifdef DEBUG
-bool blake2s_selftest(void);
-#endif
-
 #endif /* _ZINC_BLAKE2S_H */
diff --git a/src/crypto/include/zinc/chacha20.h b/src/crypto/include/zinc/chacha20.h
index 8b3cc8c..afad694 100644
--- a/src/crypto/include/zinc/chacha20.h
+++ b/src/crypto/include/zinc/chacha20.h
@@ -25,8 +25,6 @@ struct chacha20_ctx {
 	u32 counter[4];
 } __aligned(32);
 
-void chacha20_fpu_init(void);
-
 static inline void chacha20_init(struct chacha20_ctx *state,
 				 const u8 key[CHACHA20_KEY_SIZE],
 				 const u64 nonce)
diff --git a/src/crypto/include/zinc/chacha20poly1305.h b/src/crypto/include/zinc/chacha20poly1305.h
index 03979b6..339980d 100644
--- a/src/crypto/include/zinc/chacha20poly1305.h
+++ b/src/crypto/include/zinc/chacha20poly1305.h
@@ -47,8 +47,4 @@ bool __must_check xchacha20poly1305_decrypt(
 	const size_t ad_len, const u8 nonce[XCHACHA20POLY1305_NONCELEN],
 	const u8 key[CHACHA20POLY1305_KEYLEN]);
 
-#ifdef DEBUG
-bool chacha20poly1305_selftest(void);
-#endif
-
 #endif /* _ZINC_CHACHA20POLY1305_H */
diff --git a/src/crypto/include/zinc/curve25519.h b/src/crypto/include/zinc/curve25519.h
index 79bbf68..5da800f 100644
--- a/src/crypto/include/zinc/curve25519.h
+++ b/src/crypto/include/zinc/curve25519.h
@@ -19,10 +19,4 @@ void curve25519_generate_secret(u8 secret[CURVE25519_POINT_SIZE]);
 bool __must_check curve25519_generate_public(
 	u8 pub[CURVE25519_POINT_SIZE], const u8 secret[CURVE25519_POINT_SIZE]);
 
-void curve25519_fpu_init(void);
-
-#ifdef DEBUG
-bool curve25519_selftest(void);
-#endif
-
 #endif /* _ZINC_CURVE25519_H */
diff --git a/src/crypto/include/zinc/poly1305.h b/src/crypto/include/zinc/poly1305.h
index 1cdbadd..f6ea9dc 100644
--- a/src/crypto/include/zinc/poly1305.h
+++ b/src/crypto/include/zinc/poly1305.h
@@ -22,16 +22,10 @@ struct poly1305_ctx {
 	size_t num;
 } __aligned(8);
 
-void poly1305_fpu_init(void);
-
 void poly1305_init(struct poly1305_ctx *ctx, const u8 key[POLY1305_KEY_SIZE]);
 void poly1305_update(struct poly1305_ctx *ctx, const u8 *input, size_t len,
 		     simd_context_t *simd_context);
 void poly1305_final(struct poly1305_ctx *ctx, u8 mac[POLY1305_MAC_SIZE],
 		    simd_context_t *simd_context);
 
-#ifdef DEBUG
-bool poly1305_selftest(void);
-#endif
-
 #endif /* _ZINC_POLY1305_H */
-- 
cgit v1.2.3-59-g8ed1b