Ticket #857: OpenSSL.patch

/root/buff/trunk/tango/net/util/c/OpenSSL.d

@@ -437 +437 @@
-tCRYPTO_set_dynlock_create_callback CRYPTO_set_dynlock_create_callback;
-tCRYPTO_set_dynlock_lock_callback CRYPTO_set_dynlock_lock_callback;
-tCRYPTO_set_dynlock_destroy_callback CRYPTO_set_dynlock_destroy_callback;
-
+
+
+
-tERR_remove_state ERR_remove_state;
-tRAND_cleanup RAND_cleanup;
-tERR_free_strings ERR_free_strings;
@@ -651 +653 @@
-        char *file;
-        uint code;
-
-
+_
-        while (code != 0)
-        {
-            if (data && (flags & ERR_TXT_STRING))
-                exceptionString ~= Format.convert("ssl error code: {} {}:{} - {}\r\n", code, fromStringz(file), line, fromStringz(data));
-            else
-                exceptionString ~= Format.convert("ssl error code: {} {}:{}\r\n", code, fromStringz(file), line); 
-
+_
-        }
-        throw new Exception(exceptionString);
-    }
@@ -747 +749 @@
-
-void bindCrypto(SharedLib ssllib)
-{
+    
-    if (ssllib)
-    {
-        bindFunc(X509_cmp, "X509_cmp", ssllib);
@@ -797 +800 @@
-        bindFunc(PEM_read_bio_PrivateKey, "PEM_read_bio_PrivateKey", ssllib);
-        bindFunc(BIO_new_file, "BIO_new_file", ssllib);
-        bindFunc(ERR_peek_error, "ERR_peek_error", ssllib);
+                
-        try
-            bindFunc(BIO_test_flags, "BIO_test_flags", ssllib); // 0.9.7 doesn't have this function, it access the struct directly
-        catch (Exception ex)
-            _bioTestFlags = false;
+                    
-        bindFunc(BIO_ctrl, "BIO_ctrl", ssllib);
+                
-        bindFunc(RAND_load_file, "RAND_load_file", ssllib);
-        bindFunc(CRYPTO_num_locks, "CRYPTO_num_locks", ssllib);
-        bindFunc(CRYPTO_set_id_callback, "CRYPTO_set_id_callback", ssllib);
+                
-        bindFunc(CRYPTO_set_locking_callback, "CRYPTO_set_locking_callback", ssllib);
-        bindFunc(CRYPTO_set_dynlock_create_callback, "CRYPTO_set_dynlock_create_callback", ssllib);
-        bindFunc(CRYPTO_set_dynlock_lock_callback, "CRYPTO_set_dynlock_lock_callback", ssllib);
-        bindFunc(CRYPTO_set_dynlock_lock_callback, "CRYPTO_set_dynlock_lock_callback", ssllib);
-        bindFunc(CRYPTO_set_dynlock_destroy_callback, "CRYPTO_set_dynlock_destroy_callback", ssllib);
-
+_
-        bindFunc(ERR_remove_state, "ERR_remove_state", ssllib);
-        bindFunc(RAND_cleanup, "RAND_cleanup", ssllib);
-        bindFunc(ERR_free_strings, "ERR_free_strings", ssllib);
@@ -827 +834 @@
-        bindFunc(BIO_new_socket, "BIO_new_socket", ssllib);
-        bindFunc(RAND_poll, "RAND_poll", ssllib);
-        bindFunc(RSA_size, "RSA_size", ssllib);
+
-        bindFunc(RSA_public_encrypt, "RSA_public_encrypt", ssllib);
-        bindFunc(RSA_private_decrypt, "RSA_private_decrypt", ssllib);
-        bindFunc(RSA_private_encrypt, "RSA_private_encrypt", ssllib);
@@ -843 +851 @@
-        bindFunc(EVP_EncryptFinal_ex, "EVP_EncryptFinal_ex", ssllib);
-        bindFunc(EVP_DecryptFinal_ex, "EVP_DecryptFinal_ex", ssllib);
-        bindFunc(EVP_aes_128_cbc, "EVP_aes_128_cbc", ssllib);
+            
-        try {
-            bindFunc(EVP_CIPHER_CTX_block_size, "EVP_CIPHER_CTX_block_size", ssllib);
-        } catch (Exception e){