oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Sprinkle more error strings.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19129 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-11-26 17:53:57 +00:00
parent e37704f850
commit cfb2185a48
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/hx509/cms.c
View File

@@ -264,7 +264,7 @@ hx509_cms_unenvelope(hx509_context context,
heim_octet_string *params, params_data; heim_octet_string *params, params_data;
heim_octet_string ivec; heim_octet_string ivec;
size_t size; size_t size;
int ret, i, findflags = 0; int ret, i, matched = 0, findflags = 0;
memset(&key, 0, sizeof(key)); memset(&key, 0, sizeof(key));
@@ -319,7 +319,10 @@ hx509_cms_unenvelope(hx509_context context,
if (ret) if (ret)
continue; continue;
ret = _hx509_cert_private_decrypt(&ri->encryptedKey, matched = 1; /* found a matching certificate, let decrypt */
ret = _hx509_cert_private_decrypt(context,
&ri->encryptedKey,
&ri->keyEncryptionAlgorithm.algorithm, &ri->keyEncryptionAlgorithm.algorithm,
cert, &key); cert, &key);
@@ -329,11 +332,17 @@ hx509_cms_unenvelope(hx509_context context,
cert = NULL; cert = NULL;
ret2 = unparse_CMSIdentifier(context, &ri->rid, &str); ret2 = unparse_CMSIdentifier(context, &ri->rid, &str);
if (ret2 == 0) { if (ret2 == 0) {
hx509_set_error_string(context, 0, ret, hx509_set_error_string(context, HX509_ERROR_APPEND, ret,
"Failed to decrypt with %s", str); "Failed to decrypt with %s", str);
free(str); free(str);
} else }
hx509_clear_error_string(context); }
if (!matched) {
ret = HX509_CMS_NO_RECIPIENT_CERTIFICATE;
hx509_set_error_string(context, 0, ret,
"No private key matched any certificate");
goto out;
} }
if (cert == NULL) { if (cert == NULL) {