diff options
Diffstat (limited to 'kexecdh.c')
-rw-r--r-- | kexecdh.c | 85 |
1 files changed, 44 insertions, 41 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexecdh.c,v 1.5 2014/01/09 23:20:00 djm Exp $ */ | 1 | /* $OpenBSD: kexecdh.c,v 1.6 2015/01/19 20:16:15 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2010 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2010 Damien Miller. All rights reserved. |
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | 28 | ||
29 | #ifdef OPENSSL_HAS_ECC | 29 | #if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) |
30 | 30 | ||
31 | #include <sys/types.h> | 31 | #include <sys/types.h> |
32 | 32 | ||
@@ -38,60 +38,63 @@ | |||
38 | #include <openssl/ec.h> | 38 | #include <openssl/ec.h> |
39 | #include <openssl/ecdh.h> | 39 | #include <openssl/ecdh.h> |
40 | 40 | ||
41 | #include "buffer.h" | ||
42 | #include "ssh2.h" | 41 | #include "ssh2.h" |
43 | #include "key.h" | 42 | #include "sshkey.h" |
44 | #include "cipher.h" | 43 | #include "cipher.h" |
45 | #include "kex.h" | 44 | #include "kex.h" |
46 | #include "log.h" | 45 | #include "sshbuf.h" |
47 | #include "digest.h" | 46 | #include "digest.h" |
47 | #include "ssherr.h" | ||
48 | 48 | ||
49 | void | 49 | int |
50 | kex_ecdh_hash( | 50 | kex_ecdh_hash( |
51 | int hash_alg, | 51 | int hash_alg, |
52 | const EC_GROUP *ec_group, | 52 | const EC_GROUP *ec_group, |
53 | char *client_version_string, | 53 | const char *client_version_string, |
54 | char *server_version_string, | 54 | const char *server_version_string, |
55 | char *ckexinit, int ckexinitlen, | 55 | const u_char *ckexinit, size_t ckexinitlen, |
56 | char *skexinit, int skexinitlen, | 56 | const u_char *skexinit, size_t skexinitlen, |
57 | u_char *serverhostkeyblob, int sbloblen, | 57 | const u_char *serverhostkeyblob, size_t sbloblen, |
58 | const EC_POINT *client_dh_pub, | 58 | const EC_POINT *client_dh_pub, |
59 | const EC_POINT *server_dh_pub, | 59 | const EC_POINT *server_dh_pub, |
60 | const BIGNUM *shared_secret, | 60 | const BIGNUM *shared_secret, |
61 | u_char **hash, u_int *hashlen) | 61 | u_char *hash, size_t *hashlen) |
62 | { | 62 | { |
63 | Buffer b; | 63 | struct sshbuf *b; |
64 | static u_char digest[SSH_DIGEST_MAX_LENGTH]; | 64 | int r; |
65 | |||
66 | buffer_init(&b); | ||
67 | buffer_put_cstring(&b, client_version_string); | ||
68 | buffer_put_cstring(&b, server_version_string); | ||
69 | |||
70 | /* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */ | ||
71 | buffer_put_int(&b, ckexinitlen+1); | ||
72 | buffer_put_char(&b, SSH2_MSG_KEXINIT); | ||
73 | buffer_append(&b, ckexinit, ckexinitlen); | ||
74 | buffer_put_int(&b, skexinitlen+1); | ||
75 | buffer_put_char(&b, SSH2_MSG_KEXINIT); | ||
76 | buffer_append(&b, skexinit, skexinitlen); | ||
77 | |||
78 | buffer_put_string(&b, serverhostkeyblob, sbloblen); | ||
79 | buffer_put_ecpoint(&b, ec_group, client_dh_pub); | ||
80 | buffer_put_ecpoint(&b, ec_group, server_dh_pub); | ||
81 | buffer_put_bignum2(&b, shared_secret); | ||
82 | 65 | ||
66 | if (*hashlen < ssh_digest_bytes(hash_alg)) | ||
67 | return SSH_ERR_INVALID_ARGUMENT; | ||
68 | if ((b = sshbuf_new()) == NULL) | ||
69 | return SSH_ERR_ALLOC_FAIL; | ||
70 | if ((r = sshbuf_put_cstring(b, client_version_string)) != 0 || | ||
71 | (r = sshbuf_put_cstring(b, server_version_string)) != 0 || | ||
72 | /* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */ | ||
73 | (r = sshbuf_put_u32(b, ckexinitlen+1)) != 0 || | ||
74 | (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 || | ||
75 | (r = sshbuf_put(b, ckexinit, ckexinitlen)) != 0 || | ||
76 | (r = sshbuf_put_u32(b, skexinitlen+1)) != 0 || | ||
77 | (r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 || | ||
78 | (r = sshbuf_put(b, skexinit, skexinitlen)) != 0 || | ||
79 | (r = sshbuf_put_string(b, serverhostkeyblob, sbloblen)) != 0 || | ||
80 | (r = sshbuf_put_ec(b, client_dh_pub, ec_group)) != 0 || | ||
81 | (r = sshbuf_put_ec(b, server_dh_pub, ec_group)) != 0 || | ||
82 | (r = sshbuf_put_bignum2(b, shared_secret)) != 0) { | ||
83 | sshbuf_free(b); | ||
84 | return r; | ||
85 | } | ||
83 | #ifdef DEBUG_KEX | 86 | #ifdef DEBUG_KEX |
84 | buffer_dump(&b); | 87 | sshbuf_dump(b, stderr); |
85 | #endif | 88 | #endif |
86 | if (ssh_digest_buffer(hash_alg, &b, digest, sizeof(digest)) != 0) | 89 | if (ssh_digest_buffer(hash_alg, b, hash, *hashlen) != 0) { |
87 | fatal("%s: ssh_digest_buffer failed", __func__); | 90 | sshbuf_free(b); |
88 | 91 | return SSH_ERR_LIBCRYPTO_ERROR; | |
89 | buffer_free(&b); | 92 | } |
90 | 93 | sshbuf_free(b); | |
94 | *hashlen = ssh_digest_bytes(hash_alg); | ||
91 | #ifdef DEBUG_KEX | 95 | #ifdef DEBUG_KEX |
92 | dump_digest("hash", digest, ssh_digest_bytes(hash_alg)); | 96 | dump_digest("hash", hash, *hashlen); |
93 | #endif | 97 | #endif |
94 | *hash = digest; | 98 | return 0; |
95 | *hashlen = ssh_digest_bytes(hash_alg); | ||
96 | } | 99 | } |
97 | #endif /* OPENSSL_HAS_ECC */ | 100 | #endif /* defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) */ |