Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_cryptkit / lib / CryptKitDER.cpp

diff --git a/OSX/libsecurity_cryptkit/lib/CryptKitDER.cpp b/OSX/libsecurity_cryptkit/lib/CryptKitDER.cpp
index f8cabe31bee4e9eb7ca89f7b5bcacbb9e32f8c9a..de3b8979e8a51443ee50d79bb0c01db2917217eb 100644 (file)
--- a/OSX/libsecurity_cryptkit/lib/CryptKitDER.cpp
+++ b/OSX/libsecurity_cryptkit/lib/CryptKitDER.cpp
@@ -24,7 +24,6 @@
 
 #include "ckconfig.h"
 
-#if    CRYPTKIT_DER_ENABLE
 
 #include <security_cryptkit/CryptKitDER.h>
 #include <security_cryptkit/falloc.h>
@@ -37,6 +36,7 @@
 #include <Security/keyTemplates.h>
 #include <Security/oidsalg.h>
 #include <Security/oidsattr.h>
+#include <Security/x509defs.h>
 
 #define PRINT_SIG_GIANTS               0
 #define PRINT_CURVE_PARAMS             0
@@ -55,8 +55,8 @@ class feeException
 protected:
        feeException(feeReturn frtn, const char *op);   
 public:
-       ~feeException() throw() {}
-       feeReturn frtn() const throw() { return mFrtn; }
+       ~feeException() _NOEXCEPT {}
+       feeReturn frtn() const _NOEXCEPT { return mFrtn; }
     static void throwMe(feeReturn frtn, const char *op = NULL) __attribute__((noreturn));
 private:
        feeReturn mFrtn;
@@ -1241,4 +1241,3 @@ feeReturn feeDERDecodePKCS8PrivateKey(
        return frtn;
 }
 
-#endif /* CRYPTKIT_DER_ENABLE */