=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.c,v retrieving revision 1.428 retrieving revision 1.430 diff -u -r1.428 -r1.430 --- src/usr.bin/ssh/ssh-keygen.c 2021/03/12 03:43:40 1.428 +++ src/usr.bin/ssh/ssh-keygen.c 2021/07/05 01:16:46 1.430 @@ -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.430 2021/07/05 01:16:46 dtucker Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1994 Tatu Ylonen , Espoo, Finland @@ -26,10 +26,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -1986,7 +1986,7 @@ 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 @@ 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 @@ 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 @@ } 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,