[openssl-commits] [openssl] OpenSSL-fips-2_0-stable update

[Dr. Stephen Henson]

The branch OpenSSL-fips-2_0-stable has been updated
       via  a0f8d282d728a3584f08ecb5f8321c37bb06dd28 (commit)
       via  0f38e9cd782167471898440c3179c648e196d456 (commit)
      from  34f39b062c76fbd3082521b26edee7f53afc061d (commit)


- Log -----------------------------------------------------------------
commit a0f8d282d728a3584f08ecb5f8321c37bb06dd28
Author: Steve Marquess <marquess at opensslfoundation.com>
Date:   Sat Jul 4 15:18:46 2015 -0400

    Add new iOS subdirectory
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit 0f38e9cd782167471898440c3179c648e196d456
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Jul 4 15:17:45 2015 -0400

    Add new VxWorks x86 platform
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Stephen Henson <steve at openssl.org>

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

Summary of changes:
 Configure            | 1 +
 fips/fips_canister.c | 3 ++-
 util/fipsdist.pl     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Configure b/Configure
index 613f829..5f3d0cd 100755
--- a/Configure
+++ b/Configure
@@ -613,6 +613,7 @@ my %table=(
 "vxworks-ppc860","ccppc:-nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
 "vxworks-simlinux","ccpentium:-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DL_ENDIAN -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/h -I\$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK:::VXWORKS:-r::${no_asm}::::::ranlibpentium:",
 "vxworks-mips","ccmips:-mrtp -mips2 -O -G 0 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/h/wrn/coreip::-D_REENTRANT:VXWORKS:-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon::${mips32_asm}:o32::::::ranlibmips:",
+"vxworks-pentium","ccpentium:-Os -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DL_ENDIAN -DCPU=PENTIUM4 -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -D_WRS_KERNEL -D_WRS_VX_SMP -I\$(WIND_BASE)/target/h -I\$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK:::VXWORKS:-r::${no_asm}::::::ranlibpentium:",
 
 ##### Compaq Non-Stop Kernel (Tandem)
 "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",
diff --git a/fips/fips_canister.c b/fips/fips_canister.c
index adbe696..3c33d00 100644
--- a/fips/fips_canister.c
+++ b/fips/fips_canister.c
@@ -32,7 +32,8 @@ const void         *FIPS_text_end(void);
 				  defined(__aarch64__)			|| \
 				  defined(__i386__)|| defined(__i386)))	|| \
 	(defined(__vxworks)   && (defined(__ppc__) || defined(__ppc)	|| \
-				  defined(__mips__)|| defined(__mips)))	|| \
+				  defined(__mips__)|| defined(__mips)	|| \
+				  defined(__i386__)|| defined(__i386)))	|| \
         (defined(__NetBSD__)  && (defined(__powerpc__) || defined(__i386))) || \
 	(defined(__linux)     && ((defined(__PPC__) && !defined(__PPC64__)) || \
 				  defined(__arm__) || defined(__arm)) || \
diff --git a/util/fipsdist.pl b/util/fipsdist.pl
index 53f9d3e..4ebf1ac 100644
--- a/util/fipsdist.pl
+++ b/util/fipsdist.pl
@@ -58,7 +58,7 @@ while (<STDIN>)
 		}
 	else
 		{
-		next unless (/^(fips\/|crypto|util|test|include|ms|c6x)/);
+		next unless (/^(fips\/|crypto|util|test|include|ms|c6x|iOS)/);
 		}
 	if (/^crypto\/([^\/]+)/)
 		{