Commit d92b0efb authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Framework updates.

parent b329cc24

fips-1.0/fips_canister.c

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ static void *instruction_pointer(void) 
			"mfspr	%0,8\n\t"	/* mflr ret */

			"mtspr	8,%1"		/* restore lr */

			: "=r"(ret),"=r"(scratch) );

# elif	defined(__s390__) || defined(__s390x__)

#   define INSTRUCTION_POINTER_IMPLEMENTED

    __asm __volatile (	"bras	%0,1f\n1:" : "=r"(ret) );

    ret = (void *)((size_t)ret&~3UL);

# elif	defined(__sparc) || defined(__sparc__) || defined(__sparcv9)

#   define INSTRUCTION_POINTER_IMPLEMENTED

    void *scratch;

fips-1.0/fips_premain.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ extern unsigned int FIPS_incore_fingerprint(unsigned char *,unsigned int) 
 */

void FINGERPRINT_premain(void)

{ unsigned char sig[sizeof(FIPS_signature)];

  const unsigned char *p=FINGERPRINT_ascii_value;

  const unsigned char * volatile p=FINGERPRINT_ascii_value;

  unsigned int len=sizeof(sig),i;



    /* "volatilization" is done to disengage unwanted optimization... */

fips-1.0/fips_premain.c.sha1

+1 −1
Original line number Diff line number Diff line 
HMAC-SHA1(fips_premain.c)= 6a08d15c578f1258246181bf52134ae974aa5a80
 
HMAC-SHA1(fips_premain.c)= 6ea1418b49f4c9f2f76ca61e116f9d41e9b6a0e5

fips-1.0/fipsld

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ HMAC_KEY="etaonrishdlcupfm" 
case "`(uname -s) 2>/dev/null`" in

OSF1|IRIX*)	_WL_PREMAIN="-Wl,-init,FINGERPRINT_premain"	;;

HP-UX)		_WL_PREMAIN="-Wl,+init,FINGERPRINT_premain"	;;

AIX)		_WL_PREMAIN="-Wl,-binitfini:FINGERPRINT_premain";;

AIX)		_WL_PREMAIN="-Wl,-binitfini:FINGERPRINT_premain,-bnoobjreorder";;

Darwin)		(   while [ "x$1" != "x" -a "x$1" != "x-dynamiclib" ]; do shift; done;

		    [ $# -ge 1 ]

		) && _WL_PREMAIN="-Wl,-init,_FINGERPRINT_premain" ;;