[BACK]Return to packet.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/packet.c between version 1.15 and 1.16

version 1.15, 1999/11/24 00:26:02 version 1.16, 1999/11/24 19:53:48
Line 29 
Line 29 
 #include "compress.h"  #include "compress.h"
 #include "deattack.h"  #include "deattack.h"
   
 /* This variable contains the file descriptors used for communicating with  /*
    the other side.  connection_in is used for reading; connection_out   * This variable contains the file descriptors used for communicating with
    for writing.  These can be the same descriptor, in which case it is   * the other side.  connection_in is used for reading; connection_out for
    assumed to be a socket. */   * writing.  These can be the same descriptor, in which case it is assumed to
    * be a socket.
    */
 static int connection_in = -1;  static int connection_in = -1;
 static int connection_out = -1;  static int connection_out = -1;
   
 /* Cipher type.  This value is only used to determine whether to pad the  /*
    packets with zeroes or random data. */   * Cipher type.  This value is only used to determine whether to pad the
    * packets with zeroes or random data.
    */
 static int cipher_type = SSH_CIPHER_NONE;  static int cipher_type = SSH_CIPHER_NONE;
   
 /* Protocol flags for the remote side. */  /* Protocol flags for the remote side. */
Line 76 
Line 80 
 /* Set to true if the connection is interactive. */  /* Set to true if the connection is interactive. */
 static int interactive_mode = 0;  static int interactive_mode = 0;
   
 /* Sets the descriptors used for communication.  Disables encryption until  /*
    packet_set_encryption_key is called. */   * Sets the descriptors used for communication.  Disables encryption until
    * packet_set_encryption_key is called.
    */
   
 void  void
 packet_set_connection(int fd_in, int fd_out)  packet_set_connection(int fd_in, int fd_out)
Line 171 
Line 177 
         return remote_protocol_flags;          return remote_protocol_flags;
 }  }
   
 /* Starts packet compression from the next packet on in both directions.  /*
    Level is compression level 1 (fastest) - 9 (slow, best) as in gzip. */   * Starts packet compression from the next packet on in both directions.
    * Level is compression level 1 (fastest) - 9 (slow, best) as in gzip.
    */
   
 void  void
 packet_start_compression(int level)  packet_start_compression(int level)
