Whitespace changes only

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37345 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 112 insertions, 144 deletions

diff --git a/sha1.c b/sha1.c
index f81096a5d..16ddd6aa3 100644
--- a/sha1.c
+++ b/sha1.c
@@ -90,23 +90,22 @@ void SHA1ProcessMessageBlock(SHA1Context *);
  */
 int SHA1Reset(SHA1Context *context)
 {
-	if (!context)
-	{
-		 return shaNull;
+	if (!context) {
+		return shaNull;
 	}
 
-	context->Length_Low	          = 0;
-	context->Length_High	         = 0;
-	context->Message_Block_Index	 = 0;
+	context->Length_Low             = 0;
+	context->Length_High            = 0;
+	context->Message_Block_Index    = 0;
 
-	context->Intermediate_Hash[0]	= 0x67452301;
-	context->Intermediate_Hash[1]	= 0xEFCDAB89;
-	context->Intermediate_Hash[2]	= 0x98BADCFE;
-	context->Intermediate_Hash[3]	= 0x10325476;
-	context->Intermediate_Hash[4]	= 0xC3D2E1F0;
+	context->Intermediate_Hash[0]   = 0x67452301;
+	context->Intermediate_Hash[1]   = 0xEFCDAB89;
+	context->Intermediate_Hash[2]   = 0x98BADCFE;
+	context->Intermediate_Hash[3]   = 0x10325476;
+	context->Intermediate_Hash[4]   = 0xC3D2E1F0;
 
-	context->Computed	= 0;
-	context->Corrupted  = 0;
+	context->Computed               = 0;
+	context->Corrupted              = 0;
 
 	return shaSuccess;
 }
@@ -135,34 +134,27 @@ int SHA1Result( SHA1Context *context,
 {
 	int i;
 
-	if (!context || !Message_Digest)
-	{
-		 return shaNull;
+	if (!context || !Message_Digest) {
+		return shaNull;
 	}
 
-	if (context->Corrupted)
-	{
-		 return context->Corrupted;
+	if (context->Corrupted) {
+		return context->Corrupted;
 	}
 
-	if (!context->Computed)
-	{
-		 SHA1PadMessage(context);
-		 for(i=0; i<64; ++i)
-		 {
-		     /* message may be sensitive, clear it out */
-		     context->Message_Block[i] = 0;
-		 }
-		 context->Length_Low = 0;    /* and clear length */
-		 context->Length_High = 0;
-		 context->Computed = 1;
-
+	if (!context->Computed) {
+		SHA1PadMessage(context);
+		for (i = 0; i < 64; ++i) {
+			/* message may be sensitive, clear it out */
+			context->Message_Block[i] = 0;
+		}
+		context->Length_Low = 0;    /* and clear length */
+		context->Length_High = 0;
+		context->Computed = 1;
 	}
 
-	for(i = 0; i < SHA1HashSize; ++i)
-	{
-		 Message_Digest[i] = context->Intermediate_Hash[i>>2]
-		                     >> 8 * ( 3 - ( i & 0x03 ) );
+	for (i = 0; i < SHA1HashSize; ++i) {
+		Message_Digest[i] = context->Intermediate_Hash[i >> 2] >> 8 * ( 3 - ( i & 0x03 ) );
 	}
 
 	return shaSuccess;
@@ -188,52 +180,42 @@ int SHA1Result( SHA1Context *context,
  *	  sha Error Code.
  *
  */
-int SHA1Input(	SHA1Context	 *context,
-		           const uint8_t  *message_array,
-		           unsigned       length)
+int SHA1Input(SHA1Context *context, const uint8_t *message_array, unsigned length)
 {
-	if (!length)
-	{
-		 return shaSuccess;
+	if (!length) {
+		return shaSuccess;
 	}
 
-	if (!context || !message_array)
-	{
-		 return shaNull;
+	if (!context || !message_array) {
+		return shaNull;
 	}
 
-	if (context->Computed)
-	{
-		 context->Corrupted = shaStateError;
-		 return shaStateError;
+	if (context->Computed) {
+		context->Corrupted = shaStateError;
+		return shaStateError;
 	}
 
-	if (context->Corrupted)
-	{
-		  return context->Corrupted;
-	}
-	while(length-- && !context->Corrupted)
-	{
-	context->Message_Block[context->Message_Block_Index++] =
-		             (*message_array & 0xFF);
-
-	context->Length_Low += 8;
-	if (context->Length_Low == 0)
-	{
-		 context->Length_High++;
-		 if (context->Length_High == 0)
-		 {
-		     /* Message is too long */
-		     context->Corrupted = 1;
-		 }
+	if (context->Corrupted) {
+		return context->Corrupted;
 	}
 
-	if (context->Message_Block_Index == 64)
-	{
-		 SHA1ProcessMessageBlock(context);
-	}
+	while (length-- && !context->Corrupted) {
+		context->Message_Block[context->Message_Block_Index++] = (*message_array & 0xFF);
 
-	message_array++;
+		context->Length_Low += 8;
+		if (context->Length_Low == 0) {
+			context->Length_High++;
+			if (context->Length_High == 0) {
+				/* Message is too long */
+				context->Corrupted = 1;
+			}
+		}
+
+		if (context->Message_Block_Index == 64) {
+			SHA1ProcessMessageBlock(context);
+		}
+
+		message_array++;
 	}
 
 	return shaSuccess;
@@ -261,30 +243,28 @@ int SHA1Input(	SHA1Context	 *context,
  */
 void SHA1ProcessMessageBlock(SHA1Context *context)
 {
-	const uint32_t K[] =	 {       /* Constants defined in SHA-1   */
-		                     0x5A827999,
-		                     0x6ED9EBA1,
-		                     0x8F1BBCDC,
-		                     0xCA62C1D6
-		                     };
+	const uint32_t K[] =     {     /* Constants defined in SHA-1  */
+	                         0x5A827999,
+	                         0x6ED9EBA1,
+	                         0x8F1BBCDC,
+	                         0xCA62C1D6
+	                         };
 	int	        t;                 /* Loop counter                */
-	uint32_t	   temp;              /* Temporary word value        */
-	uint32_t	   W[80];             /* Word sequence               */
-	uint32_t	   A, B, C, D, E;     /* Word buffers                */
+	uint32_t    temp;              /* Temporary word value        */
+	uint32_t    W[80];             /* Word sequence               */
+	uint32_t    A, B, C, D, E;     /* Word buffers                */
 
 	/*
 	 *  Initialize the first 16 words in the array W
 	 */
-	for(t = 0; t < 16; t++)
-	{
-		 W[t] = context->Message_Block[t * 4] << 24;
-		 W[t] |= context->Message_Block[t * 4 + 1] << 16;
-		 W[t] |= context->Message_Block[t * 4 + 2] << 8;
-		 W[t] |= context->Message_Block[t * 4 + 3];
+	for (t = 0; t < 16; t++) {
+		W[t] = context->Message_Block[t * 4] << 24;
+		W[t] |= context->Message_Block[t * 4 + 1] << 16;
+		W[t] |= context->Message_Block[t * 4 + 2] << 8;
+		W[t] |= context->Message_Block[t * 4 + 3];
 	}
 
-	for(t = 16; t < 80; t++)
-	{
+	for (t = 16; t < 80; t++) {
 		W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
 	}
 
@@ -294,46 +274,40 @@ void SHA1ProcessMessageBlock(SHA1Context *context)
 	D = context->Intermediate_Hash[3];
 	E = context->Intermediate_Hash[4];
 
-	for(t = 0; t < 20; t++)
-	{
-		 temp =  SHA1CircularShift(5,A) +
-		         ((B & C) | ((~B) & D)) + E + W[t] + K[0];
-		 E = D;
-		 D = C;
-		 C = SHA1CircularShift(30,B);
-		 B = A;
-		 A = temp;
+	for (t = 0; t < 20; t++) {
+		temp = SHA1CircularShift(5,A) + ((B & C) | ((~B) & D)) + E + W[t] + K[0];
+		E = D;
+		D = C;
+		C = SHA1CircularShift(30,B);
+		B = A;
+		A = temp;
 	}
 
-	for(t = 20; t < 40; t++)
-	{
-		 temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];
-		 E = D;
-		 D = C;
-		 C = SHA1CircularShift(30,B);
-		 B = A;
-		 A = temp;
+	for (t = 20; t < 40; t++) {
+		temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];
+		E = D;
+		D = C;
+		C = SHA1CircularShift(30,B);
+		B = A;
+		A = temp;
 	}
 
-	for(t = 40; t < 60; t++)
-	{
-		 temp = SHA1CircularShift(5,A) +
-		        ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];
-		 E = D;
-		 D = C;
-		 C = SHA1CircularShift(30,B);
-		 B = A;
-		 A = temp;
+	for (t = 40; t < 60; t++) {
+		temp = SHA1CircularShift(5,A) + ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];
+		E = D;
+		D = C;
+		C = SHA1CircularShift(30,B);
+		B = A;
+		A = temp;
 	}
 
-	for(t = 60; t < 80; t++)
-	{
-		 temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];
-		 E = D;
-		 D = C;
-		 C = SHA1CircularShift(30,B);
-		 B = A;
-		 A = temp;
+	for (t = 60; t < 80; t++) {
+		temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];
+		E = D;
+		D = C;
+		C = SHA1CircularShift(30,B);
+		B = A;
+		A = temp;
 	}
 
 	context->Intermediate_Hash[0] += A;
@@ -377,28 +351,22 @@ void SHA1PadMessage(SHA1Context *context)
 	 *  block, process it, and then continue padding into a second
 	 *  block.
 	 */
-	if (context->Message_Block_Index > 55)
-	{
-		 context->Message_Block[context->Message_Block_Index++] = 0x80;
-		 while(context->Message_Block_Index < 64)
-		 {
-		     context->Message_Block[context->Message_Block_Index++] = 0;
-		 }
-
-		 SHA1ProcessMessageBlock(context);
-
-		 while(context->Message_Block_Index < 56)
-		 {
-		     context->Message_Block[context->Message_Block_Index++] = 0;
-		 }
-	}
-	else
-	{
-		 context->Message_Block[context->Message_Block_Index++] = 0x80;
-		 while(context->Message_Block_Index < 56)
-		 {
-		     context->Message_Block[context->Message_Block_Index++] = 0;
-		 }
+	if (context->Message_Block_Index > 55) {
+		context->Message_Block[context->Message_Block_Index++] = 0x80;
+		while (context->Message_Block_Index < 64) {
+			context->Message_Block[context->Message_Block_Index++] = 0;
+		}
+
+		SHA1ProcessMessageBlock(context);
+
+		while (context->Message_Block_Index < 56) {
+			context->Message_Block[context->Message_Block_Index++] = 0;
+		}
+	} else {
+		context->Message_Block[context->Message_Block_Index++] = 0x80;
+		while (context->Message_Block_Index < 56) {
+			context->Message_Block[context->Message_Block_Index++] = 0;
+		}
 	}
 
 	/*