diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2011-03-14 23:06:40 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2011-03-14 23:53:46 +0100 |
commit | 431853c84644c02e6bff1b325af5e94d3b1eacc6 (patch) | |
tree | 7206df22625034211ab120c590bb81792fac3d28 /source4/heimdal/lib/hx509/cms.c | |
parent | 8dfa224c1350a9cb3a2d35fae7721bebecfe7934 (diff) | |
download | samba-431853c84644c02e6bff1b325af5e94d3b1eacc6.tar.gz samba-431853c84644c02e6bff1b325af5e94d3b1eacc6.tar.bz2 samba-431853c84644c02e6bff1b325af5e94d3b1eacc6.zip |
Merge new lorikeet heimdal, revision 85ed7247f515770c73b1f1ced1739f6ce19d75d2
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Mon Mar 14 23:53:46 CET 2011 on sn-devel-104
Diffstat (limited to 'source4/heimdal/lib/hx509/cms.c')
-rw-r--r-- | source4/heimdal/lib/hx509/cms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/heimdal/lib/hx509/cms.c b/source4/heimdal/lib/hx509/cms.c index ef986fd4ed..6e4eefaa1c 100644 --- a/source4/heimdal/lib/hx509/cms.c +++ b/source4/heimdal/lib/hx509/cms.c @@ -656,7 +656,7 @@ hx509_cms_envelope_1(hx509_context context, ri->version = 2; cmsidflag = CMS_ID_SKI; } - + ret = fill_CMSIdentifier(cert, cmsidflag, &ri->rid); if (ret) { hx509_set_error_string(context, 0, ret, @@ -665,7 +665,7 @@ hx509_cms_envelope_1(hx509_context context, goto out; } - ret = _hx509_cert_public_encrypt(context, + ret = hx509_cert_public_encrypt(context, &key, cert, &ri->keyEncryptionAlgorithm.algorithm, &ri->encryptedKey); |