diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1996-11-03 18:57:47 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1996-11-03 18:57:47 +0000 |
| commit | f6a900184d91171c3b37f98b8a32303633977547 (patch) | |
| tree | 3595dd14edc17cb174d6fbbfc5c8dcf7e292187f /usr.bin/skey | |
| parent | dfdd57ceb8dce8a7e6ad46ae05bbe44341b03832 (diff) | |
Use new length/size macros.
Diffstat (limited to 'usr.bin/skey')
| -rw-r--r-- | usr.bin/skey/skey.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/usr.bin/skey/skey.c b/usr.bin/skey/skey.c index 68c6605353f..95fc8217a4d 100644 --- a/usr.bin/skey/skey.c +++ b/usr.bin/skey/skey.c @@ -1,4 +1,4 @@ -/* * $OpenBSD: skey.c,v 1.7 1996/10/30 01:09:23 millert Exp $*/ +/* * $OpenBSD: skey.c,v 1.8 1996/11/03 18:57:14 millert Exp $*/ /* * S/KEY v1.1b (skey.c) * @@ -36,7 +36,8 @@ main(argc, argv) char *argv[]; { int n, i, cnt = 1, pass = 0, hexmode = 0; - char passwd[256], key[8], buf[33], *seed, *slash; + char passwd[SKEY_MAX_PW_LEN+1], key[SKEY_BINKEY_SIZE]; + char buf[33], *seed, *slash; /* If we were called as otp-METHOD, set algorithm based on that */ if (strncmp(argv[0], "otp-", 4) == 0) { @@ -90,13 +91,19 @@ main(argc, argv) seed = slash; 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); usage(argv[0]); } } else { if ((n = atoi(argv[i])) < 0) { warnx("%s not positive", argv[i]); usage(argv[0]); + } else if (n > SKEY_MAX_SEQ) { + warnx("%d is larger than max (%d)", n, SKEY_MAX_SEQ); + usage(argv[0]); } seed = argv[++i]; } |