diff options
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 514637f2d..8689da087 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.87 2001/12/05 10:06:13 deraadt Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.88 2001/12/19 07:18:56 deraadt Exp $"); |
27 | 27 | ||
28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
29 | #include <openssl/md5.h> | 29 | #include <openssl/md5.h> |
@@ -111,7 +111,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) | |||
111 | myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; | 111 | myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; |
112 | } | 112 | } |
113 | if (options.hostkeyalgorithms != NULL) | 113 | if (options.hostkeyalgorithms != NULL) |
114 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = | 114 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = |
115 | options.hostkeyalgorithms; | 115 | options.hostkeyalgorithms; |
116 | 116 | ||
117 | /* start key exchange */ | 117 | /* start key exchange */ |
@@ -613,7 +613,7 @@ load_identity_file(char *filename) | |||
613 | if (options.batch_mode) | 613 | if (options.batch_mode) |
614 | return NULL; | 614 | return NULL; |
615 | snprintf(prompt, sizeof prompt, | 615 | snprintf(prompt, sizeof prompt, |
616 | "Enter passphrase for key '%.100s': ", filename); | 616 | "Enter passphrase for key '%.100s': ", filename); |
617 | for (i = 0; i < options.number_of_password_prompts; i++) { | 617 | for (i = 0; i < options.number_of_password_prompts; i++) { |
618 | passphrase = read_passphrase(prompt, 0); | 618 | passphrase = read_passphrase(prompt, 0); |
619 | if (strcmp(passphrase, "") != 0) { | 619 | if (strcmp(passphrase, "") != 0) { |
@@ -646,7 +646,7 @@ identity_sign_cb(Authctxt *authctxt, Key *key, u_char **sigp, int *lenp, | |||
646 | return -1; | 646 | return -1; |
647 | 647 | ||
648 | /* private key is stored in external hardware */ | 648 | /* private key is stored in external hardware */ |
649 | if (options.identity_keys[idx]->flags & KEY_FLAG_EXT) | 649 | if (options.identity_keys[idx]->flags & KEY_FLAG_EXT) |
650 | return key_sign(options.identity_keys[idx], sigp, lenp, data, datalen); | 650 | return key_sign(options.identity_keys[idx], sigp, lenp, data, datalen); |
651 | 651 | ||
652 | private = load_identity_file(options.identity_files[idx]); | 652 | private = load_identity_file(options.identity_files[idx]); |