diff options
author | Damien Miller <djm@mindrot.org> | 2005-07-17 17:22:45 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-07-17 17:22:45 +1000 |
commit | 0dc1bef12d30162ba09bfcc0b1cd6a5535ebdaab (patch) | |
tree | d891954deae6fe6f8574d2a7bbfe6b754a2e70dc | |
parent | 2b9b045d930b8d724f768fafdd9a46fa453b9a3e (diff) |
- djm@cvs.openbsd.org 2005/07/17 07:17:55
[auth-rh-rsa.c auth-rhosts.c auth2-chall.c auth2-gss.c channels.c]
[cipher-ctr.c gss-genr.c gss-serv.c kex.c moduli.c readconf.c]
[serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c]
[sshconnect.c sshconnect2.c]
knf says that a 2nd level indent is four (not three or five) spaces
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | auth-rh-rsa.c | 4 | ||||
-rw-r--r-- | auth-rhosts.c | 4 | ||||
-rw-r--r-- | auth2-chall.c | 4 | ||||
-rw-r--r-- | auth2-gss.c | 7 | ||||
-rw-r--r-- | channels.c | 10 | ||||
-rw-r--r-- | cipher-ctr.c | 4 | ||||
-rw-r--r-- | gss-genr.c | 6 | ||||
-rw-r--r-- | gss-serv.c | 6 | ||||
-rw-r--r-- | kex.c | 4 | ||||
-rw-r--r-- | moduli.c | 24 | ||||
-rw-r--r-- | readconf.c | 4 | ||||
-rw-r--r-- | serverloop.c | 4 | ||||
-rw-r--r-- | session.c | 4 | ||||
-rw-r--r-- | sftp-client.c | 4 | ||||
-rw-r--r-- | sftp.c | 4 | ||||
-rw-r--r-- | ssh-add.c | 4 | ||||
-rw-r--r-- | ssh-keygen.c | 4 | ||||
-rw-r--r-- | sshconnect.c | 8 | ||||
-rw-r--r-- | sshconnect2.c | 6 |
20 files changed, 64 insertions, 59 deletions
@@ -16,6 +16,12 @@ | |||
16 | the one that made the single connection | 16 | the one that made the single connection |
17 | 3. Destroy X11 listeners when the session owning them goes away | 17 | 3. Destroy X11 listeners when the session owning them goes away |
18 | testing and ok dtucker@ | 18 | testing and ok dtucker@ |
19 | - djm@cvs.openbsd.org 2005/07/17 07:17:55 | ||
20 | [auth-rh-rsa.c auth-rhosts.c auth2-chall.c auth2-gss.c channels.c] | ||
21 | [cipher-ctr.c gss-genr.c gss-serv.c kex.c moduli.c readconf.c] | ||
22 | [serverloop.c session.c sftp-client.c sftp.c ssh-add.c ssh-keygen.c] | ||
23 | [sshconnect.c sshconnect2.c] | ||
24 | knf says that a 2nd level indent is four (not three or five) spaces | ||
19 | 25 | ||
20 | 20050716 | 26 | 20050716 |
21 | - (dtucker) [auth-pam.c] Ensure that only one side of the authentication | 27 | - (dtucker) [auth-pam.c] Ensure that only one side of the authentication |
@@ -2849,4 +2855,4 @@ | |||
2849 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2855 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2850 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2856 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2851 | 2857 | ||
2852 | $Id: ChangeLog,v 1.3850 2005/07/17 07:19:24 djm Exp $ | 2858 | $Id: ChangeLog,v 1.3851 2005/07/17 07:22:45 djm Exp $ |
diff --git a/auth-rh-rsa.c b/auth-rh-rsa.c index 29eb538ec..c31f2b97b 100644 --- a/auth-rh-rsa.c +++ b/auth-rh-rsa.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: auth-rh-rsa.c,v 1.37 2003/11/04 08:54:09 djm Exp $"); | 16 | RCSID("$OpenBSD: auth-rh-rsa.c,v 1.38 2005/07/17 07:17:54 djm Exp $"); |
17 | 17 | ||
18 | #include "packet.h" | 18 | #include "packet.h" |
19 | #include "uidswap.h" | 19 | #include "uidswap.h" |
@@ -86,7 +86,7 @@ auth_rhosts_rsa(Authctxt *authctxt, char *cuser, Key *client_host_key) | |||
86 | */ | 86 | */ |
87 | 87 | ||
88 | verbose("Rhosts with RSA host authentication accepted for %.100s, %.100s on %.700s.", | 88 | verbose("Rhosts with RSA host authentication accepted for %.100s, %.100s on %.700s.", |
89 | pw->pw_name, cuser, chost); | 89 | pw->pw_name, cuser, chost); |
90 | packet_send_debug("Rhosts with RSA host authentication accepted."); | 90 | packet_send_debug("Rhosts with RSA host authentication accepted."); |
91 | return 1; | 91 | return 1; |
92 | } | 92 | } |
diff --git a/auth-rhosts.c b/auth-rhosts.c index 585246e82..aaba8557e 100644 --- a/auth-rhosts.c +++ b/auth-rhosts.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: auth-rhosts.c,v 1.32 2003/11/04 08:54:09 djm Exp $"); | 17 | RCSID("$OpenBSD: auth-rhosts.c,v 1.33 2005/07/17 07:17:54 djm Exp $"); |
18 | 18 | ||
19 | #include "packet.h" | 19 | #include "packet.h" |
20 | #include "uidswap.h" | 20 | #include "uidswap.h" |
@@ -133,7 +133,7 @@ check_rhosts_file(const char *filename, const char *hostname, | |||
133 | /* If the entry was negated, deny access. */ | 133 | /* If the entry was negated, deny access. */ |
134 | if (negated) { | 134 | if (negated) { |
135 | auth_debug_add("Matched negative entry in %.100s.", | 135 | auth_debug_add("Matched negative entry in %.100s.", |
136 | filename); | 136 | filename); |
137 | return 0; | 137 | return 0; |
138 | } | 138 | } |
139 | /* Accept authentication. */ | 139 | /* Accept authentication. */ |
diff --git a/auth2-chall.c b/auth2-chall.c index 1cea15378..b147cadf3 100644 --- a/auth2-chall.c +++ b/auth2-chall.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | */ | 24 | */ |
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2-chall.c,v 1.23 2005/06/17 02:44:32 djm Exp $"); | 26 | RCSID("$OpenBSD: auth2-chall.c,v 1.24 2005/07/17 07:17:54 djm Exp $"); |
27 | 27 | ||
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
29 | #include "auth.h" | 29 | #include "auth.h" |
@@ -167,7 +167,7 @@ kbdint_next_device(KbdintAuthctxt *kbdintctxt) | |||
167 | kbdintctxt->devices = t[len] ? xstrdup(t+len+1) : NULL; | 167 | kbdintctxt->devices = t[len] ? xstrdup(t+len+1) : NULL; |
168 | xfree(t); | 168 | xfree(t); |
169 | debug2("kbdint_next_device: devices %s", kbdintctxt->devices ? | 169 | debug2("kbdint_next_device: devices %s", kbdintctxt->devices ? |
170 | kbdintctxt->devices : "<empty>"); | 170 | kbdintctxt->devices : "<empty>"); |
171 | } while (kbdintctxt->devices && !kbdintctxt->device); | 171 | } while (kbdintctxt->devices && !kbdintctxt->device); |
172 | 172 | ||
173 | return kbdintctxt->device ? 1 : 0; | 173 | return kbdintctxt->device ? 1 : 0; |
diff --git a/auth2-gss.c b/auth2-gss.c index 855b61b4e..4d468a0e8 100644 --- a/auth2-gss.c +++ b/auth2-gss.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-gss.c,v 1.9 2005/06/17 02:44:32 djm Exp $ */ | 1 | /* $OpenBSD: auth2-gss.c,v 1.10 2005/07/17 07:17:54 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -82,9 +82,8 @@ userauth_gssapi(Authctxt *authctxt) | |||
82 | present = 0; | 82 | present = 0; |
83 | doid = packet_get_string(&len); | 83 | doid = packet_get_string(&len); |
84 | 84 | ||
85 | if (len > 2 && | 85 | if (len > 2 && doid[0] == SSH_GSS_OIDTYPE && |
86 | doid[0] == SSH_GSS_OIDTYPE && | 86 | doid[1] == len - 2) { |
87 | doid[1] == len - 2) { | ||
88 | goid.elements = doid + 2; | 87 | goid.elements = doid + 2; |
89 | goid.length = len - 2; | 88 | goid.length = len - 2; |
90 | gss_test_oid_set_member(&ms, &goid, supported, | 89 | gss_test_oid_set_member(&ms, &goid, supported, |
diff --git a/channels.c b/channels.c index 8da399b69..8c7b2b369 100644 --- a/channels.c +++ b/channels.c | |||
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: channels.c,v 1.222 2005/07/17 06:49:04 djm Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.223 2005/07/17 07:17:54 djm Exp $"); |
43 | 43 | ||
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | #include "ssh1.h" | 45 | #include "ssh1.h" |
@@ -730,8 +730,8 @@ channel_pre_open(Channel *c, fd_set * readset, fd_set * writeset) | |||
730 | FD_SET(c->wfd, writeset); | 730 | FD_SET(c->wfd, writeset); |
731 | } else if (c->ostate == CHAN_OUTPUT_WAIT_DRAIN) { | 731 | } else if (c->ostate == CHAN_OUTPUT_WAIT_DRAIN) { |
732 | if (CHANNEL_EFD_OUTPUT_ACTIVE(c)) | 732 | if (CHANNEL_EFD_OUTPUT_ACTIVE(c)) |
733 | debug2("channel %d: obuf_empty delayed efd %d/(%d)", | 733 | debug2("channel %d: obuf_empty delayed efd %d/(%d)", |
734 | c->self, c->efd, buffer_len(&c->extended)); | 734 | c->self, c->efd, buffer_len(&c->extended)); |
735 | else | 735 | else |
736 | chan_obuf_empty(c); | 736 | chan_obuf_empty(c); |
737 | } | 737 | } |
@@ -1813,8 +1813,8 @@ channel_output_poll(void) | |||
1813 | * hack for extended data: delay EOF if EFD still in use. | 1813 | * hack for extended data: delay EOF if EFD still in use. |
1814 | */ | 1814 | */ |
1815 | if (CHANNEL_EFD_INPUT_ACTIVE(c)) | 1815 | if (CHANNEL_EFD_INPUT_ACTIVE(c)) |
1816 | debug2("channel %d: ibuf_empty delayed efd %d/(%d)", | 1816 | debug2("channel %d: ibuf_empty delayed efd %d/(%d)", |
1817 | c->self, c->efd, buffer_len(&c->extended)); | 1817 | c->self, c->efd, buffer_len(&c->extended)); |
1818 | else | 1818 | else |
1819 | chan_ibuf_empty(c); | 1819 | chan_ibuf_empty(c); |
1820 | } | 1820 | } |
diff --git a/cipher-ctr.c b/cipher-ctr.c index 43f1ede57..856177349 100644 --- a/cipher-ctr.c +++ b/cipher-ctr.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 15 | */ |
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: cipher-ctr.c,v 1.5 2004/12/22 02:13:19 djm Exp $"); | 17 | RCSID("$OpenBSD: cipher-ctr.c,v 1.6 2005/07/17 07:17:55 djm Exp $"); |
18 | 18 | ||
19 | #include <openssl/evp.h> | 19 | #include <openssl/evp.h> |
20 | 20 | ||
@@ -95,7 +95,7 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, | |||
95 | } | 95 | } |
96 | if (key != NULL) | 96 | if (key != NULL) |
97 | AES_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, | 97 | AES_set_encrypt_key(key, EVP_CIPHER_CTX_key_length(ctx) * 8, |
98 | &c->aes_ctx); | 98 | &c->aes_ctx); |
99 | if (iv != NULL) | 99 | if (iv != NULL) |
100 | memcpy(c->aes_counter, iv, AES_BLOCK_SIZE); | 100 | memcpy(c->aes_counter, iv, AES_BLOCK_SIZE); |
101 | return (1); | 101 | return (1); |
diff --git a/gss-genr.c b/gss-genr.c index 3f5727b3e..9bc31aa2a 100644 --- a/gss-genr.c +++ b/gss-genr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-genr.c,v 1.3 2003/11/21 11:57:03 djm Exp $ */ | 1 | /* $OpenBSD: gss-genr.c,v 1.4 2005/07/17 07:17:55 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -78,8 +78,8 @@ ssh_gssapi_error(Gssctxt *ctxt) | |||
78 | } | 78 | } |
79 | 79 | ||
80 | char * | 80 | char * |
81 | ssh_gssapi_last_error(Gssctxt *ctxt, | 81 | ssh_gssapi_last_error(Gssctxt *ctxt, OM_uint32 *major_status, |
82 | OM_uint32 *major_status, OM_uint32 *minor_status) | 82 | OM_uint32 *minor_status) |
83 | { | 83 | { |
84 | OM_uint32 lmin; | 84 | OM_uint32 lmin; |
85 | gss_buffer_desc msg = GSS_C_EMPTY_BUFFER; | 85 | gss_buffer_desc msg = GSS_C_EMPTY_BUFFER; |
diff --git a/gss-serv.c b/gss-serv.c index e1b843f01..e191eb5a0 100644 --- a/gss-serv.c +++ b/gss-serv.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-serv.c,v 1.6 2005/06/17 02:44:32 djm Exp $ */ | 1 | /* $OpenBSD: gss-serv.c,v 1.7 2005/07/17 07:17:55 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -164,7 +164,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name) | |||
164 | */ | 164 | */ |
165 | if (tok[4] != 0x06 || tok[5] != oidl || | 165 | if (tok[4] != 0x06 || tok[5] != oidl || |
166 | ename->length < oidl+6 || | 166 | ename->length < oidl+6 || |
167 | !ssh_gssapi_check_oid(ctx,tok+6,oidl)) | 167 | !ssh_gssapi_check_oid(ctx,tok+6,oidl)) |
168 | return GSS_S_FAILURE; | 168 | return GSS_S_FAILURE; |
169 | 169 | ||
170 | offset = oidl+6; | 170 | offset = oidl+6; |
@@ -267,7 +267,7 @@ ssh_gssapi_do_child(char ***envp, u_int *envsizep) | |||
267 | debug("Setting %s to %s", gssapi_client.store.envvar, | 267 | debug("Setting %s to %s", gssapi_client.store.envvar, |
268 | gssapi_client.store.envval); | 268 | gssapi_client.store.envval); |
269 | child_set_env(envp, envsizep, gssapi_client.store.envvar, | 269 | child_set_env(envp, envsizep, gssapi_client.store.envvar, |
270 | gssapi_client.store.envval); | 270 | gssapi_client.store.envval); |
271 | } | 271 | } |
272 | } | 272 | } |
273 | 273 | ||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kex.c,v 1.62 2005/07/16 01:35:24 djm Exp $"); | 26 | RCSID("$OpenBSD: kex.c,v 1.63 2005/07/17 07:17:55 djm Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | 29 | ||
@@ -392,7 +392,7 @@ kex_choose_conf(Kex *kex) | |||
392 | 392 | ||
393 | /* ignore the next message if the proposals do not match */ | 393 | /* ignore the next message if the proposals do not match */ |
394 | if (first_kex_follows && !proposals_match(my, peer) && | 394 | if (first_kex_follows && !proposals_match(my, peer) && |
395 | !(datafellows & SSH_BUG_FIRSTKEX)) { | 395 | !(datafellows & SSH_BUG_FIRSTKEX)) { |
396 | type = packet_read(); | 396 | type = packet_read(); |
397 | debug2("skipping next packet (type %u)", type); | 397 | debug2("skipping next packet (type %u)", type); |
398 | } | 398 | } |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: moduli.c,v 1.11 2005/05/23 22:44:01 avsm Exp $ */ | 1 | /* $OpenBSD: moduli.c,v 1.12 2005/07/17 07:17:55 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 1994 Phil Karn <karn@qualcomm.com> | 3 | * Copyright 1994 Phil Karn <karn@qualcomm.com> |
4 | * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> | 4 | * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> |
@@ -112,22 +112,22 @@ | |||
112 | #define TINY_NUMBER (1UL<<16) | 112 | #define TINY_NUMBER (1UL<<16) |
113 | 113 | ||
114 | /* Ensure enough bit space for testing 2*q. */ | 114 | /* Ensure enough bit space for testing 2*q. */ |
115 | #define TEST_MAXIMUM (1UL<<16) | 115 | #define TEST_MAXIMUM (1UL<<16) |
116 | #define TEST_MINIMUM (QSIZE_MINIMUM + 1) | 116 | #define TEST_MINIMUM (QSIZE_MINIMUM + 1) |
117 | /* real TEST_MINIMUM (1UL << (SHIFT_WORD - TEST_POWER)) */ | 117 | /* real TEST_MINIMUM (1UL << (SHIFT_WORD - TEST_POWER)) */ |
118 | #define TEST_POWER (3) /* 2**n, n < SHIFT_WORD */ | 118 | #define TEST_POWER (3) /* 2**n, n < SHIFT_WORD */ |
119 | 119 | ||
120 | /* bit operations on 32-bit words */ | 120 | /* bit operations on 32-bit words */ |
121 | #define BIT_CLEAR(a,n) ((a)[(n)>>SHIFT_WORD] &= ~(1L << ((n) & 31))) | 121 | #define BIT_CLEAR(a,n) ((a)[(n)>>SHIFT_WORD] &= ~(1L << ((n) & 31))) |
122 | #define BIT_SET(a,n) ((a)[(n)>>SHIFT_WORD] |= (1L << ((n) & 31))) | 122 | #define BIT_SET(a,n) ((a)[(n)>>SHIFT_WORD] |= (1L << ((n) & 31))) |
123 | #define BIT_TEST(a,n) ((a)[(n)>>SHIFT_WORD] & (1L << ((n) & 31))) | 123 | #define BIT_TEST(a,n) ((a)[(n)>>SHIFT_WORD] & (1L << ((n) & 31))) |
124 | 124 | ||
125 | /* | 125 | /* |
126 | * Prime testing defines | 126 | * Prime testing defines |
127 | */ | 127 | */ |
128 | 128 | ||
129 | /* Minimum number of primality tests to perform */ | 129 | /* Minimum number of primality tests to perform */ |
130 | #define TRIAL_MINIMUM (4) | 130 | #define TRIAL_MINIMUM (4) |
131 | 131 | ||
132 | /* | 132 | /* |
133 | * Sieving data (XXX - move to struct) | 133 | * Sieving data (XXX - move to struct) |
@@ -254,7 +254,7 @@ gen_candidates(FILE *out, u_int32_t memory, u_int32_t power, BIGNUM *start) | |||
254 | largememory = memory; | 254 | largememory = memory; |
255 | 255 | ||
256 | if (memory != 0 && | 256 | if (memory != 0 && |
257 | (memory < LARGE_MINIMUM || memory > LARGE_MAXIMUM)) { | 257 | (memory < LARGE_MINIMUM || memory > LARGE_MAXIMUM)) { |
258 | error("Invalid memory amount (min %ld, max %ld)", | 258 | error("Invalid memory amount (min %ld, max %ld)", |
259 | LARGE_MINIMUM, LARGE_MAXIMUM); | 259 | LARGE_MINIMUM, LARGE_MAXIMUM); |
260 | return (-1); | 260 | return (-1); |
@@ -372,8 +372,8 @@ gen_candidates(FILE *out, u_int32_t memory, u_int32_t power, BIGNUM *start) | |||
372 | * fencepost errors, the last pass is skipped. | 372 | * fencepost errors, the last pass is skipped. |
373 | */ | 373 | */ |
374 | for (smallbase = TINY_NUMBER + 3; | 374 | for (smallbase = TINY_NUMBER + 3; |
375 | smallbase < (SMALL_MAXIMUM - TINY_NUMBER); | 375 | smallbase < (SMALL_MAXIMUM - TINY_NUMBER); |
376 | smallbase += TINY_NUMBER) { | 376 | smallbase += TINY_NUMBER) { |
377 | for (i = 0; i < tinybits; i++) { | 377 | for (i = 0; i < tinybits; i++) { |
378 | if (BIT_TEST(TinySieve, i)) | 378 | if (BIT_TEST(TinySieve, i)) |
379 | continue; /* 2*i+3 is composite */ | 379 | continue; /* 2*i+3 is composite */ |
diff --git a/readconf.c b/readconf.c index 5ec89e2f0..1e3c13239 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.141 2005/06/08 11:25:09 djm Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.142 2005/07/17 07:17:55 djm Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -839,7 +839,7 @@ parse_int: | |||
839 | /* Check that there is no garbage at end of line. */ | 839 | /* Check that there is no garbage at end of line. */ |
840 | if ((arg = strdelim(&s)) != NULL && *arg != '\0') { | 840 | if ((arg = strdelim(&s)) != NULL && *arg != '\0') { |
841 | fatal("%.200s line %d: garbage at end of line; \"%.200s\".", | 841 | fatal("%.200s line %d: garbage at end of line; \"%.200s\".", |
842 | filename, linenum, arg); | 842 | filename, linenum, arg); |
843 | } | 843 | } |
844 | return 0; | 844 | return 0; |
845 | } | 845 | } |
diff --git a/serverloop.c b/serverloop.c index eee1e7959..b0c4aafa0 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: serverloop.c,v 1.117 2004/08/11 21:43:05 avsm Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.118 2005/07/17 07:17:55 djm Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "packet.h" | 41 | #include "packet.h" |
@@ -865,7 +865,7 @@ server_request_direct_tcpip(void) | |||
865 | packet_check_eom(); | 865 | packet_check_eom(); |
866 | 866 | ||
867 | debug("server_request_direct_tcpip: originator %s port %d, target %s port %d", | 867 | debug("server_request_direct_tcpip: originator %s port %d, target %s port %d", |
868 | originator, originator_port, target, target_port); | 868 | originator, originator_port, target, target_port); |
869 | 869 | ||
870 | /* XXX check permission */ | 870 | /* XXX check permission */ |
871 | sock = channel_connect_to(target, target_port); | 871 | sock = channel_connect_to(target, target_port); |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.184 2005/07/17 06:49:04 djm Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.185 2005/07/17 07:17:55 djm Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -1530,7 +1530,7 @@ do_child(Session *s, const char *command) | |||
1530 | */ | 1530 | */ |
1531 | 1531 | ||
1532 | if (options.kerberos_get_afs_token && k_hasafs() && | 1532 | if (options.kerberos_get_afs_token && k_hasafs() && |
1533 | (s->authctxt->krb5_ctx != NULL)) { | 1533 | (s->authctxt->krb5_ctx != NULL)) { |
1534 | char cell[64]; | 1534 | char cell[64]; |
1535 | 1535 | ||
1536 | debug("Getting AFS token"); | 1536 | debug("Getting AFS token"); |
diff --git a/sftp-client.c b/sftp-client.c index ce15fc0a3..e4f95b0e5 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -20,7 +20,7 @@ | |||
20 | /* XXX: copy between two remote sites */ | 20 | /* XXX: copy between two remote sites */ |
21 | 21 | ||
22 | #include "includes.h" | 22 | #include "includes.h" |
23 | RCSID("$OpenBSD: sftp-client.c,v 1.55 2005/06/17 02:44:33 djm Exp $"); | 23 | RCSID("$OpenBSD: sftp-client.c,v 1.56 2005/07/17 07:17:55 djm Exp $"); |
24 | 24 | ||
25 | #include "openbsd-compat/sys-queue.h" | 25 | #include "openbsd-compat/sys-queue.h" |
26 | 26 | ||
@@ -1126,7 +1126,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, | |||
1126 | goto done; | 1126 | goto done; |
1127 | } | 1127 | } |
1128 | debug3("In write loop, ack for %u %u bytes at %llu", | 1128 | debug3("In write loop, ack for %u %u bytes at %llu", |
1129 | ack->id, ack->len, (unsigned long long)ack->offset); | 1129 | ack->id, ack->len, (unsigned long long)ack->offset); |
1130 | ++ackid; | 1130 | ++ackid; |
1131 | xfree(ack); | 1131 | xfree(ack); |
1132 | } | 1132 | } |
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | 18 | ||
19 | RCSID("$OpenBSD: sftp.c,v 1.64 2005/06/17 02:44:33 djm Exp $"); | 19 | RCSID("$OpenBSD: sftp.c,v 1.65 2005/07/17 07:17:55 djm Exp $"); |
20 | 20 | ||
21 | #ifdef USE_LIBEDIT | 21 | #ifdef USE_LIBEDIT |
22 | #include <histedit.h> | 22 | #include <histedit.h> |
@@ -1476,7 +1476,7 @@ main(int argc, char **argv) | |||
1476 | 1476 | ||
1477 | /* Allow "-" as stdin */ | 1477 | /* Allow "-" as stdin */ |
1478 | if (strcmp(optarg, "-") != 0 && | 1478 | if (strcmp(optarg, "-") != 0 && |
1479 | (infile = fopen(optarg, "r")) == NULL) | 1479 | (infile = fopen(optarg, "r")) == NULL) |
1480 | fatal("%s (%s).", strerror(errno), optarg); | 1480 | fatal("%s (%s).", strerror(errno), optarg); |
1481 | showprogress = 0; | 1481 | showprogress = 0; |
1482 | batchmode = 1; | 1482 | batchmode = 1; |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: ssh-add.c,v 1.71 2005/03/10 22:01:06 deraadt Exp $"); | 38 | RCSID("$OpenBSD: ssh-add.c,v 1.72 2005/07/17 07:17:55 djm Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -145,7 +145,7 @@ add_file(AuthenticationConnection *ac, const char *filename) | |||
145 | /* clear passphrase since it did not work */ | 145 | /* clear passphrase since it did not work */ |
146 | clear_pass(); | 146 | clear_pass(); |
147 | snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ", | 147 | snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ", |
148 | comment); | 148 | comment); |
149 | for (;;) { | 149 | for (;;) { |
150 | pass = read_passphrase(msg, RP_ALLOW_STDIN); | 150 | pass = read_passphrase(msg, RP_ALLOW_STDIN); |
151 | if (strcmp(pass, "") == 0) { | 151 | if (strcmp(pass, "") == 0) { |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 828d2be79..b17851946 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.127 2005/06/08 03:50:00 djm Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.128 2005/07/17 07:17:55 djm Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -738,7 +738,7 @@ do_known_hosts(struct passwd *pw, const char *name) | |||
738 | fprintf(stderr, "WARNING: %s contains unhashed " | 738 | fprintf(stderr, "WARNING: %s contains unhashed " |
739 | "entries\n", old); | 739 | "entries\n", old); |
740 | fprintf(stderr, "Delete this file to ensure privacy " | 740 | fprintf(stderr, "Delete this file to ensure privacy " |
741 | "of hostnames\n"); | 741 | "of hostnames\n"); |
742 | } | 742 | } |
743 | } | 743 | } |
744 | 744 | ||
diff --git a/sshconnect.c b/sshconnect.c index 84f287145..ba7b9b71e 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.167 2005/07/16 01:35:24 djm Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.168 2005/07/17 07:17:55 djm Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -547,7 +547,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
547 | switch (hostaddr->sa_family) { | 547 | switch (hostaddr->sa_family) { |
548 | case AF_INET: | 548 | case AF_INET: |
549 | local = (ntohl(((struct sockaddr_in *)hostaddr)-> | 549 | local = (ntohl(((struct sockaddr_in *)hostaddr)-> |
550 | sin_addr.s_addr) >> 24) == IN_LOOPBACKNET; | 550 | sin_addr.s_addr) >> 24) == IN_LOOPBACKNET; |
551 | salen = sizeof(struct sockaddr_in); | 551 | salen = sizeof(struct sockaddr_in); |
552 | break; | 552 | break; |
553 | case AF_INET6: | 553 | case AF_INET6: |
@@ -680,8 +680,8 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
680 | 680 | ||
681 | if (show_other_keys(host, host_key)) | 681 | if (show_other_keys(host, host_key)) |
682 | snprintf(msg1, sizeof(msg1), | 682 | snprintf(msg1, sizeof(msg1), |
683 | "\nbut keys of different type are already" | 683 | "\nbut keys of different type are already" |
684 | " known for this host."); | 684 | " known for this host."); |
685 | else | 685 | else |
686 | snprintf(msg1, sizeof(msg1), "."); | 686 | snprintf(msg1, sizeof(msg1), "."); |
687 | /* The default */ | 687 | /* The default */ |
diff --git a/sshconnect2.c b/sshconnect2.c index 60afd6d3d..012ce2b42 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.139 2005/06/17 02:44:33 djm Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.140 2005/07/17 07:17:55 djm Exp $"); |
27 | 27 | ||
28 | #include "openbsd-compat/sys-queue.h" | 28 | #include "openbsd-compat/sys-queue.h" |
29 | 29 | ||
@@ -352,7 +352,7 @@ void | |||
352 | input_userauth_error(int type, u_int32_t seq, void *ctxt) | 352 | input_userauth_error(int type, u_int32_t seq, void *ctxt) |
353 | { | 353 | { |
354 | fatal("input_userauth_error: bad message during authentication: " | 354 | fatal("input_userauth_error: bad message during authentication: " |
355 | "type %d", type); | 355 | "type %d", type); |
356 | } | 356 | } |
357 | 357 | ||
358 | void | 358 | void |
@@ -679,7 +679,7 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) | |||
679 | 679 | ||
680 | /* Stick it into GSSAPI and see what it says */ | 680 | /* Stick it into GSSAPI and see what it says */ |
681 | status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds, | 681 | status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds, |
682 | &recv_tok, &send_tok, NULL); | 682 | &recv_tok, &send_tok, NULL); |
683 | 683 | ||
684 | xfree(recv_tok.value); | 684 | xfree(recv_tok.value); |
685 | gss_release_buffer(&ms, &send_tok); | 685 | gss_release_buffer(&ms, &send_tok); |