diff options
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 5b7bc400a..4a3cf241a 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.109 2003/09/18 13:02:21 miod Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.110 2003/10/14 19:42:10 jakob Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -32,9 +32,7 @@ RCSID("$OpenBSD: ssh-keygen.c,v 1.109 2003/09/18 13:02:21 miod Exp $"); | |||
32 | #ifdef SMARTCARD | 32 | #ifdef SMARTCARD |
33 | #include "scard.h" | 33 | #include "scard.h" |
34 | #endif | 34 | #endif |
35 | #ifdef DNS | ||
36 | #include "dns.h" | 35 | #include "dns.h" |
37 | #endif | ||
38 | 36 | ||
39 | /* Number of bits in the RSA/DSA key. This value can be changed on the command line. */ | 37 | /* Number of bits in the RSA/DSA key. This value can be changed on the command line. */ |
40 | int bits = 1024; | 38 | int bits = 1024; |
@@ -625,7 +623,6 @@ do_change_passphrase(struct passwd *pw) | |||
625 | exit(0); | 623 | exit(0); |
626 | } | 624 | } |
627 | 625 | ||
628 | #ifdef DNS | ||
629 | /* | 626 | /* |
630 | * Print the SSHFP RR. | 627 | * Print the SSHFP RR. |
631 | */ | 628 | */ |
@@ -655,7 +652,6 @@ do_print_resource_record(struct passwd *pw, char *hostname) | |||
655 | printf("failed to read v2 public key from %s.\n", identity_file); | 652 | printf("failed to read v2 public key from %s.\n", identity_file); |
656 | exit(1); | 653 | exit(1); |
657 | } | 654 | } |
658 | #endif /* DNS */ | ||
659 | 655 | ||
660 | /* | 656 | /* |
661 | * Change the comment of a private key file. | 657 | * Change the comment of a private key file. |
@@ -774,9 +770,7 @@ usage(void) | |||
774 | fprintf(stderr, " -C comment Provide new comment.\n"); | 770 | fprintf(stderr, " -C comment Provide new comment.\n"); |
775 | fprintf(stderr, " -N phrase Provide new passphrase.\n"); | 771 | fprintf(stderr, " -N phrase Provide new passphrase.\n"); |
776 | fprintf(stderr, " -P phrase Provide old passphrase.\n"); | 772 | fprintf(stderr, " -P phrase Provide old passphrase.\n"); |
777 | #ifdef DNS | ||
778 | fprintf(stderr, " -r hostname Print DNS resource record.\n"); | 773 | fprintf(stderr, " -r hostname Print DNS resource record.\n"); |
779 | #endif /* DNS */ | ||
780 | #ifdef SMARTCARD | 774 | #ifdef SMARTCARD |
781 | fprintf(stderr, " -D reader Download public key from smartcard.\n"); | 775 | fprintf(stderr, " -D reader Download public key from smartcard.\n"); |
782 | fprintf(stderr, " -U reader Upload private key to smartcard.\n"); | 776 | fprintf(stderr, " -U reader Upload private key to smartcard.\n"); |
@@ -959,11 +953,7 @@ main(int ac, char **av) | |||
959 | if (print_public) | 953 | if (print_public) |
960 | do_print_public(pw); | 954 | do_print_public(pw); |
961 | if (resource_record_hostname != NULL) { | 955 | if (resource_record_hostname != NULL) { |
962 | #ifdef DNS | ||
963 | do_print_resource_record(pw, resource_record_hostname); | 956 | do_print_resource_record(pw, resource_record_hostname); |
964 | #else /* DNS */ | ||
965 | fatal("no DNS support."); | ||
966 | #endif /* DNS */ | ||
967 | } | 957 | } |
968 | if (reader_id != NULL) { | 958 | if (reader_id != NULL) { |
969 | #ifdef SMARTCARD | 959 | #ifdef SMARTCARD |