summaryrefslogtreecommitdiff
path: root/sshconnect.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-19 08:25:48 +1100
committerDamien Miller <djm@mindrot.org>1999-11-19 08:25:48 +1100
commit23b783952a3b9c3daadff0b97b9f8e312c3a72be (patch)
tree7614deec581608180862d447390fc933ec26fa42 /sshconnect.c
parent5bbbd364c993ef1d51ba77e40bb56fc017d8ea78 (diff)
- Merged OpenBSD CVS changes
- [auth-rhosts.c auth-rsa.c ssh-agent.c sshconnect.c sshd.c] more %d vs. %s in fmt-strings - [authfd.c] Integers should not be printed with %s
Diffstat (limited to 'sshconnect.c')
-rw-r--r--sshconnect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 74d41e62a..8b7737446 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -15,7 +15,7 @@ login (authentication) dialog.
15*/ 15*/
16 16
17#include "includes.h" 17#include "includes.h"
18RCSID("$Id: sshconnect.c,v 1.11 1999/11/17 22:28:11 damien Exp $"); 18RCSID("$Id: sshconnect.c,v 1.12 1999/11/18 21:25:48 damien Exp $");
19 19
20#ifdef HAVE_OPENSSL 20#ifdef HAVE_OPENSSL
21#include <openssl/bn.h> 21#include <openssl/bn.h>
@@ -1354,7 +1354,7 @@ void ssh_login(int host_key_valid,
1354 if (cipher_mask() & supported_ciphers & (1 << ssh_cipher_default)) 1354 if (cipher_mask() & supported_ciphers & (1 << ssh_cipher_default))
1355 options.cipher = ssh_cipher_default; 1355 options.cipher = ssh_cipher_default;
1356 else { 1356 else {
1357 debug("Cipher %d not supported, using %.100s instead.", 1357 debug("Cipher %s not supported, using %.100s instead.",
1358 cipher_name(ssh_cipher_default), 1358 cipher_name(ssh_cipher_default),
1359 cipher_name(SSH_FALLBACK_CIPHER)); 1359 cipher_name(SSH_FALLBACK_CIPHER));
1360 options.cipher = SSH_FALLBACK_CIPHER; 1360 options.cipher = SSH_FALLBACK_CIPHER;