From 8cbe58f0d357b14b0ce292d336469d0554a567bc Mon Sep 17 00:00:00 2001
From: miod <>
Date: Wed, 9 Jul 2014 08:20:08 +0000
Subject: KNF

---
 src/lib/libcrypto/rsa/rsa_ssl.c | 137 ++++++++++++++++++++--------------------
 1 file changed, 68 insertions(+), 69 deletions(-)

(limited to 'src/lib/libcrypto/rsa/rsa_ssl.c')

diff --git a/src/lib/libcrypto/rsa/rsa_ssl.c b/src/lib/libcrypto/rsa/rsa_ssl.c
index 3f4ec95a6e..c6ab71c674 100644
--- a/src/lib/libcrypto/rsa/rsa_ssl.c
+++ b/src/lib/libcrypto/rsa/rsa_ssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_ssl.c,v 1.7 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rsa_ssl.c,v 1.8 2014/07/09 08:20:08 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,93 +62,92 @@
 #include <openssl/rsa.h>
 #include <openssl/rand.h>
 
-int RSA_padding_add_SSLv23(unsigned char *to, int tlen,
-	const unsigned char *from, int flen)
-	{
+int
+RSA_padding_add_SSLv23(unsigned char *to, int tlen, const unsigned char *from,
+    int flen)
+{
 	int i,j;
 	unsigned char *p;
 	
-	if (flen > (tlen-11))
-		{
-		RSAerr(RSA_F_RSA_PADDING_ADD_SSLV23,RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
-		return(0);
-		}
+	if (flen > tlen - 11) {
+		RSAerr(RSA_F_RSA_PADDING_ADD_SSLV23,
+		    RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
+		return 0;
+	}
 	
-	p=(unsigned char *)to;
+	p = (unsigned char *)to;
 
-	*(p++)=0;
-	*(p++)=2; /* Public Key BT (Block Type) */
+	*(p++) = 0;
+	*(p++) = 2; /* Public Key BT (Block Type) */
 
 	/* pad out with non-zero random data */
-	j=tlen-3-8-flen;
+	j = tlen - 3 - 8 - flen;
 
-	if (RAND_bytes(p,j) <= 0)
-		return(0);
-	for (i=0; i<j; i++)
-		{
+	if (RAND_bytes(p, j) <= 0)
+		return 0;
+	for (i = 0; i < j; i++) {
 		if (*p == '\0')
-			do	{
-				if (RAND_bytes(p,1) <= 0)
-					return(0);
-				} while (*p == '\0');
+			do {
+				if (RAND_bytes(p, 1) <= 0)
+					return 0;
+			} while (*p == '\0');
 		p++;
-		}
+	}
 
-	memset(p,3,8);
-	p+=8;
-	*(p++)='\0';
+	memset(p, 3, 8);
+	p += 8;
+	*(p++) = '\0';
 
-	memcpy(p,from,(unsigned int)flen);
-	return(1);
-	}
+	memcpy(p, from, (unsigned int)flen);
+	return 1;
+}
 
-int RSA_padding_check_SSLv23(unsigned char *to, int tlen,
-	const unsigned char *from, int flen, int num)
-	{
-	int i,j,k;
+int
+RSA_padding_check_SSLv23(unsigned char *to, int tlen, const unsigned char *from,
+    int flen, int num)
+{
+	int i, j, k;
 	const unsigned char *p;
 
-	p=from;
-	if (flen < 10)
-		{
-		RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23,RSA_R_DATA_TOO_SMALL);
-		return(-1);
-		}
-	if ((num != (flen+1)) || (*(p++) != 02))
-		{
-		RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23,RSA_R_BLOCK_TYPE_IS_NOT_02);
-		return(-1);
-		}
+	p = from;
+	if (flen < 10) {
+		RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23, RSA_R_DATA_TOO_SMALL);
+		return -1;
+	}
+	if (num != flen + 1 || *(p++) != 02) {
+		RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23,
+		    RSA_R_BLOCK_TYPE_IS_NOT_02);
+		return -1;
+	}
 
 	/* scan over padding data */
-	j=flen-1; /* one for type */
-	for (i=0; i<j; i++)
-		if (*(p++) == 0) break;
+	j = flen - 1; /* one for type */
+	for (i = 0; i < j; i++)
+		if (*(p++) == 0)
+			break;
 
-	if ((i == j) || (i < 8))
-		{
-		RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23,RSA_R_NULL_BEFORE_BLOCK_MISSING);
-		return(-1);
-		}
-	for (k = -9; k<-1; k++)
-		{
-		if (p[k] !=  0x03) break;
-		}
-	if (k == -1)
-		{
-		RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23,RSA_R_SSLV3_ROLLBACK_ATTACK);
-		return(-1);
-		}
+	if (i == j || i < 8) {
+		RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23,
+		    RSA_R_NULL_BEFORE_BLOCK_MISSING);
+		return -1;
+	}
+	for (k = -9; k < -1; k++) {
+		if (p[k] !=  0x03)
+			break;
+	}
+	if (k == -1) {
+		RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23,
+		    RSA_R_SSLV3_ROLLBACK_ATTACK);
+		return -1;
+	}
 
 	i++; /* Skip over the '\0' */
-	j-=i;
-	if (j > tlen)
-		{
-		RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23,RSA_R_DATA_TOO_LARGE);
-		return(-1);
-		}
-	memcpy(to,p,(unsigned int)j);
-
-	return(j);
+	j -= i;
+	if (j > tlen) {
+		RSAerr(RSA_F_RSA_PADDING_CHECK_SSLV23, RSA_R_DATA_TOO_LARGE);
+		return -1;
 	}
+	memcpy(to, p, (unsigned int)j);
 
+	return j;
+}
-- 
cgit v1.2.3-55-g6feb