sync

lib/libcrypto/des/enc_read.c

@@ -1,25 +1,25 @@
-/* $OpenBSD: enc_read.c,v 1.16 2022/11/26 16:08:51 tb Exp $ */
+/* $OpenBSD: enc_read.c,v 1.17 2023/07/08 07:11:07 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -84,146 +84,139 @@ int DES_rw_mode = DES_PCBC_MODE;
  *     used on multiple files.
  */
 
-
-int DES_enc_read(int fd, void *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;
-	static unsigned char *net=NULL;
-	/* extra unencrypted data 
+	int net_num = 0;
+	static unsigned char *net = NULL;
+	/* extra unencrypted data
 	 * for when a block of 100 comes in but is des_read one byte at
 	 * a time. */
-	static unsigned char *unnet=NULL;
-	static int unnet_start=0;
-	static int unnet_left=0;
-	static unsigned char *tmpbuf=NULL;
+	static unsigned char *unnet = NULL;
+	static int unnet_start = 0;
+	static int unnet_left = 0;
+	static unsigned char *tmpbuf = NULL;
 	int i;
-	long num=0,rnum;
+	long num = 0, rnum;
 	unsigned char *p;
 
-	if (tmpbuf == NULL)
-		{
-		tmpbuf=malloc(BSIZE);
-		if (tmpbuf == NULL) return(-1);
-		}
-	if (net == NULL)
-		{
-		net=malloc(BSIZE);
-		if (net == NULL) return(-1);
-		}
-	if (unnet == NULL)
-		{
-		unnet=malloc(BSIZE);
-		if (unnet == NULL) return(-1);
-		}
+	if (tmpbuf == NULL) {
+		tmpbuf = malloc(BSIZE);
+		if (tmpbuf == NULL)
+			return (-1);
+	}
+	if (net == NULL) {
+		net = malloc(BSIZE);
+		if (net == NULL)
+			return (-1);
+	}
+	if (unnet == NULL) {
+		unnet = malloc(BSIZE);
+		if (unnet == NULL)
+			return (-1);
+	}
 	/* left over data from last decrypt */
-	if (unnet_left != 0)
-		{
-		if (unnet_left < len)
-			{
+	if (unnet_left != 0) {
+		if (unnet_left < len) {
 			/* we still still need more data but will return
 			 * with the number of bytes we have - should always
 			 * check the return value */
-			memcpy(buf,&(unnet[unnet_start]),
-			       unnet_left);
+			memcpy(buf, &(unnet[unnet_start]),
+			    unnet_left);
 			/* eay 26/08/92 I had the next 2 lines
 			 * reversed :-( */
-			i=unnet_left;
-			unnet_start=unnet_left=0;
-			}
-		else
-			{
-			memcpy(buf,&(unnet[unnet_start]),len);
-			unnet_start+=len;
-			unnet_left-=len;
-			i=len;
-			}
-		return(i);
+			i = unnet_left;
+			unnet_start = unnet_left = 0;
+		} else {
+			memcpy(buf, &(unnet[unnet_start]), len);
+			unnet_start += len;
+			unnet_left -= len;
+			i = len;
 		}
+		return (i);
+	}
 
 	/* We need to get more data. */
-	if (len > MAXWRITE) len=MAXWRITE;
+	if (len > MAXWRITE)
+		len = MAXWRITE;
 
 	/* first - get the length */
-	while (net_num < HDRSIZE) 
-		{
-		i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num);
+	while (net_num < HDRSIZE) {
+		i = read(fd, (void *)&(net[net_num]), HDRSIZE - net_num);
 #ifdef EINTR
-		if ((i == -1) && (errno == EINTR)) continue;
+		if ((i == -1) && (errno == EINTR))
+			continue;
 #endif
-		if (i <= 0) return(0);
-		net_num+=i;
-		}
+		if (i <= 0)
+			return (0);
+		net_num += i;
+	}
 
 	/* we now have at net_num bytes in net */
-	p=net;
+	p = net;
 	/* num=0;  */
-	n2l(p,num);
+	n2l(p, num);
 	/* num should be rounded up to the next group of eight
 	 * we make sure that we have read a multiple of 8 bytes from the net.
 	 */
 	if ((num > MAXWRITE) || (num < 0)) /* error */
-		return(-1);
-	rnum=(num < 8)?8:((num+7)/8*8);
+		return (-1);
+	rnum = (num < 8) ? 8 : ((num + 7)/8*8);
 
-	net_num=0;
-	while (net_num < rnum)
-		{
-		i=read(fd,(void *)&(net[net_num]),rnum-net_num);
+	net_num = 0;
+	while (net_num < rnum) {
+		i = read(fd, (void *)&(net[net_num]), rnum - net_num);
 #ifdef EINTR
-		if ((i == -1) && (errno == EINTR)) continue;
+		if ((i == -1) && (errno == EINTR))
+			continue;
 #endif
-		if (i <= 0) return(0);
-		net_num+=i;
-		}
+		if (i <= 0)
+			return (0);
+		net_num += i;
+	}
 
 	/* Check if there will be data left over. */
-	if (len < num)
-		{
+	if (len < num) {
 		if (DES_rw_mode & DES_PCBC_MODE)
-			DES_pcbc_encrypt(net,unnet,num,sched,iv,DES_DECRYPT);
+			DES_pcbc_encrypt(net, unnet, num, sched, iv,
+			    DES_DECRYPT);
 		else
-			DES_cbc_encrypt(net,unnet,num,sched,iv,DES_DECRYPT);
-		memcpy(buf,unnet,len);
-		unnet_start=len;
-		unnet_left=num-len;
+			DES_cbc_encrypt(net, unnet, num, sched, iv,
+			    DES_DECRYPT);
+		memcpy(buf, unnet, len);
+		unnet_start = len;
+		unnet_left = num - len;
 
 		/* The following line is done because we return num
 		 * as the number of bytes read. */
-		num=len;
-		}
-	else
-		{
+		num = len;
+	} else {
 		/* >output is a multiple of 8 byes, if len < rnum
 		 * >we must be careful.  The user must be aware that this
 		 * >routine will write more bytes than he asked for.
 		 * >The length of the buffer must be correct.
 		 * FIXED - Should be ok now 18-9-90 - eay */
-		if (len < rnum)
-			{
-
+		if (len < rnum) {
 			if (DES_rw_mode & DES_PCBC_MODE)
-				DES_pcbc_encrypt(net,tmpbuf,num,sched,iv,
-						 DES_DECRYPT);
+				DES_pcbc_encrypt(net, tmpbuf, num, sched, iv,
+				    DES_DECRYPT);
 			else
-				DES_cbc_encrypt(net,tmpbuf,num,sched,iv,
-						DES_DECRYPT);
+				DES_cbc_encrypt(net, tmpbuf, num, sched, iv,
+				    DES_DECRYPT);
 
 			/* eay 26/08/92 fix a bug that returned more
 			 * bytes than you asked for (returned len bytes :-( */
-			memcpy(buf,tmpbuf,num);
-			}
-		else
-			{
+			memcpy(buf, tmpbuf, num);
+		} else {
 			if (DES_rw_mode & DES_PCBC_MODE)
-				DES_pcbc_encrypt(net,buf,num,sched,iv,
-						 DES_DECRYPT);
+				DES_pcbc_encrypt(net, buf, num, sched, iv,
+				    DES_DECRYPT);
 			else
-				DES_cbc_encrypt(net,buf,num,sched,iv,
-						DES_DECRYPT);
-			}
+				DES_cbc_encrypt(net, buf, num, sched, iv,
+				    DES_DECRYPT);
 		}
-	return num;
 	}
-
+	return num;
+}