Use OPENSSL_GLOBAL, OPENSSL_EXTERN instead of GLOBAL and EXTERN.

[openssl.git] / crypto / des / enc_read.c

diff --git a/crypto/des/enc_read.c b/crypto/des/enc_read.c
index ed0f8f059d43e96f10dec4fad4ada66d46eaf3b2..51694a8bcf228bb4f10c2d6cff66f8deb2c6bee6 100644 (file)
--- 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;*/
-int des_rw_mode=DES_PCBC_MODE;
+OPENSSL_GLOBAL int des_rw_mode=DES_PCBC_MODE;
 
 
 /*
@@ -84,8 +84,8 @@ int des_rw_mode=DES_PCBC_MODE;
  */
 
 
-int des_enc_read(int fd, char *buf, int len, des_key_schedule sched,
-            des_cblock iv)
+int des_enc_read(int fd, void *buf, int len, des_key_schedule sched,
+                des_cblock iv)
        {
        /* data to be unencrypted */
        int net_num=0;
@@ -103,17 +103,17 @@ int des_enc_read(int fd, char *buf, int len, des_key_schedule sched,
 
        if (tmpbuf == NULL)
                {
-               tmpbuf=(unsigned char *)Malloc(BSIZE);
+               tmpbuf=Malloc(BSIZE);
                if (tmpbuf == NULL) return(-1);
                }
        if (net == NULL)
                {
-               net=(unsigned char *)Malloc(BSIZE);
+               net=Malloc(BSIZE);
                if (net == NULL) return(-1);
                }
        if (unnet == NULL)
                {
-               unnet=(unsigned char *)Malloc(BSIZE);
+               unnet=Malloc(BSIZE);
                if (unnet == NULL) return(-1);
                }
        /* left over data from last decrypt */
@@ -125,7 +125,7 @@ int des_enc_read(int fd, char *buf, int len, des_key_schedule sched,
                         * with the number of bytes we have - should always
                         * check the return value */
                        memcpy(buf,&(unnet[unnet_start]),
-                               (unsigned int)unnet_left);
+                              unnet_left);
                        /* eay 26/08/92 I had the next 2 lines
                         * reversed :-( */
                        i=unnet_left;
@@ -133,7 +133,7 @@ int des_enc_read(int fd, char *buf, int len, des_key_schedule sched,
                        }
                else
                        {
-                       memcpy(buf,&(unnet[unnet_start]),(unsigned int)len);
+                       memcpy(buf,&(unnet[unnet_start]),len);
                        unnet_start+=len;
                        unnet_left-=len;
                        i=len;
@@ -147,7 +147,7 @@ int des_enc_read(int fd, char *buf, int len, des_key_schedule sched,
        /* first - get the length */
        while (net_num < HDRSIZE) 
                {
-               i=read(fd,&(net[net_num]),(unsigned int)HDRSIZE-net_num);
+               i=read(fd,&(net[net_num]),HDRSIZE-net_num);
 #ifdef EINTR
                if ((i == -1) && (errno == EINTR)) continue;
 #endif
@@ -169,7 +169,7 @@ int des_enc_read(int fd, char *buf, int len, des_key_schedule sched,
        net_num=0;
        while (net_num < rnum)
                {
-               i=read(fd,&(net[net_num]),(unsigned int)rnum-net_num);
+               i=read(fd,&(net[net_num]),rnum-net_num);
 #ifdef EINTR
                if ((i == -1) && (errno == EINTR)) continue;
 #endif
@@ -184,9 +184,9 @@ int des_enc_read(int fd, char *buf, int len, des_key_schedule sched,
                        des_pcbc_encrypt(net,unnet,num,sched,iv,DES_DECRYPT);
                else
                        des_cbc_encrypt(net,unnet,num,sched,iv,DES_DECRYPT);
-               memcpy(buf,unnet,(unsigned int)len);
+               memcpy(buf,unnet,len);
                unnet_start=len;
-               unnet_left=(int)num-len;
+               unnet_left=num-len;
 
                /* The following line is done because we return num
                 * as the number of bytes read. */
@@ -211,18 +211,18 @@ int des_enc_read(int fd, char *buf, int len, des_key_schedule sched,
 
                        /* eay 26/08/92 fix a bug that returned more
                         * bytes than you asked for (returned len bytes :-( */
-                       memcpy(buf,tmpbuf,(unsigned int)num);
+                       memcpy(buf,tmpbuf,num);
                        }
                else
                        {
                        if (des_rw_mode & DES_PCBC_MODE)
-                               des_pcbc_encrypt(net,(unsigned char*)buf,num,
-                                                sched,iv,DES_DECRYPT);
+                               des_pcbc_encrypt(net,buf,num,sched,iv,
+                                                DES_DECRYPT);
                        else
-                               des_cbc_encrypt(net,(unsigned char*)buf,num,
-                                               sched,iv,DES_DECRYPT);
+                               des_cbc_encrypt(net,buf,num,sched,iv,
+                                               DES_DECRYPT);
                        }
                }
-       return((int)num);
+       return num;
        }