src/usr.bin/ssh/ssh-keygen.c - diff

Return to ssh-keygen.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-keygen.c between version 1.421 and 1.426

version 1.421, 2020/10/18 11:32:02

version 1.426, 2020/11/28 12:52:32

Line 55

#include "sshsig.h"

#include "ssh-sk.h"

#include "sk-api.h" /* XXX for SSH_SK_USER_PRESENCE_REQD; remove */

#include "cipher.h"

#ifdef ENABLE_PKCS11

#include "ssh-pkcs11.h"

Line 178

Line 179

fatal("unknown key type %s", key_type_name);

if (*bitsp == 0) {

#ifdef WITH_OPENSSL

u_int nid;

int nid;

switch(type) {

case KEY_DSA:

Line 1831

Line 1832

}

r = sshkey_certify(public, ca, key_type_name,

sk_provider, pin);

notify_complete(notifier);

notify_complete(notifier, "User presence confirmed");

if (r != 0)

fatal_r(r, "Couldn't certify key %s", tmp);

}

Line 3044

Line 3045

"usage: ssh-keygen [-q] [-a rounds] [-b bits] [-C comment] [-f output_keyfile]\n"

" [-m format] [-N new_passphrase] [-O option]\n"

" [-w provider]\n"

" [-w provider] [-Z cipher]\n"

" ssh-keygen -p [-a rounds] [-f keyfile] [-m format] [-N new_passphrase]\n"

" [-P old_passphrase]\n"

" [-P old_passphrase] [-Z cipher]\n"

" ssh-keygen -i [-f input_keyfile] [-m key_format]\n"

" ssh-keygen -e [-f input_keyfile] [-m key_format]\n"

" ssh-keygen -y [-f input_keyfile]\n"

Line 3079

Line 3080

" ssh-keygen -Y check-novalidate -n namespace -s signature_file\n"

" ssh-keygen -Y sign -f key_file -n namespace file ...\n"

" ssh-keygen -Y verify -f allowed_signers_file -I signer_identity\n"

" -n namespace -s signature_file [-r revocation_file]\n");

exit(1);

}

Line 3234

Line 3235

break;

case 'Z':

openssh_format_cipher = optarg;

if (cipher_by_name(openssh_format_cipher) == NULL)

fatal("Invalid OpenSSH-format cipher '%s'",

openssh_format_cipher);

break;

case 'C':

identity_comment = optarg;