diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-11-11 11:27:33 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-11-15 01:25:06 +0000 |
| commit | 1342185e333cb8139b7a70b7fe43571bcc2716a7 (patch) | |
| tree | 0e1cb8d3cfc437bd7cc3a97f2bdc472f54d95dbd /source4/heimdal/lib/hx509/collector.c | |
| parent | 13fd22f61017124d2d4964db3e32c667d119b56c (diff) | |
| download | samba-1342185e333cb8139b7a70b7fe43571bcc2716a7.tar.gz samba-1342185e333cb8139b7a70b7fe43571bcc2716a7.tar.bz2 samba-1342185e333cb8139b7a70b7fe43571bcc2716a7.zip | |
s4:heimdal: import lorikeet-heimdal-201011102149 (commit 5734d03c20e104c8f45533d07f2a2cbbd3224f29)
Diffstat (limited to 'source4/heimdal/lib/hx509/collector.c')
| -rw-r--r-- | source4/heimdal/lib/hx509/collector.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |