From: Andy Polyakov <appro@openssl.org>
Date: Mon, 20 Apr 2015 13:53:12 +0000 (+0200)
Subject: util/incore update.
X-Git-Tag: OpenSSL_1_1_0-pre1~1152
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=bd576049a9db8c6caca99c8f965663422658a464

util/incore update.

Support cross-compile platforms that don't support FINGERPRINT_premain,
e.g. VxWorks.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/util/incore b/util/incore
index e6e6ecfd89..bb765b1966 100755
--- a/util/incore
+++ b/util/incore
@@ -382,7 +382,7 @@ if (!$legacy_mode) {
     }
 
     $FINGERPRINT_ascii_value
-			= $exe->Lookup("FINGERPRINT_ascii_value")	or die;
+			= $exe->Lookup("FINGERPRINT_ascii_value");
 
 }
 if ($FIPS_text_startX && $FIPS_text_endX) {
@@ -439,9 +439,12 @@ $fingerprint = FIPS_incore_fingerprint();
 
 if ($legacy_mode) {
     print unpack("H*",$fingerprint);
-} else {
+} elsif (defined($FINGERPRINT_ascii_value)) {
     seek(FD,$FINGERPRINT_ascii_value->{st_offset},0)	or die "$!";
     print FD unpack("H*",$fingerprint)			or die "$!";
+} else {
+    seek(FD,$FIPS_signature->{st_offset},0)		or die "$!";
+    print FD $fingerprint				or die "$!";
 }
 
 close (FD);