Mailing List Archive

---
ssh-keygen.c | 74 ++++++++++++++++++++++++++--------------------------
1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/ssh-keygen.c b/ssh-keygen.c
index ed8d3b9c..d31dc503 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -2602,6 +2602,43 @@ sign_one(struct sshkey *signkey, const char *filename, int fd,
return r;
}

+static int
+sig_process_opts(char * const *opts, size_t nopts, uint64_t *verify_timep,
+ int *print_pubkey)
+{
+ size_t i;
+ time_t now;
+
+ if (verify_timep != NULL)
+ *verify_timep = 0;
+ if (print_pubkey != NULL)
+ *print_pubkey = 0;
+ for (i = 0; i < nopts; i++) {
+ if (verify_timep &&
+ strncasecmp(opts[i], "verify-time=", 12) == 0) {
+ if (parse_absolute_time(opts[i] + 12,
+ verify_timep) != 0 || *verify_timep == 0) {
+ error("Invalid \"verify-time\" option");
+ return SSH_ERR_INVALID_ARGUMENT;
+ }
+ } else if (print_pubkey &&
+ strcasecmp(opts[i], "print-pubkey") == 0) {
+ *print_pubkey = 1;
+ } else {
+ error("Invalid option \"%s\"", opts[i]);
+ return SSH_ERR_INVALID_ARGUMENT;
+ }
+ }
+ if (verify_timep && *verify_timep == 0) {
+ if ((now = time(NULL)) < 0) {
+ error("Time is before epoch");
+ return SSH_ERR_INVALID_ARGUMENT;
+ }
+ *verify_timep = (uint64_t)now;
+ }
+ return 0;
+}
+
static int
sig_sign(const char *keypath, const char *sig_namespace, int argc, char **argv)
{
@@ -2673,43 +2710,6 @@ done:
return ret;
}

-static int
-sig_process_opts(char * const *opts, size_t nopts, uint64_t *verify_timep,
- int *print_pubkey)
-{
- size_t i;
- time_t now;
-
- if (verify_timep != NULL)
- *verify_timep = 0;
- if (print_pubkey != NULL)
- *print_pubkey = 0;
- for (i = 0; i < nopts; i++) {
- if (verify_timep &&
- strncasecmp(opts[i], "verify-time=", 12) == 0) {
- if (parse_absolute_time(opts[i] + 12,
- verify_timep) != 0 || *verify_timep == 0) {
- error("Invalid \"verify-time\" option");
- return SSH_ERR_INVALID_ARGUMENT;
- }
- } else if (print_pubkey &&
- strcasecmp(opts[i], "print-pubkey") == 0) {
- *print_pubkey = 1;
- } else {
- error("Invalid option \"%s\"", opts[i]);
- return SSH_ERR_INVALID_ARGUMENT;
- }
- }
- if (verify_timep && *verify_timep == 0) {
- if ((now = time(NULL)) < 0) {
- error("Time is before epoch");
- return SSH_ERR_INVALID_ARGUMENT;
- }
- *verify_timep = (uint64_t)now;
- }
- return 0;
-}
-
static int
sig_verify(const char *signature, const char *sig_namespace,
const char *principal, const char *allowed_keys, const char *revoked_keys,
--
2.30.2

_______________________________________________
openssh-unix-dev mailing list
openssh-unix-dev@mindrot.org
https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev