Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_apple_csp / lib / FEEKeys.cpp

diff --git a/OSX/libsecurity_apple_csp/lib/FEEKeys.cpp b/OSX/libsecurity_apple_csp/lib/FEEKeys.cpp
index 5571510d46eeca4d114aabdb3aeb31fe8477c861..e906bdf821f0d1ee73020e7336c50cc20e29ea6e 100644 (file)
--- a/OSX/libsecurity_apple_csp/lib/FEEKeys.cpp
+++ b/OSX/libsecurity_apple_csp/lib/FEEKeys.cpp
@@ -34,7 +34,7 @@
 #include <assert.h>
 #include <security_utilities/debugging.h>
 
-#define feeKeyDebug(args...)   secdebug("feeKey", ## args)
+#define feeKeyDebug(args...)   secinfo("feeKey", ## args)
 
 /***
  *** FEE-style BinaryKey
@@ -68,8 +68,8 @@ void CryptKit::FEEBinaryKey::generateKeyBlob(
                const CssmKey           *paramKey,      /* optional, unused here */
                CSSM_KEYATTR_FLAGS      &attrFlags)     /* IN/OUT */
 {
-       unsigned char   *keyBlob;
-       unsigned                len;
+       unsigned char   *keyBlob = NULL;
+       unsigned                len = 0;
        feeReturn               frtn = FR_Internal;
        bool                    freeTheKey = false;
        feePubKey               keyToEncode = mFeeKey;
@@ -190,6 +190,7 @@ void CryptKit::FEEBinaryKey::generateKeyBlob(
                        break;
                default:
                        /* not reached */
+            badFormat = true;
                        break;
        }
        
@@ -243,7 +244,11 @@ void CryptKit::FEEKeyPairGenContext::generate(
        }
 
 }
-       
+
+void CryptKit::FEEKeyPairGenContext::generate(const Context &context, uint32, CssmData &params, uint32 &attrCount, Context::Attr * &attrs) {
+    CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
+}
+
 // this one is specified in, and called from, AppleKeyPairGenContext
 void CryptKit::FEEKeyPairGenContext::generate(
        const Context   &context,