highly polished whitespace, mostly fixing spaces-for-tab and bad

indentation on continuation lines. Prompted by GHPR#185

diff --git a/usr.bin/ssh/addrmatch.c b/usr.bin/ssh/addrmatch.c
index 1a5ba6e..9697d82 100644 (file)
--- a/usr.bin/ssh/addrmatch.c
+++ b/usr.bin/ssh/addrmatch.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: addrmatch.c,v 1.16 2021/01/09 11:58:50 dtucker Exp $ */
+/*     $OpenBSD: addrmatch.c,v 1.17 2021/04/03 06:18:40 djm Exp $ */
 
 /*
  * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org>
@@ -74,7 +74,7 @@ addr_match_list(const char *addr, const char *_list)
                        break;
                } else if (r == 0) {
                        if (addr != NULL && addr_netmatch(&try_addr,
-                           &match_addr, masklen) == 0) {
+                           &match_addr, masklen) == 0) {
  foundit:
                                if (neg) {
                                        ret = -1;

diff --git a/usr.bin/ssh/auth-krb5.c b/usr.bin/ssh/auth-krb5.c
index a8bc581..9d1d3bf 100644 (file)
--- a/usr.bin/ssh/auth-krb5.c
+++ b/usr.bin/ssh/auth-krb5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-krb5.c,v 1.23 2018/07/09 21:35:50 markus Exp $ */
+/* $OpenBSD: auth-krb5.c,v 1.24 2021/04/03 06:18:40 djm Exp $ */
 /*
  *    Kerberos v5 authentication and ticket-passing routines.
  *
@@ -82,7 +82,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
                goto out;
 
        problem = krb5_cc_new_unique(authctxt->krb5_ctx,
-            krb5_mcc_ops.prefix, NULL, &ccache);
+           krb5_mcc_ops.prefix, NULL, &ccache);
        if (problem)
                goto out;
 
@@ -102,7 +102,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
                goto out;
 
        problem = krb5_cc_new_unique(authctxt->krb5_ctx,
-            krb5_fcc_ops.prefix, NULL, &authctxt->krb5_fwd_ccache);
+           krb5_fcc_ops.prefix, NULL, &authctxt->krb5_fwd_ccache);
        if (problem)
                goto out;
 

diff --git a/usr.bin/ssh/auth-options.c b/usr.bin/ssh/auth-options.c
index a81b2e6..a2652c4 100644 (file)
--- a/usr.bin/ssh/auth-options.c
+++ b/usr.bin/ssh/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.94 2020/10/18 11:32:01 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.95 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Copyright (c) 2018 Damien Miller <djm@mindrot.org>
  *
@@ -807,7 +807,7 @@ sshauthopt_serialise(const struct sshauthopt *opts, struct sshbuf *m,
            (r = serialise_nullable_string(m,
            untrusted ? NULL : opts->required_from_host_cert)) != 0 ||
            (r = serialise_nullable_string(m,
-            untrusted ? NULL : opts->required_from_host_keys)) != 0)
+           untrusted ? NULL : opts->required_from_host_keys)) != 0)
                return r;
 
        /* Array options */

diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c
index e40a96c..c52f7dc 100644 (file)
--- a/usr.bin/ssh/auth.c
+++ b/usr.bin/ssh/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.151 2020/12/22 00:12:22 djm Exp $ */
+/* $OpenBSD: auth.c,v 1.152 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -424,7 +424,7 @@ auth_openfile(const char *file, struct passwd *pw, int strict_modes,
        if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) {
                if (log_missing || errno != ENOENT)
                        debug("Could not open %s '%s': %s", file_type, file,
-                          strerror(errno));
+                           strerror(errno));
                return NULL;
        }
 

diff --git a/usr.bin/ssh/auth2-pubkey.c b/usr.bin/ssh/auth2-pubkey.c
index 5234033..b77d353 100644 (file)
--- a/usr.bin/ssh/auth2-pubkey.c
+++ b/usr.bin/ssh/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.106 2021/01/27 10:05:28 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.107 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -671,7 +671,8 @@ check_authkey_line(struct ssh *ssh, struct passwd *pw, struct sshkey *key,
                goto fail_reason;
        }
        if (sshkey_cert_check_authority(key, 0, 0, 0,
-          keyopts->cert_principals == NULL ? pw->pw_name : NULL, &reason) != 0)
+           keyopts->cert_principals == NULL ? pw->pw_name : NULL,
+           &reason) != 0)
                goto fail_reason;
 
        verbose("Accepted certificate ID \"%s\" (serial %llu) "
@@ -782,7 +783,7 @@ user_cert_trusted_ca(struct ssh *ssh, struct passwd *pw, struct sshkey *key,
                found_principal = 1;
        /* If principals file or command is specified, then require a match */
        use_authorized_principals = principals_file != NULL ||
-            options.authorized_principals_command != NULL;
+           options.authorized_principals_command != NULL;
        if (!found_principal && use_authorized_principals) {
                reason = "Certificate does not contain an authorized principal";
                goto fail_reason;

diff --git a/usr.bin/ssh/auth2.c b/usr.bin/ssh/auth2.c
index 34361ae..c21c2e1 100644 (file)
--- a/usr.bin/ssh/auth2.c
+++ b/usr.bin/ssh/auth2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.160 2021/01/27 10:05:28 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.161 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -218,7 +218,7 @@ user_specific_delay(const char *user)
        double delay;
 
        (void)snprintf(b, sizeof b, "%llu%s",
-            (unsigned long long)options.timing_secret, user);
+           (unsigned long long)options.timing_secret, user);
        if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0)
                fatal_f("ssh_digest_memory");
        /* 0-4.2 ms of delay */
