INST_DIR and JINST_DIR definitions required.

ICC_t typedef required.

Author: smcmahonibm

iccpkg/Makefile

@@ -162,7 +162,7 @@ SDK_HEADERS = $(GSK_SDK)/icc.h $(GSK_SDK)/icc_a.h $(GSK_SDK)/iccglobals.h $(GSK_
 # our local dks integration and test code
 # sigtest and kemtest comes from here
 pqc_test_build:
-	$(MAKE) -C pqc all
+	"$(MAKE)" -C pqc all
 
 # only run the pqc test if we have pqc support present
 ifeq ($(strip $(PQCLIBS)),)
@@ -369,6 +369,10 @@ $(ICC_ROOT)/doc/IBM_CKC.pdf:
 $(GSK_SDK)/IBM_CKC.pdf: $(GSK_SDK) $(ICC_ROOT)/doc/IBM_CKC.pdf
 	$(CP) $(ICC_ROOT)/doc/IBM_CKC.pdf $@
 
+# local alias directory names - deprecated and only used in this Makefile
+# These are the runtime directories (package/*gskit_crypto/)
+INST_DIR	= $(GSK_DIR)
+
 # if it is a no_legacy build then delete the C dir completely
 
 runtime_setup_C: $(INST_DIR)/C/icc/icclib/$(OLD_LIBICC) $(INST_DIR)/C/icc/ReadMe.txt
@@ -661,6 +665,10 @@ $(GSK_OPENSSL): $(ICC_ROOT)/package/iccsdk/openssl$(EXESUFX)
 #$(JGSK_SDK)/Standard_International_Program_License_Agreement.pdf: $(JGSK_DIR) $(ICC_ROOT)/icc/Standard_International_Program_License_Agreement.pdf
 #	$(CP) $(ICC_ROOT)/icc/Standard_International_Program_License_Agreement.pdf $@
 #	chmod +w $@
+# local alias directory names - deprecated and only used in this Makefile
+# These are the runtime directories (package/*gskit_crypto/)
+JINST_DIR   = $(JGSK_DIR)
+
 # match runtime_setup_C
 
 Jruntime_setup_C: $(JINST_DIR)/C/icc/icclib/$(OLD_LIBICC) $(JINST_DIR)/C/icc/ReadMe.txt

iccpkg/gsk_wrap2.c

@@ -139,6 +139,16 @@ typedef struct {
   int is_wchar; /* Set if we were initialized via ICC_InitW() */
 } WICC_CTX;
 
+/*! @brief This structure is anonymous as far as ICC users are
+  concerned. It holds per-context information plus in funcs a link to 
+  more detailed internal context
+*/
+struct ICC_t
+{
+  FUNC **funcs;  /*!< Pointer to the call table */
+  int dummy2;      /*!< Dummy to wake up the debugger */       
+};
+ 
 #if defined(__sun) || defined(__hpux)
 static int setenv(const char *name,const char *value,int overwrite)
 {