diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-30 14:16:41 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-31 10:49:50 +1000 |
commit | 7da5df11ac788bc1133d8d598d298e33500524cc (patch) | |
tree | 9c201ad7bfbb674771d3cd17bda0c90d2523ffaa /ssh-keygen.c | |
parent | ff7371afd08ac0bbd957d90451d4dcd0da087ef5 (diff) |
upstream commit
remove unused wrapper functions from key.[ch]; ok djm@
Upstream-ID: ea0f4016666a6817fc11f439dd4be06bab69707e
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 7886582d7..cc3a7df18 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.303 2017/05/07 23:15:59 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.304 2017/05/30 14:16:41 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -488,7 +488,7 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen) | |||
488 | return NULL; | 488 | return NULL; |
489 | } | 489 | } |
490 | if ((key = sshkey_new_private(ktype)) == NULL) | 490 | if ((key = sshkey_new_private(ktype)) == NULL) |
491 | fatal("key_new_private failed"); | 491 | fatal("sshkey_new_private failed"); |
492 | free(type); | 492 | free(type); |
493 | 493 | ||
494 | switch (key->type) { | 494 | switch (key->type) { |
@@ -770,7 +770,7 @@ do_print_public(struct passwd *pw) | |||
770 | fatal("%s: %s", identity_file, strerror(errno)); | 770 | fatal("%s: %s", identity_file, strerror(errno)); |
771 | prv = load_identity(identity_file); | 771 | prv = load_identity(identity_file); |
772 | if ((r = sshkey_write(prv, stdout)) != 0) | 772 | if ((r = sshkey_write(prv, stdout)) != 0) |
773 | error("key_write failed: %s", ssh_err(r)); | 773 | error("sshkey_write failed: %s", ssh_err(r)); |
774 | sshkey_free(prv); | 774 | sshkey_free(prv); |
775 | fprintf(stdout, "\n"); | 775 | fprintf(stdout, "\n"); |
776 | exit(0); | 776 | exit(0); |
@@ -1019,7 +1019,7 @@ do_gen_all_hostkeys(struct passwd *pw) | |||
1019 | bits = 0; | 1019 | bits = 0; |
1020 | type_bits_valid(type, NULL, &bits); | 1020 | type_bits_valid(type, NULL, &bits); |
1021 | if ((r = sshkey_generate(type, bits, &private)) != 0) { | 1021 | if ((r = sshkey_generate(type, bits, &private)) != 0) { |
1022 | error("key_generate failed: %s", ssh_err(r)); | 1022 | error("sshkey_generate failed: %s", ssh_err(r)); |
1023 | first = 0; | 1023 | first = 0; |
1024 | continue; | 1024 | continue; |
1025 | } | 1025 | } |
@@ -1475,7 +1475,7 @@ do_change_comment(struct passwd *pw) | |||
1475 | explicit_bzero(passphrase, strlen(passphrase)); | 1475 | explicit_bzero(passphrase, strlen(passphrase)); |
1476 | free(passphrase); | 1476 | free(passphrase); |
1477 | if ((r = sshkey_from_private(private, &public)) != 0) | 1477 | if ((r = sshkey_from_private(private, &public)) != 0) |
1478 | fatal("key_from_private failed: %s", ssh_err(r)); | 1478 | fatal("sshkey_from_private failed: %s", ssh_err(r)); |
1479 | sshkey_free(private); | 1479 | sshkey_free(private); |
1480 | 1480 | ||
1481 | strlcat(identity_file, ".pub", sizeof(identity_file)); | 1481 | strlcat(identity_file, ".pub", sizeof(identity_file)); |
@@ -1662,7 +1662,7 @@ do_ca_sign(struct passwd *pw, int argc, char **argv) | |||
1662 | OPTIONS_EXTENSIONS); | 1662 | OPTIONS_EXTENSIONS); |
1663 | if ((r = sshkey_from_private(ca, | 1663 | if ((r = sshkey_from_private(ca, |
1664 | &public->cert->signature_key)) != 0) | 1664 | &public->cert->signature_key)) != 0) |
1665 | fatal("key_from_private (ca key): %s", ssh_err(r)); | 1665 | fatal("sshkey_from_private (ca key): %s", ssh_err(r)); |
1666 | 1666 | ||
1667 | if ((r = sshkey_certify(public, ca, key_type_name)) != 0) | 1667 | if ((r = sshkey_certify(public, ca, key_type_name)) != 0) |
1668 | fatal("Couldn't certify key %s: %s", tmp, ssh_err(r)); | 1668 | fatal("Couldn't certify key %s: %s", tmp, ssh_err(r)); |
@@ -1980,7 +1980,7 @@ do_show_cert(struct passwd *pw) | |||
1980 | if (*cp == '#' || *cp == '\0') | 1980 | if (*cp == '#' || *cp == '\0') |
1981 | continue; | 1981 | continue; |
1982 | if ((key = sshkey_new(KEY_UNSPEC)) == NULL) | 1982 | if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
1983 | fatal("key_new"); | 1983 | fatal("sshkey_new"); |
1984 | if ((r = sshkey_read(key, &cp)) != 0) { | 1984 | if ((r = sshkey_read(key, &cp)) != 0) { |
1985 | error("%s:%lu: invalid key: %s", path, | 1985 | error("%s:%lu: invalid key: %s", path, |
1986 | lnum, ssh_err(r)); | 1986 | lnum, ssh_err(r)); |
@@ -2126,7 +2126,7 @@ update_krl_from_file(struct passwd *pw, const char *file, int wild_ca, | |||
2126 | */ | 2126 | */ |
2127 | } | 2127 | } |
2128 | if ((key = sshkey_new(KEY_UNSPEC)) == NULL) | 2128 | if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
2129 | fatal("key_new"); | 2129 | fatal("sshkey_new"); |
2130 | if ((r = sshkey_read(key, &cp)) != 0) | 2130 | if ((r = sshkey_read(key, &cp)) != 0) |
2131 | fatal("%s:%lu: invalid key: %s", | 2131 | fatal("%s:%lu: invalid key: %s", |
2132 | path, lnum, ssh_err(r)); | 2132 | path, lnum, ssh_err(r)); |
@@ -2667,9 +2667,9 @@ main(int argc, char **argv) | |||
2667 | printf("Generating public/private %s key pair.\n", | 2667 | printf("Generating public/private %s key pair.\n", |
2668 | key_type_name); | 2668 | key_type_name); |
2669 | if ((r = sshkey_generate(type, bits, &private)) != 0) | 2669 | if ((r = sshkey_generate(type, bits, &private)) != 0) |
2670 | fatal("key_generate failed"); | 2670 | fatal("sshkey_generate failed"); |
2671 | if ((r = sshkey_from_private(private, &public)) != 0) | 2671 | if ((r = sshkey_from_private(private, &public)) != 0) |
2672 | fatal("key_from_private failed: %s\n", ssh_err(r)); | 2672 | fatal("sshkey_from_private failed: %s\n", ssh_err(r)); |
2673 | 2673 | ||
2674 | if (!have_identity) | 2674 | if (!have_identity) |
2675 | ask_filename(pw, "Enter file in which to save the key"); | 2675 | ask_filename(pw, "Enter file in which to save the key"); |