Line 184 
Line 192 
         buffer_compress_init(level);          buffer_compress_init(level);
 }  }
   
 /* Encrypts the given number of bytes, copying from src to dest.  /*
    bytes is known to be a multiple of 8. */   * Encrypts the given number of bytes, copying from src to dest. bytes is
    * known to be a multiple of 8.
    */
   
 void  void
 packet_encrypt(CipherContext * cc, void *dest, void *src,  packet_encrypt(CipherContext * cc, void *dest, void *src,
Line 194 
Line 204 
         cipher_encrypt(cc, dest, src, bytes);          cipher_encrypt(cc, dest, src, bytes);
 }  }
   
 /* Decrypts the given number of bytes, copying from src to dest.  /*
    bytes is known to be a multiple of 8. */   * Decrypts the given number of bytes, copying from src to dest. bytes is
    * known to be a multiple of 8.
    */
   
 void  void
 packet_decrypt(CipherContext * cc, void *dest, void *src,  packet_decrypt(CipherContext * cc, void *dest, void *src,
Line 206 
Line 218 
         if ((bytes % 8) != 0)          if ((bytes % 8) != 0)
                 fatal("packet_decrypt: bad ciphertext length %d", bytes);                  fatal("packet_decrypt: bad ciphertext length %d", bytes);
   
         /* Cryptographic attack detector for ssh - Modifications for packet.c          /*
           (C)1998 CORE-SDI, Buenos Aires Argentina Ariel Futoransky(futo@core-sdi.com) */           * Cryptographic attack detector for ssh - Modifications for packet.c
            * (C)1998 CORE-SDI, Buenos Aires Argentina Ariel Futoransky(futo@core-sdi.com)
            */
   
         switch (cc->type) {          switch (cc->type) {
         case SSH_CIPHER_NONE:          case SSH_CIPHER_NONE:
Line 224 
Line 238 
         cipher_decrypt(cc, dest, src, bytes);          cipher_decrypt(cc, dest, src, bytes);
 }  }
   
 /* Causes any further packets to be encrypted using the given key.  The same  /*
    key is used for both sending and reception.  However, both directions   * Causes any further packets to be encrypted using the given key.  The same
    are encrypted independently of each other. */   * key is used for both sending and reception.  However, both directions are
    * encrypted independently of each other.
    */
   
 void  void
 packet_set_encryption_key(const unsigned char *key, unsigned int keylen,  packet_set_encryption_key(const unsigned char *key, unsigned int keylen,
Line 283 
Line 299 
         buffer_put_bignum(&outgoing_packet, value);          buffer_put_bignum(&outgoing_packet, value);
 }  }
   
 /* Finalizes and sends the packet.  If the encryption key has been set,  /*
    encrypts the packet before sending. */   * Finalizes and sends the packet.  If the encryption key has been set,
    * encrypts the packet before sending.
    */
   
 void  void
 packet_send()  packet_send()
Line 294 
Line 312 
         unsigned int checksum;          unsigned int checksum;
         u_int32_t rand = 0;          u_int32_t rand = 0;
   
         /* If using packet compression, compress the payload of the          /*
            outgoing packet. */           * If using packet compression, compress the payload of the outgoing
            * packet.
            */
         if (packet_compression) {          if (packet_compression) {
                 buffer_clear(&compression_buffer);                  buffer_clear(&compression_buffer);
                 /* Skip padding. */                  /* Skip padding. */
Line 348 
Line 368 
   
         buffer_clear(&outgoing_packet);          buffer_clear(&outgoing_packet);
   
         /* Note that the packet is now only buffered in output.  It won\'t          /*
            be actually sent until packet_write_wait or packet_write_poll           * Note that the packet is now only buffered in output.  It won\'t be
            is called. */           * actually sent until packet_write_wait or packet_write_poll is
            * called.
            */
 }  }
   
 /* Waits until a packet has been received, and returns its type.  Note that  /*
    no other data is processed until this returns, so this function should   * Waits until a packet has been received, and returns its type.  Note that
    not be used during the interactive session. */   * no other data is processed until this returns, so this function should not
    * be used during the interactive session.
    */
   
 int  int
 packet_read(int *payload_len_ptr)  packet_read(int *payload_len_ptr)
Line 379 
Line 403 
                 /* If we got a packet, return it. */                  /* If we got a packet, return it. */
                 if (type != SSH_MSG_NONE)                  if (type != SSH_MSG_NONE)
                         return type;                          return type;
                 /* Otherwise, wait for some data to arrive, add it to the                  /*
                    buffer, and try again. */                   * Otherwise, wait for some data to arrive, add it to the
                    * buffer, and try again.
                    */
                 FD_ZERO(&set);                  FD_ZERO(&set);
                 FD_SET(connection_in, &set);                  FD_SET(connection_in, &set);
   
                 /* Wait for some data to arrive. */                  /* Wait for some data to arrive. */
                 select(connection_in + 1, &set, NULL, NULL, NULL);                  select(connection_in + 1, &set, NULL, NULL, NULL);
   
                 /* Read data from the socket. */                  /* Read data from the socket. */
                 len = read(connection_in, buf, sizeof(buf));                  len = read(connection_in, buf, sizeof(buf));
                 if (len == 0)                  if (len == 0)
Line 397 
Line 425 
         /* NOTREACHED */          /* NOTREACHED */
 }  }
   
 /* Waits until a packet has been received, verifies that its type matches  /*
    that given, and gives a fatal error and exits if there is a mismatch. */   * Waits until a packet has been received, verifies that its type matches
    * that given, and gives a fatal error and exits if there is a mismatch.
    */
   
 void  void
 packet_read_expect(int *payload_len_ptr, int expected_type)  packet_read_expect(int *payload_len_ptr, int expected_type)
Line 516 
Line 546 
         return (unsigned char) buf[0];          return (unsigned char) buf[0];
 }  }
   
 /* Buffers the given amount of input characters.  This is intended to be  /*
    used together with packet_read_poll. */   * Buffers the given amount of input characters.  This is intended to be used
    * together with packet_read_poll.
    */
   
 void  void
 packet_process_incoming(const char *buf, unsigned int len)  packet_process_incoming(const char *buf, unsigned int len)
Line 543 
Line 575 
         return buffer_get_int(&incoming_packet);          return buffer_get_int(&incoming_packet);
 }  }
   
 /* Returns an arbitrary precision integer from the packet data.  The integer  /*
    must have been initialized before this call. */   * Returns an arbitrary precision integer from the packet data.  The integer
    * must have been initialized before this call.
    */
   
 void  void
 packet_get_bignum(BIGNUM * value, int *length_ptr)  packet_get_bignum(BIGNUM * value, int *length_ptr)
