Security-163.tar.gz

[apple/security.git] / cdsa / cdsa_utilities / cssmcred.h

diff --git a/cdsa/cdsa_utilities/cssmcred.h b/cdsa/cdsa_utilities/cssmcred.h
index 7c8e53fd424b667d95b735d28317a07f9686a485..ecd41a01868c05defb214edf54a4b28f999b13b7 100644 (file)
--- a/cdsa/cdsa_utilities/cssmcred.h
+++ b/cdsa/cdsa_utilities/cssmcred.h
@@ -25,13 +25,10 @@
 #include <Security/utilities.h>
 #include <Security/cssmlist.h>
 #include <Security/cssmalloc.h>
+#include <list>
 
-#ifdef _CPP_CSSMCRED
-#pragma export on
-#endif
+namespace Security {
 
-namespace Security
-{
 
 //
 // PodWrappers for samples and sample groups
@@ -40,7 +37,7 @@ class CssmSample : public PodWrapper<CssmSample, CSSM_SAMPLE> {
 public:
        CssmSample(const TypedList &list)
        { TypedSample = list; Verifier = NULL; }
-       CssmSample(TypedList &list, const CssmSubserviceUid &ver)
+       CssmSample(const TypedList &list, const CssmSubserviceUid &ver)
        { TypedSample = list; Verifier = &ver; }
 
        TypedList &value() { return TypedList::overlay(TypedSample); }
@@ -58,6 +55,11 @@ public:
 
        const CssmSample &operator [] (uint32 n) const
        { assert(n < length()); return CssmSample::overlay(Samples[n]); }
+       
+public:
+       // extract all samples of a given sample type. return true if any found
+       // note that you get a shallow copy of the sample structures for temporary use ONLY
+       bool collect(CSSM_SAMPLE_TYPE sampleType, list<CssmSample> &samples) const;
 };
 
 
@@ -66,7 +68,7 @@ public:
 //
 class AccessCredentials : public PodWrapper<AccessCredentials, CSSM_ACCESS_CREDENTIALS> {
 public:
-       AccessCredentials() { memset(this, 0, sizeof(*this)); }
+       AccessCredentials() { clearPod(); }
        
        const char *tag() const { return EntryTag; }
 
@@ -75,6 +77,10 @@ public:
     
 public:
     static const AccessCredentials &null;      // all null credential
+       
+       // turn NULL into a null credential if needed
+       static const AccessCredentials *needed(const CSSM_ACCESS_CREDENTIALS *cred)
+       { return cred ? overlay(cred) : &null; }
 };
 
 
@@ -118,6 +124,7 @@ namespace DataWalkers
 template <class Action>
 void walk(Action &operate, CssmSample &sample)
 {
+       operate(sample);
        walk(operate, sample.value());
        if (sample.verifier())
                walk(operate, sample.verifier());
@@ -131,7 +138,9 @@ void walk(Action &operate, const CssmSample &sample)
 template <class Action>
 void walk(Action &operate, SampleGroup &samples)
 {
-       operate(samples.Samples, samples.length() * sizeof(CssmSample));
+       operate(samples);
+       operate.blob(const_cast<CSSM_SAMPLE * &>(samples.Samples),
+               samples.length() * sizeof(CSSM_SAMPLE));
        for (uint32 n = 0; n < samples.length(); n++)
                walk(operate, samples[n]);
 }
@@ -151,14 +160,13 @@ template <class Action>
 CSSM_ACCESS_CREDENTIALS *walk(Action &operate, CSSM_ACCESS_CREDENTIALS * &cred)
 { return walk(operate, AccessCredentials::overlayVar(cred)); }
 
+template <class Action>
+AutoCredentials *walk(Action &operate, AutoCredentials * &cred)
+{ return (AutoCredentials *)walk(operate, (AccessCredentials * &)cred); }
 
-} // end namespace DataWalkers
 
+} // end namespace DataWalkers
 } // end namespace Security
 
-#ifdef _CPP_CSSMCRED
-#pragma export off
-#endif
-
 
 #endif //_CSSMCRED