Security-58286.31.2.tar.gz

[apple/security.git] / OSX / libsecurity_transform / lib / CEncryptDecrypt.c

diff --git a/OSX/libsecurity_transform/lib/CEncryptDecrypt.c b/OSX/libsecurity_transform/lib/CEncryptDecrypt.c
index 458831c3fde93d7c9ad54101c9418224ed36e5b0..3897796fa61ec2780129ab97bda06f76935e601d 100644 (file)
--- a/OSX/libsecurity_transform/lib/CEncryptDecrypt.c
+++ b/OSX/libsecurity_transform/lib/CEncryptDecrypt.c
@@ -29,12 +29,13 @@
 #include "corecrypto/ccn.h"
 #include "stdio.h"
 #include "misc.h"
 #include "corecrypto/ccn.h"
 #include "stdio.h"
 #include "misc.h"

+#include "Utilities.h"

 
 // corecrypto headers don't like C++ (on a deaper level then extern "C" {} can fix
 // so we need a C "shim" for all our corecrypto use.
 
 CFDataRef oaep_padding_via_c(int desired_message_length, CFDataRef dataValue);
 
 // corecrypto headers don't like C++ (on a deaper level then extern "C" {} can fix
 // so we need a C "shim" for all our corecrypto use.
 
 CFDataRef oaep_padding_via_c(int desired_message_length, CFDataRef dataValue);

-CFDataRef oaep_padding_via_c(int desired_message_length, CFDataRef dataValue)
+CFDataRef oaep_padding_via_c(int desired_message_length, CFDataRef dataValue) CF_RETURNS_RETAINED

 {
        cc_unit paddingBuffer[ccn_nof_size(desired_message_length)];
        bzero(paddingBuffer, sizeof(cc_unit) * ccn_nof_size(desired_message_length)); // XXX needed??
 {
        cc_unit paddingBuffer[ccn_nof_size(desired_message_length)];
        bzero(paddingBuffer, sizeof(cc_unit) * ccn_nof_size(desired_message_length)); // XXX needed??


@@ -55,7 +56,7 @@ CFDataRef oaep_padding_via_c(int desired_message_length, CFDataRef dataValue)
 }
 
 CFDataRef oaep_unpadding_via_c(CFDataRef encodedMessage);
 }
 
 CFDataRef oaep_unpadding_via_c(CFDataRef encodedMessage);

-CFDataRef oaep_unpadding_via_c(CFDataRef encodedMessage)
+CFDataRef oaep_unpadding_via_c(CFDataRef encodedMessage) CF_RETURNS_RETAINED

 {
        size_t mlen = CFDataGetLength(encodedMessage);
        cc_size n = ccn_nof_size(mlen);
 {
        size_t mlen = CFDataGetLength(encodedMessage);
        cc_size n = ccn_nof_size(mlen);


@@ -68,7 +69,9 @@ CFDataRef oaep_unpadding_via_c(CFDataRef encodedMessage)
        
     if (err) {
                // XXX should make a CFError or something.
        
     if (err) {
                // XXX should make a CFError or something.

-               return (void*)fancy_error(CFSTR("CoreCrypto"), err, CFSTR("OAEP decode error"));
+        CFErrorRef error = fancy_error(CFSTR("CoreCrypto"), err, CFSTR("OAEP decode error"));
+        CFRetainSafe(error);
+        return (void*)error;

     }
        CFDataRef result = CFDataCreate(NULL, (UInt8*)plainText, plainTextLength);
        return result;
     }
        CFDataRef result = CFDataCreate(NULL, (UInt8*)plainText, plainTextLength);
        return result;