diff options
-rw-r--r-- | bufaux.h | 4 | ||||
-rw-r--r-- | scp.c | 3 | ||||
-rw-r--r-- | ssh-agent.c | 1 | ||||
-rw-r--r-- | sshconnect.c | 2 |
4 files changed, 3 insertions, 7 deletions
@@ -23,7 +23,7 @@ void buffer_put_bignum2(Buffer *, BIGNUM *); | |||
23 | void buffer_get_bignum(Buffer *, BIGNUM *); | 23 | void buffer_get_bignum(Buffer *, BIGNUM *); |
24 | void buffer_get_bignum2(Buffer *, BIGNUM *); | 24 | void buffer_get_bignum2(Buffer *, BIGNUM *); |
25 | 25 | ||
26 | u_int buffer_get_int(Buffer *); | 26 | u_int buffer_get_int(Buffer *); |
27 | void buffer_put_int(Buffer *, u_int); | 27 | void buffer_put_int(Buffer *, u_int); |
28 | 28 | ||
29 | #ifdef HAVE_U_INT64_T | 29 | #ifdef HAVE_U_INT64_T |
@@ -32,11 +32,9 @@ void buffer_put_int64(Buffer *, u_int64_t); | |||
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | int buffer_get_char(Buffer *); | 34 | int buffer_get_char(Buffer *); |
35 | |||
36 | void buffer_put_char(Buffer *, int); | 35 | void buffer_put_char(Buffer *, int); |
37 | 36 | ||
38 | void *buffer_get_string(Buffer *, u_int *); | 37 | void *buffer_get_string(Buffer *, u_int *); |
39 | |||
40 | void buffer_put_string(Buffer *, const void *, u_int); | 38 | void buffer_put_string(Buffer *, const void *, u_int); |
41 | void buffer_put_cstring(Buffer *, const char *); | 39 | void buffer_put_cstring(Buffer *, const char *); |
42 | 40 | ||
@@ -548,14 +548,13 @@ syserr: run_err("%s: %s", name, strerror(errno)); | |||
548 | #ifdef HAVE_LONG_LONG_INT | 548 | #ifdef HAVE_LONG_LONG_INT |
549 | snprintf(buf, sizeof buf, "C%04o %lld %s\n", | 549 | snprintf(buf, sizeof buf, "C%04o %lld %s\n", |
550 | (u_int) (stb.st_mode & FILEMODEMASK), | 550 | (u_int) (stb.st_mode & FILEMODEMASK), |
551 | (long long) stb.st_size, last); | 551 | (long long)stb.st_size, last); |
552 | #else | 552 | #else |
553 | /* XXX: Handle integer overflow? */ | 553 | /* XXX: Handle integer overflow? */ |
554 | snprintf(buf, sizeof buf, "C%04o %lu %s\n", | 554 | snprintf(buf, sizeof buf, "C%04o %lu %s\n", |
555 | (u_int) (stb.st_mode & FILEMODEMASK), | 555 | (u_int) (stb.st_mode & FILEMODEMASK), |
556 | (u_long) stb.st_size, last); | 556 | (u_long) stb.st_size, last); |
557 | #endif | 557 | #endif |
558 | |||
559 | if (verbose_mode) { | 558 | if (verbose_mode) { |
560 | fprintf(stderr, "Sending file modes: %s", buf); | 559 | fprintf(stderr, "Sending file modes: %s", buf); |
561 | fflush(stderr); | 560 | fflush(stderr); |
diff --git a/ssh-agent.c b/ssh-agent.c index 91d5d9459..555396fc5 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -42,7 +42,6 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.82 2002/03/04 17:27:39 stevesk Exp $"); | |||
42 | #include "openbsd-compat/fake-queue.h" | 42 | #include "openbsd-compat/fake-queue.h" |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | |||
46 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
47 | #include <openssl/md5.h> | 46 | #include <openssl/md5.h> |
48 | 47 | ||
diff --git a/sshconnect.c b/sshconnect.c index 511fe8f39..5bb50e0e9 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -544,7 +544,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
544 | switch (hostaddr->sa_family) { | 544 | switch (hostaddr->sa_family) { |
545 | case AF_INET: | 545 | case AF_INET: |
546 | local = (ntohl(((struct sockaddr_in *)hostaddr)-> | 546 | local = (ntohl(((struct sockaddr_in *)hostaddr)-> |
547 | sin_addr.s_addr) >> 24) == IN_LOOPBACKNET; | 547 | sin_addr.s_addr) >> 24) == IN_LOOPBACKNET; |
548 | salen = sizeof(struct sockaddr_in); | 548 | salen = sizeof(struct sockaddr_in); |
549 | break; | 549 | break; |
550 | case AF_INET6: | 550 | case AF_INET6: |