summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshconnect2.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2000-10-14 12:16:56 +0000
committermarkus <markus@openbsd.org>2000-10-14 12:16:56 +0000
commitffb71131689fe37dfdaa2ab205209a1e8f1a27cf (patch)
tree48ca7258047bdd2d2c0c994360dc1a26893062ee /usr.bin/ssh/sshconnect2.c
parentAllowTcpForwarding; from naddy@ (diff)
downloadwireguard-openbsd-ffb71131689fe37dfdaa2ab205209a1e8f1a27cf.tar.xz
wireguard-openbsd-ffb71131689fe37dfdaa2ab205209a1e8f1a27cf.zip
OpenSSH_2.3; note that is is not complete, but the version number needs to be changed for interoperability reasons
Diffstat (limited to 'usr.bin/ssh/sshconnect2.c')
-rw-r--r--usr.bin/ssh/sshconnect2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c
index ca459f62c35..1f3b5a261d4 100644
--- a/usr.bin/ssh/sshconnect2.c
+++ b/usr.bin/ssh/sshconnect2.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.25 2000/10/12 09:59:19 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.26 2000/10/14 12:16:56 markus Exp $");
#include <openssl/bn.h>
#include <openssl/rsa.h>
@@ -657,12 +657,12 @@ sign_and_send_pubkey(Authctxt *authctxt, Key *k, sign_cb_fn *sign_callback)
/* data to be signed */
buffer_init(&b);
- if (datafellows & SSH_COMPAT_SESSIONID_ENCODING) {
- buffer_put_string(&b, session_id2, session_id2_len);
- skip = buffer_len(&b);
- } else {
+ if (datafellows & SSH_OLD_SESSIONID) {
buffer_append(&b, session_id2, session_id2_len);
skip = session_id2_len;
+ } else {
+ buffer_put_string(&b, session_id2, session_id2_len);
+ skip = buffer_len(&b);
}
buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST);
buffer_put_cstring(&b, authctxt->server_user);