X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=57814fdd5c71b53ae7460aa277019f5a519e1045;hp=75818043782f0ec57e8298227d3af55d77e3c945;hb=e1707f7739f450c729e26b921e459d5da07602f9;hpb=408ca91766088b6c2d38e198b0692bf394b41248

diff --git a/src/protocol.c b/src/protocol.c
index 75818043..57814fdd 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.c,v 1.28.4.62 2000/11/20 19:12:13 guus Exp $
+    $Id: protocol.c,v 1.28.4.70 2000/12/22 21:34:24 guus Exp $
 */
 
 #include "config.h"
@@ -72,11 +72,12 @@ int check_id(char *id)
   for (i = 0; i < strlen(id); i++)
     if(!isalnum(id[i]) && id[i] != '_')
       return -1;
-          
+  
   return 0;
 }
 
-/* Generic request routines - takes care of logging and error detection as well */
+/* Generic request routines - takes care of logging and error
+   detection as well */
 
 int send_request(connection_t *cl, const char *format, ...)
 {
@@ -85,8 +86,9 @@ int send_request(connection_t *cl, const char *format, ...)
   int len, request;
 
 cp
-  /* Use vsnprintf instead of vasprintf: faster, no memory fragmentation, cleanup is automatic,
-     and there is a limit on the input buffer anyway */
+  /* Use vsnprintf instead of vasprintf: faster, no memory
+     fragmentation, cleanup is automatic, and there is a limit on the
+     input buffer anyway */
 
   va_start(args, format);
   len = vsnprintf(buffer, MAXBUFSIZE, format, args);
@@ -174,9 +176,10 @@ cp
    (H) SHA1,
    (E) Encrypted with symmetric cipher.
 
-   Part of the challenge is directly used to set the symmetric cipher key and the initial vector.
-   Since a man-in-the-middle cannot decrypt the RSA challenges, this means that he cannot get or
-   forge the key for the symmetric cipher.
+   Part of the challenge is directly used to set the symmetric cipher
+   key and the initial vector.  Since a man-in-the-middle cannot
+   decrypt the RSA challenges, this means that he cannot get or forge
+   the key for the symmetric cipher.
 */
 
 int send_id(connection_t *cl)
@@ -191,8 +194,9 @@ int id_h(connection_t *cl)
 {
   connection_t *old;
   config_t const *cfg;
+  char name[MAX_STRING_SIZE];
 cp
-  if(sscanf(cl->buffer, "%*d %as %d %lx %hd", &cl->name, &cl->protocol_version, &cl->options, &cl->port) != 4)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING" %d %lx %hd", name, &cl->protocol_version, &cl->options, &cl->port) != 4)
     {
        syslog(LOG_ERR, _("Got bad ID from %s"), cl->hostname);
        return -1;
@@ -209,14 +213,18 @@ cp
 
   /* Check if identity is a valid name */
 
-  if(check_id(cl->name))
+  if(check_id(name))
     {
       syslog(LOG_ERR, _("Peer %s uses invalid identity name"), cl->hostname);
       return -1;
     }
+  
+  /* Copy string to cl */
+  
+  cl->name = xstrdup(name);
 
   /* Load information about peer */
-cp
+
   if(read_host_config(cl))
     {
       syslog(LOG_ERR, _("Peer %s had unknown identity (%s)"), cl->hostname, cl->name);
@@ -227,7 +235,7 @@ cp
      connection list. If so, we are probably making a loop, which
      is not desirable.
    */
-cp
+
   if(cl->status.outgoing)
     {
       if((old = lookup_id(cl->name)))
@@ -240,18 +248,16 @@ cp
           return 0;
         }
     }
-cp    
-  if((cfg = get_config_val(cl->config, config_publickey)))
-    {
-      cl->rsa_key = RSA_new();
-      BN_hex2bn(&cl->rsa_key->n, cfg->data.ptr);
-      BN_hex2bn(&cl->rsa_key->e, "FFFF");
-    }
-  else
-    {
-      syslog(LOG_ERR, _("No public key known for %s (%s)"), cl->name, cl->hostname);
-      return -1;
-    }
+    
+  /* Now we can add the name to the id tree */
+  
+  id_add(cl);
+
+  /* Read in the public key, so that we can send a challenge */
+
+  if(read_rsa_public_key(cl))
+    return -1;
+
 cp
   return send_challenge(cl);
 }
