diff options
Diffstat (limited to 'auth2.c')
-rw-r--r-- | auth2.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -27,7 +27,7 @@ | |||
27 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
28 | */ | 28 | */ |
29 | #include "includes.h" | 29 | #include "includes.h" |
30 | RCSID("$OpenBSD: auth2.c,v 1.10 2000/06/18 04:05:02 markus Exp $"); | 30 | RCSID("$OpenBSD: auth2.c,v 1.11 2000/06/19 00:50:11 markus Exp $"); |
31 | 31 | ||
32 | #include <openssl/dsa.h> | 32 | #include <openssl/dsa.h> |
33 | #include <openssl/rsa.h> | 33 | #include <openssl/rsa.h> |
@@ -302,8 +302,11 @@ ssh2_auth_pubkey(struct passwd *pw, char *service) | |||
302 | sig = packet_get_string(&slen); | 302 | sig = packet_get_string(&slen); |
303 | packet_done(); | 303 | packet_done(); |
304 | buffer_init(&b); | 304 | buffer_init(&b); |
305 | buffer_append(&b, session_id2, session_id2_len); | 305 | if (datafellows & SSH_COMPAT_SESSIONID_ENCODING) { |
306 | 306 | buffer_put_string(&b, session_id2, session_id2_len); | |
307 | } else { | ||
308 | buffer_append(&b, session_id2, session_id2_len); | ||
309 | } | ||
307 | /* reconstruct packet */ | 310 | /* reconstruct packet */ |
308 | buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); | 311 | buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); |
309 | buffer_put_cstring(&b, pw->pw_name); | 312 | buffer_put_cstring(&b, pw->pw_name); |