summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/init_crypt.h93
-rw-r--r--src/uanytun.c49
2 files changed, 98 insertions, 44 deletions
diff --git a/src/init_crypt.h b/src/init_crypt.h
new file mode 100644
index 0000000..24077db
--- /dev/null
+++ b/src/init_crypt.h
@@ -0,0 +1,93 @@
+/*
+ * uAnytun
+ *
+ * uAnytun is a tiny implementation of SATP. Unlike Anytun which is a full
+ * featured implementation uAnytun has no support for multiple connections
+ * or synchronisation. It is a small single threaded implementation intended
+ * to act as a client on small platforms.
+ * The secure anycast tunneling protocol (satp) defines a protocol used
+ * for communication between any combination of unicast and anycast
+ * tunnel endpoints. It has less protocol overhead than IPSec in Tunnel
+ * mode and allows tunneling of every ETHER TYPE protocol (e.g.
+ * ethernet, ip, arp ...). satp directly includes cryptography and
+ * message authentication based on the methodes used by SRTP. It is
+ * intended to deliver a generic, scaleable and secure solution for
+ * tunneling and relaying of packets of any protocol.
+ *
+ *
+ * Copyright (C) 2007-2008 Christian Pointner <equinox@anytun.org>
+ *
+ * This file is part of uAnytun.
+ *
+ * uAnytun is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * uAnytun is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with uAnytun. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UANYTUN_init_crypt_h_INCLUDED
+#define UANYTUN_init_crypt_h_INCLUDED
+
+#ifdef NO_CRYPT
+
+
+int init_crypt()
+{
+ return 0;
+}
+
+
+#else
+
+
+#ifndef USE_SSL_CRYPTO
+
+#include <gcrypt.h>
+
+#define MIN_GCRYPT_VERSION "1.2.0"
+
+int init_crypt()
+{
+ if(!gcry_check_version(MIN_GCRYPT_VERSION)) {
+ log_printf(NOTICE, "invalid Version of libgcrypt, should be >= %s", MIN_GCRYPT_VERSION);
+ return -1;
+ }
+
+ gcry_error_t err = gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
+ if(err) {
+ log_printf(ERROR, "failed to disable secure memory: %s", gcry_strerror(err));
+ return -1;
+ }
+
+ err = gcry_control(GCRYCTL_INITIALIZATION_FINISHED);
+ if(err) {
+ log_printf(ERROR, "failed to finish libgcrypt initialization: %s", gcry_strerror(err));
+ return -1;
+ }
+
+ log_printf(NOTICE, "libgcrypt init finished");
+ return 0;
+}
+
+#else
+
+int init_crypt()
+{
+// nothing here
+ return 0;
+}
+
+#endif
+
+
+#endif
+
+#endif
diff --git a/src/uanytun.c b/src/uanytun.c
index e7f2312..322e722 100644
--- a/src/uanytun.c
+++ b/src/uanytun.c
@@ -56,49 +56,14 @@
#ifndef NO_CRYPT
#include "key_derivation.h"
#include "auth_algo.h"
-
-#ifndef USE_SSL_CRYPTO
-#include <gcrypt.h>
-#endif
+#else
+typedef u_int8_t auth_algo_t;
#endif
-
+#include "init_crypt.h"
#include "daemon.h"
#include "sysexec.h"
-#ifndef NO_CRYPT
-#ifndef USE_SSL_CRYPTO
-
-#define MIN_GCRYPT_VERSION "1.2.0"
-
-int init_libgcrypt()
-{
- if(!gcry_check_version(MIN_GCRYPT_VERSION)) {
- log_printf(NOTICE, "invalid Version of libgcrypt, should be >= %s", MIN_GCRYPT_VERSION);
- return -1;
- }
-
- gcry_error_t err = gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
- if(err) {
- log_printf(ERROR, "failed to disable secure memory: %s", gcry_strerror(err));
- return -1;
- }
-
- err = gcry_control(GCRYCTL_INITIALIZATION_FINISHED);
- if(err) {
- log_printf(ERROR, "failed to finish libgcrypt initialization: %s", gcry_strerror(err));
- return -1;
- }
-
- log_printf(NOTICE, "libgcrypt init finished");
- return 0;
-}
-#endif
-#endif
-
-#ifdef NO_CRYPT
-typedef u_int8_t auth_algo_t;
-#endif
int init_main_loop(options_t* opt, cipher_t* c, auth_algo_t* aa, key_derivation_t* kd, seq_win_t* seq_win)
{
@@ -379,17 +344,13 @@ int main(int argc, char* argv[])
exit(-1);
}
-#ifndef NO_CRYPT
-#ifndef USE_SSL_CRYPTO
- ret = init_libgcrypt();
+ ret = init_crypt();
if(ret) {
- log_printf(ERROR, "error on libgcrpyt initialization, exitting");
+ log_printf(ERROR, "error on crpyto initialization, exitting");
options_clear(&opt);
log_close();
exit(ret);
}
-#endif
-#endif
tun_device_t dev;
ret = tun_init(&dev, opt.dev_name_, opt.dev_type_, opt.ifconfig_param_.net_addr_, opt.ifconfig_param_.prefix_length_);