@@ -286,7 +292,7 @@ cp
     }
 
   /* Encrypt the random data */
-  
+
   if(RSA_public_encrypt(len, cl->hischallenge, buffer, cl->rsa_key, RSA_NO_PADDING) != len)	/* NO_PADDING because the message size equals the RSA key size and it is totally random */
     {
       syslog(LOG_ERR, _("Error during encryption of challenge for %s (%s)"), cl->name, cl->hostname);
@@ -310,10 +316,10 @@ cp
 
 int challenge_h(connection_t *cl)
 {
-  char *buffer;
+  char buffer[MAX_STRING_SIZE];
   int len;
 cp
-  if(sscanf(cl->buffer, "%*d %as", &buffer) != 1)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING, buffer) != 1)
     {
        syslog(LOG_ERR, _("Got bad CHALLENGE from %s (%s)"), cl->name, cl->hostname);
        return -1;
@@ -326,7 +332,6 @@ cp
   if(strlen(buffer) != len*2)
     {
       syslog(LOG_ERR, _("Intruder: wrong challenge length from %s (%s)"), cl->name, cl->hostname);
-      free(buffer);
       return -1;
     }
 
@@ -344,7 +349,6 @@ cp
   if(RSA_private_decrypt(len, buffer, cl->mychallenge, myself->rsa_key, RSA_NO_PADDING) != len)	/* See challenge() */
     {
       syslog(LOG_ERR, _("Error during encryption of challenge for %s (%s)"), cl->name, cl->hostname);
-      free(buffer);
       return -1;
     }
 
@@ -355,8 +359,6 @@ cp
       syslog(LOG_DEBUG, _("Received random challenge (unencrypted): %s"), buffer);
     }
 
-  free(buffer);
-    
   /* Rest is done by send_chal_reply() */
 cp
   return send_chal_reply(cl);
@@ -394,13 +396,12 @@ cp
 
 int chal_reply_h(connection_t *cl)
 {
-  char *hishash;
+  char hishash[MAX_STRING_SIZE];
   char myhash[SHA_DIGEST_LENGTH];
 cp
-  if(sscanf(cl->buffer, "%*d %as", &hishash) != 1)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING, hishash) != 1)
     {
        syslog(LOG_ERR, _("Got bad CHAL_REPLY from %s (%s)"), cl->name, cl->hostname);
-       free(hishash);
        return -1;
     }
 
@@ -409,7 +410,6 @@ cp
   if(strlen(hishash) != SHA_DIGEST_LENGTH*2)
     {
       syslog(LOG_ERR, _("Intruder: wrong challenge reply length from %s (%s)"), cl->name, cl->hostname);
-      free(hishash);
       return -1;
     }
 
@@ -432,13 +432,10 @@ cp
           hishash[SHA_DIGEST_LENGTH*2] = '\0';
           syslog(LOG_DEBUG, _("Expected challenge reply: %s"), hishash);
         }
-      free(hishash);
       return -1;
     }
 
 
-  free(hishash);
-
   /* Identity has now been positively verified.
      If we are accepting this new connection, then send our identity,
      if we are making this connecting, acknowledge.
@@ -511,10 +508,10 @@ cp
 
 int metakey_h(connection_t *cl)
 {
-  char *buffer;
+  char buffer[MAX_STRING_SIZE];
   int len;
 cp
-  if(sscanf(cl->buffer, "%*d %as", &buffer) != 1)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING, buffer) != 1)
     {
        syslog(LOG_ERR, _("Got bad METAKEY from %s (%s)"), cl->name, cl->hostname);
        return -1;
@@ -527,7 +524,6 @@ cp
   if(strlen(buffer) != len*2)
     {
       syslog(LOG_ERR, _("Intruder: wrong meta key length from %s (%s)"), cl->name, cl->hostname);
-      free(buffer);
       return -1;
     }
 
@@ -548,7 +544,6 @@ cp
   if(RSA_private_decrypt(len, buffer, cl->cipher_inkey, myself->rsa_key, RSA_NO_PADDING) != len)	/* See challenge() */
     {
       syslog(LOG_ERR, _("Error during encryption of meta key for %s (%s)"), cl->name, cl->hostname);
-      free(buffer);
       return -1;
     }
 
