diff options
Diffstat (limited to 'ssh-add.c')
-rw-r--r-- | ssh-add.c | 40 |
1 files changed, 15 insertions, 25 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-add.c,v 1.149 2020/01/06 02:00:46 djm Exp $ */ | 1 | /* $OpenBSD: ssh-add.c,v 1.150 2020/01/17 20:13:47 naddy Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -606,26 +606,16 @@ do_file(int agent_fd, int deleting, int key_only, char *file, int qflag, | |||
606 | static void | 606 | static void |
607 | usage(void) | 607 | usage(void) |
608 | { | 608 | { |
609 | fprintf(stderr, "usage: %s [options] [file ...]\n", __progname); | 609 | fprintf(stderr, |
610 | fprintf(stderr, "Options:\n"); | 610 | "usage: ssh-add [-cDdKkLlqvXx] [-E fingerprint_hash] [-S provider] [-t life]\n" |
611 | fprintf(stderr, " -l List fingerprints of all identities.\n"); | 611 | #ifdef WITH_XMSS |
612 | fprintf(stderr, " -E hash Specify hash algorithm used for fingerprints.\n"); | 612 | " [-M maxsign] [-m minleft]\n" |
613 | fprintf(stderr, " -L List public key parameters of all identities.\n"); | 613 | #endif |
614 | fprintf(stderr, " -k Load only keys and not certificates.\n"); | 614 | " [file ...]\n" |
615 | fprintf(stderr, " -c Require confirmation to sign using identities\n"); | 615 | " ssh-add -s pkcs11\n" |
616 | fprintf(stderr, " -m minleft Maxsign is only changed if less than minleft are left (for XMSS)\n"); | 616 | " ssh-add -e pkcs11\n" |
617 | fprintf(stderr, " -M maxsign Maximum number of signatures allowed (for XMSS)\n"); | 617 | " ssh-add -T pubkey ...\n" |
618 | fprintf(stderr, " -t life Set lifetime (in seconds) when adding identities.\n"); | 618 | ); |
619 | fprintf(stderr, " -d Delete identity.\n"); | ||
620 | fprintf(stderr, " -D Delete all identities.\n"); | ||
621 | fprintf(stderr, " -x Lock agent.\n"); | ||
622 | fprintf(stderr, " -X Unlock agent.\n"); | ||
623 | fprintf(stderr, " -s pkcs11 Add keys from PKCS#11 provider.\n"); | ||
624 | fprintf(stderr, " -e pkcs11 Remove keys provided by PKCS#11 provider.\n"); | ||
625 | fprintf(stderr, " -T pubkey Test if ssh-agent can access matching private key.\n"); | ||
626 | fprintf(stderr, " -S provider Specify security key provider.\n"); | ||
627 | fprintf(stderr, " -q Be quiet after a successful operation.\n"); | ||
628 | fprintf(stderr, " -v Be more verbose.\n"); | ||
629 | } | 619 | } |
630 | 620 | ||
631 | int | 621 | int |
@@ -665,7 +655,7 @@ main(int argc, char **argv) | |||
665 | 655 | ||
666 | skprovider = getenv("SSH_SK_PROVIDER"); | 656 | skprovider = getenv("SSH_SK_PROVIDER"); |
667 | 657 | ||
668 | while ((ch = getopt(argc, argv, "vklLcdDTxXE:e:M:m:Oqs:S:t:")) != -1) { | 658 | while ((ch = getopt(argc, argv, "vkKlLcdDTxXE:e:M:m:qs:S:t:")) != -1) { |
669 | switch (ch) { | 659 | switch (ch) { |
670 | case 'v': | 660 | case 'v': |
671 | if (log_level == SYSLOG_LEVEL_INFO) | 661 | if (log_level == SYSLOG_LEVEL_INFO) |
@@ -681,15 +671,15 @@ main(int argc, char **argv) | |||
681 | case 'k': | 671 | case 'k': |
682 | key_only = 1; | 672 | key_only = 1; |
683 | break; | 673 | break; |
674 | case 'K': | ||
675 | do_download = 1; | ||
676 | break; | ||
684 | case 'l': | 677 | case 'l': |
685 | case 'L': | 678 | case 'L': |
686 | if (lflag != 0) | 679 | if (lflag != 0) |
687 | fatal("-%c flag already specified", lflag); | 680 | fatal("-%c flag already specified", lflag); |
688 | lflag = ch; | 681 | lflag = ch; |
689 | break; | 682 | break; |
690 | case 'O': | ||
691 | do_download = 1; | ||
692 | break; | ||
693 | case 'x': | 683 | case 'x': |
694 | case 'X': | 684 | case 'X': |
695 | if (xflag != 0) | 685 | if (xflag != 0) |