src/usr.bin/ssh/packet.c - diff

Return to packet.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/packet.c between version 1.263 and 1.264

-version 1.263, 2017/07/23 23:37:02
+version 1.264, 2017/09/12 06:32:07
 Line 2070
 Line 2070
 Line 2070
          return ssh->state->max_packet_size;
  }
- /*
-  * 9.2.  Ignored Data Message
-  *
-  *   byte      SSH_MSG_IGNORE
-  *   string    data
-  *
-  * All implementations MUST understand (and ignore) this message at any
-  * time (after receiving the protocol version). No implementation is
-  * required to send them. This message can be used as an additional
-  * protection measure against advanced traffic analysis techniques.
-  */
  void
- ssh_packet_send_ignore(struct ssh *ssh, int nbytes)
- {
-         u_int32_t rnd = 0;
-         int r, i;
-         if ((r = sshpkt_start(ssh, SSH2_MSG_IGNORE)) != 0 ||
-             (r = sshpkt_put_u32(ssh, nbytes)) != 0)
-                 fatal("%s: %s", __func__, ssh_err(r));
-         for (i = 0; i < nbytes; i++) {
-                 if (i % 4 == 0)
-                         rnd = arc4random();
-                 if ((r = sshpkt_put_u8(ssh, (u_char)rnd & 0xff)) != 0)
-                         fatal("%s: %s", __func__, ssh_err(r));
-                 rnd >>= 8;
-         }
- }
- void
  ssh_packet_set_rekey_limits(struct ssh *ssh, u_int64_t bytes, u_int32_t seconds)
  {
          debug3("rekey after %llu bytes, %u seconds", (unsigned long long)bytes,
-Line 2517
+Line 2488
 Line 2517
 Line 2488
  }
  int
+ sshpkt_peek_string_direct(struct ssh *ssh, const u_char **valp, size_t *lenp)
+ {
+         return sshbuf_peek_string_direct(ssh->state->incoming_packet, valp, lenp);
+ }
+ int
  sshpkt_get_cstring(struct ssh *ssh, char **valp, size_t *lenp)
  {
          return sshbuf_get_cstring(ssh->state->incoming_packet, valp, lenp);
-Line 2594
+Line 2571
 Line 2594
 Line 2571
                  /* sshbuf_dump(state->output, stderr); */
          }
          sshbuf_reset(state->outgoing_packet);
+         return 0;
+ }
+ /*
+  * 9.2.  Ignored Data Message
+  *
+  *   byte      SSH_MSG_IGNORE
+  *   string    data
+  *
+  * All implementations MUST understand (and ignore) this message at any
+  * time (after receiving the protocol version). No implementation is
+  * required to send them. This message can be used as an additional
+  * protection measure against advanced traffic analysis techniques.
+  */
+ int
+ sshpkt_msg_ignore(struct ssh *ssh, u_int nbytes)
+ {
+         u_int32_t rnd = 0;
+         int r;
+         u_int i;
+         if ((r = sshpkt_start(ssh, SSH2_MSG_IGNORE)) != 0 ||
+             (r = sshpkt_put_u32(ssh, nbytes)) != 0)
+                 return r;
+         for (i = 0; i < nbytes; i++) {
+                 if (i % 4 == 0)
+                         rnd = arc4random();
+                 if ((r = sshpkt_put_u8(ssh, (u_char)rnd & 0xff)) != 0)
+                         return r;
+                 rnd >>= 8;
+         }
          return 0;
  }