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

Sprinkle some more error strings.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18049 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-09-07 09:22:07 +00:00
parent 6e2407cfb9
commit bb0a57b254
1 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/hx509/cms.c
View File

@@ -267,7 +267,8 @@ hx509_cms_unenvelope(hx509_context context,
if (ed.encryptedContentInfo.encryptedContent == NULL) { if (ed.encryptedContentInfo.encryptedContent == NULL) {
ret = HX509_CMS_NO_DATA_AVAILABLE; ret = HX509_CMS_NO_DATA_AVAILABLE;
hx509_clear_error_string(context); hx509_set_error_string(context, 0, ret,
"Content missing from encrypted data");
goto out; goto out;
} }
@@ -313,7 +314,8 @@ hx509_cms_unenvelope(hx509_context context,
ret = copy_oid(&ed.encryptedContentInfo.contentType, contentType); ret = copy_oid(&ed.encryptedContentInfo.contentType, contentType);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_set_error_string(context, 0, ret,
"Failed to copy EnvelopedData content oid");
goto out; goto out;
} }
@@ -342,7 +344,9 @@ hx509_cms_unenvelope(hx509_context context,
ret = hx509_crypto_set_key_data(crypto, key.data, key.length); ret = hx509_crypto_set_key_data(crypto, key.data, key.length);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_set_error_string(context, 0, ret,
"Failed to set key for decryption "
"of EnvelopedData");
goto out; goto out;
} }
@@ -352,7 +356,8 @@ hx509_cms_unenvelope(hx509_context context,
ivec.length ? &ivec : NULL, ivec.length ? &ivec : NULL,
content); content);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_set_error_string(context, 0, ret,
"Failed to decrypt EnvelopedData");
goto out; goto out;
} }
} }
@@ -405,7 +410,8 @@ hx509_cms_envelope_1(hx509_context context,
ret = hx509_crypto_set_random_key(crypto, &key); ret = hx509_crypto_set_random_key(crypto, &key);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_set_error_string(context, 0, ret,
"Create random key for EnvelopedData content");
hx509_crypto_destroy(crypto); hx509_crypto_destroy(crypto);
goto out; goto out;
} }
@@ -416,7 +422,8 @@ hx509_cms_envelope_1(hx509_context context,
&ivec, &ivec,
&ed.encryptedContentInfo.encryptedContent); &ed.encryptedContentInfo.encryptedContent);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_set_error_string(context, 0, ret,
"Failed to encrypt EnvelopedData content");
hx509_crypto_destroy(crypto); hx509_crypto_destroy(crypto);
goto out; goto out;
} }
@@ -426,15 +433,19 @@ hx509_cms_envelope_1(hx509_context context,
enc_alg = &ed.encryptedContentInfo.contentEncryptionAlgorithm; enc_alg = &ed.encryptedContentInfo.contentEncryptionAlgorithm;
ret = copy_oid(encryption_type, &enc_alg->algorithm); ret = copy_oid(encryption_type, &enc_alg->algorithm);
if (ret) { if (ret) {
hx509_set_error_string(context, 0, ret,
"Failed to set crypto oid "
"for EnvelopedData");
hx509_crypto_destroy(crypto); hx509_crypto_destroy(crypto);
hx509_clear_error_string(context);
goto out; goto out;
} }
ALLOC(enc_alg->parameters, 1); ALLOC(enc_alg->parameters, 1);
if (enc_alg->parameters == NULL) { if (enc_alg->parameters == NULL) {
hx509_clear_error_string(context);
hx509_crypto_destroy(crypto);
ret = ENOMEM; ret = ENOMEM;
hx509_set_error_string(context, 0, ret,
"Failed to allocate crypto paramaters "
"for EnvelopedData");
hx509_crypto_destroy(crypto);
goto out; goto out;
} }
@@ -444,15 +455,16 @@ hx509_cms_envelope_1(hx509_context context,
enc_alg->parameters); enc_alg->parameters);
hx509_crypto_destroy(crypto); hx509_crypto_destroy(crypto);
if (ret) { if (ret) {
hx509_clear_error_string(context);
goto out; goto out;
} }
} }
ALLOC_SEQ(&ed.recipientInfos, 1); ALLOC_SEQ(&ed.recipientInfos, 1);
if (ed.recipientInfos.val == NULL) { if (ed.recipientInfos.val == NULL) {
hx509_clear_error_string(context);
ret = ENOMEM; ret = ENOMEM;
hx509_set_error_string(context, 0, ret,
"Failed to allocate recipients info "
"for EnvelopedData");
goto out; goto out;
} }
@@ -461,7 +473,9 @@ hx509_cms_envelope_1(hx509_context context,
ri->version = 0; ri->version = 0;
ret = fill_CMSIdentifier(cert, &ri->rid); ret = fill_CMSIdentifier(cert, &ri->rid);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_set_error_string(context, 0, ret,
"Failed to set CMS identifier info "
"for EnvelopedData");
goto out; goto out;
} }
@@ -469,7 +483,9 @@ hx509_cms_envelope_1(hx509_context context,
&ri->keyEncryptionAlgorithm.algorithm, &ri->keyEncryptionAlgorithm.algorithm,
&ri->encryptedKey); &ri->encryptedKey);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_set_error_string(context, 0, ret,
"Failed to encrypt transport key for "
"EnvelopedData");
goto out; goto out;
} }
@@ -482,7 +498,9 @@ hx509_cms_envelope_1(hx509_context context,
ret = copy_oid(contentType, &ed.encryptedContentInfo.contentType); ret = copy_oid(contentType, &ed.encryptedContentInfo.contentType);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_set_error_string(context, 0, ret,
"Failed to copy content oid for "
"EnvelopedData");
goto out; goto out;
} }
@@ -491,7 +509,8 @@ hx509_cms_envelope_1(hx509_context context,
ASN1_MALLOC_ENCODE(EnvelopedData, content->data, content->length, ASN1_MALLOC_ENCODE(EnvelopedData, content->data, content->length,
&ed, &size, ret); &ed, &size, ret);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_set_error_string(context, 0, ret,
"Failed to encode EnvelopedData");
goto out; goto out;
} }
if (size != content->length) if (size != content->length)