Parse PEM RSA keys ourself, and use libgcrypt to do RSA encryption and decryption.

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index 6537e51..e5cd689 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -23,11 +23,12 @@
 #ifndef __TINC_CONNECTION_H__
 #define __TINC_CONNECTION_H__
 
-#include <openssl/rsa.h>
+//#include <openssl/rsa.h>
 #include <openssl/evp.h>
 
 #include <event.h>
 
+#include "rsa.h"
 #include "splay_tree.h"
 
 #define OPTION_INDIRECT                0x0001
@@ -41,7 +42,7 @@ typedef union connection_status_t {
                int connecting:1;                       /* 1 if we are waiting for a non-blocking connect() to finish */
                int termreq:1;                          /* the termination of this connection was requested */
                int remove_unused:1;                            /* Set to 1 if you want this connection removed */
-               int timeout:1;                          /* 1 if gotten timeout */
+               int timeout_unused:1;                           /* 1 if gotten timeout */
                int encryptout:1;                       /* 1 if we can encrypt outgoing traffic */
                int decryptin:1;                        /* 1 if we have to decrypt incoming traffic */
                int mst:1;                              /* 1 if this connection is part of a minimum spanning tree */
@@ -62,7 +63,6 @@ typedef struct connection_t {
        char *hostname;                         /* the hostname of its real ip */
        int protocol_version;           /* used protocol */
 
-       struct event ev;                        /* events on this metadata connection */
        int socket;                                     /* socket used for this connection */
        long int options;                       /* options for this connection */
        connection_status_t status;     /* status info */
@@ -73,7 +73,8 @@ typedef struct connection_t {
        struct node_t *node;            /* node associated with the other end */
        struct edge_t *edge;            /* edge associated with this connection */
 
-       RSA *rsa_key;                           /* his public/private key */
+       //RSA *rsa_key;                         /* his public/private key */
+       struct rsa_key_t rsa_key;          /* his public/private key */
        const EVP_CIPHER *incipher;     /* Cipher he will use to send data to us */
        const EVP_CIPHER *outcipher;    /* Cipher we will use to send data to him */
        EVP_CIPHER_CTX *inctx;          /* Context of encrypted meta data that will come from him to us */
@@ -91,18 +92,11 @@ typedef struct connection_t {
        char *mychallenge;                      /* challenge we received from him */
        char *hischallenge;                     /* challenge we sent to him */
 
-       char buffer[MAXBUFSIZE];        /* metadata input buffer */
-       int buflen;                                     /* bytes read into buffer */
-       int reqlen;                                     /* length of incoming request */
+       struct bufferevent *buffer;                     /* buffer events on this metadata connection */
+       struct event inevent;                           /* input event on this metadata connection */
        int tcplen;                                     /* length of incoming TCPpacket */
        int allow_request;                      /* defined if there's only one request possible */
 
-       char *outbuf;                           /* metadata output buffer */
-       int outbufstart;                        /* index of first meaningful byte in output buffer */
-       int outbuflen;                          /* number of meaningful bytes in output buffer */
-       int outbufsize;                         /* number of bytes allocated to output buffer */
-       struct event outev;                     /* events on this metadata connection */
-
        time_t last_ping_time;          /* last time we saw some activity from the other end or pinged them */
 
        splay_tree_t *config_tree;      /* Pointer to configuration tree belonging to him */