X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fdes%2Fenc_read.c;h=5881caf3d54cf4ab0c73073790d58db2af41cdd5;hb=9e09eebf94c933686077a1b1b2d60248acb9ba67;hp=7399ff7269837ebf756b0bf2dd3be1fce2203edf;hpb=17f389bbbfccf057a8bc04084ed068c4b368e751;p=oweals%2Fopenssl.git

diff --git a/crypto/des/enc_read.c b/crypto/des/enc_read.c
index 7399ff7269..5881caf3d5 100644
--- a/crypto/des/enc_read.c
+++ b/crypto/des/enc_read.c
@@ -63,7 +63,7 @@
 
 /* This has some uglies in it but it works - even over sockets. */
 /*extern int errno;*/
-OPENSSL_GLOBAL int des_rw_mode=DES_PCBC_MODE;
+OPENSSL_IMPLEMENT_GLOBAL(int,des_rw_mode)=DES_PCBC_MODE;
 
 
 /*
@@ -84,7 +84,7 @@ OPENSSL_GLOBAL int des_rw_mode=DES_PCBC_MODE;
  */
 
 
-int des_enc_read(int fd, void *buf, int len, des_key_schedule sched,
+int des_enc_read(int fd, void *buf, int len, des_key_schedule *sched,
 		 des_cblock *iv)
 	{
 	/* data to be unencrypted */
@@ -103,17 +103,17 @@ int des_enc_read(int fd, void *buf, int len, des_key_schedule sched,
 
 	if (tmpbuf == NULL)
 		{
-		tmpbuf=Malloc(BSIZE);
+		tmpbuf=OPENSSL_malloc(BSIZE);
 		if (tmpbuf == NULL) return(-1);
 		}
 	if (net == NULL)
 		{
-		net=Malloc(BSIZE);
+		net=OPENSSL_malloc(BSIZE);
 		if (net == NULL) return(-1);
 		}
 	if (unnet == NULL)
 		{
-		unnet=Malloc(BSIZE);
+		unnet=OPENSSL_malloc(BSIZE);
 		if (unnet == NULL) return(-1);
 		}
 	/* left over data from last decrypt */