summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-09-06 04:53:27 +0000
committerDamien Miller <djm@mindrot.org>2019-09-06 17:54:21 +1000
commitbe02d7cbde3d211ec2ed2320a1f7d86b2339d758 (patch)
tree69c45ebcf222fd0658c90d2a5bfbeff5f7a1ee36
parentd05aaaaadcad592abfaa44540928e0c61ef72ebb (diff)
upstream: lots of things were relying on libcrypto headers to
transitively include various system headers (mostly stdlib.h); include them explicitly OpenBSD-Commit-ID: 5b522f4f2d844f78bf1cc4f3f4cc392e177b2080
Diffstat
-rw-r--r--auth-options.c3
-rw-r--r--auth.c3
-rw-r--r--auth2-chall.c3
-rw-r--r--auth2-hostbased.c3
-rw-r--r--auth2-kbdint.c5
-rw-r--r--auth2-passwd.c3
-rw-r--r--auth2-pubkey.c3
-rw-r--r--auth2.c3
-rw-r--r--hmac.c3
-rw-r--r--krl.c3
-rw-r--r--log.h4
-rw-r--r--loginrec.c1
-rw-r--r--mac.c3
-rw-r--r--ssh-keygen.c3
-rw-r--r--ssh-keysign.c3
-rw-r--r--ssh-pkcs11-helper.c3
-rw-r--r--ssh_api.c7
-rw-r--r--sshbuf-getput-basic.c3
18 files changed, 42 insertions, 17 deletions
diff --git a/auth-options.c b/auth-options.c
index ac362e271..6fb59dc7e 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth-options.c,v 1.87 2019/09/03 08:32:11 djm Exp $ */ 1/* $OpenBSD: auth-options.c,v 1.88 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2018 Damien Miller <djm@mindrot.org> 3 * Copyright (c) 2018 Damien Miller <djm@mindrot.org>
4 * 4 *
@@ -19,6 +19,7 @@
19 19
20#include <sys/types.h> 20#include <sys/types.h>
21 21
22#include <stdlib.h>
22#include <netdb.h> 23#include <netdb.h>
23#include <pwd.h> 24#include <pwd.h>
24#include <stdlib.h> 25#include <stdlib.h>
diff --git a/auth.c b/auth.c
index b41d39cdc..61fb1feb3 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.c,v 1.139 2019/06/28 13:35:04 deraadt Exp $ */ 1/* $OpenBSD: auth.c,v 1.140 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -32,6 +32,7 @@
32 32
33#include <netinet/in.h> 33#include <netinet/in.h>
34 34
35#include <stdlib.h>
35#include <errno.h> 36#include <errno.h>
36#include <fcntl.h> 37#include <fcntl.h>
37#ifdef HAVE_PATHS_H 38#ifdef HAVE_PATHS_H
diff --git a/auth2-chall.c b/auth2-chall.c
index 2d5cff448..671f2f05f 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-chall.c,v 1.50 2018/07/11 18:55:11 markus Exp $ */ 1/* $OpenBSD: auth2-chall.c,v 1.51 2019/09/06 04:53:27 djm 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.
@@ -28,6 +28,7 @@
28 28
29#include <sys/types.h> 29#include <sys/types.h>
30 30
31#include <stdlib.h>
31#include <stdarg.h> 32#include <stdarg.h>
32#include <stdio.h> 33#include <stdio.h>
33#include <string.h> 34#include <string.h>
diff --git a/auth2-hostbased.c b/auth2-hostbased.c
index 0c40fad4e..d46047084 100644
--- a/auth2-hostbased.c
+++ b/auth2-hostbased.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-hostbased.c,v 1.40 2019/01/19 21:43:56 djm Exp $ */ 1/* $OpenBSD: auth2-hostbased.c,v 1.41 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -27,6 +27,7 @@
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29 29
30#include <stdlib.h>
30#include <pwd.h> 31#include <pwd.h>
31#include <string.h> 32#include <string.h>
32#include <stdarg.h> 33#include <stdarg.h>
diff --git a/auth2-kbdint.c b/auth2-kbdint.c
index a813b8f56..f88ef2c39 100644
--- a/auth2-kbdint.c
+++ b/auth2-kbdint.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-kbdint.c,v 1.9 2018/07/09 21:35:50 markus Exp $ */ 1/* $OpenBSD: auth2-kbdint.c,v 1.10 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -29,6 +29,9 @@
29 29
30#include <stdarg.h> 30#include <stdarg.h>
31 31
32#include <stdlib.h>
33#include <stdio.h>
34
32#include "xmalloc.h" 35#include "xmalloc.h"
33#include "packet.h" 36#include "packet.h"
34#include "hostfile.h" 37#include "hostfile.h"
diff --git a/auth2-passwd.c b/auth2-passwd.c
index f696abc21..6601e8664 100644
--- a/auth2-passwd.c
+++ b/auth2-passwd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-passwd.c,v 1.16 2018/07/09 21:35:50 markus Exp $ */ 1/* $OpenBSD: auth2-passwd.c,v 1.17 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -27,6 +27,7 @@
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29 29
30#include <stdlib.h>
30#include <string.h> 31#include <string.h>
31#include <stdarg.h> 32#include <stdarg.h>
32#include <stdio.h> 33#include <stdio.h>
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index d567f527c..df12c2c60 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-pubkey.c,v 1.93 2019/09/03 08:30:47 djm Exp $ */ 1/* $OpenBSD: auth2-pubkey.c,v 1.94 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -28,6 +28,7 @@
28#include <sys/types.h> 28#include <sys/types.h>
29#include <sys/stat.h> 29#include <sys/stat.h>
30 30
31#include <stdlib.h>
31#include <errno.h> 32#include <errno.h>
32#include <fcntl.h> 33#include <fcntl.h>
33#ifdef HAVE_PATHS_H 34#ifdef HAVE_PATHS_H
diff --git a/auth2.c b/auth2.c
index 9b08757ae..2143ff5de 100644
--- a/auth2.c
+++ b/auth2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2.c,v 1.156 2019/06/28 05:44:09 deraadt Exp $ */ 1/* $OpenBSD: auth2.c,v 1.157 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -37,6 +37,7 @@
37#include <unistd.h> 37#include <unistd.h>
38#include <time.h> 38#include <time.h>
39 39
40#include "stdlib.h"
40#include "atomicio.h" 41#include "atomicio.h"
41#include "xmalloc.h" 42#include "xmalloc.h"
42#include "ssh2.h" 43#include "ssh2.h"
diff --git a/hmac.c b/hmac.c
index e90b294fb..a79e8569c 100644
--- a/hmac.c
+++ b/hmac.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: hmac.c,v 1.12 2015/03/24 20:03:44 markus Exp $ */ 1/* $OpenBSD: hmac.c,v 1.13 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Markus Friedl. All rights reserved. 3 * Copyright (c) 2014 Markus Friedl. All rights reserved.
4 * 4 *
@@ -21,6 +21,7 @@
21 21
22#include <stdlib.h> 22#include <stdlib.h>
23#include <string.h> 23#include <string.h>
24#include <stdlib.h>
24 25
25#include "sshbuf.h" 26#include "sshbuf.h"
26#include "digest.h" 27#include "digest.h"
diff --git a/krl.c b/krl.c
index f36ba68ac..10a8bcc87 100644
--- a/krl.c
+++ b/krl.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 16
17/* $OpenBSD: krl.c,v 1.43 2019/06/21 04:21:04 djm Exp $ */ 17/* $OpenBSD: krl.c,v 1.44 2019/09/06 04:53:27 djm Exp $ */
18 18
19#include "includes.h" 19#include "includes.h"
20 20
@@ -29,6 +29,7 @@
29#include <string.h> 29#include <string.h>
30#include <time.h> 30#include <time.h>
31#include <unistd.h> 31#include <unistd.h>
32#include <stdlib.h>
32 33
33#include "sshbuf.h" 34#include "sshbuf.h"
34#include "ssherr.h" 35#include "ssherr.h"
diff --git a/log.h b/log.h
index ef7bea7e1..78cda287d 100644
--- a/log.h
+++ b/log.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: log.h,v 1.23 2018/07/27 12:03:17 markus Exp $ */ 1/* $OpenBSD: log.h,v 1.24 2019/09/06 04:53:27 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -15,6 +15,8 @@
15#ifndef SSH_LOG_H 15#ifndef SSH_LOG_H
16#define SSH_LOG_H 16#define SSH_LOG_H
17 17
18#include <stdarg.h> /* va_list */
19
18/* Supported syslog facilities and levels. */ 20/* Supported syslog facilities and levels. */
19typedef enum { 21typedef enum {
20 SYSLOG_FACILITY_DAEMON, 22 SYSLOG_FACILITY_DAEMON,
diff --git a/loginrec.c b/loginrec.c
index 93e48d517..e5289deb8 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -156,6 +156,7 @@
156 156
157#include <netinet/in.h> 157#include <netinet/in.h>
158 158
159#include <stdlib.h>
159#include <errno.h> 160#include <errno.h>
160#include <fcntl.h> 161#include <fcntl.h>
161#ifdef HAVE_PATHS_H 162#ifdef HAVE_PATHS_H
diff --git a/mac.c b/mac.c
index eab453a41..de346ed20 100644
--- a/mac.c
+++ b/mac.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mac.c,v 1.34 2017/05/08 22:57:38 djm Exp $ */ 1/* $OpenBSD: mac.c,v 1.35 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -30,6 +30,7 @@
30#include <stdlib.h> 30#include <stdlib.h>
31#include <string.h> 31#include <string.h>
32#include <stdio.h> 32#include <stdio.h>
33#include <stdlib.h>
33 34
34#include "digest.h" 35#include "digest.h"
35#include "hmac.h" 36#include "hmac.h"
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 7d4f33e46..cb00a1cf8 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.346 2019/09/03 20:51:49 naddy Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.347 2019/09/06 04:53:27 djm 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
@@ -24,6 +24,7 @@
24#include "openbsd-compat/openssl-compat.h" 24#include "openbsd-compat/openssl-compat.h"
25#endif 25#endif
26 26
27#include <stdint.h>
27#include <errno.h> 28#include <errno.h>
28#include <fcntl.h> 29#include <fcntl.h>
29#include <netdb.h> 30#include <netdb.h>
diff --git a/ssh-keysign.c b/ssh-keysign.c
index a4a1b8c21..218caecdf 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keysign.c,v 1.58 2019/06/14 03:28:19 djm Exp $ */ 1/* $OpenBSD: ssh-keysign.c,v 1.59 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -33,6 +33,7 @@
33#include <stdarg.h> 33#include <stdarg.h>
34#include <stdio.h> 34#include <stdio.h>
35#include <stdlib.h> 35#include <stdlib.h>
36#include <stdio.h>
36#include <string.h> 37#include <string.h>
37#include <unistd.h> 38#include <unistd.h>
38#include <errno.h> 39#include <errno.h>
diff --git a/ssh-pkcs11-helper.c b/ssh-pkcs11-helper.c
index cd79db2ae..67094111f 100644
--- a/ssh-pkcs11-helper.c
+++ b/ssh-pkcs11-helper.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-pkcs11-helper.c,v 1.19 2019/06/06 05:13:13 otto Exp $ */ 1/* $OpenBSD: ssh-pkcs11-helper.c,v 1.20 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2010 Markus Friedl. All rights reserved. 3 * Copyright (c) 2010 Markus Friedl. All rights reserved.
4 * 4 *
@@ -24,6 +24,7 @@
24 24
25#include "openbsd-compat/sys-queue.h" 25#include "openbsd-compat/sys-queue.h"
26 26
27#include <stdlib.h>
27#include <errno.h> 28#include <errno.h>
28#include <poll.h> 29#include <poll.h>
29#include <stdarg.h> 30#include <stdarg.h>
diff --git a/ssh_api.c b/ssh_api.c
index 57509973b..255adc6cf 100644
--- a/ssh_api.c
+++ b/ssh_api.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh_api.c,v 1.15 2019/01/21 10:38:54 djm Exp $ */ 1/* $OpenBSD: ssh_api.c,v 1.16 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2012 Markus Friedl. All rights reserved. 3 * Copyright (c) 2012 Markus Friedl. All rights reserved.
4 * 4 *
@@ -17,6 +17,11 @@
17 17
18#include "includes.h" 18#include "includes.h"
19 19
20#include <sys/types.h>
21
22#include <stdio.h>
23#include <stdlib.h>
24
20#include "ssh_api.h" 25#include "ssh_api.h"
21#include "compat.h" 26#include "compat.h"
22#include "log.h" 27#include "log.h"
diff --git a/sshbuf-getput-basic.c b/sshbuf-getput-basic.c
index 27058d5bb..ffa20a02c 100644
--- a/sshbuf-getput-basic.c
+++ b/sshbuf-getput-basic.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshbuf-getput-basic.c,v 1.8 2019/07/14 23:32:27 djm Exp $ */ 1/* $OpenBSD: sshbuf-getput-basic.c,v 1.9 2019/09/06 04:53:27 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2011 Damien Miller 3 * Copyright (c) 2011 Damien Miller
4 * 4 *
@@ -24,6 +24,7 @@
24#include <stdlib.h> 24#include <stdlib.h>
25#include <stdio.h> 25#include <stdio.h>
26#include <string.h> 26#include <string.h>
27#include <stdint.h>
27 28
28#include "ssherr.h" 29#include "ssherr.h"
29#include "sshbuf.h" 30#include "sshbuf.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 12:25:19 +0000