[PHP-CVS] cvs: php4 /ext/openssl openssl.c

[Ilia Alshanetsky]

iliaa           Sun Jun  8 19:52:28 2003 EDT

  Modified files:              
    /php4/ext/openssl   openssl.c 
  Log:
  MFB
  
  
Index: php4/ext/openssl/openssl.c
diff -u php4/ext/openssl/openssl.c:1.74 php4/ext/openssl/openssl.c:1.75
--- php4/ext/openssl/openssl.c:1.74     Mon Apr 28 18:42:21 2003
+++ php4/ext/openssl/openssl.c  Sun Jun  8 19:52:28 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: openssl.c,v 1.74 2003/04/28 22:42:21 iliaa Exp $ */
+/* $Id: openssl.c,v 1.75 2003/06/08 23:52:28 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1956,7 +1956,7 @@
                bio_out = BIO_new_file(filename, "w");
 
                if (passphrase && req.priv_key_encrypt) {
-                       cipher = EVP_des_ede3_cbc();
+                       cipher = (EVP_CIPHER *) EVP_des_ede3_cbc();
                } else {
                        cipher = NULL;
                }
@@ -2007,7 +2007,7 @@
                bio_out = BIO_new(BIO_s_mem());
 
                if (passphrase && req.priv_key_encrypt) {
-                       cipher = EVP_des_ede3_cbc();
+                       cipher = (EVP_CIPHER *) EVP_des_ede3_cbc();
                } else {
                        cipher = NULL;
                }
@@ -2823,16 +2823,16 @@
 
        switch (signature_algo) {
                case OPENSSL_ALGO_SHA1:
-                       mdtype = EVP_sha1();
+                       mdtype = (EVP_MD *) EVP_sha1();
                        break;
                case OPENSSL_ALGO_MD5:
-                       mdtype = EVP_md5();
+                       mdtype = (EVP_MD *) EVP_md5();
                        break;
                case OPENSSL_ALGO_MD4:
-                       mdtype = EVP_md4();
+                       mdtype = (EVP_MD *) EVP_md4();
                        break;
                case OPENSSL_ALGO_MD2:
-                       mdtype = EVP_md2();
+                       mdtype = (EVP_MD *) EVP_md2();
                        break;
        }
        



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php