summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-12-21 14:45:46 +1100
committerDamien Miller <djm@mindrot.org>2001-12-21 14:45:46 +1100
commit9f0f5c64bc4b6144e3fed6a7f538f7c21819a492 (patch)
treef79317ab211f59181a61b526f566e9c8cfe70c73 /sshconnect2.c
parent89681214ca2f50a1b1ed6164c3afe1ce14995ffc (diff)
- deraadt@cvs.openbsd.org 2001/12/19 07:18:56
[auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h] [auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c] [cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c] [match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c] [servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c] [sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c] [sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config] [ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c] basic KNF done while i was looking for something else
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c8
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"
26RCSID("$OpenBSD: sshconnect2.c,v 1.87 2001/12/05 10:06:13 deraadt Exp $"); 26RCSID("$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]);