diff --git a/ch-resp-self/SecureStorage/Identity_priv.pem b/ch-resp-self/SecureStorage/Identity_priv.pem
deleted file mode 100644
index 3484778..0000000
--- a/ch-resp-self/SecureStorage/Identity_priv.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA1FomNTVE/DdCHc0JAOZW6BC6zwcZOklne1FFni0EXJYNL4mY
-XyDvigv6zOQObjYtgKIwj01WSxAA1/4EcjfcVt6sR+I0ufEjoSDF/WX+5jFc/k5l
-dnWwZzBBEfZVSuZu8LAhqpj7woY95x9QzvNGKq0neEIonihRSnQTfwingDsKd6+c
-i0H85Pi7lJ9bGpVTGlE9AMQBQvHRlnl3Ig+L7UDeNN4CDAXYvIqXTq0RQ+OvdvMY
-g1AfZ4rGoa91Cw208zb3FCnGIpCQWGUSDypdQgo0ptQU8UiaTmF0hW0q3TeG8763
-uMKQA3QVZIASA6hp2oMVcDjeWo8+pd7Ig2iqsQIDAQABAoIBACquowrjVeYfIkA0
-r9hZNAMpp67Ipbq4Od9IzuYz9LI6a9SQAssuJs+XyFWqCjd/VsaJ8xo+qHdmdFD1
-ywV9MmHYmIbLUh9Et41htcIQ3/r7VY59CfpVPfuDsLSQT4UCS66/rEiqvsHS8zrT
-Kc4rCkG2M56Bp8HgZzSAn9GTFv3YImFzqb7fnJA84vAmWqneet6+uZK6iYjznJ3p
-jlyyUhMtnqI55nRlArlwb9stcwVRqtgTB+ztUFVCuAtYRWUBWmWdXhllzF2AO22Z
-tq03kC0y2QT178Smgkn7AT9/DLG7TnqS5xbCPwg5wK48IPh7okwYritJaSKlLPQu
-Xbha9TUCgYEA8W/Pw2I1yALKyNEzkPp2jFczUjcuxT8zPYEq9tLAItw3V3AIJbbI
-tE3UFqnFcCszcsJnHmsnxkbfRQlnq0gGiopGs5KjqUDae4QiL/s03U2Voo937ghG
-+BtWn2uf6CV7GBe0W7XqLwltWurUZQj0Y9Q+nPY19Libnm/1CGdWSJ0CgYEA4Sk4
-714u5IqK5eH69ETMmYZoapE41vykr6Pn0iWF/tNPlIV/x2MU1+5n9rfqQ3ty2zlk
-Bn5+In89a8Jqw8kMOG1nOaIWb0uz5Xs3bRxOXTdfB1S4ENdTYlbag9FcRG1kHGI6
-5wyIDVy3dC/4fB10QoIt8P4h3OW6DO1xLvZLHCUCgYEA616HewB5Ub13F4Lq9IFX
-pMU14Qau79gHCgSsb+dRLCrnQLSVHL8utqfRBS8IratQAqaGhN8N7XwWGWVrzUzw
-I4teFZ31MwFofVV5RrFs/fmu0MVws3saRLHSJqRzRYuUjw4849Nas/RKyYF5Ae5S
-4id9yuM0ApkeDL00cbbcJPkCgYAWWGj2GHq+46D1P4AQTeOgON6T9OWXMGuHotSW
-3nJ137K+IqGTwBmJdHeM3KO7Hr0/VGrA2jzaX5ZQ43KFC6bS0sizx4pCcVjhJWFS
-ysRcK+qaZ6X8xeHYmJYHDvgBMnoE9xqxY2T9Ln5mYXxflOy8zP6SNCZYLdRRBB9/
-caHyoQKBgQDhJqhzsNBiNp8ViVh9hGNfC991M2BeXojSuTwOY07uaepMgk5qcvaR
-H0HQULeflblkRuf2BxslmRMmNp/1P8uCFVnd1t+XIjz7r6RFxTsgnSTd/ee6V7Nl
-vgMTOj11Kz7cWjH+4LCfc/CtIZKvkQnM/1uAQMzjr2K6+fNQAZFBKw==
------END RSA PRIVATE KEY-----
diff --git a/ch-resp-self/defines.h b/ch-resp-self/defines.h
index 9a527e7..0c90917 100644
--- a/ch-resp-self/defines.h
+++ b/ch-resp-self/defines.h
@@ -65,7 +65,7 @@
 
 #define isRSA			0
 #define isECC 			1
