More sensible name, and try to set PMTU discovery on IPv6 sockets as well.

[oweals/tinc.git] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index dafcc20c2d29a1e49b1541296e25b7bce2d5514f..5e960ea5fc53e199b8610ab1c4a7babf3a9a9569 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -17,13 +17,14 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_auth.c,v 1.1.4.26 2003/08/28 21:05:11 guus Exp $
+    $Id: protocol_auth.c,v 1.1.4.32 2003/12/20 21:09:33 guus Exp $
 */
 
 #include "system.h"
 
 #include <openssl/sha.h>
 #include <openssl/rand.h>
+#include <openssl/err.h>
 #include <openssl/evp.h>
 
 #include "avl_tree.h"
@@ -50,7 +51,6 @@ bool send_id(connection_t *c)
 bool id_h(connection_t *c)
 {
        char name[MAX_STRING_SIZE];
-       bool choice;
 
        cp();
 
@@ -108,14 +108,6 @@ bool id_h(connection_t *c)
                return false;
        }
 
-       /* Check some options */
-
-       if((get_config_bool(lookup_config(c->config_tree, "IndirectData"), &choice) && choice) || myself->options & OPTION_INDIRECT)
-               c->options |= OPTION_INDIRECT;
-
-       if((get_config_bool(lookup_config(c->config_tree, "TCPOnly"), &choice) && choice) || myself->options & OPTION_TCPONLY)
-               c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
-
        c->allow_request = METAKEY;
 
        return send_metakey(c);
@@ -141,7 +133,7 @@ bool send_metakey(connection_t *c)
        cp();
        /* Copy random data to the buffer */
 
-       RAND_bytes(c->outkey, len);
+       RAND_pseudo_bytes(c->outkey, len);
 
        /* The message we send must be smaller than the modulus of the RSA key.
           By definition, for a key of k bits, the following formula holds:
@@ -190,10 +182,14 @@ bool send_metakey(connection_t *c)
        /* Further outgoing requests are encrypted with the key we just generated */
 
        if(c->outcipher) {
-               EVP_EncryptInit(c->outctx, c->outcipher,
-                                               c->outkey + len - c->outcipher->key_len,
-                                               c->outkey + len - c->outcipher->key_len -
-                                               c->outcipher->iv_len);
+               if(!EVP_EncryptInit(c->outctx, c->outcipher,
+                                       c->outkey + len - c->outcipher->key_len,
+                                       c->outkey + len - c->outcipher->key_len -
+                                       c->outcipher->iv_len)) {
+                       logger(LOG_ERR, _("Error during initialisation of cipher for %s (%s): %s"),
+                                       c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+                       return false;
+               }
 
                c->status.encryptout = true;
        }
@@ -262,10 +258,14 @@ bool metakey_h(connection_t *c)
                        return false;
                }
 
-               EVP_DecryptInit(c->inctx, c->incipher,
-                                               c->inkey + len - c->incipher->key_len,
-                                               c->inkey + len - c->incipher->key_len -
-                                               c->incipher->iv_len);
+               if(!EVP_DecryptInit(c->inctx, c->incipher,
+                                       c->inkey + len - c->incipher->key_len,
+                                       c->inkey + len - c->incipher->key_len -
+                                       c->incipher->iv_len)) {
+                       logger(LOG_ERR, _("Error during initialisation of cipher from %s (%s): %s"),
+                                       c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+                       return false;
+               }
 
                c->status.decryptin = true;
        } else {
@@ -315,7 +315,7 @@ bool send_challenge(connection_t *c)
 
        /* Copy random data to the buffer */
 
-       RAND_bytes(c->hischallenge, len);
+       RAND_pseudo_bytes(c->hischallenge, len);
 
        /* Convert to hex */
 
@@ -375,10 +375,13 @@ bool send_chal_reply(connection_t *c)
 
        /* Calculate the hash from the challenge we received */
 
-       EVP_DigestInit(&ctx, c->indigest);
-       EVP_DigestUpdate(&ctx, c->mychallenge,
-                                        RSA_size(myself->connection->rsa_key));
-       EVP_DigestFinal(&ctx, hash, NULL);
+       if(!EVP_DigestInit(&ctx, c->indigest)
+                       || !EVP_DigestUpdate(&ctx, c->mychallenge, RSA_size(myself->connection->rsa_key))
+                       || !EVP_DigestFinal(&ctx, hash, NULL)) {
+               logger(LOG_ERR, _("Error during calculation of response for %s (%s): %s"),
+                       c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+               return false;
+       }
 
        /* Convert the hash to a hexadecimal formatted string */
 
@@ -418,9 +421,13 @@ bool chal_reply_h(connection_t *c)
 
        /* Calculate the hash from the challenge we sent */
 
-       EVP_DigestInit(&ctx, c->outdigest);
-       EVP_DigestUpdate(&ctx, c->hischallenge, RSA_size(c->rsa_key));
-       EVP_DigestFinal(&ctx, myhash, NULL);
+       if(!EVP_DigestInit(&ctx, c->outdigest)
+                       || !EVP_DigestUpdate(&ctx, c->hischallenge, RSA_size(c->rsa_key))
+                       || !EVP_DigestFinal(&ctx, myhash, NULL)) {
+               logger(LOG_ERR, _("Error during calculation of response from %s (%s): %s"),
+                       c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
+               return false;
+       }
 
        /* Verify the incoming hash with the calculated hash */
 
@@ -452,6 +459,7 @@ bool send_ack(connection_t *c)
           to create node_t and edge_t structures. */
 
        struct timeval now;
+       bool choice;
 
        cp();
 
@@ -460,6 +468,17 @@ bool send_ack(connection_t *c)
        gettimeofday(&now, NULL);
        c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
 
+       /* Check some options */
+
+       if((get_config_bool(lookup_config(c->config_tree, "IndirectData"), &choice) && choice) || myself->options & OPTION_INDIRECT)
+               c->options |= OPTION_INDIRECT;
+
+       if((get_config_bool(lookup_config(c->config_tree, "TCPOnly"), &choice) && choice) || myself->options & OPTION_TCPONLY)
+               c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
+
+       if((get_config_bool(lookup_config(c->config_tree, "PMTUDiscovery"), &choice) && choice) || myself->options & OPTION_DONTFRAGMENT)
+               c->options |= OPTION_DONTFRAGMENT;
+
        return send_request(c, "%d %s %d %lx", ACK, myport, c->estimated_weight, c->options);
 }
 
@@ -472,6 +491,15 @@ static void send_everything(connection_t *c)
 
        /* Send all known subnets and edges */
 
+       if(tunnelserver) {
+               for(node = myself->subnet_tree->head; node; node = node->next) {
+                       s = node->data;
+                       send_add_subnet(c, s);
+               }
+
+               return;
+       }
+
        for(node = node_tree->head; node; node = node->next) {
                n = node->data;
 
@@ -556,7 +584,10 @@ bool ack_h(connection_t *c)
 
        /* Notify everyone of the new edge */
 
-       send_add_edge(broadcast, c->edge);
+       if(tunnelserver)
+               send_add_edge(c, c->edge);
+       else
+               send_add_edge(broadcast, c->edge);
 
        /* Run MST and SSSP algorithms */