(_hx509_private_key_assign_ptr): new function, exposes EVP_PKEY
(_hx509_private_key_assign_key_file): remember to free private key if there is one. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16450 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -871,6 +871,11 @@ _hx509_private_key_assign_key_file(hx509_private_key key,
|
||||
OpenSSL_add_all_algorithms();
|
||||
ERR_load_crypto_strings();
|
||||
|
||||
if (key->private_key) {
|
||||
EVP_PKEY_free(key->private_key);
|
||||
key->private_key = NULL;
|
||||
}
|
||||
|
||||
pw = _hx509_lock_get_passwords(lock);
|
||||
|
||||
for (i = 0; i < pw->len; i++) {
|
||||
@@ -892,6 +897,15 @@ _hx509_private_key_assign_key_file(hx509_private_key key,
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
_hx509_private_key_assign_ptr(hx509_private_key key, void *ptr)
|
||||
{
|
||||
if (key->private_key)
|
||||
EVP_PKEY_free(key->private_key);
|
||||
key->private_key = ptr;
|
||||
}
|
||||
|
||||
|
||||
struct hx509_crypto_data {
|
||||
char *name;
|
||||
const EVP_CIPHER *c;
|
||||
|
Reference in New Issue
Block a user