diff options
author | Justus Winter <justus@g10code.com> | 2016-05-02 16:00:26 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2016-11-03 15:20:36 +0100 |
commit | e3a866b8c19601803d1f8aaea40573c738d4acfd (patch) | |
tree | d5c130d2830d24651505dc5be67efdc835b1afe3 /src/wrapper.c | |
parent | f62cded9f0bc2d08afe0ef2d79e247951f193559 (diff) | |
download | libssh-e3a866b8c19601803d1f8aaea40573c738d4acfd.tar.gz libssh-e3a866b8c19601803d1f8aaea40573c738d4acfd.tar.xz libssh-e3a866b8c19601803d1f8aaea40573c738d4acfd.zip |
ecdh: Implement ECDH using libgcrypt
* include/libssh/crypto.h (struct ssh_crypto_struct): Provide a
suitable 'ecdh_privkey'.
* include/libssh/ecdh.h: Also define 'HAVE_ECDH' if we do ECC using
libgcrypt.
(ecdh_build_k): New prototype.
* src/CMakeLists.txt (libssh_SRCS): Add backend-specific files.
* src/ecdh.c: Move backend-specific parts to...
* src/ecdh_crypto.c: ... this file.
* src/ecdh_gcrypt.c: New file.
* src/wrapper.c (crypto_free): Free 'ecdh_privkey'.
Signed-off-by: Justus Winter <justus@g10code.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src/wrapper.c')
-rw-r--r-- | src/wrapper.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wrapper.c b/src/wrapper.c index 705d6c80..a7511f0a 100644 --- a/src/wrapper.c +++ b/src/wrapper.c @@ -161,7 +161,11 @@ void crypto_free(struct ssh_crypto_struct *crypto){ SAFE_FREE(crypto->ecdh_client_pubkey); SAFE_FREE(crypto->ecdh_server_pubkey); if(crypto->ecdh_privkey != NULL){ +#ifdef HAVE_OPENSSL_ECC EC_KEY_free(crypto->ecdh_privkey); +#elif defined HAVE_GCRYPT_ECC + gcry_sexp_release(crypto->ecdh_privkey); +#endif crypto->ecdh_privkey = NULL; } #endif |