summaryrefslogtreecommitdiff
path: root/auth2.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-01-24 12:43:25 +0000
committerColin Watson <cjwatson@debian.org>2011-01-24 12:43:25 +0000
commit626f1d986ff72aa514da63e34744e1de9cf21b9a (patch)
treed215a5280bc2e57251e4a9e08bfd3674ad824a94 /auth2.c
parent6ed622cb6fe8f71bbe0d998cdd12280410bfb420 (diff)
parent0970072c89b079b022538e3c366fbfa2c53fc821 (diff)
* New upstream release (http://www.openssh.org/txt/release-5.7):
- Implement Elliptic Curve Cryptography modes for key exchange (ECDH) and host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA offer better performance than plain DH and DSA at the same equivalent symmetric key length, as well as much shorter keys. - sftp(1)/sftp-server(8): add a protocol extension to support a hard link operation. It is available through the "ln" command in the client. The old "ln" behaviour of creating a symlink is available using its "-s" option or through the preexisting "symlink" command. - scp(1): Add a new -3 option to scp: Copies between two remote hosts are transferred through the local host (closes: #508613). - ssh(1): "atomically" create the listening mux socket by binding it on a temporary name and then linking it into position after listen() has succeeded. This allows the mux clients to determine that the server socket is either ready or stale without races (closes: #454784). Stale server sockets are now automatically removed (closes: #523250). - ssh(1): install a SIGCHLD handler to reap expired child process (closes: #594687). - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent temporary directories (closes: #357469, although only if you arrange for ssh-agent to actually see $TMPDIR since the setgid bit will cause it to be stripped off).
Diffstat (limited to 'auth2.c')
-rw-r--r--auth2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/auth2.c b/auth2.c
index 04ae2bdb2..1255b1fcd 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.121 2009/06/22 05:39:28 dtucker Exp $ */ 1/* $OpenBSD: auth2.c,v 1.122 2010/08/31 09:58:37 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -184,7 +184,7 @@ input_service_request(int type, u_int32_t seq, void *ctxt)
184 Authctxt *authctxt = ctxt; 184 Authctxt *authctxt = ctxt;
185 u_int len; 185 u_int len;
186 int acceptit = 0; 186 int acceptit = 0;
187 char *service = packet_get_string(&len); 187 char *service = packet_get_cstring(&len);
188 packet_check_eom(); 188 packet_check_eom();
189 189
190 if (authctxt == NULL) 190 if (authctxt == NULL)
@@ -223,9 +223,9 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
223 if (authctxt == NULL) 223 if (authctxt == NULL)
224 fatal("input_userauth_request: no authctxt"); 224 fatal("input_userauth_request: no authctxt");
225 225
226 user = packet_get_string(NULL); 226 user = packet_get_cstring(NULL);
227 service = packet_get_string(NULL); 227 service = packet_get_cstring(NULL);
228 method = packet_get_string(NULL); 228 method = packet_get_cstring(NULL);
229 debug("userauth-request for user %s service %s method %s", user, service, method); 229 debug("userauth-request for user %s service %s method %s", user, service, method);
230 debug("attempt %d failures %d", authctxt->attempt, authctxt->failures); 230 debug("attempt %d failures %d", authctxt->attempt, authctxt->failures);
231 231