From 431853c84644c02e6bff1b325af5e94d3b1eacc6 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Mar 2011 23:06:40 +0100 Subject: Merge new lorikeet heimdal, revision 85ed7247f515770c73b1f1ced1739f6ce19d75d2 Autobuild-User: Jelmer Vernooij Autobuild-Date: Mon Mar 14 23:53:46 CET 2011 on sn-devel-104 --- source4/heimdal/lib/hx509/collector.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/heimdal/lib/hx509/collector.c') diff --git a/source4/heimdal/lib/hx509/collector.c b/source4/heimdal/lib/hx509/collector.c index 1a44de00a3..0cb186399f 100644 --- a/source4/heimdal/lib/hx509/collector.c +++ b/source4/heimdal/lib/hx509/collector.c @@ -105,7 +105,7 @@ free_private_key(struct private_key *key) { free_AlgorithmIdentifier(&key->alg); if (key->private_key) - _hx509_private_key_free(&key->private_key); + hx509_private_key_free(&key->private_key); der_free_octet_string(&key->localKeyId); free(key); } @@ -143,7 +143,7 @@ _hx509_collector_private_key_add(hx509_context context, if (private_key) { key->private_key = private_key; } else { - ret = _hx509_parse_private_key(context, alg, + ret = hx509_parse_private_key(context, alg, key_data->data, key_data->length, HX509_KEY_FORMAT_DER, &key->private_key); -- cgit