diff options
| author | Damien Miller <djm@mindrot.org> | 2014-01-10 10:58:53 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-01-10 10:58:53 +1100 |
| commit | b3051d01e505c9c2dc00faab472a0d06fa6b0e65 (patch) | |
| tree | c0ca49b5fc4e5e1a066157b4dbd9c68cfcd41d63 /kexc25519s.c | |
| parent | e00e413dd16eb747fb2c15a099971d91c13cf70f (diff) | |
| download | openssh-git-b3051d01e505c9c2dc00faab472a0d06fa6b0e65.tar.gz | |
- djm@cvs.openbsd.org 2014/01/09 23:20:00
[digest.c digest.h hostfile.c kex.c kex.h kexc25519.c kexc25519c.c]
[kexc25519s.c kexdh.c kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c]
[kexgexs.c key.c key.h roaming_client.c roaming_common.c schnorr.c]
[schnorr.h ssh-dss.c ssh-ecdsa.c ssh-rsa.c sshconnect2.c]
Introduce digest API and use it to perform all hashing operations
rather than calling OpenSSL EVP_Digest* directly. Will make it easier
to build a reduced-feature OpenSSH without OpenSSL in future;
feedback, ok markus@
Diffstat (limited to 'kexc25519s.c')
| -rw-r--r-- | kexc25519s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kexc25519s.c b/kexc25519s.c index 784841b8..dc4f56c8 100644 --- a/kexc25519s.c +++ b/kexc25519s.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kexc25519s.c,v 1.2 2013/11/02 22:02:14 markus Exp $ */ +/* $OpenBSD: kexc25519s.c,v 1.3 2014/01/09 23:20:00 djm Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2010 Damien Miller. All rights reserved. @@ -81,7 +81,7 @@ kexc25519_server(Kex *kex) /* calc H */ key_to_blob(server_host_public, &server_host_key_blob, &sbloblen); kex_c25519_hash( - kex->evp_md, + kex->hash_alg, kex->client_version_string, kex->server_version_string, buffer_ptr(&kex->peer), buffer_len(&kex->peer), |