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

Framework updates.

parent 1970bc27

fips-1.0/fips_premain.c

+5 −0
Original line number Diff line number Diff line
@@ -27,7 +27,12 @@ 
# endif

  void FINGERPRINT_premain(void);

  static int premain_wrapper(void) { FINGERPRINT_premain(); return 0; }

# ifdef _WIN64

# pragma section(".CRT$XCU",read)

  __declspec(allocate(".CRT$XCU"))

# else

# pragma data_seg(".CRT$XCU")

# endif

  static int (*p)(void) = premain_wrapper;

  /* This results in pointer to premain to appear in .CRT segment,

   * which is traversed by Visual C run-time initialization code.

fips-1.0/fips_premain.c.sha1

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

util/mk1mf.pl

+1 −1
Original line number Diff line number Diff line
@@ -968,7 +968,7 @@ if ($fips) 
					"\$(FIPS_SHA1_EXE)", "");

		$rules.=&do_link_rule("\$(FIPS_SHA1_EXE)",

					"\$(OBJ_D)${o}fips_standalone_sha1$obj \$(OBJ_D)${o}sha1dgst$obj \$(SHA1_ASM_OBJ)",

					"","", 1);

					"","\$(EX_LIBS)", 1);

		}

	else

		{

util/pl/VC-32.pl

+2 −2
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ sub do_lib_rule 
			$ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";

			$ret.="\tSET FIPS_TARGET=$target\n";

			$ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";

			$ret.="\t\$(FIPSLINK) \$(MLFLAGS) $base_arg $efile$target ";

			$ret.="\t\$(FIPSLINK) \$(MLFLAGS) /map $base_arg $efile$target ";

			$ret.="$name @<<\n  \$(SHLIB_EX_OBJ) $objs ";

			$ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n<<\n";

			}
@@ -386,7 +386,7 @@ sub do_link_rule 
		$ret.="\tSET FIPS_TARGET=$target\n";

		$ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";

		$ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";

		$ret.="\t\$(FIPSLINK) \$(LFLAGS) $efile$target @<<\n";

		$ret.="\t\$(FIPSLINK) \$(LFLAGS) /map $efile$target @<<\n";

		$ret.="\t\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n<<\n";

		}

	else