diff options
| author |   millert <millert@openbsd.org> | 1996-11-22 03:24:36 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 1996-11-22 03:24:36 +0000 |
| commit | 9dc679e5affe096decbf774f4734a14b984c34ea (patch) | |
| tree | d5febd6d495787d6191474cd3752e3da26b3230d | |
| parent | correct version of last commit (diff) | |
| download | wireguard-openbsd-9dc679e5affe096decbf774f4734a14b984c34ea.tar.xz wireguard-openbsd-9dc679e5affe096decbf774f4734a14b984c34ea.zip | |
fix thinko wrt otp-* handling
| -rw-r--r-- | usr.bin/skey/skey.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/usr.bin/skey/skey.c b/usr.bin/skey/skey.c index 95fc8217a4d..1e7d815f7f2 100644 --- a/usr.bin/skey/skey.c +++ b/usr.bin/skey/skey.c @@ -1,4 +1,4 @@ -/* * $OpenBSD: skey.c,v 1.8 1996/11/03 18:57:14 millert Exp $*/ +/* * $OpenBSD: skey.c,v 1.9 1996/11/22 03:24:36 millert Exp $*/ /* * S/KEY v1.1b (skey.c) * @@ -40,9 +40,14 @@ main(argc, argv) char buf[33], *seed, *slash; /* If we were called as otp-METHOD, set algorithm based on that */ - if (strncmp(argv[0], "otp-", 4) == 0) { - if (skey_set_algorithm(&argv[0][4]) == NULL) - errx(1, "Unknown hash algorithm %s", &argv[0][4]); + if ((slash = strrchr(argv[0], '/'))) + slash++; + else + slash = argv[0]; + if (strncmp(slash, "otp-", 4) == 0) { + slash += 4; + if (skey_set_algorithm(slash) == NULL) + errx(1, "Unknown hash algorithm %s", slash); } for (i = 1; i < argc && argv[i][0] == '-' && strcmp(argv[i], "--");) { @@ -99,7 +104,7 @@ main(argc, argv) } } else { if ((n = atoi(argv[i])) < 0) { - warnx("%s not positive", argv[i]); + warnx("%d not positive", n); usage(argv[0]); } else if (n > SKEY_MAX_SEQ) { warnx("%d is larger than max (%d)", n, SKEY_MAX_SEQ); |