From 624dc60c1b4ed11d7b3f7ce36475b4d9e4ae86bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Tue, 5 Jun 2007 06:17:44 +0000
Subject: [PATCH] Limit the searches to the selected keychain.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20923 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/hx509/ks_keychain.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/hx509/ks_keychain.c b/lib/hx509/ks_keychain.c
index 78a5c31a1..33badab1d 100644
--- a/lib/hx509/ks_keychain.c
+++ b/lib/hx509/ks_keychain.c
@@ -96,6 +96,7 @@ kc_rsa_finish(RSA *rsa)
 {
     struct kc_rsa *kc_rsa = RSA_get_app_data(rsa);
     CFRelease(kc_rsa->item);
+    memset(kc_rsa, 0, sizeof(*kc_rsa));
     free(kc_rsa);
     return 1;
 }
@@ -215,8 +216,9 @@ static int
 keychain_iter_start(hx509_context context,
 		    hx509_certs certs, void *data, void **cursor)
 {
-    OSStatus ret;
+    struct ks_keychain *ctx = data;
     struct iter *iter;
+    OSStatus ret;
 
     iter = calloc(1, sizeof(*iter));
     if (iter == NULL) {
@@ -224,7 +226,7 @@ keychain_iter_start(hx509_context context,
 	return ENOMEM;
     }
 
-    ret = SecKeychainSearchCreateFromAttributes(NULL,
+    ret = SecKeychainSearchCreateFromAttributes(ctx->keychain,
 						kSecCertificateItemClass,
 						NULL,
 						&iter->searchRef);