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 /sshconnect2.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 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 0d339b9c..8acffc5c 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.200 2013/12/30 23:52:28 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.201 2014/01/09 23:20:00 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1006,7 +1006,7 @@ jpake_password_to_secret(Authctxt *authctxt, const char *crypt_scheme, debug3("%s: crypted = %s", __func__, crypted); #endif - if (hash_buffer(crypted, strlen(crypted), EVP_sha256(), + if (hash_buffer(crypted, strlen(crypted), SSH_DIGEST_SHA1, &secret, &secret_len) != 0) fatal("%s: hash_buffer", __func__); |