@@ -656,7 +656,7 @@ void
 auth2_record_info(Authctxt *authctxt, const char *fmt, ...)
 {
        va_list ap;
-        int i;
+       int i;
 
        free(authctxt->auth_method_info);
        authctxt->auth_method_info = NULL;

diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c
index 4f55aa4..ebeb829 100644 (file)
--- a/usr.bin/ssh/channels.c
+++ b/usr.bin/ssh/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.405 2021/02/15 20:43:15 markus Exp $ */
+/* $OpenBSD: channels.c,v 1.406 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2266,7 +2266,7 @@ channel_handler_init(struct ssh_channels *sc)
        chan_fn **pre, **post;
 
        if ((pre = calloc(SSH_CHANNEL_MAX_TYPE, sizeof(*pre))) == NULL ||
-          (post = calloc(SSH_CHANNEL_MAX_TYPE, sizeof(*post))) == NULL)
+           (post = calloc(SSH_CHANNEL_MAX_TYPE, sizeof(*post))) == NULL)
                fatal_f("allocation failed");
 
        pre[SSH_CHANNEL_OPEN] =                 &channel_pre_open;
@@ -2666,7 +2666,7 @@ channel_proxy_downstream(struct ssh *ssh, Channel *downstream)
                        goto out;
                }
                c = channel_new(ssh, "mux proxy", SSH_CHANNEL_MUX_PROXY,
-                  -1, -1, -1, 0, 0, 0, ctype, 1);
+                   -1, -1, -1, 0, 0, 0, ctype, 1);
                c->mux_ctx = downstream;        /* point to mux client */
                c->mux_downstream_id = id;      /* original downstream id */
                if ((r = sshbuf_put_cstring(modified, ctype)) != 0 ||
@@ -2693,7 +2693,7 @@ channel_proxy_downstream(struct ssh *ssh, Channel *downstream)
                        goto out;
                }
                c = channel_new(ssh, "mux proxy", SSH_CHANNEL_MUX_PROXY,
-                  -1, -1, -1, 0, 0, 0, "mux-down-connect", 1);
+                   -1, -1, -1, 0, 0, 0, "mux-down-connect", 1);
                c->mux_ctx = downstream;        /* point to mux client */
                c->mux_downstream_id = id;
                c->remote_id = remote_id;

diff --git a/usr.bin/ssh/channels.h b/usr.bin/ssh/channels.h
index 513c415..b318974 100644 (file)
--- a/usr.bin/ssh/channels.h
+++ b/usr.bin/ssh/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.136 2021/04/03 05:54:14 djm Exp $ */
+/* $OpenBSD: channels.h,v 1.137 2021/04/03 06:18:40 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -286,7 +286,7 @@ int  channel_input_status_confirm(int, u_int32_t, struct ssh *);
 /* file descriptor handling (read/write) */
 
 void    channel_prepare_select(struct ssh *, fd_set **, fd_set **, int *,
-            u_int*, time_t*);
+           u_int*, time_t*);
 void     channel_after_select(struct ssh *, fd_set *, fd_set *);
 void     channel_output_poll(struct ssh *);
 

diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c
index 553ac70..c7664a3 100644 (file)
--- a/usr.bin/ssh/cipher.c
+++ b/usr.bin/ssh/cipher.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.c,v 1.118 2020/12/21 11:09:32 dtucker Exp $ */
+/* $OpenBSD: cipher.c,v 1.119 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -480,11 +480,10 @@ cipher_get_keyiv(struct sshcipher_ctx *cc, u_char *iv, size_t len)
        if ((size_t)evplen != len)
                return SSH_ERR_INVALID_ARGUMENT;
        if (cipher_authlen(c)) {
-               if (!EVP_CIPHER_CTX_ctrl(cc->evp, EVP_CTRL_GCM_IV_GEN,
-                  len, iv))
-                      return SSH_ERR_LIBCRYPTO_ERROR;
+               if (!EVP_CIPHER_CTX_ctrl(cc->evp, EVP_CTRL_GCM_IV_GEN, len, iv))
+                       return SSH_ERR_LIBCRYPTO_ERROR;
        } else if (!EVP_CIPHER_CTX_get_iv(cc->evp, iv, len))
-              return SSH_ERR_LIBCRYPTO_ERROR;
+               return SSH_ERR_LIBCRYPTO_ERROR;
 #endif
        return 0;
 }

diff --git a/usr.bin/ssh/dh.c b/usr.bin/ssh/dh.c
index 4242f78..1af5755 100644 (file)
--- a/usr.bin/ssh/dh.c
+++ b/usr.bin/ssh/dh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.c,v 1.73 2021/03/12 04:08:19 dtucker Exp $ */
+/* $OpenBSD: dh.c,v 1.74 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  *
@@ -267,7 +267,7 @@ dh_pub_is_valid(const DH *dh, const BIGNUM *dh_pub)
         */
        if (bits_set < 4) {
                logit("invalid public DH value (%d/%d)",
-                  bits_set, BN_num_bits(dh_p));
+                   bits_set, BN_num_bits(dh_p));
                return 0;
        }
        return 1;

diff --git a/usr.bin/ssh/kex.c b/usr.bin/ssh/kex.c
index b218691..d663466 100644 (file)
--- a/usr.bin/ssh/kex.c
+++ b/usr.bin/ssh/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.167 2021/01/31 22:55:29 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.168 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -1171,7 +1171,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
        if (version_addendum != NULL && *version_addendum == '\0')
                version_addendum = NULL;
        if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n",
-          PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
+           PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
            version_addendum == NULL ? "" : " ",
            version_addendum == NULL ? "" : version_addendum)) != 0) {
                oerrno = errno;

diff --git a/usr.bin/ssh/kexgen.c b/usr.bin/ssh/kexgen.c
index bad1599..12d8bab 100644 (file)
--- a/usr.bin/ssh/kexgen.c
+++ b/usr.bin/ssh/kexgen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgen.c,v 1.6 2021/01/31 22:55:29 djm Exp $ */
+/* $OpenBSD: kexgen.c,v 1.7 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Copyright (c) 2019 Markus Friedl.  All rights reserved.
  *
@@ -319,7 +319,7 @@ input_kex_gen_init(int type, u_int32_t seq, struct ssh *ssh)
 
        /* sign H */
        if ((r = kex->sign(ssh, server_host_private, server_host_public,
-            &signature, &slen, hash, hashlen, kex->hostkey_alg)) != 0)
+           &signature, &slen, hash, hashlen, kex->hostkey_alg)) != 0)
                goto out;
 
        /* send server hostkey, ECDH pubkey 'Q_S' and signed H */

