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

better error handling

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25193 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-05-06 19:04:02 +00:00
parent f6800d16eb
commit a1b70e2edc
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/hx509/crypto.c
View File

@@ -416,7 +416,7 @@ ecdsa_create_signature(hx509_context context,
ret = set_digest_alg(signatureAlgorithm, sig_oid, "\x05\x00", 2); ret = set_digest_alg(signatureAlgorithm, sig_oid, "\x05\x00", 2);
if (ret) { if (ret) {
hx509_clear_error_string(context); hx509_clear_error_string(context);
return ret; goto error;
} }
} }
@@ -426,13 +426,19 @@ ecdsa_create_signature(hx509_context context,
data, data,
NULL, NULL,
&indata); &indata);
if (ret) {
if (signatureAlgorithm)
free_AlgorithmIdentifier(signatureAlgorithm);
goto error;
}
sig->length = ECDSA_size(signer->private_key.ecdsa); sig->length = ECDSA_size(signer->private_key.ecdsa);
sig->data = malloc(sig->length); sig->data = malloc(sig->length);
if (sig->data == NULL) { if (sig->data == NULL) {
der_free_octet_string(&indata); der_free_octet_string(&indata);
hx509_set_error_string(context, 0, ENOMEM, "out of memory"); ret = ENOMEM;
return ENOMEM; hx509_set_error_string(context, 0, ret, "out of memory");
goto error;
} }
siglen = sig->length; siglen = sig->length;
@@ -441,9 +447,10 @@ ecdsa_create_signature(hx509_context context,
sig->data, &siglen, signer->private_key.ecdsa); sig->data, &siglen, signer->private_key.ecdsa);
der_free_octet_string(&indata); der_free_octet_string(&indata);
if (ret != 1) { if (ret != 1) {
hx509_set_error_string(context, 0, HX509_CMS_FAILED_CREATE_SIGATURE, ret = HX509_CMS_FAILED_CREATE_SIGATURE;
hx509_set_error_string(context, 0, ret,
"ECDSA sign failed: %d", ret); "ECDSA sign failed: %d", ret);
return HX509_CMS_FAILED_CREATE_SIGATURE; goto error;
} }
if (siglen > sig->length) if (siglen > sig->length)
_hx509_abort("ECDSA signature prelen longer the output len"); _hx509_abort("ECDSA signature prelen longer the output len");
@@ -451,6 +458,10 @@ ecdsa_create_signature(hx509_context context,
sig->length = siglen; sig->length = siglen;
return 0; return 0;
error:
if (signatureAlgorithm)
free_AlgorithmIdentifier(signatureAlgorithm);
return ret;
} }
static int static int