diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-08-01 20:17:56 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-08-01 20:17:56 +0200 |
| commit | 2fbe25b39d096b55a5dbb80720cd01e08e42a2b0 (patch) | |
| tree | 64a0a19d5278bb341396189789fd41e530e31d0d /source4/heimdal/lib/hx509/ks_p12.c | |
| parent | 3573420d7d108d796e0b424c131061dc74c23033 (diff) | |
| parent | f2ac351d6ef8d240f9e45f4df58b022052457d76 (diff) | |
| download | samba-2fbe25b39d096b55a5dbb80720cd01e08e42a2b0.tar.gz samba-2fbe25b39d096b55a5dbb80720cd01e08e42a2b0.tar.bz2 samba-2fbe25b39d096b55a5dbb80720cd01e08e42a2b0.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
(This used to be commit c87a8ba1fef1ba508ad6527d0bae4bcdd5b3cb69)
Diffstat (limited to 'source4/heimdal/lib/hx509/ks_p12.c')
| -rw-r--r-- | source4/heimdal/lib/hx509/ks_p12.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/heimdal/lib/hx509/ks_p12.c b/source4/heimdal/lib/hx509/ks_p12.c index 12756e6c07..3ab824a330 100644 --- a/source4/heimdal/lib/hx509/ks_p12.c +++ b/source4/heimdal/lib/hx509/ks_p12.c @@ -32,7 +32,7 @@ */ #include "hx_locl.h" -RCSID("$Id: ks_p12.c 21146 2007-06-18 21:37:25Z lha $"); +RCSID("$Id: ks_p12.c 23413 2008-07-26 18:34:53Z lha $"); struct ks_pkcs12 { hx509_certs certs; @@ -276,6 +276,7 @@ envelopedData_parser(hx509_context context, 0, data, length, NULL, + 0, &contentType, &content); if (ret) { @@ -361,14 +362,14 @@ p12_init(hx509_context context, goto out; } - ret = _hx509_map_file(residue, &buf, &len, NULL); + ret = rk_undumpdata(residue, &buf, &len); if (ret) { hx509_clear_error_string(context); goto out; } ret = decode_PKCS12_PFX(buf, len, &pfx, NULL); - _hx509_unmap_file(buf, len); + rk_xfree(buf); if (ret) { hx509_set_error_string(context, 0, ret, "Failed to decode the PFX in %s", residue); |