diff --git a/usr.bin/ssh/log.c b/usr.bin/ssh/log.c
index 2304248..bb80f17 100644 (file)
--- a/usr.bin/ssh/log.c
+++ b/usr.bin/ssh/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.56 2020/12/04 02:25:13 djm Exp $ */
+/* $OpenBSD: log.c,v 1.57 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -285,7 +285,7 @@ log_redirect_stderr_to(const char *logfile)
 
        if ((fd = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0600)) == -1) {
                fprintf(stderr, "Couldn't open logfile %s: %s\n", logfile,
-                    strerror(errno));
+                   strerror(errno));
                exit(1);
        }
        log_stderr_fd = fd;

diff --git a/usr.bin/ssh/misc.c b/usr.bin/ssh/misc.c
index a32d7fe..2f54d63 100644 (file)
--- a/usr.bin/ssh/misc.c
+++ b/usr.bin/ssh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.163 2021/04/03 05:21:46 djm Exp $ */
+/* $OpenBSD: misc.c,v 1.164 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005-2020 Damien Miller.  All rights reserved.
@@ -1149,7 +1149,7 @@ vdollar_percent_expand(int *parseerror, int dollar, int percent,
                        string += 2;  /* skip over '${' */
                        if ((varend = strchr(string, '}')) == NULL) {
                                error_f("environment variable '%s' missing "
-                                  "closing '}'", string);
+                                   "closing '}'", string);
                                goto out;
                        }
                        len = varend - string;

diff --git a/usr.bin/ssh/misc.h b/usr.bin/ssh/misc.h
index f19928a..70cd778 100644 (file)
--- a/usr.bin/ssh/misc.h
+++ b/usr.bin/ssh/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.94 2021/03/03 08:42:52 djm Exp $ */
+/* $OpenBSD: misc.h,v 1.95 2021/04/03 06:18:40 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -115,9 +115,9 @@ struct arglist {
        u_int   nalloc;
 };
 void    addargs(arglist *, char *, ...)
-            __attribute__((format(printf, 2, 3)));
+           __attribute__((format(printf, 2, 3)));
 void    replacearg(arglist *, u_int, char *, ...)
-            __attribute__((format(printf, 3, 4)));
+           __attribute__((format(printf, 3, 4)));
 void    freeargs(arglist *);
 
 int     tun_open(int, int, char **);
@@ -172,7 +172,7 @@ const char *iptos2str(int);
 void mktemp_proto(char *, size_t);
 
 void    child_set_env(char ***envp, u_int *envsizep, const char *name,
-            const char *value);
+           const char *value);
 
 int     argv_split(const char *, int *, char ***);
 char   *argv_assemble(int, char **argv);
@@ -180,9 +180,9 @@ int  exited_cleanly(pid_t, const char *, const char *, int);
 
 struct stat;
 int     safe_path(const char *, struct stat *, const char *, uid_t,
-            char *, size_t);
+           char *, size_t);
 int     safe_path_fd(int, const char *, struct passwd *,
-            char *err, size_t errlen);
+           char *err, size_t errlen);
 
 /* authorized_key-style options parsing helpers */
 int    opt_flag(const char *opt, int allow_negate, const char **optsp);

diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c
index a344111..55dad8c 100644 (file)
--- a/usr.bin/ssh/mux.c
+++ b/usr.bin/ssh/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.86 2020/10/29 02:52:43 djm Exp $ */
+/* $OpenBSD: mux.c,v 1.87 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *
@@ -541,7 +541,7 @@ format_forward(u_int ftype, struct Forward *fwd)
                xasprintf(&ret, "dynamic forward %.200s:%d -> *",
                    (fwd->listen_host == NULL) ?
                    (options.fwd_opts.gateway_ports ? "*" : "LOCALHOST") :
-                    fwd->listen_host, fwd->listen_port);
+                   fwd->listen_host, fwd->listen_port);
                break;
        case MUX_FWD_REMOTE:
                xasprintf(&ret, "remote forward %.200s:%d -> %.200s:%d",
@@ -636,7 +636,7 @@ mux_confirm_remote_forward(struct ssh *ssh, int type, u_int32_t seq, void *ctxt)
                            rfwd->allocated_port)) != 0)
                                fatal_fr(r, "reply");
                        channel_update_permission(ssh, rfwd->handle,
-                          rfwd->allocated_port);
+                           rfwd->allocated_port);
                } else {
                        reply_ok(out, fctx->rid);
                }
@@ -651,7 +651,7 @@ mux_confirm_remote_forward(struct ssh *ssh, int type, u_int32_t seq, void *ctxt)
                        xasprintf(&failmsg, "remote port forwarding failed for "
                            "listen port %d", rfwd->listen_port);
 
-                debug2_f("clearing registered forwarding for listen %d, "
+               debug2_f("clearing registered forwarding for listen %d, "
                    "connect %s:%d", rfwd->listen_port,
                    rfwd->connect_path ? rfwd->connect_path :
                    rfwd->connect_host, rfwd->connect_port);
@@ -2257,7 +2257,7 @@ muxclient(const char *path)
        if (strlcpy(addr.sun_path, path,
            sizeof(addr.sun_path)) >= sizeof(addr.sun_path))
                fatal("ControlPath too long ('%s' >= %u bytes)", path,
-                    (unsigned int)sizeof(addr.sun_path));
+                   (unsigned int)sizeof(addr.sun_path));
 
        if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) == -1)
                fatal_f("socket(): %s", strerror(errno));

diff --git a/usr.bin/ssh/packet.c b/usr.bin/ssh/packet.c
index 897ad42..3156eed 100644 (file)
--- a/usr.bin/ssh/packet.c
+++ b/usr.bin/ssh/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.299 2021/01/27 10:05:28 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.300 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -664,7 +664,7 @@ static int
 ssh_packet_init_compression(struct ssh *ssh)
 {
        if (!ssh->state->compression_buffer &&
-          ((ssh->state->compression_buffer = sshbuf_new()) == NULL))
+           ((ssh->state->compression_buffer = sshbuf_new()) == NULL))
                return SSH_ERR_ALLOC_FAIL;
        return 0;
 }
@@ -866,11 +866,11 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
        }
        if (state->newkeys[mode] != NULL) {
                debug_f("rekeying %s, input %llu bytes %llu blocks, "
-                  "output %llu bytes %llu blocks", dir,
-                  (unsigned long long)state->p_read.bytes,
-                  (unsigned long long)state->p_read.blocks,
-                  (unsigned long long)state->p_send.bytes,
-                  (unsigned long long)state->p_send.blocks);
+                   "output %llu bytes %llu blocks", dir,
+                   (unsigned long long)state->p_read.bytes,
+                   (unsigned long long)state->p_read.blocks,
+                   (unsigned long long)state->p_send.bytes,
+                   (unsigned long long)state->p_send.blocks);
                kex_free_newkeys(state->newkeys[mode]);
                state->newkeys[mode] = NULL;
        }
@@ -905,7 +905,7 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
           explicit_bzero(mac->key, mac->key_len); */
        if ((comp->type == COMP_ZLIB ||
            (comp->type == COMP_DELAYED &&
-            state->after_authentication)) && comp->enabled == 0) {
+           state->after_authentication)) && comp->enabled == 0) {
                if ((r = ssh_packet_init_compression(ssh)) < 0)
                        return r;
                if (mode == MODE_OUT) {

diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c
index 2f5ebe2..8a8c778 100644 (file)
--- a/usr.bin/ssh/readconf.c
+++ b/usr.bin/ssh/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.352 2021/02/24 01:18:08 dtucker Exp $ */
+/* $OpenBSD: readconf.c,v 1.353 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -662,7 +662,7 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw,
                        snprintf(uidstr, sizeof(uidstr), "%llu",
                            (unsigned long long)pw->pw_uid);
                        conn_hash_hex = ssh_connection_hash(thishost, host,
-                          portstr, ruser);
+                           portstr, ruser);
                        keyalias = options->host_key_alias ?
                            options->host_key_alias : host;
 
@@ -1012,7 +1012,7 @@ parse_time:
  parse_multistate:
                arg = strdelim(&s);
                if ((value = parse_multistate_value(arg, filename, linenum,
-                    multistate_ptr)) == -1) {
+                   multistate_ptr)) == -1) {
                        error("%s line %d: unsupported option \"%s\".",
                            filename, linenum, arg);
                        return -1;
@@ -1980,7 +1980,7 @@ parse_pubkey_algos:
                arg = strdelim(&s);
                arg2 = strdelim(&s);
                value = parse_multistate_value(arg, filename, linenum,
-                    multistate_yesnoaskconfirm);
+                   multistate_yesnoaskconfirm);
                value2 = 0; /* unlimited lifespan by default */
                if (value == 3 && arg2 != NULL) {
                        /* allow "AddKeysToAgent confirm 5m" */

diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index e921092..ca8f81d 100644 (file)
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.213 2020/10/18 11:32:01 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.214 2021/04/03 06:18:40 djm Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -603,7 +603,7 @@ do_times(int fd, int verb, const struct stat *sb)
 
 static int
 parse_scp_uri(const char *uri, char **userp, char **hostp, int *portp,
-     char **pathp)
+    char **pathp)
 {
        int r;
 
@@ -1396,8 +1396,7 @@ sink(int argc, char **argv, const char *src)
                                if (pflag)
                                        (void) chmod(np, mode);
                        } else {
-                               /* Handle copying from a read-only
-                                  directory */
+                               /* Handle copying from a read-only directory */
                                mod_flag = 1;
                                if (mkdir(np, mode | S_IRWXU) == -1)
                                        goto bad;

diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c
index 0a945ef..98c02d7 100644 (file)
--- a/usr.bin/ssh/servconf.c
+++ b/usr.bin/ssh/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.378 2021/03/12 04:08:19 dtucker Exp $ */
+/* $OpenBSD: servconf.c,v 1.379 2021/04/03 06:18:40 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -2059,7 +2059,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
        case sMatch:
                if (cmdline)
                        fatal("Match directive not supported as a command-line "
-                          "option");
+                           "option");
                value = match_cfg_line(&cp, linenum,
                    (*inc_flags & SSHCFG_NEVERMATCH ? NULL : connectinfo));
                if (value < 0)
@@ -2392,7 +2392,7 @@ load_server_config(const char *filename, struct sshbuf *conf)
        sshbuf_reset(conf);
        /* grow buffer, so realloc is avoided for large config files */
        if (fstat(fileno(f), &st) == 0 && st.st_size > 0 &&
-            (r = sshbuf_allocate(conf, st.st_size)) != 0)
+           (r = sshbuf_allocate(conf, st.st_size)) != 0)
                fatal_fr(r, "allocate");
        while (getline(&line, &linesize, f) != -1) {
                lineno++;
@@ -2445,12 +2445,12 @@ int parse_server_match_testspec(struct connection_info *ci, char *spec)
                        ci->lport = a2port(p + 6);
                        if (ci->lport == -1) {
                                fprintf(stderr, "Invalid port '%s' in test mode"
-                                  " specification %s\n", p+6, p);
+                                   " specification %s\n", p+6, p);
                                return -1;
                        }
                } else {
                        fprintf(stderr, "Invalid test mode specification %s\n",
-                          p);
+                           p);
                        return -1;
                }
        }
@@ -2847,9 +2847,9 @@ dump_config(ServerOptions *o)
        dump_cfg_strarray_oneline(sAuthorizedKeysFile, o->num_authkeys_files,
            o->authorized_keys_files);
        dump_cfg_strarray(sHostKeyFile, o->num_host_key_files,
-            o->host_key_files);
+           o->host_key_files);
        dump_cfg_strarray(sHostCertificate, o->num_host_cert_files,
-            o->host_cert_files);
+           o->host_cert_files);
        dump_cfg_strarray(sAllowUsers, o->num_allow_users, o->allow_users);
        dump_cfg_strarray(sDenyUsers, o->num_deny_users, o->deny_users);
        dump_cfg_strarray(sAllowGroups, o->num_allow_groups, o->allow_groups);

diff --git a/usr.bin/ssh/servconf.h b/usr.bin/ssh/servconf.h
index 70e0d9a..72ee588 100644 (file)
--- a/usr.bin/ssh/servconf.h
+++ b/usr.bin/ssh/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.153 2021/04/03 05:54:14 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.154 2021/04/03 06:18:40 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -292,13 +292,13 @@ struct connection_info *get_connection_info(struct ssh *, int, int);
 void    initialize_server_options(ServerOptions *);
 void    fill_default_server_options(ServerOptions *);
 int     process_server_config_line(ServerOptions *, char *, const char *, int,
-            int *, struct connection_info *, struct include_list *includes);
+           int *, struct connection_info *, struct include_list *includes);
 void    process_permitopen(struct ssh *ssh, ServerOptions *options);
 void    load_server_config(const char *, struct sshbuf *);
 void    parse_server_config(ServerOptions *, const char *, struct sshbuf *,
-            struct include_list *includes, struct connection_info *);
+           struct include_list *includes, struct connection_info *);
 void    parse_server_match_config(ServerOptions *,
-            struct include_list *includes, struct connection_info *);
+           struct include_list *includes, struct connection_info *);
 int     parse_server_match_testspec(struct connection_info *, char *);
 int     server_match_spec_complete(struct connection_info *);
 void    copy_set_server_options(ServerOptions *, ServerOptions *, int);

diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index 3463104..b1e8db5 100644 (file)
--- a/usr.bin/ssh/serverloop.c
+++ b/usr.bin/ssh/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.225 2021/01/27 10:05:28 djm Exp $ */
+/* $OpenBSD: serverloop.c,v 1.226 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -828,7 +828,7 @@ server_input_global_request(int type, u_int32_t seq, struct ssh *ssh)
                    options.disable_forwarding ||
                    (!want_reply && fwd.listen_port == 0) ||
                    (fwd.listen_port != 0 &&
-                    !bind_permitted(fwd.listen_port, pw->pw_uid))) {
+                   !bind_permitted(fwd.listen_port, pw->pw_uid))) {
                        success = 0;
                        ssh_packet_send_debug(ssh, "Server has disabled port forwarding.");
                } else {

diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c
index b52d273..e301dfc 100644 (file)
--- a/usr.bin/ssh/session.c
+++ b/usr.bin/ssh/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.327 2020/12/14 03:13:12 djm Exp $ */
+/* $OpenBSD: session.c,v 1.328 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1128,7 +1128,7 @@ do_setusercontext(struct passwd *pw)
 
                if (!in_chroot && options.chroot_directory != NULL &&
                    strcasecmp(options.chroot_directory, "none") != 0) {
-                        tmp = tilde_expand_filename(options.chroot_directory,
+                       tmp = tilde_expand_filename(options.chroot_directory,
                            pw->pw_uid);
                        snprintf(uidstr, sizeof(uidstr), "%llu",
                            (unsigned long long)pw->pw_uid);

diff --git a/usr.bin/ssh/sftp-client.c b/usr.bin/ssh/sftp-client.c
index a969060..00edab2 100644 (file)
--- a/usr.bin/ssh/sftp-client.c
+++ b/usr.bin/ssh/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.141 2021/03/31 22:16:34 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.142 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -501,7 +501,8 @@ do_init(int fd_in, int fd_out, u_int transfer_buflen, u_int num_requests,
                        ret->num_requests =
                            MINIMUM(DEFAULT_NUM_REQUESTS, limits.open_handles);
                        debug("Server handle limit %llu; using %u",
-                             (unsigned long long)limits.open_handles, ret->num_requests);
+                           (unsigned long long)limits.open_handles,
+                           ret->num_requests);
                }
        }
 
@@ -563,7 +564,7 @@ do_limits(struct sftp_conn *conn, struct sftp_limits *limits)
                fatal("ID mismatch (%u != %u)", msg_id, id);
        if (type != SSH2_FXP_EXTENDED_REPLY) {
                fatal("Expected SSH2_FXP_EXTENDED_REPLY(%u) packet, got %u",
-                     SSH2_FXP_EXTENDED_REPLY, type);
+                   SSH2_FXP_EXTENDED_REPLY, type);
        }
 
        memset(limits, 0, sizeof(*limits));
@@ -1022,7 +1023,7 @@ do_hardlink(struct sftp_conn *conn, const char *oldpath, const char *newpath)
                fatal_fr(r, "compose");
        send_msg(conn, msg);
        debug3("Sent message hardlink@openssh.com \"%s\" -> \"%s\"",
-              oldpath, newpath);
+           oldpath, newpath);
        sshbuf_free(msg);
 
        status = get_status(conn, id);
@@ -1735,7 +1736,7 @@ do_upload(struct sftp_conn *conn, const char *local_path,
 
                if ((off_t)c->size >= sb.st_size) {
                        error("destination file bigger or same size as "
-                             "source file");
+                           "source file");
                        close(local_fd);
                        return -1;
                }

diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c
index a2dddeb..4e47796 100644 (file)
--- a/usr.bin/ssh/sftp-server.c
+++ b/usr.bin/ssh/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.126 2021/04/03 05:28:43 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.127 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -143,7 +143,7 @@ static const struct sftp_handler handlers[] = {
 /* SSH2_FXP_EXTENDED submessages */
 static const struct sftp_handler extended_handlers[] = {
        { "posix-rename", "posix-rename@openssh.com", 0,
-          process_extended_posix_rename, 1 },
+           process_extended_posix_rename, 1 },
        { "statvfs", "statvfs@openssh.com", 0, process_extended_statvfs, 0 },
        { "fstatvfs", "fstatvfs@openssh.com", 0, process_extended_fstatvfs, 0 },
        { "hardlink", "hardlink@openssh.com", 0, process_extended_hardlink, 1 },
@@ -1349,7 +1349,7 @@ process_extended_statvfs(u_int32_t id)
                send_status(id, errno_to_portable(errno));
        else
                send_statvfs(id, &st);
-        free(path);
+       free(path);
 }
 
 static void

diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c
index f42c43b..c3ad248 100644 (file)
--- a/usr.bin/ssh/sftp.c
+++ b/usr.bin/ssh/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.207 2021/03/31 22:16:34 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.208 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -719,7 +719,7 @@ process_put(struct sftp_conn *conn, const char *src, const char *dst,
                }
                free(tmp);
 
-                resume |= global_aflag;
+               resume |= global_aflag;
                if (!quiet && resume)
                        mprintf("Resuming upload of %s to %s\n",
                            g.gl_pathv[i], abs_dst);

diff --git a/usr.bin/ssh/srclimit.c b/usr.bin/ssh/srclimit.c
index f40fb19..853a0ee 100644 (file)
--- a/usr.bin/ssh/srclimit.c
+++ b/usr.bin/ssh/srclimit.c
@@ -100,7 +100,7 @@ srclimit_check_allow(int sock, int id)
                return 1;
        }
        debug3("%s: new unauthenticated connection from %s/%d, at %d of %d",
-            __func__, xas, bits, count, max_persource);
+           __func__, xas, bits, count, max_persource);
 
        if (first_unused == max_children) { /* no free slot found */
                debug3("%s: no free slot", __func__);

diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c
index ade339f..bca50bb 100644 (file)
--- a/usr.bin/ssh/ssh-add.c
+++ b/usr.bin/ssh/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.159 2021/01/11 02:12:58 dtucker Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.160 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -329,10 +329,10 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag,
                        fprintf(stderr, "Skipping update: ");
                        if (left == minleft) {
                                fprintf(stderr,
-                                  "required signatures left (%d).\n", left);
+                                   "required signatures left (%d).\n", left);
                        } else {
                                fprintf(stderr,
-                                  "more signatures left (%d) than"
+                                   "more signatures left (%d) than"
                                    " required (%d).\n", left, minleft);
                        }
                        ssh_free_identitylist(idlist);

diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index f49306b..8c7030a 100644 (file)
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.277 2021/02/12 03:14:18 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.278 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -245,8 +245,8 @@ process_request_identities(SocketEntry *e)
            (r = sshbuf_put_u32(msg, idtab->nentries)) != 0)
                fatal_fr(r, "compose");
        TAILQ_FOREACH(id, &idtab->idlist, next) {
-               if ((r = sshkey_puts_opts(id->key, msg, SSHKEY_SERIALIZE_INFO))
-                    != 0 ||
+               if ((r = sshkey_puts_opts(id->key, msg,
+                   SSHKEY_SERIALIZE_INFO)) != 0 ||
                    (r = sshbuf_put_cstring(msg, id->comment)) != 0) {
                        error_fr(r, "compose key/comment");
                        continue;
@@ -1271,7 +1271,7 @@ prepare_poll(struct pollfd **pfdp, size_t *npfdp, int *timeoutp, u_int maxfds)
                        if ((r = sshbuf_check_reserve(sockets[i].input,
                            AGENT_RBUF_LEN)) == 0 &&
                            (r = sshbuf_check_reserve(sockets[i].output,
-                            AGENT_MAX_LEN)) == 0)
+                           AGENT_MAX_LEN)) == 0)
                                pfd[j].events = POLLIN;
                        else if (r != SSH_ERR_NO_BUFFER_SPACE)
                                fatal_fr(r, "reserve");

diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 7bc0275..202e38c 100644 (file)
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.428 2021/03/12 03:43:40 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.429 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1986,7 +1986,7 @@ add_cert_option(char *opt)
                        fatal("Invalid source-address list");
                certflags_src_addr = xstrdup(val);
        } else if (strncasecmp(opt, "extension:", 10) == 0 ||
-                  (iscrit = (strncasecmp(opt, "critical:", 9) == 0))) {
+                   (iscrit = (strncasecmp(opt, "critical:", 9) == 0))) {
                val = xstrdup(strchr(opt, ':') + 1);
                if ((cp = strchr(val, '=')) != NULL)
                        *cp++ = '\0';
@@ -2706,12 +2706,12 @@ done:
                                fatal_f("sshkey_fingerprint failed");
                        if (principal == NULL) {
                                printf("Good \"%s\" signature with %s key %s\n",
-                                      sig_namespace, sshkey_type(sign_key), fp);
+                                   sig_namespace, sshkey_type(sign_key), fp);
 
                        } else {
                                printf("Good \"%s\" signature for %s with %s key %s\n",
-                                      sig_namespace, principal,
-                                      sshkey_type(sign_key), fp);
+                                   sig_namespace, principal,
+                                   sshkey_type(sign_key), fp);
                        }
                } else {
                        printf("Could not verify signature.\n");
@@ -3345,12 +3345,12 @@ main(int argc, char **argv)
                if (strncmp(sign_op, "find-principals", 15) == 0) {
                        if (ca_key_path == NULL) {
                                error("Too few arguments for find-principals:"
-                                     "missing signature file");
+                                   "missing signature file");
                                exit(1);
                        }
                        if (!have_identity) {
                                error("Too few arguments for find-principals:"
-                                     "missing allowed keys file");
+                                   "missing allowed keys file");
                                exit(1);
                        }
                        return sig_find_principals(ca_key_path, identity_file);
@@ -3371,7 +3371,7 @@ main(int argc, char **argv)
                } else if (strncmp(sign_op, "check-novalidate", 16) == 0) {
                        if (ca_key_path == NULL) {
                                error("Too few arguments for check-novalidate: "
-                                     "missing signature file");
+                                   "missing signature file");
                                exit(1);
                        }
                        return sig_verify(ca_key_path, cert_principals,

diff --git a/usr.bin/ssh/ssh-sk-client.c b/usr.bin/ssh/ssh-sk-client.c
index d57e0ef..d928bda 100644 (file)
--- a/usr.bin/ssh/ssh-sk-client.c
+++ b/usr.bin/ssh/ssh-sk-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-sk-client.c,v 1.8 2020/10/18 11:32:02 djm Exp $ */
+/* $OpenBSD: ssh-sk-client.c,v 1.9 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Copyright (c) 2019 Google LLC
  *
@@ -155,9 +155,9 @@ client_converse(struct sshbuf *msg, struct sshbuf **respp, u_int type)
        /* Request preamble: type, log_on_stderr, log_level */
        ll = log_level_get();
        if ((r = sshbuf_put_u32(req, type)) != 0 ||
-          (r = sshbuf_put_u8(req, log_is_on_stderr() != 0)) != 0 ||
-          (r = sshbuf_put_u32(req, ll < 0 ? 0 : ll)) != 0 ||
-          (r = sshbuf_putb(req, msg)) != 0) {
+           (r = sshbuf_put_u8(req, log_is_on_stderr() != 0)) != 0 ||
+           (r = sshbuf_put_u32(req, ll < 0 ? 0 : ll)) != 0 ||
+           (r = sshbuf_putb(req, msg)) != 0) {
                error_fr(r, "compose");
                goto out;
        }

diff --git a/usr.bin/ssh/ssh_api.c b/usr.bin/ssh/ssh_api.c
index 3de2980..eae3e6f 100644 (file)
--- a/usr.bin/ssh/ssh_api.c
+++ b/usr.bin/ssh/ssh_api.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh_api.c,v 1.26 2021/01/27 10:05:28 djm Exp $ */
+/* $OpenBSD: ssh_api.c,v 1.27 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Copyright (c) 2012 Markus Friedl.  All rights reserved.
  *
@@ -77,7 +77,7 @@ mm_choose_dh(int min, int nbits, int max)
 int
 ssh_init(struct ssh **sshp, int is_server, struct kex_params *kex_params)
 {
-        char *myproposal[PROPOSAL_MAX] = { KEX_CLIENT };
+       char *myproposal[PROPOSAL_MAX] = { KEX_CLIENT };
        struct ssh *ssh;
        char **proposal;
        static int called;
@@ -355,7 +355,7 @@ _ssh_read_banner(struct ssh *ssh, struct sshbuf *banner)
                if (ssh->kex->server || ++n > SSH_MAX_PRE_BANNER_LINES) {
   bad:
                        if ((r = sshbuf_put(ssh_packet_get_output(ssh),
-                          mismatch, strlen(mismatch))) != 0)
+                           mismatch, strlen(mismatch))) != 0)
                                return r;
                        return SSH_ERR_NO_PROTOCOL_VERSION;
                }

diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c
index 2cd8321..72fdad1 100644 (file)
--- a/usr.bin/ssh/sshconnect.c
+++ b/usr.bin/ssh/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.351 2021/03/03 21:40:16 sthen Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.352 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -79,7 +79,7 @@ expand_proxy_command(const char *proxy_command, const char *user,
 {
        char *tmp, *ret, strport[NI_MAXSERV];
        const char *keyalias = options.host_key_alias ?
-            options.host_key_alias : host_arg;
+           options.host_key_alias : host_arg;
 
        snprintf(strport, sizeof strport, "%d", port);
        xasprintf(&tmp, "exec %s", proxy_command);
@@ -231,8 +231,10 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, const char *host_arg,
                argv[2] = command_string;
                argv[3] = NULL;
 
-               /* Execute the proxy command.  Note that we gave up any
-                  extra privileges above. */
+               /*
+                * Execute the proxy command.  Note that we gave up any
+                * extra privileges above.
+                */
                ssh_signal(SIGPIPE, SIG_DFL);
                execv(argv[0], argv);
                perror(argv[0]);
@@ -377,14 +379,14 @@ ssh_create_socket(struct addrinfo *ai)
        } else if (options.bind_interface != NULL) {
                if ((r = getifaddrs(&ifaddrs)) != 0) {
                        error("getifaddrs: %s: %s", options.bind_interface,
-                             strerror(errno));
+                           strerror(errno));
                        goto fail;
                }
                bindaddrlen = sizeof(bindaddr);
                if (check_ifaddrs(options.bind_interface, ai->ai_family,
                    ifaddrs, &bindaddr, &bindaddrlen) != 0) {
                        logit("getifaddrs: %s: no suitable addresses",
-                             options.bind_interface);
+                           options.bind_interface);
                        goto fail;
                }
        }
