From 11cba2a4523fda447e2554ea457484655bedc831 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 23 Jul 2019 21:51:22 +1000 Subject: Re-apply portability changes to current sha2.{c,h}. Rather than attempt to apply 14 years' worth of changes to OpenBSD's sha2 I imported the current versions directly then re-applied the portability changes. This also allowed re-syncing digest-libc.c against upstream. --- mac.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'mac.c') diff --git a/mac.c b/mac.c index 51dc11d76..9a504e892 100644 --- a/mac.c +++ b/mac.c @@ -58,10 +58,8 @@ static const struct macalg macs[] = { /* Encrypt-and-MAC (encrypt-and-authenticate) variants */ { "hmac-sha1", SSH_DIGEST, SSH_DIGEST_SHA1, 0, 0, 0, 0 }, { "hmac-sha1-96", SSH_DIGEST, SSH_DIGEST_SHA1, 96, 0, 0, 0 }, -#ifdef HAVE_EVP_SHA256 { "hmac-sha2-256", SSH_DIGEST, SSH_DIGEST_SHA256, 0, 0, 0, 0 }, { "hmac-sha2-512", SSH_DIGEST, SSH_DIGEST_SHA512, 0, 0, 0, 0 }, -#endif { "hmac-md5", SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 0 }, { "hmac-md5-96", SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 0 }, { "umac-64@openssh.com", SSH_UMAC, 0, 0, 128, 64, 0 }, @@ -70,10 +68,8 @@ static const struct macalg macs[] = { /* Encrypt-then-MAC variants */ { "hmac-sha1-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_SHA1, 0, 0, 0, 1 }, { "hmac-sha1-96-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_SHA1, 96, 0, 0, 1 }, -#ifdef HAVE_EVP_SHA256 { "hmac-sha2-256-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_SHA256, 0, 0, 0, 1 }, { "hmac-sha2-512-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_SHA512, 0, 0, 0, 1 }, -#endif { "hmac-md5-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 1 }, { "hmac-md5-96-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 1 }, { "umac-64-etm@openssh.com", SSH_UMAC, 0, 0, 128, 64, 1 }, -- cgit v1.2.3 From 2ea60312e1c08dea88982fec68244f89a40912ff Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 23 Jul 2019 22:11:50 +1000 Subject: Include stdlib.h for free() and calloc(). --- auth-options.c | 1 + hmac.c | 2 ++ krl.c | 1 + mac.c | 1 + 4 files changed, 5 insertions(+) (limited to 'mac.c') diff --git a/auth-options.c b/auth-options.c index 514221882..ca92f7a73 100644 --- a/auth-options.c +++ b/auth-options.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include diff --git a/hmac.c b/hmac.c index 1c879640c..e90b294fb 100644 --- a/hmac.c +++ b/hmac.c @@ -18,6 +18,8 @@ #include "includes.h" #include + +#include #include #include "sshbuf.h" diff --git a/krl.c b/krl.c index bb960882f..f36ba68ac 100644 --- a/krl.c +++ b/krl.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include diff --git a/mac.c b/mac.c index 9a504e892..eab453a41 100644 --- a/mac.c +++ b/mac.c @@ -27,6 +27,7 @@ #include +#include #include #include -- cgit v1.2.3 From be02d7cbde3d211ec2ed2320a1f7d86b2339d758 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Fri, 6 Sep 2019 04:53:27 +0000 Subject: 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 --- auth-options.c | 3 ++- auth.c | 3 ++- auth2-chall.c | 3 ++- auth2-hostbased.c | 3 ++- auth2-kbdint.c | 5 ++++- auth2-passwd.c | 3 ++- auth2-pubkey.c | 3 ++- auth2.c | 3 ++- hmac.c | 3 ++- krl.c | 3 ++- log.h | 4 +++- loginrec.c | 1 + mac.c | 3 ++- ssh-keygen.c | 3 ++- ssh-keysign.c | 3 ++- ssh-pkcs11-helper.c | 3 ++- ssh_api.c | 7 ++++++- sshbuf-getput-basic.c | 3 ++- 18 files changed, 42 insertions(+), 17 deletions(-) (limited to 'mac.c') 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 @@ -/* $OpenBSD: auth-options.c,v 1.87 2019/09/03 08:32:11 djm Exp $ */ +/* $OpenBSD: auth-options.c,v 1.88 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2018 Damien Miller * @@ -19,6 +19,7 @@ #include +#include #include #include #include diff --git a/auth.c b/auth.c index b41d39cdc..61fb1feb3 100644 --- a/auth.c +++ b/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.139 2019/06/28 13:35:04 deraadt Exp $ */ +/* $OpenBSD: auth.c,v 1.140 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -32,6 +32,7 @@ #include +#include #include #include #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 @@ -/* $OpenBSD: auth2-chall.c,v 1.50 2018/07/11 18:55:11 markus Exp $ */ +/* $OpenBSD: auth2-chall.c,v 1.51 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Per Allansson. All rights reserved. @@ -28,6 +28,7 @@ #include +#include #include #include #include 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 @@ -/* $OpenBSD: auth2-hostbased.c,v 1.40 2019/01/19 21:43:56 djm Exp $ */ +/* $OpenBSD: auth2-hostbased.c,v 1.41 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -27,6 +27,7 @@ #include +#include #include #include #include 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 @@ -/* $OpenBSD: auth2-kbdint.c,v 1.9 2018/07/09 21:35:50 markus Exp $ */ +/* $OpenBSD: auth2-kbdint.c,v 1.10 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -29,6 +29,9 @@ #include +#include +#include + #include "xmalloc.h" #include "packet.h" #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 @@ -/* $OpenBSD: auth2-passwd.c,v 1.16 2018/07/09 21:35:50 markus Exp $ */ +/* $OpenBSD: auth2-passwd.c,v 1.17 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -27,6 +27,7 @@ #include +#include #include #include #include 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 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.93 2019/09/03 08:30:47 djm Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.94 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -28,6 +28,7 @@ #include #include +#include #include #include #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 @@ -/* $OpenBSD: auth2.c,v 1.156 2019/06/28 05:44:09 deraadt Exp $ */ +/* $OpenBSD: auth2.c,v 1.157 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -37,6 +37,7 @@ #include #include +#include "stdlib.h" #include "atomicio.h" #include "xmalloc.h" #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 @@ -/* $OpenBSD: hmac.c,v 1.12 2015/03/24 20:03:44 markus Exp $ */ +/* $OpenBSD: hmac.c,v 1.13 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2014 Markus Friedl. All rights reserved. * @@ -21,6 +21,7 @@ #include #include +#include #include "sshbuf.h" #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 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: krl.c,v 1.43 2019/06/21 04:21:04 djm Exp $ */ +/* $OpenBSD: krl.c,v 1.44 2019/09/06 04:53:27 djm Exp $ */ #include "includes.h" @@ -29,6 +29,7 @@ #include #include #include +#include #include "sshbuf.h" #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 @@ -/* $OpenBSD: log.h,v 1.23 2018/07/27 12:03:17 markus Exp $ */ +/* $OpenBSD: log.h,v 1.24 2019/09/06 04:53:27 djm Exp $ */ /* * Author: Tatu Ylonen @@ -15,6 +15,8 @@ #ifndef SSH_LOG_H #define SSH_LOG_H +#include /* va_list */ + /* Supported syslog facilities and levels. */ typedef enum { 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 @@ #include +#include #include #include #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 @@ -/* $OpenBSD: mac.c,v 1.34 2017/05/08 22:57:38 djm Exp $ */ +/* $OpenBSD: mac.c,v 1.35 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -30,6 +30,7 @@ #include #include #include +#include #include "digest.h" #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 @@ -/* $OpenBSD: ssh-keygen.c,v 1.346 2019/09/03 20:51:49 naddy Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.347 2019/09/06 04:53:27 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1994 Tatu Ylonen , Espoo, Finland @@ -24,6 +24,7 @@ #include "openbsd-compat/openssl-compat.h" #endif +#include #include #include #include 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 @@ -/* $OpenBSD: ssh-keysign.c,v 1.58 2019/06/14 03:28:19 djm Exp $ */ +/* $OpenBSD: ssh-keysign.c,v 1.59 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include 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 @@ -/* $OpenBSD: ssh-pkcs11-helper.c,v 1.19 2019/06/06 05:13:13 otto Exp $ */ +/* $OpenBSD: ssh-pkcs11-helper.c,v 1.20 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * @@ -24,6 +24,7 @@ #include "openbsd-compat/sys-queue.h" +#include #include #include #include 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 @@ -/* $OpenBSD: ssh_api.c,v 1.15 2019/01/21 10:38:54 djm Exp $ */ +/* $OpenBSD: ssh_api.c,v 1.16 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2012 Markus Friedl. All rights reserved. * @@ -17,6 +17,11 @@ #include "includes.h" +#include + +#include +#include + #include "ssh_api.h" #include "compat.h" #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 @@ -/* $OpenBSD: sshbuf-getput-basic.c,v 1.8 2019/07/14 23:32:27 djm Exp $ */ +/* $OpenBSD: sshbuf-getput-basic.c,v 1.9 2019/09/06 04:53:27 djm Exp $ */ /* * Copyright (c) 2011 Damien Miller * @@ -24,6 +24,7 @@ #include #include #include +#include #include "ssherr.h" #include "sshbuf.h" -- cgit v1.2.3 From edd1d3a6261aecbf9a55944fd7be1db83571b46e Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 2 Oct 2019 10:54:28 +1000 Subject: remove duplicate #includes Prompted by Jakub Jelen --- auth-bsdauth.c | 2 -- auth-options.c | 1 - auth.h | 4 ++-- auth2.c | 3 --- dns.c | 1 - hmac.c | 1 - hostfile.c | 1 - kex.h | 15 +++------------ kexecdh.c | 8 +++----- krl.c | 1 - mac.c | 1 - sandbox-systrace.c | 1 - ssh-keysign.c | 1 - sshconnect.c | 1 - 14 files changed, 8 insertions(+), 33 deletions(-) (limited to 'mac.c') diff --git a/auth-bsdauth.c b/auth-bsdauth.c index 4dc5045c2..d124e994e 100644 --- a/auth-bsdauth.c +++ b/auth-bsdauth.c @@ -29,8 +29,6 @@ #include #include -#include - #ifdef BSD_AUTH #include "xmalloc.h" #include "sshkey.h" diff --git a/auth-options.c b/auth-options.c index 9550f656f..90b0d7f25 100644 --- a/auth-options.c +++ b/auth-options.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/auth.h b/auth.h index 04ad99ffb..becc672b5 100644 --- a/auth.h +++ b/auth.h @@ -234,7 +234,7 @@ pid_t subprocess(const char *, struct passwd *, int sys_auth_passwd(struct ssh *, const char *); #if defined(KRB5) && !defined(HEIMDAL) -#include krb5_error_code ssh_krb5_cc_gen(krb5_context, krb5_ccache *); #endif -#endif + +#endif /* AUTH_H */ diff --git a/auth2.c b/auth2.c index 2143ff5de..0e7762242 100644 --- a/auth2.c +++ b/auth2.c @@ -52,14 +52,11 @@ #include "auth.h" #include "dispatch.h" #include "pathnames.h" -#include "sshbuf.h" #include "ssherr.h" - #ifdef GSSAPI #include "ssh-gss.h" #endif #include "monitor_wrap.h" -#include "ssherr.h" #include "digest.h" /* import */ diff --git a/dns.c b/dns.c index ff1a2c41c..e4f9bf830 100644 --- a/dns.c +++ b/dns.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include "xmalloc.h" diff --git a/hmac.c b/hmac.c index a79e8569c..32688876d 100644 --- a/hmac.c +++ b/hmac.c @@ -21,7 +21,6 @@ #include #include -#include #include "sshbuf.h" #include "digest.h" diff --git a/hostfile.c b/hostfile.c index 389aae1fc..96ab880d4 100644 --- a/hostfile.c +++ b/hostfile.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include "xmalloc.h" diff --git a/kex.h b/kex.h index 6465df88d..a5ae6ac05 100644 --- a/kex.h +++ b/kex.h @@ -30,6 +30,9 @@ #include "crypto_api.h" #ifdef WITH_OPENSSL +# include +# include +# include # ifdef OPENSSL_HAS_ECC # include # else /* OPENSSL_HAS_ECC */ @@ -45,18 +48,6 @@ # define EC_POINT void #endif /* WITH_OPENSSL */ -#ifdef WITH_OPENSSL -#include -#include -#include -#include -#else /* OPENSSL */ -#define BIGNUM void -#define DH void -#define EC_KEY void -#define EC_GROUP void -#endif /* WITH_OPENSSL */ - #define KEX_COOKIE_LEN 16 #define KEX_DH1 "diffie-hellman-group1-sha1" diff --git a/kexecdh.c b/kexecdh.c index be324a838..bcfa3b107 100644 --- a/kexecdh.c +++ b/kexecdh.c @@ -211,11 +211,9 @@ kex_ecdh_dec(struct kex *kex, const struct sshbuf *server_blob, #else -#include - -#include "sshkey.h" -#include "kex.h" -#include "ssherr.h" +struct kex; +struct sshbuf; +struct sshkey; int kex_ecdh_keypair(struct kex *kex) diff --git a/krl.c b/krl.c index 10a8bcc87..a7f690955 100644 --- a/krl.c +++ b/krl.c @@ -29,7 +29,6 @@ #include #include #include -#include #include "sshbuf.h" #include "ssherr.h" diff --git a/mac.c b/mac.c index de346ed20..f3dda6692 100644 --- a/mac.c +++ b/mac.c @@ -30,7 +30,6 @@ #include #include #include -#include #include "digest.h" #include "hmac.h" diff --git a/sandbox-systrace.c b/sandbox-systrace.c index add4c46d0..93e63b8e0 100644 --- a/sandbox-systrace.c +++ b/sandbox-systrace.c @@ -36,7 +36,6 @@ #include #include #include -#include #include "atomicio.h" #include "log.h" diff --git a/ssh-keysign.c b/ssh-keysign.c index 3ede407d3..6cfd5b46c 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/sshconnect.c b/sshconnect.c index bcb732a32..6230dad32 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -56,7 +56,6 @@ #include "compat.h" #include "sshkey.h" #include "sshconnect.h" -#include "hostfile.h" #include "log.h" #include "misc.h" #include "readconf.h" -- cgit v1.2.3