From cda5bbd725f8345ce10699dfa32734af2f761de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Wed, 4 Jan 2006 06:34:46 +0000 Subject: [PATCH] (_hx509_private_key_assign_key_file): use function to extra rsa key git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16464 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/hx509/crypto.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/hx509/crypto.c b/lib/hx509/crypto.c index 4345fd105..81cf7d1e1 100644 --- a/lib/hx509/crypto.c +++ b/lib/hx509/crypto.c @@ -970,14 +970,11 @@ _hx509_private_key_assign_key_file(hx509_private_key key, fclose(f); if (private_key == NULL) continue; - if (private_key->type != EVP_PKEY_RSA) { - EVP_PKEY_free(private_key); - return EINVAL; - } - key->private_key2.rsa = private_key->pkey.rsa; - RSA_up_ref(key->private_key2.rsa); + key->private_key2.rsa = EVP_PKEY_get1_RSA(private_key); EVP_PKEY_free(private_key); + if (key->private_key2.rsa == NULL) + return EINVAL; return 0; }