@@ -827,7 +829,7 @@ load_hostkeys_command(struct hostkeys *hostkeys, const char *command_template,
        /* Turn the command into an argument vector */
        if (argv_split(command_template, &ac, &av) != 0) {
                error("%s \"%s\" contains invalid quotes", tag,
-                  command_template);
+                   command_template);
                goto out;
        }
        if (ac == 0) {

diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index c960fe7..974a7c9 100644 (file)
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.346 2021/01/27 10:05:28 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.347 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -664,7 +664,7 @@ format_identity(Identity *id)
        const char *note = "";
 
        if (id->key != NULL) {
-            fp = sshkey_fingerprint(id->key, options.fingerprint_hash,
+               fp = sshkey_fingerprint(id->key, options.fingerprint_hash,
                    SSH_FP_DEFAULT);
        }
        if (id->key) {
@@ -1235,7 +1235,7 @@ identity_sign(struct identity *id, u_char **sigp, size_t *lenp,
                        return SSH_ERR_KEY_NOT_FOUND;
                if (id->key != NULL && !sshkey_equal_public(prv, id->key)) {
                        error_f("private key %s contents do not match public",
-                          id->filename);
+                           id->filename);
                        r = SSH_ERR_KEY_NOT_FOUND;
                        goto out;
                }

diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 8a6a1b4..d669671 100644 (file)
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.571 2021/03/12 04:08:19 dtucker Exp $ */
+/* $OpenBSD: sshd.c,v 1.572 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1592,7 +1592,7 @@ main(int ac, char **av)
         */
        if (test_flag < 2 && connection_info != NULL)
                fatal("Config test connection parameter (-C) provided without "
-                  "test mode (-T)");
+                   "test mode (-T)");
 
        /* Fetch our configuration */
        if ((cfg = sshbuf_new()) == NULL)
@@ -1878,8 +1878,10 @@ main(int ac, char **av)
        /* Reinitialize the log (because of the fork above). */
        log_init(__progname, options.log_level, options.log_facility, log_stderr);
 
-       /* Chdir to the root directory so that the current disk can be
-          unmounted if desired. */
+       /*
+        * Chdir to the root directory so that the current disk can be
+        * unmounted if desired.
+        */
        if (chdir("/") == -1)
                error("chdir(\"/\"): %s", strerror(errno));
 

diff --git a/usr.bin/ssh/sshkey-xmss.c b/usr.bin/ssh/sshkey-xmss.c
index ee69faf..d3acf57 100644 (file)
--- a/usr.bin/ssh/sshkey-xmss.c
+++ b/usr.bin/ssh/sshkey-xmss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey-xmss.c,v 1.10 2021/03/06 20:36:31 millert Exp $ */
+/* $OpenBSD: sshkey-xmss.c,v 1.11 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Copyright (c) 2017 Markus Friedl.  All rights reserved.
  *
@@ -584,7 +584,7 @@ sshkey_xmss_update_state(const struct sshkey *k, int printerror)
                goto done;
        } else if (idx != state->idx + 1) {
                PRINT("more than one signature happened: idx %u state %u",
-                     idx, state->idx);
+                   idx, state->idx);
                goto done;
        }
        state->idx = idx;

diff --git a/usr.bin/ssh/sshkey-xmss.h b/usr.bin/ssh/sshkey-xmss.h
index bf52d29..32a12be 100644 (file)
--- a/usr.bin/ssh/sshkey-xmss.h
+++ b/usr.bin/ssh/sshkey-xmss.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey-xmss.h,v 1.2 2020/10/19 22:49:23 dtucker Exp $ */
+/* $OpenBSD: sshkey-xmss.h,v 1.3 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Copyright (c) 2017 Markus Friedl.  All rights reserved.
  *
@@ -25,10 +25,10 @@
 #ifndef SSHKEY_XMSS_H
 #define SSHKEY_XMSS_H
 
-#define XMSS_SHA2_256_W16_H10_NAME "XMSS_SHA2-256_W16_H10"
-#define XMSS_SHA2_256_W16_H16_NAME "XMSS_SHA2-256_W16_H16"
-#define XMSS_SHA2_256_W16_H20_NAME "XMSS_SHA2-256_W16_H20"
-#define XMSS_DEFAULT_NAME         XMSS_SHA2_256_W16_H10_NAME
+#define XMSS_SHA2_256_W16_H10_NAME     "XMSS_SHA2-256_W16_H10"
+#define XMSS_SHA2_256_W16_H16_NAME     "XMSS_SHA2-256_W16_H16"
+#define XMSS_SHA2_256_W16_H20_NAME     "XMSS_SHA2-256_W16_H20"
+#define XMSS_DEFAULT_NAME              XMSS_SHA2_256_W16_H10_NAME
 
 size_t  sshkey_xmss_pklen(const struct sshkey *);
 size_t  sshkey_xmss_sklen(const struct sshkey *);
@@ -37,7 +37,7 @@ void   sshkey_xmss_free_state(struct sshkey *);
 int     sshkey_xmss_generate_private_key(struct sshkey *, u_int);
 int     sshkey_xmss_serialize_state(const struct sshkey *, struct sshbuf *);
 int     sshkey_xmss_serialize_state_opt(const struct sshkey *, struct sshbuf *,
-            enum sshkey_serialize_rep);
+           enum sshkey_serialize_rep);
 int     sshkey_xmss_serialize_pk_info(const struct sshkey *, struct sshbuf *,
            enum sshkey_serialize_rep);
 int     sshkey_xmss_deserialize_state(struct sshkey *, struct sshbuf *);

diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c
index 2ae461f..a3be721 100644 (file)
--- a/usr.bin/ssh/sshkey.c
+++ b/usr.bin/ssh/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.115 2021/02/02 22:36:46 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.116 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -137,7 +137,7 @@ static const struct keytype keytypes[] = {
        { "ecdsa-sha2-nistp384-cert-v01@openssh.com", "ECDSA-CERT", NULL,
            KEY_ECDSA_CERT, NID_secp384r1, 1, 0 },
        { "ecdsa-sha2-nistp521-cert-v01@openssh.com", "ECDSA-CERT", NULL,
-          KEY_ECDSA_CERT, NID_secp521r1, 1, 0 },
+           KEY_ECDSA_CERT, NID_secp521r1, 1, 0 },
        { "sk-ecdsa-sha2-nistp256-cert-v01@openssh.com", "ECDSA-SK-CERT", NULL,
            KEY_ECDSA_SK_CERT, NID_X9_62_prime256v1, 1, 0 },
 #endif /* WITH_OPENSSL */
@@ -1996,7 +1996,7 @@ sshkey_shield_private(struct sshkey *k)
        if (sshkey_is_shielded(k) && (r = sshkey_unshield_private(k)) != 0)
                goto out;
        if ((r = sshkey_private_serialize_opt(k, prvbuf,
-            SSHKEY_SERIALIZE_SHIELD)) != 0)
+           SSHKEY_SERIALIZE_SHIELD)) != 0)
                goto out;
        /* pad to cipher blocksize */
        i = 0;