@@ -559,8 +554,6 @@ cp
       syslog(LOG_DEBUG, _("Received random meta key (unencrypted): %s"), buffer);
     }
 
-  free(buffer);
-
   EVP_DecryptInit(cl->cipher_inctx, EVP_bf_cfb(), cl->cipher_inkey, cl->cipher_inkey + EVP_bf_cfb()->key_len);
   
 cp
@@ -577,8 +570,6 @@ cp
   if(cl->status.outgoing)
     cl->allow_request = ACK;
 
-  setup_vpn_connection(cl);
-
   x = send_request(cl, "%d", ACK);
   cl->status.encryptout = 1;
 cp
@@ -672,16 +663,15 @@ cp
 
 int add_subnet_h(connection_t *cl)
 {
-  char *subnetstr;
-  char *name;
+  char subnetstr[MAX_STRING_SIZE];
+  char name[MAX_STRING_SIZE];
   connection_t *owner, *p;
   subnet_t *subnet;
   rbl_t *rbl;
 cp
-  if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 2)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 2)
     {
       syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s)"), cl->name, cl->hostname);
-      free(name); free(subnetstr);
       return -1;
     }
 
@@ -690,7 +680,6 @@ cp
   if(check_id(name))
     {
       syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
-      free(name); free(subnetstr);
       return -1;
     }
 
@@ -699,19 +688,15 @@ cp
   if(!(subnet = str2net(subnetstr)))
     {
       syslog(LOG_ERR, _("Got bad ADD_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
-      free(name); free(subnetstr);
       return -1;
     }
 
-  free(subnetstr);
-  
   /* Check if somebody tries to add a subnet of ourself */
 
   if(!strcmp(name, myself->name))
     {
       syslog(LOG_ERR, _("Warning: got ADD_SUBNET from %s (%s) for ourself, restarting"),
              cl->name, cl->hostname);
-      free(name);
       sighup = 1;
       return 0;
     }
@@ -722,7 +707,6 @@ cp
     {
       syslog(LOG_ERR, _("Got ADD_SUBNET for %s from %s (%s) which is not in our connection list"),
              name, cl->name, cl->hostname);
-      free(name);
       return -1;
     }
 
@@ -756,16 +740,15 @@ cp
 
 int del_subnet_h(connection_t *cl)
 {
-  char *subnetstr;
-  char *name;
+  char subnetstr[MAX_STRING_SIZE];
+  char name[MAX_STRING_SIZE];
   connection_t *owner, *p;
   subnet_t *subnet;
   rbl_t *rbl;
 cp
-  if(sscanf(cl->buffer, "%*d %as %as", &name, &subnetstr) != 3)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING, name, subnetstr) != 3)
     {
       syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s)"), cl->name, cl->hostname);
-      free(name); free(subnetstr);
       return -1;
     }
 
@@ -774,7 +757,6 @@ cp
   if(check_id(name))
     {
       syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid identity name"), cl->name, cl->hostname);
-      free(name); free(subnetstr);
       return -1;
     }
 
@@ -783,7 +765,6 @@ cp
   if(!(subnet = str2net(subnetstr)))
     {
       syslog(LOG_ERR, _("Got bad DEL_SUBNET from %s (%s): invalid subnet string"), cl->name, cl->hostname);
-      free(name); free(subnetstr);
       return -1;
     }
 
@@ -795,7 +776,6 @@ cp
     {
       syslog(LOG_ERR, _("Warning: got DEL_SUBNET from %s (%s) for ourself, restarting"),
              cl->name, cl->hostname);
-      free(name);
       sighup = 1;
       return 0;
     }
@@ -806,7 +786,6 @@ cp
     {
       syslog(LOG_ERR, _("Got DEL_SUBNET for %s from %s (%s) which is not in our connection list"),
              name, cl->name, cl->hostname);
-      free(name);
       return -1;
     }
 
@@ -838,11 +817,12 @@ cp
 int add_host_h(connection_t *cl)
 {
   connection_t *old, *new, *p;
+  char name[MAX_STRING_SIZE];
   rbl_t *rbl;
 cp
   new = new_connection();
 
-  if(sscanf(cl->buffer, "%*d %as %lx:%d %lx", &new->name, &new->address, &new->port, &new->options) != 4)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%d %lx", name, &new->address, &new->port, &new->options) != 4)
     {
        syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s)"), cl->name, cl->hostname);
        return -1;
@@ -850,7 +830,7 @@ cp
 
   /* Check if identity is a valid name */
 
-  if(check_id(new->name))
+  if(check_id(name))
     {
       syslog(LOG_ERR, _("Got bad ADD_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
       free_connection(new);
@@ -859,7 +839,7 @@ cp
 
   /* Check if somebody tries to add ourself */
 
-  if(!strcmp(new->name, myself->name))
+  if(!strcmp(name, myself->name))
     {
       syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname);
       sighup = 1;
@@ -873,13 +853,13 @@ cp
 
   /* Check if the new host already exists in the connnection list */
 
-  if((old = lookup_id(new->name)))
+  if((old = lookup_id(name)))
     {
       if((new->address == old->address) && (new->port == old->port))
         {
           if(debug_lvl >= DEBUG_CONNECTIONS)
             syslog(LOG_NOTICE, _("Got duplicate ADD_HOST for %s (%s) from %s (%s)"),
-                   old->name, old->hostname, new->name, new->hostname);
+                   old->name, old->hostname, name, new->hostname);
           free_connection(new);
           return 0;
         }
@@ -895,7 +875,9 @@ cp
 
   /* Hook it up into the connection */
 
+  new->name = xstrdup(name);
   connection_add(new);
+  id_add(new);
 
   /* Tell the rest about the new host */
 
@@ -912,12 +894,6 @@ cp
   new->status.active = 1;
   new->cipher_pkttype = EVP_bf_cfb();
   new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
-
-  /* Okay this is a bit ugly... it would be better to setup UDP sockets dynamically, or
-   * perhaps just one UDP socket... but then again, this has benefits too...
-   */
-   
-  setup_vpn_connection(new);
 cp
   return 0;
 }
@@ -931,14 +907,14 @@ cp
 
 int del_host_h(connection_t *cl)
 {
-  char *name;
+  char name[MAX_STRING_SIZE];
   ip_t address;
   port_t port;
   long int options;
   connection_t *old, *p;
   rbl_t *rbl;
 cp
-  if(sscanf(cl->buffer, "%*d %as %lx:%d %lx", &name, &address, &port, &options) != 4)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING" %lx:%d %lx", name, &address, &port, &options) != 4)
     {
       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s)"),
              cl->name, cl->hostname);
@@ -950,7 +926,6 @@ cp
   if(check_id(name))
     {
       syslog(LOG_ERR, _("Got bad DEL_HOST from %s (%s): invalid identity name"), cl->name, cl->hostname);
-      free(name);
       return -1;
     }
 
@@ -960,7 +935,6 @@ cp
     {
       syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
              cl->name, cl->hostname);
-      free(name);
       sighup = 1;
       return 0;
     }
@@ -971,7 +945,6 @@ cp
     {
       syslog(LOG_ERR, _("Got DEL_HOST from %s (%s) for %s which is not in our connection list"),
              name, cl->name, cl->hostname);
-      free(name);
       return -1;
     }
   
@@ -1014,9 +987,9 @@ cp
 int status_h(connection_t *cl)
 {
   int statusno;
-  char *statusstring;
+  char statusstring[MAX_STRING_SIZE];
 cp
-  if(sscanf(cl->buffer, "%*d %d %as", &statusno, &statusstring) != 2)
+  if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &statusno, statusstring) != 2)
     {
        syslog(LOG_ERR, _("Got bad STATUS from %s (%s)"),
               cl->name, cl->hostname);
@@ -1030,7 +1003,6 @@ cp
     }
 
 cp
-  free(statusstring);
   return 0;
 }
 
@@ -1045,9 +1017,9 @@ cp
 int error_h(connection_t *cl)
 {
   int errno;
-  char *errorstring;
+  char errorstring[MAX_STRING_SIZE];
 cp
-  if(sscanf(cl->buffer, "%*d %d %as", &errno, &errorstring) != 2)
+  if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &errno, errorstring) != 2)
     {
        syslog(LOG_ERR, _("Got bad ERROR from %s (%s)"),
               cl->name, cl->hostname);
@@ -1060,7 +1032,6 @@ cp
              cl->name, cl->hostname, strerror(errno), errorstring);
     }
 
-  free(errorstring);
   terminate_connection(cl);
 cp
   return 0;
