# HG changeset patch
# User Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
# Date 1437166371 25200
# Node ID f81cb9995e58aa87c8a8adf85a84b19e8278c886
# Parent  ab6b84c0570589073aebe72d425988e91be043ef
21452701 openssl fips doesn't build now that isalist is gone

diff -r ab6b84c05705 -r f81cb9995e58 components/openssl/openssl-fips/64/isalist.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openssl/openssl-fips/64/isalist.sh	Fri Jul 17 13:52:51 2015 -0700
@@ -0,0 +1,42 @@
+#!/bin/ksh93
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# A simple isalist replacement which pretends to be 64-bit
+
+UNAME_M=$(uname -m)
+
+case $UNAME_M in
+	sun4[uv])
+		echo "sparcv9"
+		;;
+	i86pc)
+		echo "amd64"
+		;;
+	*)
+		echo "unknown"
+		;;
+esac
+
diff -r ab6b84c05705 -r f81cb9995e58 components/openssl/openssl-fips/Makefile
--- a/components/openssl/openssl-fips/Makefile	Fri Jul 17 13:25:28 2015 -0700
+++ b/components/openssl/openssl-fips/Makefile	Fri Jul 17 13:52:51 2015 -0700
@@ -50,7 +50,7 @@
 # command sets U1 and U2 are defined in the FIPS 2.0.5 security policy and must be
 # run as shown there. Nothing from the tarball can be modified. We use the U2
 # command set, see below.
-FAKE_ISALIST = 32/isalist
+FAKE_ISALIST = 32/isalist 64/isalist
 FAKE_MAKE = fips-gmake
 FAKE_CC = cc
 FAKE_APPS = $(FAKE_ISALIST) $(FAKE_MAKE) $(FAKE_CC)
@@ -62,7 +62,7 @@
 # we'll also pick up gcc if we find it in the path, so force it to
 # find one that doesn't work like it wants
 FIPS_PATH_32 = $(COMPONENT_DIR)/32:$(COMPONENT_DIR)/gcc:$(PATH)
-FIPS_PATH_64 = $(COMPONENT_DIR)/gcc:$(PATH)
+FIPS_PATH_64 = $(COMPONENT_DIR)/64:$(COMPONENT_DIR)/gcc:$(PATH)
 
 # HMAC-SHA-1 digest of the OpenSSL FIPS tar file is used for the
 # integrity test requirement for the FIPS-140 validation.