diff options
| author | Damien Miller <djm@mindrot.org> | 2014-01-10 00:58:53 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-01-10 00:58:53 +0100 |
| commit | b3051d01e505c9c2dc00faab472a0d06fa6b0e65 (patch) | |
| tree | c0ca49b5fc4e5e1a066157b4dbd9c68cfcd41d63 /key.h | |
| parent | - guenther@cvs.openbsd.org 2014/01/09 03:26:00 (diff) | |
| download | openssh-b3051d01e505c9c2dc00faab472a0d06fa6b0e65.tar.xz openssh-b3051d01e505c9c2dc00faab472a0d06fa6b0e65.zip | |
- 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 'key.h')
| -rw-r--r-- | key.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: key.h,v 1.40 2013/12/06 13:39:49 markus Exp $ */ +/* $OpenBSD: key.h,v 1.41 2014/01/09 23:20:00 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -131,7 +131,7 @@ u_int key_curve_nid_to_bits(int); int key_ecdsa_bits_to_nid(int); #ifdef OPENSSL_HAS_ECC int key_ecdsa_key_to_nid(EC_KEY *); -const EVP_MD *key_ec_nid_to_evpmd(int nid); +int key_ec_nid_to_hash_alg(int nid); int key_ec_validate_public(const EC_GROUP *, const EC_POINT *); int key_ec_validate_private(const EC_KEY *); #endif |