@@ -3626,7 +3626,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
        if ((expect_sk_application != NULL && (k->sk_application == NULL ||
            strcmp(expect_sk_application, k->sk_application) != 0)) ||
            (expect_ed25519_pk != NULL && (k->ed25519_pk == NULL ||
-            memcmp(expect_ed25519_pk, k->ed25519_pk, ED25519_PK_SZ) != 0))) {
+           memcmp(expect_ed25519_pk, k->ed25519_pk, ED25519_PK_SZ) != 0))) {
                r = SSH_ERR_KEY_CERT_MISMATCH;
                goto out;
        }
@@ -3904,7 +3904,7 @@ sshkey_private_to_blob2(struct sshkey *prv, struct sshbuf *blob,
 
        /* append private key and comment*/
        if ((r = sshkey_private_serialize_opt(prv, encrypted,
-            SSHKEY_SERIALIZE_FULL)) != 0 ||
+           SSHKEY_SERIALIZE_FULL)) != 0 ||
            (r = sshbuf_put_cstring(encrypted, comment)) != 0)
                goto out;
 
@@ -4527,12 +4527,12 @@ sshkey_parse_private_pem_fileblob(struct sshbuf *blob, int type,
        clear_libcrypto_errors();
        if ((pk = PEM_read_bio_PrivateKey(bio, NULL, NULL,
            (char *)passphrase)) == NULL) {
-              /*
-               * libcrypto may return various ASN.1 errors when attempting
-               * to parse a key with an incorrect passphrase.
-               * Treat all format errors as "incorrect passphrase" if a
-               * passphrase was supplied.
-               */
+               /*
+                * libcrypto may return various ASN.1 errors when attempting
+                * to parse a key with an incorrect passphrase.
+                * Treat all format errors as "incorrect passphrase" if a
+                * passphrase was supplied.
+                */
                if (passphrase != NULL && *passphrase != '\0')
                        r = SSH_ERR_KEY_WRONG_PASSPHRASE;
                else

diff --git a/usr.bin/ssh/utf8.h b/usr.bin/ssh/utf8.h
index 5e26519..129248f 100644 (file)
--- a/usr.bin/ssh/utf8.h
+++ b/usr.bin/ssh/utf8.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: utf8.h,v 1.3 2020/05/01 06:28:52 djm Exp $ */
+/* $OpenBSD: utf8.h,v 1.4 2021/04/03 06:18:41 djm Exp $ */
 /*
  * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -17,11 +17,11 @@
 
 int     vasnmprintf(char **, size_t, int *, const char *, va_list);
 int     mprintf(const char *, ...)
-            __attribute__((format(printf, 1, 2)));
+           __attribute__((format(printf, 1, 2)));
 int     fmprintf(FILE *, const char *, ...)
-            __attribute__((format(printf, 2, 3)));
+           __attribute__((format(printf, 2, 3)));
 int     vfmprintf(FILE *, const char *, va_list);
 int     snmprintf(char *, size_t, int *, const char *, ...)
-            __attribute__((format(printf, 4, 5)));
+           __attribute__((format(printf, 4, 5)));
 int     asmprintf(char **, size_t, int *, const char *, ...)
-            __attribute__((format(printf, 4, 5)));
+           __attribute__((format(printf, 4, 5)));

diff --git a/usr.bin/ssh/xmalloc.h b/usr.bin/ssh/xmalloc.h
index abaf7ad..a6b8d23 100644 (file)
--- a/usr.bin/ssh/xmalloc.h
+++ b/usr.bin/ssh/xmalloc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.h,v 1.19 2019/11/12 22:32:48 djm Exp $ */
+/* $OpenBSD: xmalloc.h,v 1.20 2021/04/03 06:18:41 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -22,7 +22,6 @@ void  *xreallocarray(void *, size_t, size_t);
 void   *xrecallocarray(void *, size_t, size_t, size_t);
 char   *xstrdup(const char *);
 int     xasprintf(char **, const char *, ...)
-                __attribute__((__format__ (printf, 2, 3)))
-                __attribute__((__nonnull__ (2)));
+    __attribute__((__format__ (printf, 2, 3))) __attribute__((__nonnull__ (2)));
 int     xvasprintf(char **, const char *, va_list)
-               __attribute__((__nonnull__ (2)));
+    __attribute__((__nonnull__ (2)));