diff options
-rw-r--r-- | auth2-chall.c | 4 | ||||
-rw-r--r-- | auth2-kbdint.c | 5 | ||||
-rw-r--r-- | authfd.c | 4 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | match.c | 4 | ||||
-rw-r--r-- | readconf.c | 4 | ||||
-rw-r--r-- | session.c | 4 | ||||
-rw-r--r-- | sftp-glob.c | 4 | ||||
-rw-r--r-- | sshconnect.c | 4 | ||||
-rw-r--r-- | sshconnect2.c | 4 | ||||
-rw-r--r-- | umac.c | 2 |
11 files changed, 21 insertions, 22 deletions
diff --git a/auth2-chall.c b/auth2-chall.c index 671f2f05f..c57387b71 100644 --- a/auth2-chall.c +++ b/auth2-chall.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-chall.c,v 1.51 2019/09/06 04:53:27 djm Exp $ */ | 1 | /* $OpenBSD: auth2-chall.c,v 1.52 2019/11/13 04:47:52 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2001 Per Allansson. All rights reserved. | 4 | * Copyright (c) 2001 Per Allansson. All rights reserved. |
@@ -29,9 +29,9 @@ | |||
29 | #include <sys/types.h> | 29 | #include <sys/types.h> |
30 | 30 | ||
31 | #include <stdlib.h> | 31 | #include <stdlib.h> |
32 | #include <stdarg.h> | ||
33 | #include <stdio.h> | 32 | #include <stdio.h> |
34 | #include <string.h> | 33 | #include <string.h> |
34 | #include <stdarg.h> | ||
35 | 35 | ||
36 | #include "xmalloc.h" | 36 | #include "xmalloc.h" |
37 | #include "ssh2.h" | 37 | #include "ssh2.h" |
diff --git a/auth2-kbdint.c b/auth2-kbdint.c index f88ef2c39..e23d2edd2 100644 --- a/auth2-kbdint.c +++ b/auth2-kbdint.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-kbdint.c,v 1.10 2019/09/06 04:53:27 djm Exp $ */ | 1 | /* $OpenBSD: auth2-kbdint.c,v 1.11 2019/11/13 04:47:52 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -27,10 +27,9 @@ | |||
27 | 27 | ||
28 | #include <sys/types.h> | 28 | #include <sys/types.h> |
29 | 29 | ||
30 | #include <stdarg.h> | ||
31 | |||
32 | #include <stdlib.h> | 30 | #include <stdlib.h> |
33 | #include <stdio.h> | 31 | #include <stdio.h> |
32 | #include <stdarg.h> | ||
34 | 33 | ||
35 | #include "xmalloc.h" | 34 | #include "xmalloc.h" |
36 | #include "packet.h" | 35 | #include "packet.h" |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfd.c,v 1.119 2019/11/12 19:33:08 markus Exp $ */ | 1 | /* $OpenBSD: authfd.c,v 1.120 2019/11/13 04:47:52 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 |
@@ -44,8 +44,8 @@ | |||
44 | #include <fcntl.h> | 44 | #include <fcntl.h> |
45 | #include <stdlib.h> | 45 | #include <stdlib.h> |
46 | #include <signal.h> | 46 | #include <signal.h> |
47 | #include <stdarg.h> | ||
48 | #include <string.h> | 47 | #include <string.h> |
48 | #include <stdarg.h> | ||
49 | #include <unistd.h> | 49 | #include <unistd.h> |
50 | #include <errno.h> | 50 | #include <errno.h> |
51 | 51 | ||
diff --git a/clientloop.c b/clientloop.c index b5a1f7038..068506210 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.327 2019/07/24 08:57:00 mestre Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.328 2019/11/13 04:47:52 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 |
@@ -77,10 +77,10 @@ | |||
77 | #include <paths.h> | 77 | #include <paths.h> |
78 | #endif | 78 | #endif |
79 | #include <signal.h> | 79 | #include <signal.h> |
80 | #include <stdarg.h> | ||
81 | #include <stdio.h> | 80 | #include <stdio.h> |
82 | #include <stdlib.h> | 81 | #include <stdlib.h> |
83 | #include <string.h> | 82 | #include <string.h> |
83 | #include <stdarg.h> | ||
84 | #include <termios.h> | 84 | #include <termios.h> |
85 | #include <pwd.h> | 85 | #include <pwd.h> |
86 | #include <unistd.h> | 86 | #include <unistd.h> |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: match.c,v 1.40 2019/10/04 04:13:39 djm Exp $ */ | 1 | /* $OpenBSD: match.c,v 1.41 2019/11/13 04:47:52 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 |
@@ -40,9 +40,9 @@ | |||
40 | #include <sys/types.h> | 40 | #include <sys/types.h> |
41 | 41 | ||
42 | #include <ctype.h> | 42 | #include <ctype.h> |
43 | #include <stdarg.h> | ||
44 | #include <stdlib.h> | 43 | #include <stdlib.h> |
45 | #include <string.h> | 44 | #include <string.h> |
45 | #include <stdarg.h> | ||
46 | #include <stdio.h> | 46 | #include <stdio.h> |
47 | 47 | ||
48 | #include "xmalloc.h" | 48 | #include "xmalloc.h" |
diff --git a/readconf.c b/readconf.c index 3d99367c3..b7a1caa11 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.311 2019/11/12 19:33:08 markus Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.312 2019/11/13 04:47:52 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 |
@@ -35,9 +35,9 @@ | |||
35 | #endif | 35 | #endif |
36 | #include <pwd.h> | 36 | #include <pwd.h> |
37 | #include <signal.h> | 37 | #include <signal.h> |
38 | #include <stdarg.h> | ||
39 | #include <stdio.h> | 38 | #include <stdio.h> |
40 | #include <string.h> | 39 | #include <string.h> |
40 | #include <stdarg.h> | ||
41 | #include <unistd.h> | 41 | #include <unistd.h> |
42 | #ifdef USE_SYSTEM_GLOB | 42 | #ifdef USE_SYSTEM_GLOB |
43 | # include <glob.h> | 43 | # include <glob.h> |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.c,v 1.316 2019/06/28 13:35:04 deraadt Exp $ */ | 1 | /* $OpenBSD: session.c,v 1.317 2019/11/13 04:47:52 deraadt 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 |
@@ -56,10 +56,10 @@ | |||
56 | #endif | 56 | #endif |
57 | #include <pwd.h> | 57 | #include <pwd.h> |
58 | #include <signal.h> | 58 | #include <signal.h> |
59 | #include <stdarg.h> | ||
60 | #include <stdio.h> | 59 | #include <stdio.h> |
61 | #include <stdlib.h> | 60 | #include <stdlib.h> |
62 | #include <string.h> | 61 | #include <string.h> |
62 | #include <stdarg.h> | ||
63 | #include <unistd.h> | 63 | #include <unistd.h> |
64 | #include <limits.h> | 64 | #include <limits.h> |
65 | 65 | ||
diff --git a/sftp-glob.c b/sftp-glob.c index feba0a23c..f573f98f0 100644 --- a/sftp-glob.c +++ b/sftp-glob.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-glob.c,v 1.28 2019/10/02 00:42:30 djm Exp $ */ | 1 | /* $OpenBSD: sftp-glob.c,v 1.29 2019/11/13 04:47:52 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -23,9 +23,9 @@ | |||
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | #include <dirent.h> | 25 | #include <dirent.h> |
26 | #include <stdarg.h> | ||
27 | #include <stdlib.h> | 26 | #include <stdlib.h> |
28 | #include <string.h> | 27 | #include <string.h> |
28 | #include <stdarg.h> | ||
29 | 29 | ||
30 | #include "xmalloc.h" | 30 | #include "xmalloc.h" |
31 | #include "sftp.h" | 31 | #include "sftp.h" |
diff --git a/sshconnect.c b/sshconnect.c index 7e9369ee3..0b33ea58b 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.322 2019/11/12 19:33:08 markus Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.323 2019/11/13 04:47:52 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 |
@@ -39,9 +39,9 @@ | |||
39 | #include <poll.h> | 39 | #include <poll.h> |
40 | #endif | 40 | #endif |
41 | #include <signal.h> | 41 | #include <signal.h> |
42 | #include <stdarg.h> | ||
43 | #include <stdio.h> | 42 | #include <stdio.h> |
44 | #include <stdlib.h> | 43 | #include <stdlib.h> |
44 | #include <stdarg.h> | ||
45 | #include <string.h> | 45 | #include <string.h> |
46 | #include <unistd.h> | 46 | #include <unistd.h> |
47 | #ifdef HAVE_IFADDRS_H | 47 | #ifdef HAVE_IFADDRS_H |
diff --git a/sshconnect2.c b/sshconnect2.c index c8db626df..85c1c231a 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.312 2019/11/12 22:36:44 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.313 2019/11/13 04:47:52 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -36,9 +36,9 @@ | |||
36 | #include <netdb.h> | 36 | #include <netdb.h> |
37 | #include <pwd.h> | 37 | #include <pwd.h> |
38 | #include <signal.h> | 38 | #include <signal.h> |
39 | #include <stdarg.h> | ||
40 | #include <stdio.h> | 39 | #include <stdio.h> |
41 | #include <string.h> | 40 | #include <string.h> |
41 | #include <stdarg.h> | ||
42 | #include <unistd.h> | 42 | #include <unistd.h> |
43 | #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS) | 43 | #if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS) |
44 | #include <vis.h> | 44 | #include <vis.h> |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: umac.c,v 1.17 2018/04/10 00:10:49 djm Exp $ */ | 1 | /* $OpenBSD: umac.c,v 1.18 2019/11/13 04:47:52 deraadt Exp $ */ |
2 | /* ----------------------------------------------------------------------- | 2 | /* ----------------------------------------------------------------------- |
3 | * | 3 | * |
4 | * umac.c -- C Implementation UMAC Message Authentication | 4 | * umac.c -- C Implementation UMAC Message Authentication |