version 1.318, 2018/07/09 21:59:10 |
version 1.319, 2018/08/08 01:16:01 |
|
|
char *pkcs11provider = NULL; |
char *pkcs11provider = NULL; |
|
|
/* Use new OpenSSH private key format when writing SSH2 keys instead of PEM */ |
/* Use new OpenSSH private key format when writing SSH2 keys instead of PEM */ |
int use_new_format = 0; |
int use_new_format = 1; |
|
|
/* Cipher for new-format private keys */ |
/* Cipher for new-format private keys */ |
char *new_format_cipher = NULL; |
char *new_format_cipher = NULL; |
|
|
} |
} |
if (strcasecmp(optarg, "PEM") == 0) { |
if (strcasecmp(optarg, "PEM") == 0) { |
convert_format = FMT_PEM; |
convert_format = FMT_PEM; |
|
use_new_format = 0; |
break; |
break; |
} |
} |
fatal("Unsupported conversion format \"%s\"", optarg); |
fatal("Unsupported conversion format \"%s\"", optarg); |
|
|
cert_principals = optarg; |
cert_principals = optarg; |
break; |
break; |
case 'o': |
case 'o': |
use_new_format = 1; |
/* no-op; new format is already the default */ |
break; |
break; |
case 'p': |
case 'p': |
change_passphrase = 1; |
change_passphrase = 1; |