Improve support for loading encrypted private keys

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@40139 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Niels Grewe 2016-10-11 11:59:04 +00:00
parent 28de617ef6
commit f9540e172e
8 changed files with 646 additions and 598 deletions

View file

@ -941,8 +941,14 @@ static NSMutableDictionary *privateKeyCache1 = nil;
}
else
{
# ifdef HAVE_GNUTLS_X509_PRIVKEY_IMPORT2
ret = gnutls_x509_privkey_import2(k->key, &datum,
GNUTLS_X509_FMT_PEM,
[k->password UTF8String], 0);
# else
ret = gnutls_x509_privkey_import_pkcs8(k->key, &datum,
GNUTLS_X509_FMT_PEM, [k->password UTF8String], 0);
# endif
}
if (ret < 0)
{