Support for MQ 9.1.4 encrypted datasets

Author: ibmmqmet

CHANGES.md

@@ -2,7 +2,8 @@
 History (newest at top)
 =======================
 
-xxxx 2019 (vX.X.X)
+Dec 2019 (v5.2.0)
+* Add support for MQ 9.1.4 encrypted datasets and logs
 * Update the header filter to force C99 standardised types internally (eg uint32_t)
 
 Sep 2019 (v5.1.5)

bin/aix/convH

@@ -26,7 +26,7 @@ else
   flags="$flags $optim"
 fi
 
-export PLATFLAGS=$flags CC=$cc VERS=913
+export PLATFLAGS=$flags CC=$cc VERS=914
 make -e -f Makefile.unix $*
 
 rm -f $targdir/convH $targdir/mqsmfcsv

bin/aix/mqsmfcsv

@@ -3,7 +3,7 @@ CC=i686-w64-mingw32-gcc
 # CFLAGS= -I. -m32 -fpack-struct=8 -DPLATFORM_WINDOWS 
 CFLAGS= -I. -m32  -DPLATFORM_WINDOWS 
 PLATFLAGS=
-VERS=913
+VERS=914
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \

bin/linux/mqsmfcsv

@@ -1,5 +1,5 @@
 CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J /O2 /DPLATFORM_WINDOWS
-VERS=913
+VERS=914
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \

bin/win/mqsmfcsv.exe

@@ -13,10 +13,21 @@
 #include <stdio.h>
 #include "mqsmf.h"
 
+/*******************************************************************/
+/* Bitfields on z/OS are implemented in the compiler with the      */
+/* first bit being the top bit of a word. So we refer to           */
+/* flags in that order.                                            */
+/*******************************************************************/
+#define QESDENCF (0x80000000)
+
 SMFPRINTGLOB;
 
 void printQESD(qesd *p)
 {
+  unsigned int  flags;
+  unsigned int  *u;
+
+
       SMFPRINTSTART("QESD",p,conv16(p->qesdll));
 
       ADDSTREN("Structure"        , p -> qesdstr,12);
@@ -92,6 +103,21 @@ void printQESD(qesd *p)
       ADDSTCK ("Other_Read_IO_Time", p -> qesdioot);
       ADDSTCK ("Other_Read_IO_Wait", p -> qesdioow);
 
+#if CSQDSMF_VERSION >= 914
+      if (conv16(p->qesdll)>offsetof(qesd,qesdflag)) {
+        u = (unsigned int *)&p->qesdflag;
+        flags = conv32(*(u+1));
+
+        if(flags & QESDENCF) {
+          ADDSTR("Encrypted","Yes",3);
+        }
+        else
+        {
+          ADDSTR("Encrypted","No",3);
+        }
+      }
+#endif
+
       SMFPRINTSTOP;
       return;
 }

src/M

@@ -20,6 +20,7 @@
 /* flags in that order.                                            */
 /*******************************************************************/
 #define QIS1EXPF (0x80000000)
+#define QIS1ENCF (0x40000000)
 
 SMFPRINTGLOB;
 
@@ -72,7 +73,16 @@ void printQIS1(qis1 *p)
   {
     ADDSTR("Expand","No",3);
   }
-
+#if CSQDSMF_VERSION >= 914
+  if(flags & QIS1ENCF)
+  {
+    ADDSTR("Encrypted","Yes",3);
+  }
+  else
+  {
+    ADDSTR("Encrypted","No",3);
+  }
+#endif
   SMFPRINTSTOP;
 
   return;

src/Makefile.gcc.win

@@ -97,6 +97,7 @@ void printQJST(qjst *p)
     ADDU64 ("IO_Time_Sum_Squares_2", p->qjstiosqu[1]);
   }
 
+#if CSQDSMF_VERSION >= 912
   /* MQ 9.1.2 added support for zHyperwrite logging */
   if (conv16(p->qjstll)>offsetof(qjst,qjstcp1n))
   {
@@ -105,6 +106,14 @@ void printQJST(qjst *p)
       ADDS32("New_Logs_ZHW_Capable"     , p->qjsthwc);
       ADDS32("New_Logs_ZHW_Enabled"     , p->qjsthwe);
   }
+#endif
+
+#if CSQDSMF_VERSION >= 914
+  /* MQ 9.1.4 added support for encrypted datasets */
+  if (conv16(p->qjstll)>offsetof(qjst,qjstencr)) {
+      ADDS32("New_Logs_Encrypted",p->qjstencr);
+  }
+#endif
 
   SMFPRINTSTOP;
 

src/Makefile.win

@@ -6,10 +6,10 @@ qct_ssl : 48
 qct_dns : 48
 qcst : 324
 qest : 4104
-qesd : 328
+qesd : 336
 qist : 80
 qis1 : 104
-qjst : 592
+qjst : 596
 qlst : 32
 qmac : 48
 qmst : 104