Merge pull request #3 from IBM/1.1.1x-update

Update from OpensslIBM support repo.

Author: smcmahonibm

icc/Makefile

@@ -165,27 +165,31 @@ create_openssl: ../openssl_source/$(OPENSSL_VER)-icc.tar.gz
 # Untar the sources for the version of OpenSSL we use
 # since 1.1.1u the OpenSSL tar has icc patches applied
 # the first dir name in the archive will vary so we make an empty directory to extract
-	[ -n "$(EX_SUFFIX)" ] || \
 	( \
 	   cd .. ; \
 	   rm -r $(OPENSSL_VER) openssl ; \
 	   rm -rf x; mkdir x; cd x; \
 	   tar xzf ../openssl_source/$(OPENSSL_VER)-icc.tar.gz ; \
-	   mv `ls -d *`/openssl ../$(OPENSSL_VER) ; \
+	   mv openssl ../$(OPENSSL_VER) ; \
 	   chmod +x ../$(OPENSSL_VER)/Configure ; \
 	   cd ..; \
+	   rmdir x; \
 	)
-# Apply all the patches
+# Apply all the patches and fixes
 # rm Makefile , which SHOULDN'T BE THERE ANYWAY
 # Note: since 1.1.1u we are not applying patches.
+# ref opensslver.mk: OSSL_DIR is ../$(OPENSSL_VER)$(EX_SUFFIX) and EX_SUFFIX is usually "" so they are the same.
 	( \
-	   cd $(OSSL_DIR) ;\
-	   [ -n "$(EX_SUFFIX)" ] || \
-		sh ../openssl_source/tools/patchem2 "../openssl_source/$(OPENSSL_BIN)" ;\
-		chmod +x tools/*;\
-	   	rm -f Makefile; \
+	if [ -d $(OSSL_DIR) ] ; then \
+        cd $(OSSL_DIR) ;\
+        sh ../openssl_source/tools/patchem2 "../openssl_source/$(OPENSSL_BIN)" ;\
+        chmod +x tools/*;\
+       	rm -f Makefile; \
+	else exit 1 ; \
+	fi \
 	)
 
+
 #- Create the OpenSSL sources from tarfile and patches on zOS
 #- This has NO automated dependencies as that messes the automated builds
 #- this MUST be tripped manually.

icc/icc.rc

@@ -0,0 +1,105 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+#include "iccversion.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION ICC_VERSION_VER,ICC_VERSION_REL,ICC_VERSION_MOD,ICC_VERSION_FIX
+ PRODUCTVERSION ICC_VERSION_VER,ICC_VERSION_REL,ICC_VERSION_MOD,ICC_VERSION_FIX
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "0c0904b0"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "IBM\0"
+            VALUE "FileDescription", ICC_DESCRIPTION1
+            VALUE "FileVersion", ICC_PRODUCT_VERSION
+            VALUE "InternalName", "OCKC\0"
+            VALUE "OriginalFilename", "icc.lib\0"
+            VALUE "ProductName", "OpenCryptographyKitC"
+            VALUE "ProductVersion", ICC_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0xc09, 1200
+    END
+END
+
+#endif    // !_MAC
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

icc/opensslver.mk

@@ -20,7 +20,7 @@ OPENSSL_VER    = openssl-$(OPENSSL_BIN)
 # checked into source control. This option is used by iSeries/OS400 for Clearcase builds.
 
 # Where the source tree for OpenSSL will be
-OSSL_DIR       = ../$(OPENSSL_VER)$(EX_SUFFIX)
+OSSL_DIR       = $(ICC_ROOT)/$(OPENSSL_VER)$(EX_SUFFIX)
 
 # What file we use in the OpenSSL tree to trip a regen of the sources
 OSSL_TAG       = $(OSSL_DIR)/Makefile