From 954da14c150771857b095f108995d41f843f950d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sun, 29 Oct 2017 16:06:14 +0100 Subject: pki_crypto: Don't use deprecated function with newer OpenSSL Signed-off-by: Andreas Schneider --- src/pki_crypto.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/pki_crypto.c b/src/pki_crypto.c index 53287f30..19821725 100644 --- a/src/pki_crypto.c +++ b/src/pki_crypto.c @@ -453,11 +453,24 @@ int pki_key_generate_rsa(ssh_key key, int parameter){ int pki_key_generate_dss(ssh_key key, int parameter){ int rc; +#if OPENSSL_VERSION_NUMBER > 0x10100000L + rc = DSA_generate_parameters_ex(key->dsa, + parameter, + NULL, /* seed */ + 0, /* seed_len */ + NULL, /* counter_ret */ + NULL, /* h_ret */ + NULL); /* cb */ + if (rc != 1) { + return SSH_ERROR; + } +#else key->dsa = DSA_generate_parameters(parameter, NULL, 0, NULL, NULL, NULL, NULL); if(key->dsa == NULL){ return SSH_ERROR; } +#endif rc = DSA_generate_key(key->dsa); if (rc != 1){ DSA_free(key->dsa); -- cgit v1.2.3