Use conditional compilation for cryptographic functions.

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 28c85cf..887da4a 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,6 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
                   2006      Scott Lamb <slamb@slamb.org>
 
@@ -60,7 +60,7 @@ bool send_meta(connection_t *c, const char *buffer, int length) {
        if(c->status.encryptout) {
                size_t outlen = length;
 
-               if(!cipher_encrypt(&c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
+               if(!cipher_encrypt(c->outcipher, buffer, length, buffer_prepare(&c->outbuf, length), &outlen, false) || outlen != length) {
                        logger(DEBUG_ALWAYS, LOG_ERR, "Error while encrypting metadata to %s (%s)",
                                        c->name, c->hostname);
                        return false;
@@ -171,7 +171,7 @@ bool receive_meta(connection_t *c) {
                } else {
                        size_t outlen = inlen;
 
-                       if(!cipher_decrypt(&c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
+                       if(!cipher_decrypt(c->incipher, bufp, inlen, buffer_prepare(&c->inbuf, inlen), &outlen, false) || inlen != outlen) {
                                logger(DEBUG_ALWAYS, LOG_ERR, "Error while decrypting metadata from %s (%s)",
                                           c->name, c->hostname);
                                return false;
@@ -189,19 +189,19 @@ bool receive_meta(connection_t *c) {
                                        break;
 
                                if(!c->node) {
-                                       if(proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
+                                       if(c->outgoing && proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
                                                if(tcpbuffer[0] == 0 && tcpbuffer[1] == 0x5a) {
                                                        logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
                                                } else {
                                                        logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected");
                                                        return false;
                                                }
-                                       } else if(proxytype == PROXY_SOCKS5 && c->allow_request == ID) {
+                                       } else if(c->outgoing && proxytype == PROXY_SOCKS5 && c->allow_request == ID) {
                                                if(tcpbuffer[0] != 5) {
                                                        logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server");
                                                        return false;
                                                }
-                                               if(tcpbuffer[1] == 0xff) {
+                                               if(tcpbuffer[1] == (char)0xff) {
                                                        logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected: unsuitable authentication method");
                                                        return false;
                                                }