Merge branch 'master' into 1.1

[tinc] / src / openssl / rsagen.h

diff --git a/src/event.h b/src/openssl/rsagen.h
similarity index 50%
rename from src/event.h
rename to src/openssl/rsagen.h
index 345a5f9..422d156 100644 (file)
--- a/src/event.h
+++ b/src/openssl/rsagen.h
@@ -1,7 +1,6 @@
 /*
-    event.h -- header for event.c
-    Copyright (C) 2002-2009 Guus Sliepen <guus@tinc-vpn.org>,
-                  2002-2005 Ivo Timmermans
+    rsagen.h -- RSA key generation and export
+    Copyright (C) 2008 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,29 +17,13 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EVENT_H__
-#define __TINC_EVENT_H__
+#ifndef __TINC_RSAGEN_H__
+#define __TINC_RSAGEN_H__
 
-#include "avl_tree.h"
+#include "rsa.h"
 
-extern avl_tree_t *event_tree;
+extern bool rsa_generate(rsa_t *rsa, size_t bits, unsigned long exponent);
+extern bool rsa_write_pem_public_key(rsa_t *rsa, FILE *fp);
+extern bool rsa_write_pem_private_key(rsa_t *rsa, FILE *fp);
 
-typedef void (*event_handler_t)(void *);
-
-typedef struct {
-       time_t time;
-       int id;
-       event_handler_t handler;
-       void *data;
-} event_t;
-
-extern void init_events(void);
-extern void exit_events(void);
-extern void expire_events(void);
-extern event_t *new_event(void) __attribute__ ((__malloc__));
-extern void free_event(event_t *);
-extern void event_add(event_t *);
-extern void event_del(event_t *);
-extern event_t *get_expired_event(void);
-
-#endif                                                 /* __TINC_EVENT_H__ */
+#endif