[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  bd576049a9db8c6caca99c8f965663422658a464 (commit)
      from  7ee7f9202581f2bf4098384ce3bb55c8fe2180b3 (commit)


- Log -----------------------------------------------------------------
commit bd576049a9db8c6caca99c8f965663422658a464
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon Apr 20 15:53:12 2015 +0200

    util/incore update.
    
    Support cross-compile platforms that don't support FINGERPRINT_premain,
    e.g. VxWorks.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 util/incore | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/util/incore b/util/incore
index e6e6ecf..bb765b1 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);