Framework updates.

diff --git a/fips-1.0/fips_canister.c b/fips-1.0/fips_canister.c
index cbe47155dbae9fafb36eed12a8d88462d1329bd9..64580694c48e3e0bd98f42f59fb8ef8401f16b8e 100644 (file)
--- a/fips-1.0/fips_canister.c
+++ b/fips-1.0/fips_canister.c
@@ -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;

diff --git a/fips-1.0/fips_premain.c b/fips-1.0/fips_premain.c
index 6a75d909eb1d4a931ca73355d88134d8be9a3f12..a39f976ecaa04a791dd8cae2dacbe69b84f1dc3d 100644 (file)
--- a/fips-1.0/fips_premain.c
+++ b/fips-1.0/fips_premain.c
@@ -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... */

diff --git a/fips-1.0/fips_premain.c.sha1 b/fips-1.0/fips_premain.c.sha1
index 967ec89d988aab25db75906426b83ce3981f29da..a83f59346d2b45a7f8ea212e2243282d88eff797 100644 (file)
--- a/fips-1.0/fips_premain.c.sha1
+++ b/fips-1.0/fips_premain.c.sha1
@@ -1 +1 @@
-HMAC-SHA1(fips_premain.c)= 6a08d15c578f1258246181bf52134ae974aa5a80
+HMAC-SHA1(fips_premain.c)= 6ea1418b49f4c9f2f76ca61e116f9d41e9b6a0e5

diff --git a/fips-1.0/fipsld b/fips-1.0/fipsld
index fd31b2c019536060a4e2aff4af513657852e77a0..863e3b3dcfea6674eef0cf81899a7fe6f24c2e90 100755 (executable)
--- a/fips-1.0/fipsld
+++ b/fips-1.0/fipsld
@@ -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" ;;