From 1342185e333cb8139b7a70b7fe43571bcc2716a7 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 11 Nov 2010 11:27:33 +1100
Subject: s4:heimdal: import lorikeet-heimdal-201011102149 (commit
 5734d03c20e104c8f45533d07f2a2cbbd3224f29)

---
 source4/heimdal/lib/hx509/collector.c | 1 +
 1 file changed, 1 insertion(+)

(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 ab36fe2dc8..1a44de00a3 100644
--- a/source4/heimdal/lib/hx509/collector.c
+++ b/source4/heimdal/lib/hx509/collector.c
@@ -145,6 +145,7 @@ _hx509_collector_private_key_add(hx509_context context,
     } else {
 	ret = _hx509_parse_private_key(context, alg,
 				       key_data->data, key_data->length,
+				       HX509_KEY_FORMAT_DER,
 				       &key->private_key);
 	if (ret)
 	    goto out;
-- 
cgit