-#define DFL_PKC			isRSA		// isECC, 1 = ECC, 0= RSA
+#define DFL_PKC			isECC		// isECC, 1 = ECC, 0= RSA
 
 //#define BIN 			2
 #define PEM 			0
@@ -179,4 +179,4 @@ typedef struct
 
 
 #endif	//DEFINE_HEADERS_SEEN
-//End of file
\ No newline at end of file
+//End of file
diff --git a/ch-resp-self/keys/Alias_priv.pem b/ch-resp-self/keys/Alias_priv.pem
deleted file mode 100644
index 230055a..0000000
--- a/ch-resp-self/keys/Alias_priv.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAr6sq5kOG6A/12geq+/i8Ta2BnaMGqxLR4a9PciukW7awogS9
-WNpA8DlWV2B1M5zSZSKPPS9PDdC/JqXSiMWt5fHZpRCyZ3Zokclc/V8TWgDkRxZF
-xHkPWUDshUIXaMzwj+eJvm2qH+LWrjr0zxqvKj2a8qFs0gYMqGB1jGun/N41Tz8B
-/QmWjeakd8Zr3iY6cxVqd4GvUTgn/KC4YeZ2/CkdQTPQx6fdYrVHF0DMqrAZCSns
-yRAa02oAZhiBzz4gw//fB5+k42/+Mrzrnmv/l4HnQwnGPIBQK4IDYe7YyOt7ZWRF
-RkQydwHXE5fVifjrmKOj0vM1tRKjfZ1CoRxEFQIDAQABAoIBAD/6co7XZCBLg8pL
-BaJsRkRyHyVG1SxkF81+uEwICf2fDTiMyls8be8vqrr69eR8xoGv8wQhIUUSVDPi
-q8lFWZ7IFPDRonAdB1ulPzlGMbmTXpBnU7SJNKZYh2vHFNiF301B0gBpV07yoiZl
-cXimKsqTEkYwtX3OVzjRnK4uHUnyF1zO/BrAaXBXy8cBwsad18uZlPrjkMxCT10O
-dK45SkyjUb8xyU+gAiEKmIrqrkJesVhjjgatMvbBoXTI54Hyl5vxxYRVMkzBdPGR
-PFxVD6kBTpwO94eJP1jKCjwwExPP0PGbT8ZI02XKzBHF5igtR4hgwv3I6sxTTqAH
-rHNn/5cCgYEA2/JJYfr0FK3JmY8HjH7pTaHtlst/mbawZxUosUdWYT84CUqMlr2b
-36hTtMUzmtXofuQpRrqX4xNTP8ou48Untl+9hHooqVtiH+XFLpTNg+OvJcGQWVJM
-5XrRDtce5EoIGPGW6IfxbnI9YGNSM7zEfw41oynWNVR0PMsFmn4STSMCgYEAzHbU
-suofi1aA7WJYQ8CuwUnYRoPJixNo/d50wQLZZfssvUvmC6cXL41xzFmvhw4PM+to
-dKcXELcyTGI/r5D8UevRuJNz4Ei0/ssIVNmYxwFG/zSLmqdGyyNlRV3dNBfknYHl
-5eIXb55x2NuSJ0SfV/T6dXnlQrCu2AIaKf/jCWcCgYAocoH0NsY0F1F/n8HvoFcf
-I6whkwLALcx66HU3RLsp3wpbCw6Xmf7UPoxGLg2zZ6r9ys+cZiwQYjlo/bFpyZPo
-AetENYLMwjVlUEfWrR6uJmzLMLFu+6eQe+l+JSlVKhgbHjJ2SKmpefC3jQxM32Xz
-R5Wtj8AIxqMpmtxI8O5EqQKBgQCQ4oPGZHEF475oeI/jMt6iyRkgnrJqgs6bVs+V
-FdfHlD0Xxni1OSoM4EYLcGIZabUMLXxPbTfC+I4D4nsOhcbGpjxuds5d2CephWXZ
-+ndwTU9p+GoUpQRdXi+c/+6Hw4aUtj+arqO8zKIP8UeX2+CuC0KPjFkQ8PJ0zsiL
-im/vcQKBgQClGriNpXHBH1Sge07qtsw8JnySjOfrrPXyGyeLzlkD6kRrB+Wr1VpN
-mDWr4yHLLdJnPl3V1gdSPLI/2e+gaDoT8qRnsAaJfh1ItA0LfKad4kycHsE+VQJ6
-phDsZ6iqIkgD5r6+14Lsv0YMRxnnvQGPwvQs9TqJqK6/Coqf3pfw/w==
------END RSA PRIVATE KEY-----
diff --git a/ch-resp-self/keys/Alias_pub.pem b/ch-resp-self/keys/Alias_pub.pem
deleted file mode 100644
index cce3af4..0000000
--- a/ch-resp-self/keys/Alias_pub.pem
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr6sq5kOG6A/12geq+/i8
-Ta2BnaMGqxLR4a9PciukW7awogS9WNpA8DlWV2B1M5zSZSKPPS9PDdC/JqXSiMWt
-5fHZpRCyZ3Zokclc/V8TWgDkRxZFxHkPWUDshUIXaMzwj+eJvm2qH+LWrjr0zxqv
-Kj2a8qFs0gYMqGB1jGun/N41Tz8B/QmWjeakd8Zr3iY6cxVqd4GvUTgn/KC4YeZ2
-/CkdQTPQx6fdYrVHF0DMqrAZCSnsyRAa02oAZhiBzz4gw//fB5+k42/+Mrzrnmv/
-l4HnQwnGPIBQK4IDYe7YyOt7ZWRFRkQydwHXE5fVifjrmKOj0vM1tRKjfZ1CoRxE
-FQIDAQAB
------END PUBLIC KEY-----
diff --git a/ch-resp-self/keys/Identity_pub.pem b/ch-resp-self/keys/Identity_pub.pem
deleted file mode 100644
index 6847cee..0000000
--- a/ch-resp-self/keys/Identity_pub.pem
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1FomNTVE/DdCHc0JAOZW
-6BC6zwcZOklne1FFni0EXJYNL4mYXyDvigv6zOQObjYtgKIwj01WSxAA1/4Ecjfc
-Vt6sR+I0ufEjoSDF/WX+5jFc/k5ldnWwZzBBEfZVSuZu8LAhqpj7woY95x9QzvNG
-Kq0neEIonihRSnQTfwingDsKd6+ci0H85Pi7lJ9bGpVTGlE9AMQBQvHRlnl3Ig+L
-7UDeNN4CDAXYvIqXTq0RQ+OvdvMYg1AfZ4rGoa91Cw208zb3FCnGIpCQWGUSDypd
-Qgo0ptQU8UiaTmF0hW0q3TeG8763uMKQA3QVZIASA6hp2oMVcDjeWo8+pd7Ig2iq
-sQIDAQAB
------END PUBLIC KEY-----
diff --git a/ch-resp-self/keys/session1_priv.pem b/ch-resp-self/keys/session1_priv.pem
deleted file mode 100644
index f36fb58..0000000
--- a/ch-resp-self/keys/session1_priv.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAxjNp2QVTj7a31kgNwQ8ATisSfcAfg002bDZEeXi3NrgQJNyG
-Rsz9x0aYWxz5iT2c5aj8WNL3jzAdbm4RH3gV309XIaRmuivU5ICkW4glxFpDeG0A
-+I1Wf2Yu5e/0FNPTSYah5tNyGNbh9jfacqu5SfA3ejsvOIGRs2WahtcPw3F1IbWP
-FiapRf0o8m2s2ihSugCwdkA5mRq0svJ7xJpU32FRti1DEHcVNJ1Q2ZuvkzJuVywF
-c1kZwh/Ou6ED45aj27Xidbt1rPX6cmZvt11xzx0MHNrvUiToR158IbHjjQZx2oyP
-Z8qSwkHPuMp7kVFZRxz1/4hARxJSaVXfiXJmKwIDAQABAoIBABDnMJdADjTQSJRf
-QmuyZlHETZ2ThXx9WMSuH3UxQjAfTs0opiZNSYq1rrz9LHDeZCOX9Pwe8zBEfQtp
-GqURk41JvGy+Pb6R32RPbkpEwwfLCjxae33hu+c95TEEn6R+aONj4SneODmoayPu
-9n6CE67GbEzMgFtJfY4MU7s9MHcimW1/tlrszMDp89IM9Q5PUDeu/fR908gFC4PH
-iO/pUL2X955z0RhQYPKV91Nd4AUWROA4/E2znWYWHJhRsqgb2oVPkyvkNQON4jut
-QnK6/kOftTNN64R3lfVtws0QuwgocmJsCOAYn9WF2ZcmR8HCXkf+7RsuIajoqYBi
-xy0ifU0CgYEA/VJxg8hCR42ovAorHdQ9I4XI5DZ3sArKtN5f8tKgw0rQxZU9VDXL
-ZuXAjFrBae2zTUX5hmaBVMs6RvcqmbCEMJ12bO5Ay9jbNZbhTopIS4o7IaC1mIzI
-UCBAUBsgAkpfJGRl7h3Ds6MLycIojf1ZCjJVPI3Yvv/YmoqR2iMKrq8CgYEAyEvM
-JYE+zcBreff1KYTxmHWL0xUJTDmnX9lRgAvw8XE7w51qzA+W5bVR2+x4/+H9LjCp
-nPdVoZKOqCc7ECMQQNo5qnS8btxQy6v2MilryyWAS45U68nG5gwu7tVUjZNxc6L5
-BQbPpOReaJuLTE3gz2d5tbLaKZY0l6kxrZG//0UCgYEAlqiurGKw0J92iAdAJ2hv
-yC2sEdY3DrMMZc+PnvoX9K4NRkWBCRFJXHQuNQtQ1rAxIDcKtR1Hs+d+THB5nJg3
-tjYgFZ8JWHMrxE5sx2pEnvCiRFixR/4KsGTN+xZ2zgXvWdSALsLy/mZs/1yDBBd2
-GjNfMDlofAfridX58pM+qi8CgYA6Zsd2pBHQ4ms0HBWS7p2XK6cCfB7C6AiijPYT
-lOfDLpYTeoHaUC1aex0MOA4r5hPxdOTvzLpeKyKHazDwipjBoB+yUOlklb7FNDXL
-+IHisOOQpEaknafuCd1hbDiEM1qgMgPT8GF5HdFdRQU/0XFcaDp3vVeZSp+5HO9M
-QbQu1QKBgQCUM/P3p89QWMC80bYujNGD1dIBEEwvby9xgTTw8DeumOHpVwUp60hS
-kOHP1biCT2nBihfHqFbs21XiYhZuywFEYWv44PziFXMdIuAYXKZ6JRcR04bg3vpW
-j3VPiLbW9/5Wl4fmaWh+P4nGQPK+m3fDnfQrTDqLf2tb8IxPkXDiig==
------END RSA PRIVATE KEY-----
diff --git a/ch-resp-self/keys/session1_pub.pem b/ch-resp-self/keys/session1_pub.pem
deleted file mode 100644
index 184735c..0000000
--- a/ch-resp-self/keys/session1_pub.pem
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxjNp2QVTj7a31kgNwQ8A
-TisSfcAfg002bDZEeXi3NrgQJNyGRsz9x0aYWxz5iT2c5aj8WNL3jzAdbm4RH3gV
-309XIaRmuivU5ICkW4glxFpDeG0A+I1Wf2Yu5e/0FNPTSYah5tNyGNbh9jfacqu5
-SfA3ejsvOIGRs2WahtcPw3F1IbWPFiapRf0o8m2s2ihSugCwdkA5mRq0svJ7xJpU
-32FRti1DEHcVNJ1Q2ZuvkzJuVywFc1kZwh/Ou6ED45aj27Xidbt1rPX6cmZvt11x
-zx0MHNrvUiToR158IbHjjQZx2oyPZ8qSwkHPuMp7kVFZRxz1/4hARxJSaVXfiXJm
-KwIDAQAB
------END PUBLIC KEY-----
diff --git a/ch-resp-self/out/main b/ch-resp-self/out/main
deleted file mode 100755
index b8fe6b2..0000000
Binary files a/ch-resp-self/out/main and /dev/null differ