diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
commit | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (patch) | |
tree | 28fc9a13eaab935e4de055b561b333d67387a934 /kexdh.c | |
parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'kexdh.c')
-rw-r--r-- | kexdh.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kexdh.c,v 1.19 2003/02/16 17:09:57 markus Exp $"); | 26 | RCSID("$OpenBSD: kexdh.c,v 1.20 2005/11/04 05:15:59 djm Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | 29 | ||
@@ -32,7 +32,7 @@ RCSID("$OpenBSD: kexdh.c,v 1.19 2003/02/16 17:09:57 markus Exp $"); | |||
32 | #include "ssh2.h" | 32 | #include "ssh2.h" |
33 | #include "kex.h" | 33 | #include "kex.h" |
34 | 34 | ||
35 | u_char * | 35 | void |
36 | kex_dh_hash( | 36 | kex_dh_hash( |
37 | char *client_version_string, | 37 | char *client_version_string, |
38 | char *server_version_string, | 38 | char *server_version_string, |
@@ -41,7 +41,8 @@ kex_dh_hash( | |||
41 | u_char *serverhostkeyblob, int sbloblen, | 41 | u_char *serverhostkeyblob, int sbloblen, |
42 | BIGNUM *client_dh_pub, | 42 | BIGNUM *client_dh_pub, |
43 | BIGNUM *server_dh_pub, | 43 | BIGNUM *server_dh_pub, |
44 | BIGNUM *shared_secret) | 44 | BIGNUM *shared_secret, |
45 | u_char **hash, u_int *hashlen) | ||
45 | { | 46 | { |
46 | Buffer b; | 47 | Buffer b; |
47 | static u_char digest[EVP_MAX_MD_SIZE]; | 48 | static u_char digest[EVP_MAX_MD_SIZE]; |
@@ -77,5 +78,6 @@ kex_dh_hash( | |||
77 | #ifdef DEBUG_KEX | 78 | #ifdef DEBUG_KEX |
78 | dump_digest("hash", digest, EVP_MD_size(evp_md)); | 79 | dump_digest("hash", digest, EVP_MD_size(evp_md)); |
79 | #endif | 80 | #endif |
80 | return digest; | 81 | *hash = digest; |
82 | *hashlen = EVP_MD_size(evp_md); | ||
81 | } | 83 | } |