Security-55471.14.4.tar.gz

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

diff --git a/libsecurity_transform/lib/CEncryptDecrypt.c b/libsecurity_transform/lib/CEncryptDecrypt.c
index d9bb66bd5e4d096b45415f3d0cb220dbab6f9ef5..2c960f75294f0c2f51d794c0a8013556872f2632 100644 (file)
--- a/libsecurity_transform/lib/CEncryptDecrypt.c
+++ b/libsecurity_transform/lib/CEncryptDecrypt.c
@@ -33,12 +33,14 @@
 // 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.
 
 // 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.
 

+#warning "This declaration should be in some headers"
+CFDataRef oaep_padding_via_c(int desired_message_length, CFDataRef dataValue);

 CFDataRef oaep_padding_via_c(int desired_message_length, CFDataRef dataValue)
 {
        cc_unit paddingBuffer[ccn_nof_size(desired_message_length)];
        bzero(paddingBuffer, sizeof(cc_unit) * ccn_nof_size(desired_message_length)); // XXX needed??
        static dispatch_once_t randomNumberGenneratorInitialzed;
 CFDataRef oaep_padding_via_c(int desired_message_length, CFDataRef dataValue)
 {
        cc_unit paddingBuffer[ccn_nof_size(desired_message_length)];
        bzero(paddingBuffer, sizeof(cc_unit) * ccn_nof_size(desired_message_length)); // XXX needed??
        static dispatch_once_t randomNumberGenneratorInitialzed;

-       static static struct ccrng_system_state rng;
+       static struct ccrng_system_state rng;

        dispatch_once(&randomNumberGenneratorInitialzed, ^{
         ccrng_system_init(&rng);
        });
        dispatch_once(&randomNumberGenneratorInitialzed, ^{
         ccrng_system_init(&rng);
        });


@@ -53,6 +55,8 @@ CFDataRef oaep_padding_via_c(int desired_message_length, CFDataRef dataValue)
        return paddedValue ? paddedValue : (void*)GetNoMemoryErrorAndRetain();
 }
 
        return paddedValue ? paddedValue : (void*)GetNoMemoryErrorAndRetain();
 }
 

+#warning "This declaration should be in some headers"
+CFDataRef oaep_unpadding_via_c(CFDataRef encodedMessage);

 CFDataRef oaep_unpadding_via_c(CFDataRef encodedMessage)
 {
        size_t mlen = CFDataGetLength(encodedMessage);
 CFDataRef oaep_unpadding_via_c(CFDataRef encodedMessage)
 {
        size_t mlen = CFDataGetLength(encodedMessage);