sha: remove need for 64 byte alignment on input

Author: DacoTaco

libogc/sha.c

@@ -27,6 +27,7 @@ distribution.
 -------------------------------------------------------------*/
 #if defined(HW_RVL)
 
+#include <malloc.h>
 #include <string.h>
 #include "gctypes.h"
 #include "gcutil.h"
@@ -43,36 +44,50 @@ typedef enum
 	AddData = 0x01,
 	FinalizeHash = 0x02,
 } ShaCommand;
+static u8 input_buffer[0x1000] ATTRIBUTE_ALIGN(64);
 
 static s32 SHA_ExecuteCommand(const ShaCommand command, sha_context* context, const void* in_data, const u32 data_size, void* out_data)
 {
 	ioctlv* params = (ioctlv*)iosAlloc(__sha_hid, sizeof(ioctlv) * 3);
-	s32 ret = -1;
-	
 	if(params == NULL)
-		return -4;
+		return -5;
 
-	for (u32 i = 0; i < data_size; i += SHA_MSGBLOCK_SIZE) {
-		u32 size = SHA_MSGBLOCK_SIZE;
+	params[1].data = (void*) context;
+	params[1].len  = sizeof(sha_context);
+	params[2].data = out_data;
+	params[2].len  = 0x14;
+
+	//if data is not 64-byte aligned we use the internal input_buffer to contain the data
+	bool isAlignedInput = ((u32)in_data & 0x3F) == 0;
+	s32 ret = -1;
+
+	for (u32 i = 0; i < data_size;) 
+	{
+		const void* input = in_data + i;
+		u32 size = isAlignedInput ? SHA_MSGBLOCK_SIZE : sizeof(input_buffer);
 		ShaCommand block_cmd = command;
-		
+
 		//if it's the final block, set size correctly.
 		//if it's not the final block, and we got a finalize, we will first send the add command
-		if(i+SHA_MSGBLOCK_SIZE >= data_size)
+		if(i+size >= data_size)
 			size = data_size - i;
 		else if(command == FinalizeHash)
 			block_cmd = AddData;
 
-		params[0].data	= (void*)((u32)in_data + i);
-		params[0].len	= size;
-		params[1].data	= (void*) context;
-		params[1].len	= sizeof(sha_context);
-		params[2].data	= (void*)((u32)out_data);
-		params[2].len	= 0x14;
+		if(!isAlignedInput)
+		{
+			input = input_buffer;
+			memcpy(input_buffer, in_data + i, size);
+		}
+
+		params[0].data = (void*)input;
+		params[0].len  = size;
 
 		ret = IOS_Ioctlv(__sha_fd, block_cmd, 1, 2, params);
 		if (ret < 0)
 			break;
+
+		i += size;
 	}
 
 	iosFree(__sha_hid, params);
@@ -140,9 +155,6 @@ s32 SHA_Calculate(sha_context* context, const void* data, const u32 data_size, v
 	if(((u32)context & 0x1F) != 0 || ((u32)message_digest & 0x1F) != 0)
 		return -4;
 
-	if( data != NULL && ((u32)data & 0x3F) != 0)
-		return -4;
-	
 	return SHA_ExecuteCommand(FinalizeHash, context, data, data_size, message_digest);
 }
 
@@ -151,7 +163,7 @@ s32 SHA_Input(sha_context* context, const void* data, const u32 data_size)
 	if(context == NULL || data == NULL || data_size == 0)
 		return -1;
 
-	if((((u32)context) & 0x1F) || (((u32)data) & 0x3F))
+	if(((u32)context) & 0x1F)
 		return -4;
 
 	return SHA_ExecuteCommand(AddData, context, data, data_size, NULL);