Line 552 
Line 586 
         *length_ptr = buffer_get_bignum(&incoming_packet, value);          *length_ptr = buffer_get_bignum(&incoming_packet, value);
 }  }
   
 /* Returns a string from the packet data.  The string is allocated using  /*
    xmalloc; it is the responsibility of the calling program to free it when   * Returns a string from the packet data.  The string is allocated using
    no longer needed.  The length_ptr argument may be NULL, or point to an   * xmalloc; it is the responsibility of the calling program to free it when
    integer into which the length of the string is stored. */   * no longer needed.  The length_ptr argument may be NULL, or point to an
    * integer into which the length of the string is stored.
    */
   
 char  char *
 *  
 packet_get_string(unsigned int *length_ptr)  packet_get_string(unsigned int *length_ptr)
 {  {
         return buffer_get_string(&incoming_packet, length_ptr);          return buffer_get_string(&incoming_packet, length_ptr);
 }  }
   
 /* Sends a diagnostic message from the server to the client.  This message  /*
    can be sent at any time (but not while constructing another message).   * Sends a diagnostic message from the server to the client.  This message
    The message is printed immediately, but only if the client is being   * can be sent at any time (but not while constructing another message). The
    executed in verbose mode.  These messages are primarily intended to   * message is printed immediately, but only if the client is being executed
    ease debugging authentication problems.   The length of the formatted   * in verbose mode.  These messages are primarily intended to ease debugging
    message must not exceed 1024 bytes.  This will automatically call   * authentication problems.   The length of the formatted message must not
    packet_write_wait. */   * exceed 1024 bytes.  This will automatically call packet_write_wait.
    */
   
 void  void
 packet_send_debug(const char *fmt,...)  packet_send_debug(const char *fmt,...)
Line 588 
Line 624 
         packet_write_wait();          packet_write_wait();
 }  }
   
 /* Logs the error plus constructs and sends a disconnect  /*
    packet, closes the connection, and exits.  This function never returns.   * Logs the error plus constructs and sends a disconnect packet, closes the
    The error message should not contain a newline.  The length of the   * connection, and exits.  This function never returns. The error message
    formatted message must not exceed 1024 bytes. */   * should not contain a newline.  The length of the formatted message must
    * not exceed 1024 bytes.
    */
   
 void  void
 packet_disconnect(const char *fmt,...)  packet_disconnect(const char *fmt,...)
Line 603 
Line 641 
                 fatal("packet_disconnect called recursively.");                  fatal("packet_disconnect called recursively.");
         disconnecting = 1;          disconnecting = 1;
   
         /* Format the message.  Note that the caller must make sure the          /*
            message is of limited size. */           * Format the message.  Note that the caller must make sure the
            * message is of limited size.
            */
         va_start(args, fmt);          va_start(args, fmt);
         vsnprintf(buf, sizeof(buf), fmt, args);          vsnprintf(buf, sizeof(buf), fmt, args);
         va_end(args);          va_end(args);
Line 625 
Line 665 
         fatal("Disconnecting: %.100s", buf);          fatal("Disconnecting: %.100s", buf);
 }  }
   
 /* Checks if there is any buffered output, and tries to write some of the  /* Checks if there is any buffered output, and tries to write some of the output. */
    output. */  
   
 void  void
 packet_write_poll()  packet_write_poll()
Line 644 
Line 683 
         }          }
 }  }
   
 /* Calls packet_write_poll repeatedly until all pending output data has  /*
    been written. */   * Calls packet_write_poll repeatedly until all pending output data has been
    * written.
    */
   
 void  void
 packet_write_wait()  packet_write_wait()
Line 689 
Line 730 
         /* Record that we are in interactive mode. */          /* Record that we are in interactive mode. */
         interactive_mode = interactive;          interactive_mode = interactive;
   
         /* Only set socket options if using a socket (as indicated by the          /*
            descriptors being the same). */           * Only set socket options if using a socket (as indicated by the
            * descriptors being the same).
            */
         if (connection_in != connection_out)          if (connection_in != connection_out)
                 return;                  return;
   
Line 701 
Line 744 
                         error("setsockopt SO_KEEPALIVE: %.100s", strerror(errno));                          error("setsockopt SO_KEEPALIVE: %.100s", strerror(errno));
         }          }
         if (interactive) {          if (interactive) {
                 /* Set IP options for an interactive connection.  Use                  /*
                    IPTOS_LOWDELAY and TCP_NODELAY. */                   * Set IP options for an interactive connection.  Use
                    * IPTOS_LOWDELAY and TCP_NODELAY.
                    */
                 int lowdelay = IPTOS_LOWDELAY;                  int lowdelay = IPTOS_LOWDELAY;
                 if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, (void *) &lowdelay,                  if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, (void *) &lowdelay,
                                sizeof(lowdelay)) < 0)                                 sizeof(lowdelay)) < 0)
Line 711 
Line 756 
                                sizeof(on)) < 0)                                 sizeof(on)) < 0)
                         error("setsockopt TCP_NODELAY: %.100s", strerror(errno));                          error("setsockopt TCP_NODELAY: %.100s", strerror(errno));
         } else {          } else {
                 /* Set IP options for a non-interactive connection.  Use                  /*
                    IPTOS_THROUGHPUT. */                   * Set IP options for a non-interactive connection.  Use
                    * IPTOS_THROUGHPUT.
                    */
                 int throughput = IPTOS_THROUGHPUT;                  int throughput = IPTOS_THROUGHPUT;
                 if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, (void *) &throughput,                  if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, (void *) &throughput,
                                sizeof(throughput)) < 0)                                 sizeof(throughput)) < 0)
Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16