Commit 4d5d543e authored by Bodo Möller's avatar Bodo Möller
Browse files

Some solaris-usparc MD5 fixes.

parent da70ff71

crypto/md32_common.h

+4 −2
Original line number Diff line number Diff line
@@ -468,7 +468,8 @@ void HASH_UPDATE (HASH_CTX *c, const unsigned char *data, unsigned long len) 
		 */

		if ((((unsigned long)data)%4) == 0)

			{

			HASH_BLOCK_DATA_ORDER_ALIGNED (c,data,sw);

			/* data is properly aligned so that we can cast it: */

			HASH_BLOCK_DATA_ORDER_ALIGNED (c,(HASH_LONG *)data,sw);

			sw*=HASH_CBLOCK;

			data+=sw;

			len-=sw;
@@ -514,7 +515,8 @@ void HASH_TRANSFORM (HASH_CTX *c, const unsigned char *data) 
	{

#if defined(HASH_BLOCK_DATA_ORDER_ALIGNED) && HASH_BLOCK_DATA_ORDER_ALIGNED!=1

	if ((((unsigned long)data)%4) == 0)

		HASH_BLOCK_DATA_ORDER_ALIGNED (c,data,1);

		/* data is properly aligned so that we can cast it: */

		HASH_BLOCK_DATA_ORDER_ALIGNED (c,(HASH_LONG *)data,1);

	else

#if !defined(HASH_BLOCK_DATA_ORDER)

		{

crypto/md5/Makefile.ssl

+5 −2
Original line number Diff line number Diff line
@@ -67,11 +67,14 @@ asm/mx86unix.cpp: asm/md5-586.pl 
	(cd asm; $(PERL) md5-586.pl cpp >mx86unix.cpp)



# works for both SC and gcc

# (PATH is changed because /usr/ccs/bin/as knows opcodes we need

# that GNU as has never heard of)

asm/md5-sparcv8plus.o: asm/md5-sparcv9.S

	$(CPP) -DULTRASPARC -DMD5_BLOCK_DATA_ORDER asm/md5-sparcv9.S | as -xarch=v8plus /dev/fd/0 -o asm/md5-sparcv8plus.o

	$(CPP) -DULTRASPARC -DMD5_BLOCK_DATA_ORDER asm/md5-sparcv9.S | \

	PATH=/usr/ccs/bin:$(PATH) as -xarch=v8plus /dev/fd/0 -o asm/md5-sparcv8plus.o



asm/md5-sparcv9.o: asm/md5-sparcv9.S

	$(CC) -xarch=v9 -DULTRASPARC -DMD5_BLOCK_DATA_ORDER -c asm/md5-sparcv9.S -o asm/md5-sparcv9.o

	PATH=/usr/ccs/bin:$(PATH) $(CC) -xarch=v9 -DULTRASPARC -DMD5_BLOCK_DATA_ORDER -c asm/md5-sparcv9.S -o asm/md5-sparcv9.o





files: