diff options
Diffstat (limited to 'kexdh.c')
-rw-r--r-- | kexdh.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexdh.c,v 1.26 2016/05/02 10:26:04 djm Exp $ */ | 1 | /* $OpenBSD: kexdh.c,v 1.27 2018/12/27 03:25:25 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -46,8 +46,8 @@ | |||
46 | int | 46 | int |
47 | kex_dh_hash( | 47 | kex_dh_hash( |
48 | int hash_alg, | 48 | int hash_alg, |
49 | const char *client_version_string, | 49 | const struct sshbuf *client_version, |
50 | const char *server_version_string, | 50 | const struct sshbuf *server_version, |
51 | const u_char *ckexinit, size_t ckexinitlen, | 51 | const u_char *ckexinit, size_t ckexinitlen, |
52 | const u_char *skexinit, size_t skexinitlen, | 52 | const u_char *skexinit, size_t skexinitlen, |
53 | const u_char *serverhostkeyblob, size_t sbloblen, | 53 | const u_char *serverhostkeyblob, size_t sbloblen, |
@@ -63,8 +63,8 @@ kex_dh_hash( | |||
63 | return SSH_ERR_INVALID_ARGUMENT; | 63 | return SSH_ERR_INVALID_ARGUMENT; |
64 | if ((b = sshbuf_new()) == NULL) | 64 | if ((b = sshbuf_new()) == NULL) |
65 | return SSH_ERR_ALLOC_FAIL; | 65 | return SSH_ERR_ALLOC_FAIL; |
66 | if ((r = sshbuf_put_cstring(b, client_version_string)) != 0 || | 66 | if ((r = sshbuf_put_stringb(b, client_version)) < 0 || |
67 | (r = sshbuf_put_cstring(b, server_version_string)) != 0 || | 67 | (r = sshbuf_put_stringb(b, server_version)) < 0 || |
68 | /* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */ | 68 | /* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */ |
69 | (r = sshbuf_put_u32(b, ckexinitlen+1)) != 0 || | 69 | (r = sshbuf_put_u32(b, ckexinitlen+1)) != 0 || |
70 | (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 || | 70 | (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 || |