diff options
author | Colin Watson <cjwatson@debian.org> | 2016-12-20 00:22:53 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-12-23 19:08:35 +0000 |
commit | ee52365e713e546dbd878d73d9590dbaccd760ba (patch) | |
tree | 841d0d9ae73e83070bcc3b46218ebdd18142dda3 /sshconnect.c | |
parent | 8a4a5c22e363ad6a110ad9b787170297f5da8f04 (diff) | |
parent | 2103d3e5566c54e08a59be750579a249e46747d7 (diff) |
New upstream release (7.4p1).
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sshconnect.c b/sshconnect.c index 07dfc9da1..c64c51bbb 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.271 2016/01/14 22:56:56 markus Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.272 2016/09/12 01:22:38 deraadt 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 |
@@ -15,7 +15,6 @@ | |||
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | 17 | ||
18 | #include <sys/param.h> /* roundup */ | ||
19 | #include <sys/types.h> | 18 | #include <sys/types.h> |
20 | #include <sys/wait.h> | 19 | #include <sys/wait.h> |
21 | #include <sys/stat.h> | 20 | #include <sys/stat.h> |
@@ -1409,7 +1408,7 @@ ssh_put_password(char *password) | |||
1409 | packet_put_cstring(password); | 1408 | packet_put_cstring(password); |
1410 | return; | 1409 | return; |
1411 | } | 1410 | } |
1412 | size = roundup(strlen(password) + 1, 32); | 1411 | size = ROUNDUP(strlen(password) + 1, 32); |
1413 | padded = xcalloc(1, size); | 1412 | padded = xcalloc(1, size); |
1414 | strlcpy(padded, password, size); | 1413 | strlcpy(padded, password, size); |
1415 | packet_put_string(padded, size); | 1414 | packet_put_string(padded, size); |