Security-59306.61.1.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / TrustItem.cpp

diff --git a/OSX/libsecurity_keychain/lib/TrustItem.cpp b/OSX/libsecurity_keychain/lib/TrustItem.cpp
index 4c2e363265561591e340586a21560c8e9d7c9f0e..ba59b5ebc5496311ae638b3f9055fe693bd15791 100644 (file)
--- a/OSX/libsecurity_keychain/lib/TrustItem.cpp
+++ b/OSX/libsecurity_keychain/lib/TrustItem.cpp
@@ -41,13 +41,13 @@ namespace KeychainCore {
 // Construct a UserTrustItem from attributes and initial content
 //
 UserTrustItem::UserTrustItem(Certificate *cert, Policy *policy, const TrustData &trustData) :
 // Construct a UserTrustItem from attributes and initial content
 //
 UserTrustItem::UserTrustItem(Certificate *cert, Policy *policy, const TrustData &trustData) :

-       ItemImpl(CSSM_DL_DB_RECORD_USER_TRUST,
+       ItemImpl((SecItemClass)CSSM_DL_DB_RECORD_USER_TRUST,

                reinterpret_cast<SecKeychainAttributeList *>(NULL),
                UInt32(sizeof(trustData)),
                reinterpret_cast<const void *>(&trustData)),
        mCertificate(cert), mPolicy(policy)
 {
                reinterpret_cast<SecKeychainAttributeList *>(NULL),
                UInt32(sizeof(trustData)),
                reinterpret_cast<const void *>(&trustData)),
        mCertificate(cert), mPolicy(policy)
 {

-       secdebug("usertrust", "%p create(%p,%p) = %d",
+       secinfo("usertrust", "%p create(%p,%p) = %d",

                this, cert, policy, SecTrustUserSetting(trustData.trust));
 }
 
                this, cert, policy, SecTrustUserSetting(trustData.trust));
 }
 


@@ -57,7 +57,7 @@ UserTrustItem::UserTrustItem(Certificate *cert, Policy *policy, const TrustData
 //
 UserTrustItem::~UserTrustItem() 
 {
 //
 UserTrustItem::~UserTrustItem() 
 {

-       secdebug("usertrust", "%p destroyed", this);
+       secinfo("usertrust", "%p destroyed", this);

 }
 
 
 }
 
 


@@ -94,7 +94,7 @@ PrimaryKey UserTrustItem::add(Keychain &keychain)
        try
        {
                mUniqueId = db->insert(recordType, mDbAttributes.get(), mData.get());
        try
        {
                mUniqueId = db->insert(recordType, mDbAttributes.get(), mData.get());

-               secdebug("usertrust", "%p inserted", this);
+               secinfo("usertrust", "%p inserted", this);

        }
        catch (const CssmError &e)
        {
        }
        catch (const CssmError &e)
        {


@@ -102,7 +102,7 @@ PrimaryKey UserTrustItem::add(Keychain &keychain)
                        throw;
 
                // Create the trust relation and try again.
                        throw;
 
                // Create the trust relation and try again.

-               secdebug("usertrust", "adding schema relation for user trusts");
+               secinfo("usertrust", "adding schema relation for user trusts");

                db->createRelation(CSSM_DL_DB_RECORD_USER_TRUST, "CSSM_DL_DB_RECORD_USER_TRUST",
                        Schema::UserTrustSchemaAttributeCount,
                        Schema::UserTrustSchemaAttributeList,
                db->createRelation(CSSM_DL_DB_RECORD_USER_TRUST, "CSSM_DL_DB_RECORD_USER_TRUST",
                        Schema::UserTrustSchemaAttributeCount,
                        Schema::UserTrustSchemaAttributeList,


@@ -117,7 +117,7 @@ PrimaryKey UserTrustItem::add(Keychain &keychain)
                        Schema::UserTrustSchemaIndexList);
 
                mUniqueId = db->insert(recordType, mDbAttributes.get(), mData.get());
                        Schema::UserTrustSchemaIndexList);
 
                mUniqueId = db->insert(recordType, mDbAttributes.get(), mData.get());

-               secdebug("usertrust", "%p inserted now", this);
+               secinfo("usertrust", "%p inserted now", this);

        }
 
        mPrimaryKey = keychain->makePrimaryKey(recordType, mUniqueId);
        }
 
        mPrimaryKey = keychain->makePrimaryKey(recordType, mUniqueId);