[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.39 and 1.40

version 1.39, 2000/12/06 22:58:15 version 1.40, 2000/12/19 23:17:57
Line 84 
Line 84 
 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. */
 static unsigned int remote_protocol_flags = 0;  static u_int remote_protocol_flags = 0;
   
 /* Encryption context for receiving data.  This is only used for decryption. */  /* Encryption context for receiving data.  This is only used for decryption. */
 static CipherContext receive_context;  static CipherContext receive_context;
Line 167 
Line 167 
         connection_in = fd_in;          connection_in = fd_in;
         connection_out = fd_out;          connection_out = fd_out;
         cipher_type = SSH_CIPHER_NONE;          cipher_type = SSH_CIPHER_NONE;
         cipher_init(&send_context, none, (unsigned char *) "", 0, NULL, 0);          cipher_init(&send_context, none, (u_char *) "", 0, NULL, 0);
         cipher_init(&receive_context, none, (unsigned char *) "", 0, NULL, 0);          cipher_init(&receive_context, none, (u_char *) "", 0, NULL, 0);
         if (!initialized) {          if (!initialized) {
                 initialized = 1;                  initialized = 1;
                 buffer_init(&input);                  buffer_init(&input);
Line 281 
Line 281 
 /* Sets remote side protocol flags. */  /* Sets remote side protocol flags. */
   
 void  void
 packet_set_protocol_flags(unsigned int protocol_flags)  packet_set_protocol_flags(u_int protocol_flags)
 {  {
         remote_protocol_flags = protocol_flags;          remote_protocol_flags = protocol_flags;
         channel_set_options((protocol_flags & SSH_PROTOFLAG_HOST_IN_FWD_OPEN) != 0);          channel_set_options((protocol_flags & SSH_PROTOFLAG_HOST_IN_FWD_OPEN) != 0);
Line 289 
Line 289 
   
 /* Returns the remote protocol flags set earlier by the above function. */  /* Returns the remote protocol flags set earlier by the above function. */
   
 unsigned int  u_int
 packet_get_protocol_flags()  packet_get_protocol_flags()
 {  {
         return remote_protocol_flags;          return remote_protocol_flags;
Line 318 
Line 318 
   
 void  void
 packet_encrypt(CipherContext * cc, void *dest, void *src,  packet_encrypt(CipherContext * cc, void *dest, void *src,
     unsigned int bytes)      u_int bytes)
 {  {
         cipher_encrypt(cc, dest, src, bytes);          cipher_encrypt(cc, dest, src, bytes);
 }  }
Line 329 
Line 329 
  */   */
   
 void  void
 packet_decrypt(CipherContext *context, void *dest, void *src, unsigned int bytes)  packet_decrypt(CipherContext *context, void *dest, void *src, u_int bytes)
 {  {
         /*          /*
          * Cryptographic attack detector for ssh - Modifications for packet.c           * Cryptographic attack detector for ssh - Modifications for packet.c
Line 350 
Line 350 
  */   */
   
 void  void
 packet_set_encryption_key(const unsigned char *key, unsigned int keylen,  packet_set_encryption_key(const u_char *key, u_int keylen,
     int number)      int number)
 {  {
         Cipher *cipher = cipher_by_number(number);          Cipher *cipher = cipher_by_number(number);
Line 410 
Line 410 
 /* Appends an integer to the packet data. */  /* Appends an integer to the packet data. */
   
 void  void
 packet_put_int(unsigned int value)  packet_put_int(u_int value)
 {  {
         buffer_put_int(&outgoing_packet, value);          buffer_put_int(&outgoing_packet, value);
 }  }
Line 418 
Line 418 
 /* Appends a string to packet data. */  /* Appends a string to packet data. */
   
 void  void
 packet_put_string(const char *buf, unsigned int len)  packet_put_string(const char *buf, u_int len)
 {  {
         buffer_put_string(&outgoing_packet, buf, len);          buffer_put_string(&outgoing_packet, buf, len);
 }  }
Line 429 
Line 429 
 }  }
   
 void  void
 packet_put_raw(const char *buf, unsigned int len)  packet_put_raw(const char *buf, u_int len)
 {  {
         buffer_append(&outgoing_packet, buf, len);          buffer_append(&outgoing_packet, buf, len);
 }  }
Line 458 
Line 458 
 {  {
         char buf[8], *cp;          char buf[8], *cp;
         int i, padding, len;          int i, padding, len;
         unsigned int checksum;          u_int checksum;
         u_int32_t rand = 0;          u_int32_t rand = 0;
   
         /*          /*
Line 493 
Line 493 
         buffer_consume(&outgoing_packet, 8 - padding);          buffer_consume(&outgoing_packet, 8 - padding);
   
         /* Add check bytes. */          /* Add check bytes. */
         checksum = ssh_crc32((unsigned char *) buffer_ptr(&outgoing_packet),          checksum = ssh_crc32((u_char *) buffer_ptr(&outgoing_packet),
             buffer_len(&outgoing_packet));              buffer_len(&outgoing_packet));
         PUT_32BIT(buf, checksum);          PUT_32BIT(buf, checksum);
         buffer_append(&outgoing_packet, buf, 4);          buffer_append(&outgoing_packet, buf, 4);
Line 530 
Line 530 
 void  void
 packet_send2()  packet_send2()
 {  {
         unsigned char *macbuf = NULL;          u_char *macbuf = NULL;
         char *cp;          char *cp;
         unsigned int packet_length = 0;          u_int packet_length = 0;
         unsigned int i, padlen, len;          u_int i, padlen, len;
         u_int32_t rand = 0;          u_int32_t rand = 0;
         static unsigned int seqnr = 0;          static u_int seqnr = 0;
         int type;          int type;
         Enc *enc   = NULL;          Enc *enc   = NULL;
         Mac *mac   = NULL;          Mac *mac   = NULL;
Line 604 
Line 604 
         /* compute MAC over seqnr and packet(length fields, payload, padding) */          /* compute MAC over seqnr and packet(length fields, payload, padding) */
         if (mac && mac->enabled) {          if (mac && mac->enabled) {
                 macbuf = hmac( mac->md, seqnr,                  macbuf = hmac( mac->md, seqnr,
                     (unsigned char *) buffer_ptr(&outgoing_packet),                      (u_char *) buffer_ptr(&outgoing_packet),
                     buffer_len(&outgoing_packet),                      buffer_len(&outgoing_packet),
                     mac->key, mac->key_len                      mac->key, mac->key_len
                 );                  );
Line 742 
Line 742 
 int  int
 packet_read_poll1(int *payload_len_ptr)  packet_read_poll1(int *payload_len_ptr)
 {  {
         unsigned int len, padded_len;          u_int len, padded_len;
         unsigned char *ucp;          u_char *ucp;
         char buf[8], *cp;          char buf[8], *cp;
         unsigned int checksum, stored_checksum;          u_int checksum, stored_checksum;
   
         /* Check if input size is less than minimum packet size. */          /* Check if input size is less than minimum packet size. */
         if (buffer_len(&input) < 4 + 8)          if (buffer_len(&input) < 4 + 8)
                 return SSH_MSG_NONE;                  return SSH_MSG_NONE;
         /* Get length of incoming packet. */          /* Get length of incoming packet. */
         ucp = (unsigned char *) buffer_ptr(&input);          ucp = (u_char *) buffer_ptr(&input);
         len = GET_32BIT(ucp);          len = GET_32BIT(ucp);
         if (len < 1 + 2 + 2 || len > 256 * 1024)          if (len < 1 + 2 + 2 || len > 256 * 1024)
                 packet_disconnect("Bad packet length %d.", len);                  packet_disconnect("Bad packet length %d.", len);
Line 778 
Line 778 
 #endif  #endif
   
         /* Compute packet checksum. */          /* Compute packet checksum. */
         checksum = ssh_crc32((unsigned char *) buffer_ptr(&incoming_packet),          checksum = ssh_crc32((u_char *) buffer_ptr(&incoming_packet),
             buffer_len(&incoming_packet) - 4);              buffer_len(&incoming_packet) - 4);
   
         /* Skip padding. */          /* Skip padding. */
Line 790 
Line 790 
                 packet_disconnect("packet_read_poll: len %d != buffer_len %d.",                  packet_disconnect("packet_read_poll: len %d != buffer_len %d.",
                     len, buffer_len(&incoming_packet));                      len, buffer_len(&incoming_packet));
   
         ucp = (unsigned char *) buffer_ptr(&incoming_packet) + len - 4;          ucp = (u_char *) buffer_ptr(&incoming_packet) + len - 4;
         stored_checksum = GET_32BIT(ucp);          stored_checksum = GET_32BIT(ucp);
         if (checksum != stored_checksum)          if (checksum != stored_checksum)
                 packet_disconnect("Corrupted check bytes on input.");                  packet_disconnect("Corrupted check bytes on input.");
Line 811 
Line 811 
         *payload_len_ptr = buffer_len(&incoming_packet);          *payload_len_ptr = buffer_len(&incoming_packet);
   
         /* Return type. */          /* Return type. */
         return (unsigned char) buf[0];          return (u_char) buf[0];
 }  }
   
 int  int
 packet_read_poll2(int *payload_len_ptr)  packet_read_poll2(int *payload_len_ptr)
 {  {
         unsigned int padlen, need;          u_int padlen, need;
         unsigned char buf[8], *macbuf;          u_char buf[8], *macbuf;
         unsigned char *ucp;          u_char *ucp;
         char *cp;          char *cp;
         static unsigned int packet_length = 0;          static u_int packet_length = 0;
         static unsigned int seqnr = 0;          static u_int seqnr = 0;
         int type;          int type;
         int maclen, block_size;          int maclen, block_size;
         Enc *enc   = NULL;          Enc *enc   = NULL;
Line 848 
Line 848 
                 buffer_append_space(&incoming_packet, &cp, block_size);                  buffer_append_space(&incoming_packet, &cp, block_size);
                 packet_decrypt(&receive_context, cp, buffer_ptr(&input),                  packet_decrypt(&receive_context, cp, buffer_ptr(&input),
                     block_size);                      block_size);
                 ucp = (unsigned char *) buffer_ptr(&incoming_packet);                  ucp = (u_char *) buffer_ptr(&incoming_packet);
                 packet_length = GET_32BIT(ucp);                  packet_length = GET_32BIT(ucp);
                 if (packet_length < 1 + 4 || packet_length > 256 * 1024) {                  if (packet_length < 1 + 4 || packet_length > 256 * 1024) {
                         buffer_dump(&incoming_packet);                          buffer_dump(&incoming_packet);
Line 883 
Line 883 
          */           */
         if (mac && mac->enabled) {          if (mac && mac->enabled) {
                 macbuf = hmac( mac->md, seqnr,                  macbuf = hmac( mac->md, seqnr,
                     (unsigned char *) buffer_ptr(&incoming_packet),                      (u_char *) buffer_ptr(&incoming_packet),
                     buffer_len(&incoming_packet),                      buffer_len(&incoming_packet),
                     mac->key, mac->key_len                      mac->key, mac->key_len
                 );                  );
Line 926 
Line 926 
         packet_length = 0;          packet_length = 0;
   
         /* extract packet type */          /* extract packet type */
         type = (unsigned char)buf[0];          type = (u_char)buf[0];
   
         if (type == SSH2_MSG_NEWKEYS) {          if (type == SSH2_MSG_NEWKEYS) {
                 if (kex==NULL || mac==NULL || enc==NULL || comp==NULL)                  if (kex==NULL || mac==NULL || enc==NULL || comp==NULL)
Line 949 
Line 949 
         fprintf(stderr, "read/plain[%d]:\r\n",type);          fprintf(stderr, "read/plain[%d]:\r\n",type);
         buffer_dump(&incoming_packet);          buffer_dump(&incoming_packet);
 #endif  #endif
         return (unsigned char)type;          return (u_char)type;
 }  }
   
 int  int
Line 1018 
Line 1018 
  */   */
   
 void  void
 packet_process_incoming(const char *buf, unsigned int len)  packet_process_incoming(const char *buf, u_int len)
 {  {
         buffer_append(&input, buf, len);          buffer_append(&input, buf, len);
 }  }
   
 /* Returns a character from the packet. */  /* Returns a character from the packet. */
   
 unsigned int  u_int
 packet_get_char()  packet_get_char()
 {  {
         char ch;          char ch;
         buffer_get(&incoming_packet, &ch, 1);          buffer_get(&incoming_packet, &ch, 1);
         return (unsigned char) ch;          return (u_char) ch;
 }  }
   
 /* Returns an integer from the packet data. */  /* Returns an integer from the packet data. */
   
 unsigned int  u_int
 packet_get_int()  packet_get_int()
 {  {
         return buffer_get_int(&incoming_packet);          return buffer_get_int(&incoming_packet);
Line 1081 
Line 1081 
  */   */
   
 char *  char *
 packet_get_string(unsigned int *length_ptr)  packet_get_string(u_int *length_ptr)
 {  {
         return buffer_get_string(&incoming_packet, length_ptr);          return buffer_get_string(&incoming_packet, length_ptr);
 }  }
Legend:
Removed from v.1.39  
changed lines
  Added in v.1.40