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

Add hx509_cert_init_data and use everywhere

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21085 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-06-13 06:39:53 +00:00
parent 8554301502
commit f622a16e97
6 changed files with 39 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/hx509/ks_keychain.c
View File

@@ -347,25 +347,19 @@ keychain_iter_start(hx509_context context,
return ENOMEM;
}
for (i = 0; i < CFArrayGetCount(anchors); i++) {
Certificate t;
SecCertificateRef cr;
hx509_cert cert;
SecCertificateRef cr =
(SecCertificateRef)CFArrayGetValueAtIndex(anchors, i);
CSSM_DATA cssm;
cr = (SecCertificateRef)CFArrayGetValueAtIndex(anchors, i);
SecCertificateGetData(cr, &cssm);
ret = decode_Certificate(cssm.Data, cssm.Length, &t, NULL);
if (ret)
continue;
ret = hx509_cert_init(context, &t, &cert);
ret = hx509_cert_init_data(context, cssm.Data, cssm.Length, &cert);
if (ret)
continue;
ret = hx509_certs_add(context, iter->certs, cert);
free_Certificate(&t);
hx509_cert_free(cert);
}
CFRelease(anchors);
@@ -412,11 +406,9 @@ keychain_iter(hx509_context context,
SecKeychainItemRef itemRef;
SecItemAttr item;
struct iter *iter = cursor;
Certificate t;
OSStatus ret;
UInt32 len;
void *ptr = NULL;
size_t size;
if (iter->certs)
return hx509_certs_next_cert(context, iter->certs, iter->cursor, cert);
@@ -444,15 +436,7 @@ keychain_iter(hx509_context context,
if (ret)
return EINVAL;
ret = decode_Certificate(ptr, len, &t, &size);
CFRelease(itemRef);
if (ret) {
hx509_set_error_string(context, 0, ret, "Failed to parse certificate");
goto out;
}
ret = hx509_cert_init(context, &t, cert);
free_Certificate(&t);
ret = hx509_cert_init_data(context, ptr, len, cert);
if (ret)
goto out;