Changeset 4298

Timestamp:

01/28/09 10:00:11 (3 years ago)

Author:

fawzi

Message:

making OpenSSL work on mac 10.5, using c_ulong (plus comment about to do for using it more consistently) fix #1349

Files:

• trunk/tango/net/c/OpenSSL.d (modified) (8 diffs)

trunk/tango/net/c/OpenSSL.d

@@ -15 +15 @@
-private import tango.stdc.stdio;
-private import tango.stdc.stringz;
+private import tango.stdc.config: c_long,c_ulong;
-
-private import tango.io.Stdout;
@@ -38 +39 @@
-
-   These will need to be reversed to support 64bit tango
+   (should use c_long and c_ulong from tango.stdc.config)
-
-   XXX TODO XXX
@@ -135 +137 @@
-        void *ap_data;
-        int key_len;
-
-
-
-
+
-        void *cipher_data;
-        int final_used;
@@ -144 +143 @@
-        ubyte[EVP_MAX_BLOCK_LENGTH] finalv;
-    };
+    
+    // fallback for OpenSSL 0.9.7l 28 Sep 2006 that defines only macros
+    int EVP_CIPHER_CTX_block_size_097l(EVP_CIPHER_CTX *e){
+        return *((cast(int*)e.cipher)+1);
+    }
-
-    struct BIO 
@@ -630 +634 @@
-    static SharedLib eaylib = null;
-}
+version(darwin){
+    static SharedLib cryptolib = null;
+}
-static ReadWriteMutex[] _locks = null;
-
@@ -836 +843 @@
-        bindFunc(EVP_DecryptFinal_ex, "EVP_DecryptFinal_ex", ssllib);
-        bindFunc(EVP_aes_128_cbc, "EVP_aes_128_cbc", ssllib);
-
+
+
+
+
+
+
-        bindFunc(EVP_CIPHER_CTX_cleanup, "EVP_CIPHER_CTX_cleanup", ssllib);
-    }
@@ -881 +893 @@
-        version(Posix)
-        {
-
+
+
+
+
+
+
+
-        }
-
@@ -906 +924 @@
-    if (ssllib)
-        ssllib.unload();
+    version(darwin){
+        if (cryptolib)
+            cryptolib.unload();
+    }
-    version(Win32)
-    {