diff --git a/AESCMACtest.c b/AESCMACtest.c
new file mode 100644
index 0000000..ec0db81
--- /dev/null
+++ b/AESCMACtest.c
@@ -0,0 +1,51 @@
+#include <stdio.h>
+#include <strings.h>
+#include "aes_cmac.h"
+#include "aes128.h"
+
+////////////////////////////////////////////////////////////////////////////////
+void dump(const char *label,uint8 *dt,int len)
+{
+  int i;
+  printf("%s",label);
+  for(i=0;i<len;i++)
+  {
+    printf("%02x",*dt++);
+  }
+  printf("\n");
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+int main(int argc, char const* argv[])
+{
+	char *msg1 = "01234567890123456789";
+	char *msg2 = "11234567890123456789";
+	char *msg3 = "01234567891123456789";
+	char *msg4 = "0123456789012345";
+	char *msg5 = "ABCDEFGHIJJJJJJ5";
+	char *msg6 = "ABCDEFGHIJJJJJJK";
+	char *msg7 = "ZBCDEFGHIJJJJJJK";
+
+  uint mac[4];
+
+	uint8 key[] = { 0x12, 0x34, 0x56, 0x78, 0xab, 0xcd, 0x56, 0x78,
+	               0x00, 0x34, 0x00, 0x78, 0x00, 0x00, 0x56, 0x78,};
+#define DUMP(msg) \
+  printf("%-30s- ", msg);\
+    memcpy(mac, (uint8*)AES_cmac(key, (uint *)msg, strlen(msg)), aes_datalen);\
+    dump(#msg " CMAC = ", (uint8*)mac, aes_datalen);
+
+  DUMP(msg1);
+  DUMP(msg2);
+  DUMP(msg3);
+  DUMP(msg4);
+  DUMP(msg1);
+  DUMP(msg5);
+  DUMP(msg6);
+  DUMP(msg7);
+  DUMP(msg5);
+	return 0;
+}
+
+// vi:expandtab:foldmethod=syntax sw=2 ts=2
diff --git a/AESKDFtest.c b/AESKDFtest.c
new file mode 100644
index 0000000..97e5fd6
--- /dev/null
+++ b/AESKDFtest.c
@@ -0,0 +1,41 @@
+#include <stdio.h>
+#include <strings.h>
+#include "aes_kdf.h"
+
+////////////////////////////////////////////////////////////////////////////////
+void dump(const char *label,uint8 *dt,int len)
+{
+  int i;
+  printf("%s",label);
+  for(i=0;i<len;i++)
+  {
+    printf("%02x",*dt++);
+  }
+  printf("\n");
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+int main(int argc, char const* argv[])
+{
+	char *msg1 = "0123456789012345";
+	char *msg2 = "1123456789012345";
+	char *msg3 = "0123456789112345";
+
+  uint mac[4];
+
+	uint8 key[] = { 0x12, 0x34, 0x56, 0x78, 0xab, 0xcd, 0x56, 0x78,
+	               0x00, 0x34, 0x00, 0x78, 0x00, 0x00, 0x56, 0x78,};
+#define DUMP(msg) \
+  printf("%-30s- ", msg);\
+    memcpy(mac, (uint8*)AES_KDF((uint *)msg, 1), aes_datalen);\
+    dump(#msg " CMAC = ", (uint8*)mac, aes_datalen);
+
+  DUMP(msg1);
+  DUMP(msg2);
+  DUMP(msg3);
+  DUMP(msg1);
+	return 0;
+}
+
+// vi:expandtab:foldmethod=syntax sw=2 ts=2
diff --git a/AEStest.c b/AEStest.c
new file mode 100644
index 0000000..95b55f7
--- /dev/null
+++ b/AEStest.c
@@ -0,0 +1,42 @@
+#include <stdio.h>
+#include <strings.h>
+
+#include "aes128.h"
+
+////////////////////////////////////////////////////////////////////////////////
+void dump(const char *label,uint8 *dt,int len)
+{
+  int i;
+  printf("%s",label);
+  for(i=0;i<len;i++)
+  {
+    printf("%02x",*dt++);
+  }
+  printf("\n");
+}
+
+////////////////////////////////////////////////////////////////////////////////
+int main(int argc, char const* argv[])
+{
+  uint8 key[]={0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+               0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f};
+  uint8 init[]={0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,
+               0x88,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff};
+  uint data[16]; 
+  uint8 *data8 = (uint8*)data;
+
+  memcpy(data,init,sizeof(init));
+
+  printf("** AES-128 TEST **\n");
+    dump("plain::: ",data8,16);
+    dump("key::::: ",key ,16);
+  AES128_crypt(data, key);
+    dump("crypt::: ",data8,16);
+  AES128_decrypt(data, key);
+    dump("decrypt: ",data8,16);
+  printf("\n");
+
+  return 0;
+}
+
+// vi:expandtab:foldmethod=syntax sw=2 ts=2
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..2284cab
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+.PHONY: all clean
+
+ALL:= AEStest AESCMACtest AESKDFtest
+all: ${ALL}
+
+AEStest: AEStest.o aes128.o
+AESCMACtest: AESCMACtest.o aes_cmac.o aes128.o
+AESKDFtest: AESKDFtest.o aes_kdf.o aes128.o
+
+clean:
+	rm -f *.o ${ALL}