diff options
author | Darren Tucker <dtucker@zip.com.au> | 2007-02-19 22:10:25 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2007-02-19 22:10:25 +1100 |
commit | 82a3d2bc6ff4e1a1031274f5298b8b2eddc0439f (patch) | |
tree | 15727bbaa8485dcccc6a088dfe3a9343b1013fb9 | |
parent | a52c5b64868034d874c8a988f476a8b407d152b4 (diff) |
- stevesk@cvs.openbsd.org 2007/01/21 01:41:54
[auth-skey.c kex.c ssh-keygen.c session.c clientloop.c]
spaces
-rw-r--r-- | auth-skey.c | 6 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | kex.c | 4 | ||||
-rw-r--r-- | session.c | 6 | ||||
-rw-r--r-- | ssh-keygen.c | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/auth-skey.c b/auth-skey.c index 25073dbae..cb43dba48 100644 --- a/auth-skey.c +++ b/auth-skey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-skey.c,v 1.26 2006/08/05 08:28:24 dtucker Exp $ */ | 1 | /* $OpenBSD: auth-skey.c,v 1.27 2007/01/21 01:41:54 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -59,8 +59,8 @@ skey_query(void *ctx, char **name, char **infotxt, | |||
59 | sizeof(challenge)) == -1) | 59 | sizeof(challenge)) == -1) |
60 | return -1; | 60 | return -1; |
61 | 61 | ||
62 | *name = xstrdup(""); | 62 | *name = xstrdup(""); |
63 | *infotxt = xstrdup(""); | 63 | *infotxt = xstrdup(""); |
64 | *numprompts = 1; | 64 | *numprompts = 1; |
65 | *prompts = xcalloc(*numprompts, sizeof(char *)); | 65 | *prompts = xcalloc(*numprompts, sizeof(char *)); |
66 | *echo_on = xcalloc(*numprompts, sizeof(u_int)); | 66 | *echo_on = xcalloc(*numprompts, sizeof(u_int)); |
diff --git a/clientloop.c b/clientloop.c index 4c5108199..0b6fbe88d 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.176 2006/10/11 12:38:03 markus Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.177 2007/01/21 01:41:54 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1757,7 +1757,7 @@ client_request_agent(const char *request_type, int rchan) | |||
1757 | error("Warning: this is probably a break-in attempt by a malicious server."); | 1757 | error("Warning: this is probably a break-in attempt by a malicious server."); |
1758 | return NULL; | 1758 | return NULL; |
1759 | } | 1759 | } |
1760 | sock = ssh_get_authentication_socket(); | 1760 | sock = ssh_get_authentication_socket(); |
1761 | if (sock < 0) | 1761 | if (sock < 0) |
1762 | return NULL; | 1762 | return NULL; |
1763 | c = channel_new("authentication agent connection", | 1763 | c = channel_new("authentication agent connection", |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.c,v 1.76 2006/08/03 03:34:42 deraadt Exp $ */ | 1 | /* $OpenBSD: kex.c,v 1.77 2007/01/21 01:41:54 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -552,7 +552,7 @@ dump_digest(char *msg, u_char *digest, int len) | |||
552 | u_int i; | 552 | u_int i; |
553 | 553 | ||
554 | fprintf(stderr, "%s\n", msg); | 554 | fprintf(stderr, "%s\n", msg); |
555 | for (i = 0; i< len; i++) { | 555 | for (i = 0; i < len; i++) { |
556 | fprintf(stderr, "%02x", digest[i]); | 556 | fprintf(stderr, "%02x", digest[i]); |
557 | if (i%32 == 31) | 557 | if (i%32 == 31) |
558 | fprintf(stderr, "\n"); | 558 | fprintf(stderr, "\n"); |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.c,v 1.220 2006/10/09 23:36:11 djm Exp $ */ | 1 | /* $OpenBSD: session.c,v 1.221 2007/01/21 01:41:54 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -2027,7 +2027,7 @@ session_input_channel_req(Channel *c, const char *rtype) | |||
2027 | } else if (strcmp(rtype, "exec") == 0) { | 2027 | } else if (strcmp(rtype, "exec") == 0) { |
2028 | success = session_exec_req(s); | 2028 | success = session_exec_req(s); |
2029 | } else if (strcmp(rtype, "pty-req") == 0) { | 2029 | } else if (strcmp(rtype, "pty-req") == 0) { |
2030 | success = session_pty_req(s); | 2030 | success = session_pty_req(s); |
2031 | } else if (strcmp(rtype, "x11-req") == 0) { | 2031 | } else if (strcmp(rtype, "x11-req") == 0) { |
2032 | success = session_x11_req(s); | 2032 | success = session_x11_req(s); |
2033 | } else if (strcmp(rtype, "auth-agent-req@openssh.com") == 0) { | 2033 | } else if (strcmp(rtype, "auth-agent-req@openssh.com") == 0) { |
@@ -2152,7 +2152,7 @@ session_close_single_x11(int id, void *arg) | |||
2152 | 2152 | ||
2153 | debug3("session_close_single_x11: channel %d", id); | 2153 | debug3("session_close_single_x11: channel %d", id); |
2154 | channel_cancel_cleanup(id); | 2154 | channel_cancel_cleanup(id); |
2155 | if ((s = session_by_x11_channel(id)) == NULL) | 2155 | if ((s = session_by_x11_channel(id)) == NULL) |
2156 | fatal("session_close_single_x11: no x11 channel %d", id); | 2156 | fatal("session_close_single_x11: no x11 channel %d", id); |
2157 | for (i = 0; s->x11_chanids[i] != -1; i++) { | 2157 | for (i = 0; s->x11_chanids[i] != -1; i++) { |
2158 | debug("session_close_single_x11: session %d: " | 2158 | debug("session_close_single_x11: session %d: " |
diff --git a/ssh-keygen.c b/ssh-keygen.c index ed3cdb3ed..04a9b939a 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.159 2007/01/12 20:20:41 jmc Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.160 2007/01/21 01:41:54 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -241,7 +241,7 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen) | |||
241 | buffer_init(&b); | 241 | buffer_init(&b); |
242 | buffer_append(&b, blob, blen); | 242 | buffer_append(&b, blob, blen); |
243 | 243 | ||
244 | magic = buffer_get_int(&b); | 244 | magic = buffer_get_int(&b); |
245 | if (magic != SSH_COM_PRIVATE_KEY_MAGIC) { | 245 | if (magic != SSH_COM_PRIVATE_KEY_MAGIC) { |
246 | error("bad magic 0x%x != 0x%x", magic, SSH_COM_PRIVATE_KEY_MAGIC); | 246 | error("bad magic 0x%x != 0x%x", magic, SSH_COM_PRIVATE_KEY_MAGIC); |
247 | buffer_free(&b); | 247 | buffer_free(&b); |
@@ -284,7 +284,7 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen) | |||
284 | buffer_get_bignum_bits(&b, key->dsa->priv_key); | 284 | buffer_get_bignum_bits(&b, key->dsa->priv_key); |
285 | break; | 285 | break; |
286 | case KEY_RSA: | 286 | case KEY_RSA: |
287 | e = buffer_get_char(&b); | 287 | e = buffer_get_char(&b); |
288 | debug("e %lx", e); | 288 | debug("e %lx", e); |
289 | if (e < 30) { | 289 | if (e < 30) { |
290 | e <<= 8; | 290 | e <<= 8; |