Use conditional compilation for cryptographic functions.

[tinc] / src / sptps.h

diff --git a/src/sptps.h b/src/sptps.h
index 5037c46..ee41f46 100644 (file)
--- a/src/sptps.h
+++ b/src/sptps.h
@@ -1,6 +1,6 @@
 /*
     sptps.h -- Simple Peer-to-Peer Security
-    Copyright (C) 2011 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2011-2013 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
@@ -53,21 +53,22 @@ typedef struct sptps {
        uint16_t reclen;
 
        bool instate;
-       cipher_t incipher;
-       digest_t indigest;
+       cipher_t *incipher;
+       digest_t *indigest;
        uint32_t inseqno;
+       uint32_t received;
        unsigned int replaywin;
        unsigned int farfuture;
        char *late;
 
        bool outstate;
-       cipher_t outcipher;
-       digest_t outdigest;
+       cipher_t *outcipher;
+       digest_t *outdigest;
        uint32_t outseqno;
 
-       ecdsa_t mykey;
-       ecdsa_t hiskey;
-       ecdh_t ecdh;
+       ecdsa_t *mykey;
+       ecdsa_t *hiskey;
+       ecdh_t *ecdh;
 
        char *mykex;
        char *hiskex;
@@ -81,7 +82,10 @@ typedef struct sptps {
 } sptps_t;
 
 extern unsigned int sptps_replaywin;
-extern bool sptps_start(sptps_t *s, void *handle, bool initiator, bool datagram, ecdsa_t mykey, ecdsa_t hiskey, const char *label, size_t labellen, send_data_t send_data, receive_record_t receive_record);
+extern void sptps_log_quiet(sptps_t *s, int s_errno, const char *format, va_list ap);
+extern void sptps_log_stderr(sptps_t *s, int s_errno, const char *format, va_list ap);
+extern void (*sptps_log)(sptps_t *s, int s_errno, const char *format, va_list ap);
+extern bool sptps_start(sptps_t *s, void *handle, bool initiator, bool datagram, ecdsa_t *mykey, ecdsa_t *hiskey, const char *label, size_t labellen, send_data_t send_data, receive_record_t receive_record);
 extern bool sptps_stop(sptps_t *s);
 extern bool sptps_send_record(sptps_t *s, uint8_t type, const char *data, uint16_t len);
 extern bool sptps_receive_data(sptps_t *s, const char *data, size_t len);