@@ -1130,10 +1101,10 @@ cp
 
 int key_changed_h(connection_t *cl)
 {
-  char *from_id;
+  char from_id[MAX_STRING_SIZE];
   connection_t *from;
 cp
-  if(sscanf(cl->buffer, "%*d %as", &from_id) != 1)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING, from_id) != 1)
     {
       syslog(LOG_ERR, _("Got bad KEY_CHANGED from %s (%s)"),
              cl->name, cl->hostname);
@@ -1144,12 +1115,9 @@ cp
     {
       syslog(LOG_ERR, _("Got KEY_CHANGED from %s (%s) origin %s which does not exist in our connection list"),
              cl->name, cl->hostname, from_id);
-      free(from_id);
       return -1;
     }
 
-  free(from_id);
-
   from->status.validkey = 0;
   from->status.waitingforkey = 0;
 
@@ -1167,11 +1135,12 @@ cp
 
 int req_key_h(connection_t *cl)
 {
-  char *from_id, *to_id;
+  char from_id[MAX_STRING_SIZE];
+  char to_id[MAX_STRING_SIZE];
   connection_t *from, *to;
   char pktkey[129];
 cp
-  if(sscanf(cl->buffer, "%*d %as %as", &from_id, &to_id) != 2)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING, from_id, to_id) != 2)
     {
        syslog(LOG_ERR, _("Got bad REQ_KEY from %s (%s)"),
               cl->name, cl->hostname);
@@ -1182,7 +1151,6 @@ cp
     {
       syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) origin %s which does not exist in our connection list"),
              cl->name, cl->hostname, from_id);
-      free(from_id); free(to_id);
       return -1;
     }
 
@@ -1200,7 +1168,6 @@ cp
         {
           syslog(LOG_ERR, _("Got REQ_KEY from %s (%s) destination %s which does not exist in our connection list"),
                  cl->name, cl->hostname, to_id);
-          free(from_id); free(to_id);
           return -1;
         }
         
@@ -1214,7 +1181,6 @@ cp
         send_req_key(from, to);
     }
 
-  free(from_id); free(to_id);
 cp
   return 0;
 }
@@ -1228,11 +1194,13 @@ cp
 
 int ans_key_h(connection_t *cl)
 {
-  char *from_id, *to_id, *pktkey;
+  char from_id[MAX_STRING_SIZE];
+  char to_id[MAX_STRING_SIZE];
+  char pktkey[MAX_STRING_SIZE];
   int keylength;
   connection_t *from, *to;
 cp
-  if(sscanf(cl->buffer, "%*d %as %as %as", &from_id, &to_id, &pktkey) != 3)
+  if(sscanf(cl->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING, from_id, to_id, pktkey) != 3)
     {
        syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s)"),
               cl->name, cl->hostname);
@@ -1243,7 +1211,6 @@ cp
     {
       syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) origin %s which does not exist in our connection list"),
              cl->name, cl->hostname, from_id);
-      free(from_id); free(to_id); free(pktkey);
       return -1;
     }
 
@@ -1255,7 +1222,6 @@ cp
     {
       syslog(LOG_ERR, _("Got bad ANS_KEY from %s (%s) origin %s: invalid key length"),
              cl->name, cl->hostname, from->name);
-      free(from_id); free(to_id); free(pktkey);
       return -1;
     }
 
@@ -1267,7 +1233,6 @@ cp
         {
           syslog(LOG_ERR, _("Got ANS_KEY from %s (%s) destination %s which does not exist in our connection list"),
                  cl->name, cl->hostname, to_id);
-          free(from_id); free(to_id);
           return -1;
         }
       send_ans_key(from, to, pktkey);
@@ -1278,15 +1243,13 @@ cp
   if(from->cipher_pktkey)
     free(from->cipher_pktkey);
 
+  from->cipher_pktkey = xstrdup(pktkey);
   keylength /= 2;
-  hex2bin(pktkey, pktkey, keylength);
-  pktkey[keylength] = '\0';
-  from->cipher_pktkey = pktkey;
+  hex2bin(from->cipher_pktkey, from->cipher_pktkey, keylength);
+  from->cipher_pktkey[keylength] = '\0';
 
   from->status.validkey = 1;
   from->status.waitingforkey = 0;
-    
-  free(from_id); free(to_id);
 cp
   return 0;
 }