From 023db2863e36fe648b62e21c30fda0f38765323b 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

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 src/main.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 75959aa..ea5e904 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,12 +10,7 @@
 #include "ratelimiter.h"
 #include "netlink.h"
 #include "uapi/wireguard.h"
-
-#include <zinc/chacha20poly1305.h>
-#include <zinc/chacha20.h>
-#include <zinc/poly1305.h>
-#include <zinc/blake2s.h>
-#include <zinc/curve25519.h>
+#include "crypto/zinc.h"
 
 #include <linux/version.h>
 #include <linux/init.h>
@@ -27,14 +22,13 @@ static int __init mod_init(void)
 {
 	int ret;
 
-	chacha20_fpu_init();
-	poly1305_fpu_init();
-	blake2s_fpu_init();
-	curve25519_fpu_init();
+	if ((ret = chacha20_mod_init()) || (ret = poly1305_mod_init()) ||
+	    (ret = chacha20poly1305_mod_init()) || (ret = blake2s_mod_init()) ||
+	    (ret = curve25519_mod_init()))
+		return ret;
+
 #ifdef DEBUG
 	if (!allowedips_selftest() || !packet_counter_selftest() ||
-	    !curve25519_selftest() || !poly1305_selftest() ||
-	    !chacha20poly1305_selftest() || !blake2s_selftest() ||
 	    !ratelimiter_selftest())
 		return -ENOTRECOVERABLE;
 #endif
-- 
cgit v1.2.3