Security-55471.14.8.tar.gz

[apple/security.git] / libsecurity_utilities / lib / errors.h

diff --git a/libsecurity_utilities/lib/errors.h b/libsecurity_utilities/lib/errors.h
index cbb78668b5d8fe0f8574e666cc5d75b49a009a0d..dfc686d5c76ef9c33bd2077a5cbb682d729ee443 100644 (file)
--- a/libsecurity_utilities/lib/errors.h
+++ b/libsecurity_utilities/lib/errors.h
@@ -30,9 +30,8 @@
 
 #include <AvailabilityMacros.h>
 #include <exception>
 
 #include <AvailabilityMacros.h>
 #include <exception>

-#include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>

 #include <errno.h>
 #include <errno.h>

-
+#include <Security/SecBase.h>

 #undef check
 
 
 #undef check
 
 


@@ -92,7 +91,7 @@ public:
        virtual int unixError() const;
     virtual const char *what () const throw ();
     
        virtual int unixError() const;
     virtual const char *what () const throw ();
     

-    static void check(OSStatus status) { if (status != noErr) throwMe(status); }
+    static void check(OSStatus status) { if (status != errSecSuccess) throwMe(status); }

     static void throwMe(int err) __attribute__((noreturn));
 };
 
     static void throwMe(int err) __attribute__((noreturn));
 };
 


@@ -118,6 +117,17 @@ public:
 };
 
 
 };
 
 

+// Something that gets thrown when ModuleNexus creation fails
+class ModuleNexusError : public CommonError {
+protected:
+    ModuleNexusError() {}
+
+public:
+    virtual OSStatus osStatus() const;
+       virtual int unixError() const;
+    static void throwMe() __attribute__((noreturn));
+};
+

 } // end namespace Security
 
 
 } // end namespace Security