diff options
| author |   provos <provos@openbsd.org> | 2000-11-11 15:34:25 +0000 |
|---|---|---|
| committer | provos <provos@openbsd.org> | 2000-11-11 15:34:25 +0000 |
| commit | 1c0185e21cb2d50bdb4ed83bbb842987f074d2e7 (patch) | |
| tree | d969bec0d33ecf3334a9d385b4d0c9477681a8ea | |
| parent | CAST128 should be 6 (again itojun@openbsd.org) (diff) | |
| download | wireguard-openbsd-1c0185e21cb2d50bdb4ed83bbb842987f074d2e7.tar.xz wireguard-openbsd-1c0185e21cb2d50bdb4ed83bbb842987f074d2e7.zip | |
allow prompt to be specified anywhere on the command line, make it work
with md5. prohibit makekey mode and prompt.
| -rw-r--r-- | usr.bin/encrypt/encrypt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/encrypt/encrypt.c b/usr.bin/encrypt/encrypt.c index 04cc41c9e8f..7a5dfc7a18f 100644 --- a/usr.bin/encrypt/encrypt.c +++ b/usr.bin/encrypt/encrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: encrypt.c,v 1.12 2000/11/10 15:33:12 provos Exp $ */ +/* $OpenBSD: encrypt.c,v 1.13 2000/11/11 15:34:25 provos Exp $ */ /* * Copyright (c) 1996, Jason Downs. All rights reserved. @@ -143,17 +143,17 @@ int main(argc, argv) while ((opt = getopt(argc, argv, "kmps:b:")) != -1) { switch (opt) { case 'k': /* Stdin/Stdout Unix crypt */ - if (operation != -1) + if (operation != -1 || prompt) usage(); operation = DO_MAKEKEY; break; case 'm': /* MD5 password hash */ - if (operation != -1 || prompt) + if (operation != -1) usage(); operation = DO_MD5; break; case 'p': - if (operation != -1) + if (operation == DO_MAKEKEY) usage(); prompt = 1; break; |