build: Remove tinydtls library 41/16941/19
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 21 Feb 2017 17:11:21 +0000 (18:11 +0100)
committerRandeep Singh <randeep.s@samsung.com>
Thu, 23 Feb 2017 04:40:29 +0000 (04:40 +0000)
[Chul Lee]

Remove tinydtls library

[Philippe Coval]

Ported from 1.2-rel branch to master,
and removed presence is other SConscript.

Conflicts:
service/coap-http-proxy/unittests/SConscript
resource/csdk/SConscript
resource/csdk/connectivity/src/SConscript
resource/csdk/stack/test/SConscript
resource/csdk/security/src/doxmresource.c

Change-Id: I78f470af822587f2cd50eac6e9b1fb4ff5b87219
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16137
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16941
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
166 files changed:
NOTICE.md
build_common/android/SConscript
extlibs/tinydtls/0001-Add-TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256-cipher-su.patch [deleted file]
extlibs/tinydtls/0001-Added-anonymous-ecdh-cipher-suite-into-tinydtls.patch [deleted file]
extlibs/tinydtls/0001-Added-support-in-tinyDTLS-to-support-rehandshake.patch [deleted file]
extlibs/tinydtls/0001-Adding-autoconf-generated-files-in-tinydtls-repo.patch [deleted file]
extlibs/tinydtls/0001-Bug-Fix-in-earlier-rehandhsake-implementation.patch [deleted file]
extlibs/tinydtls/0001-Fix-the-wrong-implementation-about-the-anonymous-cip.patch [deleted file]
extlibs/tinydtls/0001-Fixed-issue-to-pass-PSK-identity-hint-to-application.patch [deleted file]
extlibs/tinydtls/0001-Updated-tinyDTLS-test-apps-to-use-identity-hint.patch [deleted file]
extlibs/tinydtls/0001-add-support-of-X.509-into-tinyDTLS-external-library.patch [deleted file]
extlibs/tinydtls/Android.mk [deleted file]
extlibs/tinydtls/LICENSE [deleted file]
extlibs/tinydtls/Makefile.in [deleted file]
extlibs/tinydtls/Makefile.tinydtls [deleted file]
extlibs/tinydtls/README [deleted file]
extlibs/tinydtls/README_Iotivity [deleted file]
extlibs/tinydtls/SConscript [deleted file]
extlibs/tinydtls/aes/Makefile.in [deleted file]
extlibs/tinydtls/aes/rijndael.c [deleted file]
extlibs/tinydtls/aes/rijndael.h [deleted file]
extlibs/tinydtls/alert.h [deleted file]
extlibs/tinydtls/ccm.c [deleted file]
extlibs/tinydtls/ccm.h [deleted file]
extlibs/tinydtls/configure.in [deleted file]
extlibs/tinydtls/crypto.c [deleted file]
extlibs/tinydtls/crypto.h [deleted file]
extlibs/tinydtls/debug.c [deleted file]
extlibs/tinydtls/debug.h [deleted file]
extlibs/tinydtls/doc/Doxyfile.in [deleted file]
extlibs/tinydtls/doc/DoxygenLayout.xml [deleted file]
extlibs/tinydtls/doc/Makefile.in [deleted file]
extlibs/tinydtls/dtls.c [deleted file]
extlibs/tinydtls/dtls.h [deleted file]
extlibs/tinydtls/dtls_config.h [deleted file]
extlibs/tinydtls/dtls_config.h.in [deleted file]
extlibs/tinydtls/dtls_hal.h [deleted file]
extlibs/tinydtls/dtls_time.c [deleted file]
extlibs/tinydtls/dtls_time.h [deleted file]
extlibs/tinydtls/ecc/LICENSE.txt [deleted file]
extlibs/tinydtls/ecc/Makefile.contiki [deleted file]
extlibs/tinydtls/ecc/Makefile.ecc [deleted file]
extlibs/tinydtls/ecc/Makefile.in [deleted file]
extlibs/tinydtls/ecc/README.md [deleted file]
extlibs/tinydtls/ecc/asm_arm.inc [deleted file]
extlibs/tinydtls/ecc/asm_avr.inc [deleted file]
extlibs/tinydtls/ecc/ecc.c [deleted file]
extlibs/tinydtls/ecc/ecc.h [deleted file]
extlibs/tinydtls/ecc/test/ecc_test/ecc_test.ino [deleted file]
extlibs/tinydtls/ecc/test/emk_rules.py [deleted file]
extlibs/tinydtls/ecc/test/test_ecdh.c [deleted file]
extlibs/tinydtls/ecc/test/test_ecdsa.c [deleted file]
extlibs/tinydtls/examples/contiki/Makefile.in [deleted file]
extlibs/tinydtls/examples/contiki/dtls-client.c [deleted file]
extlibs/tinydtls/examples/contiki/dtls-server.c [deleted file]
extlibs/tinydtls/global.h [deleted file]
extlibs/tinydtls/hmac.c [deleted file]
extlibs/tinydtls/hmac.h [deleted file]
extlibs/tinydtls/netq.c [deleted file]
extlibs/tinydtls/netq.h [deleted file]
extlibs/tinydtls/numeric.h [deleted file]
extlibs/tinydtls/peer.c [deleted file]
extlibs/tinydtls/peer.h [deleted file]
extlibs/tinydtls/platform-specific/Makefile.in [deleted file]
extlibs/tinydtls/platform-specific/config-cc2538dk.h [deleted file]
extlibs/tinydtls/platform-specific/config-econotag.h [deleted file]
extlibs/tinydtls/platform-specific/config-minimal-net.h [deleted file]
extlibs/tinydtls/platform-specific/config-sky.h [deleted file]
extlibs/tinydtls/platform-specific/config-wismote.h [deleted file]
extlibs/tinydtls/prng.h [deleted file]
extlibs/tinydtls/session.c [deleted file]
extlibs/tinydtls/session.h [deleted file]
extlibs/tinydtls/sha2/Makefile.in [deleted file]
extlibs/tinydtls/sha2/README [deleted file]
extlibs/tinydtls/sha2/sha2.c [deleted file]
extlibs/tinydtls/sha2/sha2.h [deleted file]
extlibs/tinydtls/sha2/sha2prog.c [deleted file]
extlibs/tinydtls/sha2/sha2speed.c [deleted file]
extlibs/tinydtls/sha2/sha2test.pl [deleted file]
extlibs/tinydtls/sha2/testvectors/vector001.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector001.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector002.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector002.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector003.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector003.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector004.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector004.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector005.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector005.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector006.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector006.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector007.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector007.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector008.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector008.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector009.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector009.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector010.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector010.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector011.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector011.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector012.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector012.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector013.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector013.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector014.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector014.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector015.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector015.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector016.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector016.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector017.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector017.info [deleted file]
extlibs/tinydtls/sha2/testvectors/vector018.dat [deleted file]
extlibs/tinydtls/sha2/testvectors/vector018.info [deleted file]
extlibs/tinydtls/state.h [deleted file]
extlibs/tinydtls/t_list.h [deleted file]
extlibs/tinydtls/tests/Makefile.in [deleted file]
extlibs/tinydtls/tests/cbc_aes128-test.c [deleted file]
extlibs/tinydtls/tests/cbc_aes128-testdata.c [deleted file]
extlibs/tinydtls/tests/ccm-test.c [deleted file]
extlibs/tinydtls/tests/ccm-testdata.c [deleted file]
extlibs/tinydtls/tests/dsrv-test.c [deleted file]
extlibs/tinydtls/tests/dtls-client.c [deleted file]
extlibs/tinydtls/tests/dtls-server.c [deleted file]
extlibs/tinydtls/tests/netq-test.c [deleted file]
extlibs/tinydtls/tests/pcap.c [deleted file]
extlibs/tinydtls/tests/prf-test.c [deleted file]
extlibs/tinydtls/tests/secure-server.c [deleted file]
extlibs/tinydtls/tinydtls.h [deleted file]
extlibs/tinydtls/tinydtls.h.in [deleted file]
extlibs/tinydtls/uthash.h [deleted file]
extlibs/tinydtls/utlist.h [deleted file]
gbsbuild.sh
java/jni/SConscript
resource/c_common/utlist.h [new file with mode: 0644]
resource/csdk/connectivity/build/android/jni/Android.mk
resource/csdk/connectivity/build/tizen/Makefile
resource/csdk/connectivity/build/tizen/gbsbuild.sh
resource/csdk/connectivity/build/tizen/packaging/com.oic.ca.spec
resource/csdk/connectivity/src/SConscript
resource/csdk/security/SConscript
resource/csdk/security/provisioning/SConscript
resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
resource/csdk/security/provisioning/src/ownershiptransfermanager.c
resource/csdk/security/provisioning/src/oxmjustworks.c
resource/csdk/security/provisioning/src/oxmmanufacturercert.c
resource/csdk/security/provisioning/src/oxmpreconfpin.c
resource/csdk/security/provisioning/src/oxmrandompin.c
resource/csdk/security/provisioning/unittest/SConscript
resource/csdk/security/src/credresource.c
resource/csdk/security/src/directpairing.c
resource/csdk/security/src/doxmresource.c
resource/csdk/security/src/dpairingresource.c
resource/csdk/security/src/oxmpincommon.c
resource/csdk/security/tool/SConscript
resource/csdk/security/unittest/SConscript
resource/csdk/stack/SConscript
resource/csdk/stack/samples/linux/SimpleClientServer/SConscript
resource/csdk/stack/samples/linux/secure/SConscript
resource/csdk/stack/samples/tizen/build/gbsbuild.sh
resource/csdk/stack/samples/tizen/build/packaging/com.oic.ri.spec
resource/csdk/stack/test/SConscript
resource/unittests/SConscript
service/coap-http-proxy/unittests/SConscript
service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/build/tizen/gbsbuild.sh

index 2afab02..29d9415 100644 (file)
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -25,13 +25,11 @@ which is open source software, written and copyright by Olaf Bergmann
 with a BSD and GPLv2 license. The original software is available from
   http://sourceforge.net/projects/libcoap/
 
-The DTLS protocol is provided by the tinyDTLS package,
-which is open source software, written and copyright by Olaf Bergmann
-with an MIT license. The tinyDTLS library relies on algorithms whose
-source is under a BSD license. The additional licenses can be viewed at
-  http://tinydtls.sourceforge.net/
+The TLS/DTLS protocol is provided by the mbedTLS package,
+which is open source software, written and copyright by ARM
+with an Apache 2.0 license.
 The original software is available from
-  http://sourceforge.net/projects/tinydtls/
+  https://github.com/ARMmbed/mbedtls
 
 This project relies on utilities in the Boost C++library which is open
 source software with a Boost Software License v1.0. The details of the
@@ -50,3 +48,8 @@ which is open source software, written and copyright by Dave Gamble
 with an MIT license. The original software is available from
   http://sourceforge.net/projects/cjson/
 
+The Linked List macro(utlist.h) is provided by the uthash package,
+which is open source software, written and copyright by Troy D. Hanson
+with an BSD license.
+The original software is available from
+  https://github.com/troydhanson/uthash
\ No newline at end of file
index f24c038..61c504d 100644 (file)
@@ -221,7 +221,6 @@ env.AppendUnique(LIBPATH = [src_dir + '/resource/csdk/connectivity/lib/android']
 env.AppendUnique(LIBS = ['log', 'coap'])
 
 if env.get('SECURED') == '1':
-       env.AppendUnique(LIBS = ['tinydtls'])
        env.SConscript('#extlibs/mbedtls/SConscript')
        env.AppendUnique(LIBS = ['mbedtls','mbedx509','mbedcrypto'])
 
diff --git a/extlibs/tinydtls/0001-Add-TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256-cipher-su.patch b/extlibs/tinydtls/0001-Add-TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256-cipher-su.patch
deleted file mode 100644 (file)
index 5221174..0000000
+++ /dev/null
@@ -1,746 +0,0 @@
-From 947179cd0d3646359272cc0645e5049e2426f9e0 Mon Sep 17 00:00:00 2001
-From: Sachin Agrawal <sachin.agrawal@intel.com>
-Date: Thu, 6 Aug 2015 15:13:29 -0700
-Subject: [PATCH 1/1] Add TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256 cipher suite
- in tinydtls
-
-[Patch #1] Initial upload
-[Patch #2] Add function to calculate the pre-master key of ECDHE_PSK cipher suite.
-[Patch #3] Update codes according to review comments
-[Patch #4] Modify code alignment.
-
-Change-Id: I70be3a8e9469cc1913373d820b4a3d4f4a6d6d0d
-Signed-off-by: leechul <chuls.lee@samsung.com>
-Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
----
- extlibs/tinydtls/crypto.c            |   41 +++-
- extlibs/tinydtls/crypto.h            |    9 +
- extlibs/tinydtls/dtls.c              |  401 ++++++++++++++++++++++++++++++++--
- extlibs/tinydtls/global.h            |    1 +
- extlibs/tinydtls/tests/dtls-client.c |    8 +-
- 5 files changed, 444 insertions(+), 16 deletions(-)
-
-diff --git a/extlibs/tinydtls/crypto.c b/extlibs/tinydtls/crypto.c
-index 3fbb993..deaf581 100644
---- a/extlibs/tinydtls/crypto.c
-+++ b/extlibs/tinydtls/crypto.c
-@@ -641,6 +641,41 @@ dtls_ecdsa_verify_sig(const unsigned char *pub_key_x,
- }
- #endif /* DTLS_ECC */
-+#if defined(DTLS_PSK) && defined(DTLS_ECC)
-+int dtls_ecdhe_psk_pre_master_secret(unsigned char *psk, size_t psklen,
-+                                     unsigned char *ecc_priv_key,
-+                                     unsigned char *ecc_pub_key_x,
-+                                     unsigned char *ecc_pub_key_y,
-+                                     size_t ecc_key_size,
-+                                     unsigned char *result,
-+                                     size_t result_len)
-+{
-+  uint8_t eccPublicKey[64];
-+  uint8_t eccPrivateKey[32];
-+  unsigned char *p = result;
-+
-+  if (result_len < uECC_BYTES + psklen + (sizeof(uint16) * 2)) {
-+    return -1;
-+  }
-+
-+  dtls_int_to_uint16(p, uECC_BYTES);
-+  p += sizeof(uint16);
-+
-+  memcpy(eccPublicKey, ecc_pub_key_x, 32);
-+  memcpy(eccPublicKey + 32, ecc_pub_key_y, 32);
-+  memcpy(eccPrivateKey, ecc_priv_key, 32);
-+  uECC_shared_secret(eccPublicKey, eccPrivateKey, p);
-+  p += uECC_BYTES;
-+
-+  dtls_int_to_uint16(p, psklen);
-+  p += sizeof(uint16);
-+
-+  memcpy(p, psk, psklen);
-+
-+  return uECC_BYTES + psklen + (sizeof(uint16) * 2);
-+}
-+#endif /* defined(DTLS_PSK) && defined(DTLS_ECC) */
-+
- int
- dtls_encrypt(const unsigned char *src, size_t length,
-            unsigned char *buf,
-@@ -665,7 +700,8 @@ dtls_encrypt(const unsigned char *src, size_t length,
-         memmove(buf, src, length);
-       ret = dtls_ccm_encrypt(&ctx->data, src, length, buf, nounce, aad, la);
-   }
--  if(cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256) {
-+  if(cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256 ||
-+     cipher == TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256) {
-       ret = rijndael_set_key(&ctx->data.ctx, key, 8 * keylen);
-       if (ret < 0) {
-         /* cleanup everything in case the key has the wrong size */
-@@ -708,7 +744,8 @@ dtls_decrypt(const unsigned char *src, size_t length,
-       ret = dtls_ccm_decrypt(&ctx->data, src, length, buf, nounce, aad, la);
-   }
--  if(cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256) {
-+  if(cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256 ||
-+     cipher == TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256) {
-       ret = rijndael_set_key(&ctx->data.ctx, key, 8 * keylen);
-       if (ret < 0) {
-         /* cleanup everything in case the key has the wrong size */
-diff --git a/extlibs/tinydtls/crypto.h b/extlibs/tinydtls/crypto.h
-index a81d306..f4cfc66 100644
---- a/extlibs/tinydtls/crypto.h
-+++ b/extlibs/tinydtls/crypto.h
-@@ -39,6 +39,7 @@
- #include "numeric.h"
- #include "hmac.h"
- #include "ccm.h"
-+#include "ecc/ecc.h"
- /* TLS_PSK_WITH_AES_128_CCM_8 */
- #define DTLS_MAC_KEY_LENGTH    0
-@@ -129,6 +130,13 @@ typedef struct {
-   dtls_compression_t compression;             /**< compression method */
-   dtls_cipher_t cipher;               /**< cipher type */
-   unsigned int do_client_auth:1;
-+
-+#ifdef DTLS_ECC && DTLS_PSK
-+  struct keyx_t {
-+    dtls_handshake_parameters_ecc_t ecc;
-+    dtls_handshake_parameters_psk_t psk;
-+  } keyx;
-+#else /* DTLS_ECC && DTLS_PSK */
-   union {
- #ifdef DTLS_ECC
-     dtls_handshake_parameters_ecc_t ecc;
-@@ -137,6 +145,7 @@ typedef struct {
-     dtls_handshake_parameters_psk_t psk;
- #endif /* DTLS_PSK */
-   } keyx;
-+#endif /* DTLS_ECC && DTLS_PSK */
- } dtls_handshake_parameters_t;
- /* The following macros provide access to the components of the
-diff --git a/extlibs/tinydtls/dtls.c b/extlibs/tinydtls/dtls.c
-index b5b8fd1..6104a08 100644
---- a/extlibs/tinydtls/dtls.c
-+++ b/extlibs/tinydtls/dtls.c
-@@ -506,6 +506,17 @@ static inline int is_tls_ecdh_anon_with_aes_128_cbc_sha_256(dtls_cipher_t cipher
- #endif
- }
-+/** returns true if the cipher matches TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256 */
-+static inline int is_tls_ecdhe_psk_with_aes_128_cbc_sha_256(dtls_cipher_t cipher)
-+{
-+#if defined(DTLS_ECC) && defined(DTLS_PSK)
-+  return cipher == TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256;
-+#else
-+  return 0;
-+#endif /* defined(DTLS_PSK) && defined(DTLS_ECC) */
-+}
-+
-+
- /** returns true if the application is configured for psk */
- static inline int is_psk_supported(dtls_context_t *ctx)
-@@ -549,6 +560,17 @@ static inline int is_ecdh_anon_supported(dtls_context_t *ctx)
- #endif
- }
-+/** returns true if ecdhe_psk_with_aes_128_cbc_sha_256 is supported */
-+static inline int is_ecdhe_psk_supported(dtls_context_t *ctx)
-+{
-+#if defined(DTLS_ECC) && defined(DTLS_PSK)
-+    return is_psk_supported(ctx);
-+#else
-+    return 0;
-+#endif /* defined(DTLS_PSK) && defined(DTLS_ECC) */
-+}
-+
-+
- /**
-  * Returns @c 1 if @p code is a cipher suite other than @c
-  * TLS_NULL_WITH_NULL_NULL that we recognize.
-@@ -563,14 +585,17 @@ known_cipher(dtls_context_t *ctx, dtls_cipher_t code, int is_client) {
-   int psk;
-   int ecdsa;
-   int ecdh_anon;
-+  int ecdhe_psk;
-   psk = is_psk_supported(ctx);
-   ecdsa = is_ecdsa_supported(ctx, is_client);
-   ecdh_anon = is_ecdh_anon_supported(ctx);
-+  ecdhe_psk = is_ecdhe_psk_supported(ctx);
-   return (psk && is_tls_psk_with_aes_128_ccm_8(code)) ||
-        (ecdsa && is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(code)) ||
--       (ecdh_anon && is_tls_ecdh_anon_with_aes_128_cbc_sha_256(code));
-+       (ecdh_anon && is_tls_ecdh_anon_with_aes_128_cbc_sha_256(code)) ||
-+       (ecdhe_psk && is_tls_ecdhe_psk_with_aes_128_cbc_sha_256(code));
- }
- /**
-@@ -676,7 +701,11 @@ calculate_key_block(dtls_context_t *ctx,
-                   dtls_peer_t *peer,
-                   session_t *session,
-                   dtls_peer_type role) {
--  unsigned char *pre_master_secret;
-+#if defined(DTLS_PSK) && defined(DTLS_ECC)
-+  unsigned char pre_master_secret[MAX_KEYBLOCK_LENGTH + uECC_BYTES];
-+#else
-+  unsigned char pre_master_secret[MAX_KEYBLOCK_LENGTH];
-+#endif /* defined(DTLS_PSK) && defined(DTLS_ECC) */
-   int pre_master_len = 0;
-   dtls_security_parameters_t *security = dtls_security_params_next(peer);
-   uint8 master_secret[DTLS_MASTER_SECRET_LENGTH];
-@@ -685,8 +714,6 @@ calculate_key_block(dtls_context_t *ctx,
-     return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-   }
--  pre_master_secret = security->key_block;
--
-   switch (handshake->cipher) {
- #ifdef DTLS_PSK
-   case TLS_PSK_WITH_AES_128_CCM_8: {
-@@ -733,6 +760,35 @@ calculate_key_block(dtls_context_t *ctx,
-     break;
-   }
- #endif /* DTLS_ECC */
-+#if defined(DTLS_PSK) && defined(DTLS_ECC)
-+    case TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256: {
-+      unsigned char psk[DTLS_PSK_MAX_KEY_LEN];
-+      int psklen;
-+
-+      psklen = CALL(ctx, get_psk_info, session, DTLS_PSK_KEY,
-+             handshake->keyx.psk.identity,
-+             handshake->keyx.psk.id_length,
-+             psk, DTLS_PSK_MAX_KEY_LEN);
-+      if (psklen < 0) {
-+        dtls_crit("no psk key for session available\n");
-+        return psklen;
-+      }
-+
-+      pre_master_len = dtls_ecdhe_psk_pre_master_secret(psk, psklen,
-+                           handshake->keyx.ecc.own_eph_priv,
-+                           handshake->keyx.ecc.other_eph_pub_x,
-+                           handshake->keyx.ecc.other_eph_pub_y,
-+                           sizeof(handshake->keyx.ecc.own_eph_priv),
-+                           pre_master_secret,
-+                           MAX_KEYBLOCK_LENGTH + uECC_BYTES);
-+
-+      if (pre_master_len < 0) {
-+        dtls_crit("the curve was too long, for the pre master secret\n");
-+        return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-+      }
-+      break;
-+    }
-+#endif /* defined(DTLS_PSK) && defined(DTLS_ECC)  */
-   default:
-     dtls_crit("calculate_key_block: unknown cipher\n");
-     return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-@@ -1113,6 +1169,56 @@ check_client_keyexchange(dtls_context_t *ctx,
-     data += sizeof(handshake->keyx.ecc.other_eph_pub_y);
-   }
- #endif /* DTLS_ECC */
-+#if defined(DTLS_PSK) && defined(DTLS_ECC)
-+  if (is_tls_ecdhe_psk_with_aes_128_cbc_sha_256(handshake->cipher)) {
-+    int id_length;
-+
-+    if (length < DTLS_HS_LENGTH + DTLS_CKXEC_LENGTH) {
-+      dtls_debug("The client key exchange is too short\n");
-+      return dtls_alert_fatal_create(DTLS_ALERT_HANDSHAKE_FAILURE);
-+    }
-+    data += DTLS_HS_LENGTH;
-+
-+    //PSK hint
-+    id_length = dtls_uint16_to_int(data);
-+    data += sizeof(uint16);
-+
-+    if (DTLS_HS_LENGTH + DTLS_CKXPSK_LENGTH_MIN + DTLS_CKXEC_LENGTH + id_length != length) {
-+      dtls_debug("The identity has a wrong length\n");
-+      return dtls_alert_fatal_create(DTLS_ALERT_HANDSHAKE_FAILURE);
-+    }
-+
-+    if (id_length > DTLS_PSK_MAX_CLIENT_IDENTITY_LEN) {
-+      dtls_warn("please use a smaller client identity\n");
-+      return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-+    }
-+
-+    handshake->keyx.psk.id_length = id_length;
-+    memcpy(handshake->keyx.psk.identity, data, id_length);
-+    data += id_length;
-+
-+    //ECDH public
-+    if (dtls_uint8_to_int(data) != 1 + 2 * DTLS_EC_KEY_SIZE) {
-+      dtls_alert("expected 65 bytes long public point\n");
-+      return dtls_alert_fatal_create(DTLS_ALERT_HANDSHAKE_FAILURE);
-+    }
-+    data += sizeof(uint8);
-+
-+    if (dtls_uint8_to_int(data) != 4) {
-+      dtls_alert("expected uncompressed public point\n");
-+      return dtls_alert_fatal_create(DTLS_ALERT_HANDSHAKE_FAILURE);
-+    }
-+    data += sizeof(uint8);
-+
-+    memcpy(handshake->keyx.ecc.other_eph_pub_x, data,
-+       sizeof(handshake->keyx.ecc.other_eph_pub_x));
-+    data += sizeof(handshake->keyx.ecc.other_eph_pub_x);
-+
-+    memcpy(handshake->keyx.ecc.other_eph_pub_y, data,
-+       sizeof(handshake->keyx.ecc.other_eph_pub_y));
-+    data += sizeof(handshake->keyx.ecc.other_eph_pub_y);
-+  }
-+#endif /* defined(DTLS_PSK) && defined(DTLS_ECC) */
- #ifdef DTLS_PSK
-   if (is_tls_psk_with_aes_128_ccm_8(handshake->cipher)) {
-     int id_length;
-@@ -1286,7 +1392,8 @@ dtls_prepare_record(dtls_peer_t *peer, dtls_security_parameters_t *security,
-       p += data_len_array[i];
-       res += data_len_array[i];
-     }
--  } else if (is_tls_ecdh_anon_with_aes_128_cbc_sha_256(security->cipher)) {
-+  } else if (is_tls_ecdh_anon_with_aes_128_cbc_sha_256(security->cipher) ||
-+             is_tls_ecdhe_psk_with_aes_128_cbc_sha_256(security->cipher)) {
-     unsigned char nonce[DTLS_CBC_IV_LENGTH];
-@@ -2116,6 +2223,80 @@ dtls_send_server_key_exchange_ecdh(dtls_context_t *ctx, dtls_peer_t *peer,
- }
- #endif /* DTLS_ECC */
-+#if defined(DTLS_PSK) && defined(DTLS_ECC)
-+static int dtls_send_server_key_exchange_ecdhe_psk(dtls_context_t *ctx, dtls_peer_t *peer,
-+                                const unsigned char *psk_hint, size_t psk_hint_len)
-+{
-+  /* The ASN.1 Integer representation of an 32 byte unsigned int could be
-+   * 33 bytes long add space for that */
-+  uint8 buf[DTLS_SKEXEC_LENGTH + DTLS_SKEXECPSK_LENGTH_MAX + 2];
-+  uint8 *p;
-+  uint8 *ephemeral_pub_x;
-+  uint8 *ephemeral_pub_y;
-+  dtls_handshake_parameters_t *config = peer->handshake_params;
-+
-+  /* ServerKeyExchange
-+    * Please see Session 2, RFC 5489.
-+
-+         struct {
-+          select (KeyExchangeAlgorithm) {
-+              //other cases for rsa, diffie_hellman, etc.
-+              case ec_diffie_hellman_psk:  // NEW
-+                  opaque psk_identity_hint<0..2^16-1>;
-+                  ServerECDHParams params;
-+          };
-+      } ServerKeyExchange; */
-+  p = buf;
-+
-+  assert(psk_hint_len <= DTLS_PSK_MAX_CLIENT_IDENTITY_LEN);
-+  if (psk_hint_len > DTLS_PSK_MAX_CLIENT_IDENTITY_LEN) {
-+    // should never happen
-+    dtls_warn("psk identity hint is too long\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-+  }
-+
-+  // psk_identity_hint
-+  dtls_int_to_uint16(p, psk_hint_len);
-+  p += sizeof(uint16);
-+
-+  memcpy(p, psk_hint, psk_hint_len);
-+  p += psk_hint_len;
-+
-+  /* ServerECDHParams. */
-+  /* ECCurveType curve_type: named_curve */
-+  dtls_int_to_uint8(p, TLS_EC_CURVE_TYPE_NAMED_CURVE);
-+  p += sizeof(uint8);
-+
-+  /* NamedCurve namedcurve: secp256r1 */
-+  dtls_int_to_uint16(p, TLS_EXT_ELLIPTIC_CURVES_SECP256R1);
-+  p += sizeof(uint16);
-+
-+  dtls_int_to_uint8(p, 1 + 2 * DTLS_EC_KEY_SIZE);
-+  p += sizeof(uint8);
-+
-+  /* This should be an uncompressed point, but I do not have access to the spec. */
-+  dtls_int_to_uint8(p, 4);
-+  p += sizeof(uint8);
-+
-+  /* store the pointer to the x component of the pub key and make space */
-+  ephemeral_pub_x = p;
-+  p += DTLS_EC_KEY_SIZE;
-+
-+  /* store the pointer to the y component of the pub key and make space */
-+  ephemeral_pub_y = p;
-+  p += DTLS_EC_KEY_SIZE;
-+
-+  dtls_ecdsa_generate_key(config->keyx.ecc.own_eph_priv,
-+              ephemeral_pub_x, ephemeral_pub_y,
-+              DTLS_EC_KEY_SIZE);
-+
-+  assert(p - buf <= sizeof(buf));
-+
-+  return dtls_send_handshake_msg(ctx, peer, DTLS_HT_SERVER_KEY_EXCHANGE,
-+                               buf, p - buf);
-+}
-+#endif /* defined(DTLS_PSK) && defined(DTLS_ECC) */
-+
- #ifdef DTLS_PSK
- static int
- dtls_send_server_key_exchange_psk(dtls_context_t *ctx, dtls_peer_t *peer,
-@@ -2207,6 +2388,7 @@ dtls_send_server_hello_msgs(dtls_context_t *ctx, dtls_peer_t *peer)
-   int res;
-   int ecdsa;
-   int ecdh_anon;
-+  int ecdhe_psk;
-   res = dtls_send_server_hello(ctx, peer);
-@@ -2217,6 +2399,7 @@ dtls_send_server_hello_msgs(dtls_context_t *ctx, dtls_peer_t *peer)
-   ecdsa = is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher);
-   ecdh_anon = is_tls_ecdh_anon_with_aes_128_cbc_sha_256(peer->handshake_params->cipher);
-+  ecdhe_psk = is_tls_ecdhe_psk_with_aes_128_cbc_sha_256(peer->handshake_params->cipher);
- #ifdef DTLS_ECC
-   if(ecdh_anon) {
-@@ -2261,7 +2444,31 @@ dtls_send_server_hello_msgs(dtls_context_t *ctx, dtls_peer_t *peer)
-     }
-   }
- #endif /* DTLS_ECC */
-+#if defined(DTLS_PSK) && defined(DTLS_ECC)
-+  else if(ecdhe_psk) {
-+    unsigned char psk_hint[DTLS_PSK_MAX_CLIENT_IDENTITY_LEN];
-+    int psk_len;
-+
-+    /* The identity hint is optional, therefore we ignore the result
-+     * and check psk only. */
-+    psk_len = CALL(ctx, get_psk_info, &peer->session, DTLS_PSK_HINT,
-+             NULL, 0, psk_hint, DTLS_PSK_MAX_CLIENT_IDENTITY_LEN);
-+    if (psk_len < 0) {
-+      dtls_debug("dtls_server_hello: cannot create ServerKeyExchange\n");
-+      return psk_len;
-+    }
-+
-+    if (psk_len > 0) {
-+      res = dtls_send_server_key_exchange_ecdhe_psk(ctx, peer, psk_hint, (size_t)psk_len);
-+
-+      if (res < 0) {
-+        dtls_debug("dtls_server_hello(with ECDHE): cannot prepare Server Key Exchange record\n");
-+        return res;
-+      }
-+    }
-+  }
-+#endif /* defined(DTLS_PSK) && defined(DTLS_ECC) */
- #ifdef DTLS_PSK
-   if (is_tls_psk_with_aes_128_ccm_8(peer->handshake_params->cipher)) {
-     unsigned char psk_hint[DTLS_PSK_MAX_CLIENT_IDENTITY_LEN];
-@@ -2308,7 +2515,11 @@ dtls_send_ccs(dtls_context_t *ctx, dtls_peer_t *peer) {
- static int
- dtls_send_client_key_exchange(dtls_context_t *ctx, dtls_peer_t *peer)
- {
-+#if defined(DTLS_PSK) && defined(DTLS_ECC)
-+  uint8 buf[DTLS_CKXEC_LENGTH + 2 + DTLS_PSK_MAX_CLIENT_IDENTITY_LEN];
-+#else
-   uint8 buf[DTLS_CKXEC_LENGTH];
-+#endif /* defined(DTLS_PSK) && defined(DTLS_ECC) */
-   uint8 client_id[DTLS_PSK_MAX_CLIENT_IDENTITY_LEN];
-   uint8 *p;
-   dtls_handshake_parameters_t *handshake = peer->handshake_params;
-@@ -2368,6 +2579,60 @@ dtls_send_client_key_exchange(dtls_context_t *ctx, dtls_peer_t *peer)
-     break;
-   }
- #endif /* DTLS_ECC */
-+#if defined(DTLS_PSK) && defined(DTLS_ECC)
-+  case TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256: {
-+      int psk_len;
-+      uint8 *ephemeral_pub_x;
-+      uint8 *ephemeral_pub_y;
-+
-+    /* Please see Session 2, RFC 5489.
-+         struct {
-+            select (KeyExchangeAlgorithm) {
-+                // other cases for rsa, diffie_hellman, etc.
-+                case ec_diffie_hellman_psk:
-+                    opaque psk_identity<0..2^16-1>;
-+                    ClientECDiffieHellmanPublic public;
-+            } exchange_keys;
-+        } ClientKeyExchange;
-+    */
-+
-+    psk_len = CALL(ctx, get_psk_info, &peer->session, DTLS_PSK_IDENTITY,
-+               NULL, 0,
-+               client_id,
-+               sizeof(client_id));
-+    if (psk_len < 0) {
-+      dtls_crit("no psk identity set in kx\n");
-+      return psk_len;
-+    }
-+
-+    if (psk_len + sizeof(uint16) > DTLS_CKXEC_LENGTH) {
-+      dtls_warn("the psk identity is too long\n");
-+      return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-+    }
-+
-+    dtls_int_to_uint16(p, psk_len);
-+    p += sizeof(uint16);
-+
-+    memcpy(p, client_id, psk_len);
-+    p += psk_len;
-+
-+    dtls_int_to_uint8(p, 1 + 2 * DTLS_EC_KEY_SIZE);
-+    p += sizeof(uint8);
-+
-+    dtls_int_to_uint8(p, 4);
-+    p += sizeof(uint8);
-+
-+    ephemeral_pub_x = p;
-+    p += DTLS_EC_KEY_SIZE;
-+    ephemeral_pub_y = p;
-+    p += DTLS_EC_KEY_SIZE;
-+
-+    dtls_ecdsa_generate_key(peer->handshake_params->keyx.ecc.own_eph_priv,
-+                          ephemeral_pub_x, ephemeral_pub_y,
-+                          DTLS_EC_KEY_SIZE);
-+    break;
-+  }
-+#endif /* defined(DTLS_PSK) && defined(DTLS_ECC) */
-   default:
-     dtls_crit("cipher not supported\n");
-     return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-@@ -2457,6 +2722,7 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-   int psk = 0;
-   int ecdsa = 0;
-   int ecdh_anon = 0;
-+  int ecdhe_psk = 0;
-   dtls_handshake_parameters_t *handshake = peer->handshake_params;
-   dtls_tick_t now;
-@@ -2471,14 +2737,18 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-       case TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256:
-         ecdh_anon = is_ecdh_anon_supported(ctx);
-         break;
-+      case TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256:
-+        ecdhe_psk = is_ecdhe_psk_supported(ctx);
-+        break;
-       default:
-         psk = is_psk_supported(ctx);
-         ecdsa = is_ecdsa_supported(ctx, 1);
-         ecdh_anon = is_ecdh_anon_supported(ctx);
-+        ecdhe_psk = is_ecdhe_psk_supported(ctx);
-         break;
-    }
--  cipher_size = 2 + (ecdsa ? 2 : 0) + (psk ? 2 : 0) + (ecdh_anon ? 2 : 0);
-+  cipher_size = 2 + (ecdsa ? 2 : 0) + (psk ? 2 : 0) + (ecdh_anon ? 2 : 0) + (ecdhe_psk ? 2 : 0);
-   extension_size = (ecdsa) ? (2 + 6 + 6 + 8 + 6) : 0;
-   if (cipher_size == 0) {
-@@ -2533,6 +2803,10 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-     dtls_int_to_uint16(p, TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8);
-     p += sizeof(uint16);
-   }
-+  if (ecdhe_psk) {
-+      dtls_int_to_uint16(p, TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256);
-+      p += sizeof(uint16);
-+  }
-   /* compression method */
-   dtls_int_to_uint8(p, 1);
-@@ -2900,8 +3174,97 @@ check_server_key_exchange_ecdh(dtls_context_t *ctx,
-   return 0;
- }
--
- #endif /* DTLS_ECC */
-+#if defined(DTLS_PSK) && defined(DTLS_ECC)
-+check_server_key_exchange_ecdhe_psk(dtls_context_t *ctx,
-+                            dtls_peer_t *peer,
-+                            uint8 *data, size_t data_length)
-+{
-+  dtls_handshake_parameters_t *config = peer->handshake_params;
-+  uint16_t psk_len = 0;
-+
-+  /* ServerKeyExchange
-+    * Please see Session 2, RFC 5489.
-+
-+         struct {
-+          select (KeyExchangeAlgorithm) {
-+              //other cases for rsa, diffie_hellman, etc.
-+              case ec_diffie_hellman_psk:  // NEW
-+                  opaque psk_identity_hint<0..2^16-1>;
-+                  ServerECDHParams params;
-+          };
-+      } ServerKeyExchange; */
-+
-+  update_hs_hash(peer, data, data_length);
-+
-+  assert(is_tls_ecdhe_psk_with_aes_128_cbc_sha_256(config->cipher));
-+
-+  data += DTLS_HS_LENGTH;
-+
-+  psk_len = dtls_uint16_to_int(data);
-+  data += sizeof(uint16);
-+
-+  if (psk_len != data_length - DTLS_HS_LENGTH - DTLS_SKEXEC_ECDH_ANON_LENGTH - sizeof(uint16)) {
-+    dtls_warn("the length of the server identity hint is worng\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_DECODE_ERROR);
-+  }
-+
-+  if (psk_len > DTLS_PSK_MAX_CLIENT_IDENTITY_LEN) {
-+    dtls_warn("please use a smaller server identity hint\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-+  }
-+
-+  // store the psk_identity_hint in config->keyx.psk for later use
-+  config->keyx.psk.id_length = psk_len;
-+  memcpy(config->keyx.psk.identity, data, psk_len);
-+
-+  data += psk_len;
-+  data_length -= psk_len;
-+
-+  if (data_length < DTLS_HS_LENGTH + DTLS_SKEXEC_ECDH_ANON_LENGTH) {
-+    dtls_alert("the packet length does not match the expected\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_DECODE_ERROR);
-+  }
-+
-+  if (dtls_uint8_to_int(data) != TLS_EC_CURVE_TYPE_NAMED_CURVE) {
-+    dtls_alert("Only named curves supported\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_HANDSHAKE_FAILURE);
-+  }
-+  data += sizeof(uint8);
-+  data_length -= sizeof(uint8);
-+
-+  if (dtls_uint16_to_int(data) != TLS_EXT_ELLIPTIC_CURVES_SECP256R1) {
-+    dtls_alert("secp256r1 supported\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_HANDSHAKE_FAILURE);
-+  }
-+  data += sizeof(uint16);
-+  data_length -= sizeof(uint16);
-+
-+  if (dtls_uint8_to_int(data) != 1 + 2 * DTLS_EC_KEY_SIZE) {
-+    dtls_alert("expected 65 bytes long public point\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_HANDSHAKE_FAILURE);
-+  }
-+  data += sizeof(uint8);
-+  data_length -= sizeof(uint8);
-+
-+  if (dtls_uint8_to_int(data) != 4) {
-+    dtls_alert("expected uncompressed public point\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_DECODE_ERROR);
-+  }
-+  data += sizeof(uint8);
-+  data_length -= sizeof(uint8);
-+
-+  memcpy(config->keyx.ecc.other_eph_pub_x, data, sizeof(config->keyx.ecc.other_eph_pub_x));
-+  data += sizeof(config->keyx.ecc.other_eph_pub_x);
-+  data_length -= sizeof(config->keyx.ecc.other_eph_pub_x);
-+
-+  memcpy(config->keyx.ecc.other_eph_pub_y, data, sizeof(config->keyx.ecc.other_eph_pub_y));
-+  data += sizeof(config->keyx.ecc.other_eph_pub_y);
-+  data_length -= sizeof(config->keyx.ecc.other_eph_pub_y);
-+
-+  return 0;
-+}
-+#endif /* defined(DTLS_PSK) && defined(DTLS_ECC) */
- #ifdef DTLS_PSK
- static int
-@@ -3113,7 +3476,8 @@ decrypt_verify(dtls_peer_t *peer, uint8 *packet, size_t length,
-   if (security->cipher == TLS_NULL_WITH_NULL_NULL) {
-     /* no cipher suite selected */
-     return clen;
--  } else if (is_tls_ecdh_anon_with_aes_128_cbc_sha_256(security->cipher)) {
-+  } else if (is_tls_ecdh_anon_with_aes_128_cbc_sha_256(security->cipher) ||
-+             is_tls_ecdhe_psk_with_aes_128_cbc_sha_256(security->cipher)) {
-     unsigned char nonce[DTLS_CBC_IV_LENGTH];
-@@ -3169,17 +3533,17 @@ decrypt_verify(dtls_peer_t *peer, uint8 *packet, size_t length,
-                      dtls_kb_remote_write_key(security, peer->role),
-                      dtls_kb_key_size(security, peer->role),
-                      A_DATA, A_DATA_LEN,
--                     security->cipher);
-+                     security->cipher);
-   }
-   if (clen < 0)
-     dtls_warn("decryption failed\n");
-   else {
- #ifndef NDEBUG
--      dtls_debug("decrypt_verify(): found %i bytes cleartext\n", clen);
-+    dtls_debug("decrypt_verify(): found %i bytes cleartext\n", clen);
- #endif
--      dtls_security_params_free_other(peer);
--      dtls_debug_dump("cleartext", *cleartext, clen);
-+    dtls_security_params_free_other(peer);
-+    dtls_debug_dump("cleartext", *cleartext, clen);
-   }
-   return clen;
-@@ -3282,7 +3646,8 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-     }
-     if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher))
-       peer->state = DTLS_STATE_WAIT_SERVERCERTIFICATE; //ecdsa
--    else if (is_tls_ecdh_anon_with_aes_128_cbc_sha_256(peer->handshake_params->cipher))
-+    else if (is_tls_ecdh_anon_with_aes_128_cbc_sha_256(peer->handshake_params->cipher) ||
-+        is_tls_ecdhe_psk_with_aes_128_cbc_sha_256(peer->handshake_params->cipher))
-         peer->state = DTLS_STATE_WAIT_SERVERKEYEXCHANGE; //ecdh
-     else
-       peer->state = DTLS_STATE_WAIT_SERVERHELLODONE; //psk
-@@ -3329,6 +3694,16 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-       err = check_server_key_exchange_ecdh(ctx, peer, data, data_length);
-     }
- #endif /* DTLS_ECC */
-+
-+#if defined(DTLS_PSK) && defined(DTLS_ECC)
-+    if (is_tls_ecdhe_psk_with_aes_128_cbc_sha_256(peer->handshake_params->cipher)) {
-+        if (state != DTLS_STATE_WAIT_SERVERKEYEXCHANGE) {
-+          return dtls_alert_fatal_create(DTLS_ALERT_UNEXPECTED_MESSAGE);
-+        }
-+      err = check_server_key_exchange_ecdhe_psk(ctx, peer, data, data_length);
-+    }
-+#endif defined(DTLS_PSK) && defined(DTLS_ECC)
-+
- #ifdef DTLS_PSK
-     if (is_tls_psk_with_aes_128_ccm_8(peer->handshake_params->cipher)) {
-       if (state != DTLS_STATE_WAIT_SERVERHELLODONE) {
-diff --git a/extlibs/tinydtls/global.h b/extlibs/tinydtls/global.h
-index 169c726..8b3c518 100644
---- a/extlibs/tinydtls/global.h
-+++ b/extlibs/tinydtls/global.h
-@@ -75,6 +75,7 @@ typedef enum {
-   TLS_NULL_WITH_NULL_NULL = 0x0000,   /**< NULL cipher  */
-   TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256 = 0xC018, /**< see RFC 4492 */
-   TLS_PSK_WITH_AES_128_CCM_8 = 0xC0A8, /**< see RFC 6655 */
-+  TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256 = 0xC037, /**< see RFC 5489 */
-   TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 = 0xC0AE /**< see RFC 7251 */
- } dtls_cipher_t;
-diff --git a/extlibs/tinydtls/tests/dtls-client.c b/extlibs/tinydtls/tests/dtls-client.c
-index dfc822a..dfd34c8 100644
---- a/extlibs/tinydtls/tests/dtls-client.c
-+++ b/extlibs/tinydtls/tests/dtls-client.c
-@@ -311,7 +311,8 @@ usage( const char *program, const char *version) {
-           "\t-c num\t\tcipher suite (default: 1)\n"
-           "\t\t\t1: TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256 \n"
-           "\t\t\t2: TLS_PSK_WITH_AES_128_CCM_8\n"
--          "\t\t\t3: TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8\n",
-+          "\t\t\t3: TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8\n"
-+          "\t\t\t4: TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256\n",
-          program, version, program, DEFAULT_PORT);
- }
-@@ -430,6 +431,11 @@ main(int argc, char **argv) {
-           selected_cipher = TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 ;
-           ecdh_anon_enalbe = DTLS_CIPHER_DISABLE;
-       }
-+      else if( strcmp(optarg, "4") == 0)
-+      {
-+          selected_cipher = TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA_256;
-+          ecdh_anon_enalbe = DTLS_CIPHER_DISABLE;
-+      }
-       break;
-     default:
-       usage(argv[0], dtls_package_version());
--- 
-1.7.9.5
-
diff --git a/extlibs/tinydtls/0001-Added-anonymous-ecdh-cipher-suite-into-tinydtls.patch b/extlibs/tinydtls/0001-Added-anonymous-ecdh-cipher-suite-into-tinydtls.patch
deleted file mode 100644 (file)
index ba75317..0000000
+++ /dev/null
@@ -1,1164 +0,0 @@
-From bdfe0e312f9c2cd34df7bfff070dfe8a9e82d147 Mon Sep 17 00:00:00 2001
-From: leechul <chuls.lee@samsung.com>
-Date: Thu, 9 Apr 2015 16:25:43 +0900
-Subject: [PATCH 1/1] Added anonymous ecdh cipher suite into tinydtls
-
-Change-Id: I80fa2985587618ebe7debdacba45996614c4cf1b
-Signed-off-by: leechul <chuls.lee@samsung.com>
-Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
----
- extlibs/tinydtls/aes/rijndael.h      |    1 +
- extlibs/tinydtls/crypto.c            |  173 ++++++++++++++++---
- extlibs/tinydtls/crypto.h            |   15 +-
- extlibs/tinydtls/dtls.c              |  301 +++++++++++++++++++++++++---------
- extlibs/tinydtls/dtls.h              |   28 +++-
- extlibs/tinydtls/global.h            |    6 +
- extlibs/tinydtls/tests/dtls-client.c |   42 ++++-
- extlibs/tinydtls/tests/dtls-server.c |   21 ++-
- 8 files changed, 468 insertions(+), 119 deletions(-)
- mode change 100755 => 100644 extlibs/tinydtls/crypto.c
-
-diff --git a/extlibs/tinydtls/aes/rijndael.h b/extlibs/tinydtls/aes/rijndael.h
-index 60e9bef..712798b 100755
---- a/extlibs/tinydtls/aes/rijndael.h
-+++ b/extlibs/tinydtls/aes/rijndael.h
-@@ -30,6 +30,7 @@
- #include <stdint.h>
-+#define WITH_AES_DECRYPT 1
- #define AES_MAXKEYBITS        (256)
- #define AES_MAXKEYBYTES       (AES_MAXKEYBITS>>3)
- /* for 256-bit keys we need 14 rounds for a 128 we only need 10 round */
-diff --git a/extlibs/tinydtls/crypto.c b/extlibs/tinydtls/crypto.c
-old mode 100755
-new mode 100644
-index 0113342..0ea1546
---- a/extlibs/tinydtls/crypto.c
-+++ b/extlibs/tinydtls/crypto.c
-@@ -54,6 +54,8 @@
- #include "crypto.h"
- #include "ccm.h"
- #include "ecc/ecc.h"
-+#include "aes/rijndael.h"
-+#include "sha2/sha2.h"
- #include "prng.h"
- #include "netq.h"
-@@ -292,7 +294,7 @@ dtls_mac(dtls_hmac_context_t *hmac_ctx,
- }
- static size_t
--dtls_ccm_encrypt(aes128_ccm_t *ccm_ctx, const unsigned char *src, size_t srclen,
-+dtls_ccm_encrypt(aes128_t *ccm_ctx, const unsigned char *src, size_t srclen,
-                unsigned char *buf,
-                unsigned char *nounce,
-                const unsigned char *aad, size_t la) {
-@@ -309,7 +311,7 @@ dtls_ccm_encrypt(aes128_ccm_t *ccm_ctx, const unsigned char *src, size_t srclen,
- }
- static size_t
--dtls_ccm_decrypt(aes128_ccm_t *ccm_ctx, const unsigned char *src,
-+dtls_ccm_decrypt(aes128_t *ccm_ctx, const unsigned char *src,
-                size_t srclen, unsigned char *buf,
-                unsigned char *nounce,
-                const unsigned char *aad, size_t la) {
-@@ -325,6 +327,95 @@ dtls_ccm_decrypt(aes128_ccm_t *ccm_ctx, const unsigned char *src,
-   return len;
- }
-+static size_t
-+dtls_cbc_encrypt(aes128_t *aes_ctx,
-+                 const unsigned char *iv,
-+                 const unsigned char *src, size_t srclen,
-+                 unsigned char *buf) {
-+
-+    unsigned char cbc[DTLS_BLK_LENGTH];
-+    unsigned char tmp[DTLS_BLK_LENGTH];
-+    unsigned char *pos;
-+    dtls_hash_ctx shactx;
-+    int i, j;
-+    int blocks;
-+
-+    pos = buf;
-+
-+    dtls_hash_init(&shactx);
-+    dtls_hash_update(&shactx, src, srclen);
-+    dtls_hash_finalize(pos + srclen, &shactx);
-+
-+    memcpy(cbc, iv, DTLS_BLK_LENGTH);
-+    blocks = (srclen + SHA256_DIGEST_LENGTH) / DTLS_BLK_LENGTH;
-+
-+    for (i = 0; i < blocks; i++) {
-+        for (j = 0; j < DTLS_BLK_LENGTH; j++) {
-+            cbc[j] ^= pos[j];
-+        }
-+
-+        rijndael_encrypt(&aes_ctx->ctx, cbc, tmp);
-+        memcpy(cbc, tmp, DTLS_BLK_LENGTH);
-+        memcpy(pos, cbc, DTLS_BLK_LENGTH);
-+        pos += DTLS_BLK_LENGTH;
-+    }
-+
-+    dtls_debug_dump("Encrypted Data:", buf, srclen + SHA256_DIGEST_LENGTH);
-+
-+    return srclen + SHA256_DIGEST_LENGTH;
-+}
-+
-+
-+static size_t
-+dtls_cbc_decrypt(aes128_t *aes_ctx,
-+                 const unsigned char *iv,
-+                 const unsigned char *src, size_t srclen,
-+                 unsigned char *buf) {
-+
-+    unsigned char cbc[DTLS_BLK_LENGTH];
-+    unsigned char tmp[DTLS_BLK_LENGTH];
-+    unsigned char tmp2[DTLS_BLK_LENGTH];
-+    unsigned char msg_hash[SHA256_DIGEST_LENGTH];
-+    unsigned char *pos;
-+    dtls_hash_ctx shactx;
-+    int i, j;
-+    int blocks;
-+
-+    pos = buf;
-+    memcpy(pos, src, srclen);
-+
-+    memcpy(cbc, iv, DTLS_BLK_LENGTH);
-+    blocks = srclen / DTLS_BLK_LENGTH;
-+
-+    for (i = 0; i < blocks; i++)
-+    {
-+        memcpy(tmp, pos, DTLS_BLK_LENGTH);
-+        rijndael_decrypt(&aes_ctx->ctx, pos, tmp2);
-+        memcpy(pos, tmp2, DTLS_BLK_LENGTH);
-+
-+        for (j = 0; j < DTLS_BLK_LENGTH; j++) {
-+            pos[j] ^= cbc[j];
-+        }
-+
-+        memcpy(cbc, tmp, DTLS_BLK_LENGTH);
-+        pos += DTLS_BLK_LENGTH;
-+    }
-+
-+    dtls_hash_init(&shactx);
-+    dtls_hash_update(&shactx, buf, srclen - SHA256_DIGEST_LENGTH);
-+    dtls_hash_finalize(msg_hash, &shactx);
-+
-+    dtls_debug_dump("decrypted data:", buf, srclen);
-+
-+    if(memcmp(msg_hash, buf + (srclen - SHA256_DIGEST_LENGTH), SHA256_DIGEST_LENGTH) != 0)
-+    {
-+        dtls_warn("message is broken\n");
-+        return -1;
-+    }
-+
-+    return srclen - SHA256_DIGEST_LENGTH;
-+}
-+
- #ifdef DTLS_PSK
- int
- dtls_psk_pre_master_secret(unsigned char *key, size_t keylen,
-@@ -432,13 +523,10 @@ void
- dtls_ecdsa_create_sig_hash(const unsigned char *priv_key, size_t key_size,
-                          const unsigned char *sign_hash, size_t sign_hash_size,
-                          uint32_t point_r[9], uint32_t point_s[9]) {
--  int ret;
--
-   uint8_t privateKey[32];
-   uint8_t hashValue[32];
-   uint8_t sign[64];
--
-   uECC_sign(privateKey, hashValue, sign);
-   memcpy(point_r, sign, 32);
-   memcpy(point_s, sign + 32, 32);
-@@ -505,21 +593,37 @@ dtls_encrypt(const unsigned char *src, size_t length,
-            unsigned char *buf,
-            unsigned char *nounce,
-            unsigned char *key, size_t keylen,
--           const unsigned char *aad, size_t la)
-+           const unsigned char *aad, size_t la,
-+           const dtls_cipher_t cipher)
- {
--  int ret;
-+  int ret = 0;
-   struct dtls_cipher_context_t *ctx = dtls_cipher_context_get();
--  ret = rijndael_set_key_enc_only(&ctx->data.ctx, key, 8 * keylen);
--  if (ret < 0) {
--    /* cleanup everything in case the key has the wrong size */
--    dtls_warn("cannot set rijndael key\n");
--    goto error;
-+  if(cipher == TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 ||
-+     cipher == TLS_PSK_WITH_AES_128_CCM_8) {
-+      ret = rijndael_set_key_enc_only(&ctx->data.ctx, key, 8 * keylen);
-+      if (ret < 0) {
-+        /* cleanup everything in case the key has the wrong size */
-+        dtls_warn("cannot set rijndael key\n");
-+        goto error;
-+      }
-+
-+      if (src != buf)
-+        memmove(buf, src, length);
-+      ret = dtls_ccm_encrypt(&ctx->data, src, length, buf, nounce, aad, la);
-+  }
-+  if(cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA) {
-+      ret = rijndael_set_key(&ctx->data.ctx, key, 8 * keylen);
-+      if (ret < 0) {
-+        /* cleanup everything in case the key has the wrong size */
-+        dtls_warn("cannot set rijndael key\n");
-+        goto error;
-+      }
-+
-+      if (src != buf)
-+        memmove(buf, src, length);
-+      ret = dtls_cbc_encrypt(&ctx->data, nounce, src, length, buf);
-   }
--
--  if (src != buf)
--    memmove(buf, src, length);
--  ret = dtls_ccm_encrypt(&ctx->data, src, length, buf, nounce, aad, la);
- error:
-   dtls_cipher_context_release();
-@@ -531,21 +635,38 @@ dtls_decrypt(const unsigned char *src, size_t length,
-            unsigned char *buf,
-            unsigned char *nounce,
-            unsigned char *key, size_t keylen,
--           const unsigned char *aad, size_t la)
-+           const unsigned char *aad, size_t la,
-+           const dtls_cipher_t cipher)
- {
--  int ret;
-+  int ret = 0;
-   struct dtls_cipher_context_t *ctx = dtls_cipher_context_get();
--  ret = rijndael_set_key_enc_only(&ctx->data.ctx, key, 8 * keylen);
--  if (ret < 0) {
--    /* cleanup everything in case the key has the wrong size */
--    dtls_warn("cannot set rijndael key\n");
--    goto error;
-+  if(cipher == TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 ||
-+     cipher == TLS_PSK_WITH_AES_128_CCM_8) {
-+      ret = rijndael_set_key_enc_only(&ctx->data.ctx, key, 8 * keylen);
-+      if (ret < 0) {
-+        /* cleanup everything in case the key has the wrong size */
-+        dtls_warn("cannot set rijndael key\n");
-+        goto error;
-+      }
-+
-+      if (src != buf)
-+        memmove(buf, src, length);
-+      ret = dtls_ccm_decrypt(&ctx->data, src, length, buf, nounce, aad, la);
-   }
--  if (src != buf)
--    memmove(buf, src, length);
--  ret = dtls_ccm_decrypt(&ctx->data, src, length, buf, nounce, aad, la);
-+  if(cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA) {
-+      ret = rijndael_set_key(&ctx->data.ctx, key, 8 * keylen);
-+      if (ret < 0) {
-+        /* cleanup everything in case the key has the wrong size */
-+        dtls_warn("cannot set rijndael key\n");
-+        goto error;
-+      }
-+
-+      if (src != buf)
-+        memmove(buf, src, length);
-+      ret = dtls_cbc_decrypt(&ctx->data, nounce, src, length, buf);
-+    }
- error:
-   dtls_cipher_context_release();
-diff --git a/extlibs/tinydtls/crypto.h b/extlibs/tinydtls/crypto.h
-index 972a174..dd13ffa 100644
---- a/extlibs/tinydtls/crypto.h
-+++ b/extlibs/tinydtls/crypto.h
-@@ -69,11 +69,11 @@ typedef enum {
- /** Crypto context for TLS_PSK_WITH_AES_128_CCM_8 cipher suite. */
- typedef struct {
-   rijndael_ctx ctx;                  /**< AES-128 encryption context */
--} aes128_ccm_t;
-+} aes128_t;
- typedef struct dtls_cipher_context_t {
-   /** numeric identifier of this cipher suite in host byte order. */
--  aes128_ccm_t data;          /**< The crypto context */
-+  aes128_t data;              /**< The crypto context */
- } dtls_cipher_context_t;
- typedef struct {
-@@ -82,7 +82,8 @@ typedef struct {
-   uint8 other_eph_pub_y[32];
-   uint8 other_pub_x[32];
-   uint8 other_pub_y[32];
--} dtls_handshake_parameters_ecdsa_t;
-+} dtls_handshake_parameters_ecc_t;
-+
- /* This is the maximal supported length of the psk client identity and psk
-  * server identity hint */
-@@ -129,7 +130,7 @@ typedef struct {
-   unsigned int do_client_auth:1;
-   union {
- #ifdef DTLS_ECC
--    dtls_handshake_parameters_ecdsa_t ecdsa;
-+    dtls_handshake_parameters_ecc_t ecc;
- #endif /* DTLS_ECC */
- #ifdef DTLS_PSK
-     dtls_handshake_parameters_psk_t psk;
-@@ -265,7 +266,8 @@ int dtls_encrypt(const unsigned char *src, size_t length,
-                unsigned char *buf,
-                unsigned char *nounce,
-                unsigned char *key, size_t keylen,
--               const unsigned char *aad, size_t aad_length);
-+               const unsigned char *aad, size_t aad_length,
-+               const dtls_cipher_t cipher);
- /** 
-  * Decrypts the given buffer \p src of given \p length, writing the
-@@ -289,7 +291,8 @@ int dtls_decrypt(const unsigned char *src, size_t length,
-                unsigned char *buf,
-                unsigned char *nounce,
-                unsigned char *key, size_t keylen,
--               const unsigned char *a_data, size_t a_data_length);
-+               const unsigned char *a_data, size_t a_data_length,
-+               const dtls_cipher_t cipher);
- /* helper functions */
-diff --git a/extlibs/tinydtls/dtls.c b/extlibs/tinydtls/dtls.c
-index a87d7f1..f9a9a0b 100644
---- a/extlibs/tinydtls/dtls.c
-+++ b/extlibs/tinydtls/dtls.c
-@@ -79,6 +79,7 @@
- #define DTLS_SH_LENGTH (2 + DTLS_RANDOM_LENGTH + 1 + 2 + 1)
- #define DTLS_CE_LENGTH (3 + 3 + 27 + DTLS_EC_KEY_SIZE + DTLS_EC_KEY_SIZE)
- #define DTLS_SKEXEC_LENGTH (1 + 2 + 1 + 1 + DTLS_EC_KEY_SIZE + DTLS_EC_KEY_SIZE + 1 + 1 + 2 + 70)
-+#define DTLS_SKEXEC_ECDH_ANON_LENGTH (1 + 2 + 1 + 1 + DTLS_EC_KEY_SIZE + DTLS_EC_KEY_SIZE)
- #define DTLS_SKEXECPSK_LENGTH_MIN 2
- #define DTLS_SKEXECPSK_LENGTH_MAX 2 + DTLS_PSK_MAX_CLIENT_IDENTITY_LEN
- #define DTLS_CKXPSK_LENGTH_MIN 2
-@@ -167,6 +168,24 @@ dtls_init() {
-   peer_init();
- }
-+ void
-+ dtls_enables_anon_ecdh(dtls_context_t* ctx, dtls_cipher_enable_t is_enable)
-+{
-+    if(ctx)
-+    {
-+        ctx->is_anon_ecdh_eabled = is_enable;
-+    }
-+}
-+
-+void
-+dtls_select_cipher(dtls_context_t* ctx, const dtls_cipher_t cipher)
-+{
-+    if(ctx)
-+    {
-+        ctx->selected_cipher = cipher;
-+    }
-+}
-+
- /* Calls cb_alert() with given arguments if defined, otherwise an
-  * error message is logged and the result is -1. This is just an
-  * internal helper.
-@@ -477,6 +496,17 @@ static inline int is_tls_psk_with_aes_128_ccm_8(dtls_cipher_t cipher)
- #endif /* DTLS_PSK */
- }
-+/** returns true if the cipher matches TLS_ECDH_anon_WITH_AES_128_CBC_SHA */
-+static inline int is_tls_ecdh_anon_with_aes_128_cbc_sha(dtls_cipher_t cipher)
-+{
-+#ifdef DTLS_ECC
-+    return cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA;
-+#else
-+    return 0;
-+#endif
-+}
-+
-+
- /** returns true if the application is configured for psk */
- static inline int is_psk_supported(dtls_context_t *ctx)
- {
-@@ -509,6 +539,16 @@ static inline int is_ecdsa_client_auth_supported(dtls_context_t *ctx)
- #endif /* DTLS_ECC */
- }
-+/** returns true if ecdh_anon_with_aes_128_cbc_sha is supported */
-+static inline int is_ecdh_anon_supported(dtls_context_t *ctx)
-+{
-+#ifdef DTLS_ECC
-+    return ctx &&  (ctx->is_anon_ecdh_eabled == DTLS_CIPHER_ENABLE);
-+#else
-+    return 0;
-+#endif
-+}
-+
- /**
-  * Returns @c 1 if @p code is a cipher suite other than @c
-  * TLS_NULL_WITH_NULL_NULL that we recognize.
-@@ -522,11 +562,15 @@ static int
- known_cipher(dtls_context_t *ctx, dtls_cipher_t code, int is_client) {
-   int psk;
-   int ecdsa;
-+  int ecdh_anon;
-   psk = is_psk_supported(ctx);
-   ecdsa = is_ecdsa_supported(ctx, is_client);
-+  ecdh_anon = is_ecdh_anon_supported(ctx);
-+
-   return (psk && is_tls_psk_with_aes_128_ccm_8(code)) ||
--       (ecdsa && is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(code));
-+       (ecdsa && is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(code)) ||
-+       (ecdh_anon && is_tls_ecdh_anon_with_aes_128_cbc_sha(code));
- }
- /**
-@@ -674,11 +718,12 @@ calculate_key_block(dtls_context_t *ctx,
-   }
- #endif /* DTLS_PSK */
- #ifdef DTLS_ECC
--  case TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8: {
--    pre_master_len = dtls_ecdh_pre_master_secret(handshake->keyx.ecdsa.own_eph_priv,
--                                               handshake->keyx.ecdsa.other_eph_pub_x,
--                                               handshake->keyx.ecdsa.other_eph_pub_y,
--                                               sizeof(handshake->keyx.ecdsa.own_eph_priv),
-+  case TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-+  case TLS_ECDH_anon_WITH_AES_128_CBC_SHA: {
-+    pre_master_len = dtls_ecdh_pre_master_secret(handshake->keyx.ecc.own_eph_priv,
-+                                               handshake->keyx.ecc.other_eph_pub_x,
-+                                               handshake->keyx.ecc.other_eph_pub_y,
-+                                               sizeof(handshake->keyx.ecc.own_eph_priv),
-                                                pre_master_secret,
-                                                MAX_KEYBLOCK_LENGTH);
-     if (pre_master_len < 0) {
-@@ -1038,7 +1083,8 @@ check_client_keyexchange(dtls_context_t *ctx,
-                        uint8 *data, size_t length) {
- #ifdef DTLS_ECC
--  if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(handshake->cipher)) {
-+  if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(handshake->cipher) ||
-+       is_tls_ecdh_anon_with_aes_128_cbc_sha(handshake->cipher) ) {
-     if (length < DTLS_HS_LENGTH + DTLS_CKXEC_LENGTH) {
-       dtls_debug("The client key exchange is too short\n");
-@@ -1058,13 +1104,13 @@ check_client_keyexchange(dtls_context_t *ctx,
-     }
-     data += sizeof(uint8);
--    memcpy(handshake->keyx.ecdsa.other_eph_pub_x, data,
--         sizeof(handshake->keyx.ecdsa.other_eph_pub_x));
--    data += sizeof(handshake->keyx.ecdsa.other_eph_pub_x);
-+    memcpy(handshake->keyx.ecc.other_eph_pub_x, data,
-+         sizeof(handshake->keyx.ecc.other_eph_pub_x));
-+    data += sizeof(handshake->keyx.ecc.other_eph_pub_x);
--    memcpy(handshake->keyx.ecdsa.other_eph_pub_y, data,
--         sizeof(handshake->keyx.ecdsa.other_eph_pub_y));
--    data += sizeof(handshake->keyx.ecdsa.other_eph_pub_y);
-+    memcpy(handshake->keyx.ecc.other_eph_pub_y, data,
-+         sizeof(handshake->keyx.ecc.other_eph_pub_y));
-+    data += sizeof(handshake->keyx.ecc.other_eph_pub_y);
-   }
- #endif /* DTLS_ECC */
- #ifdef DTLS_PSK
-@@ -1253,6 +1299,8 @@ dtls_prepare_record(dtls_peer_t *peer, dtls_security_parameters_t *security,
-       dtls_debug("dtls_prepare_record(): encrypt using TLS_PSK_WITH_AES_128_CCM_8\n");
-     } else if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(security->cipher)) {
-       dtls_debug("dtls_prepare_record(): encrypt using TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8\n");
-+    } else if (is_tls_ecdh_anon_with_aes_128_cbc_sha(security->cipher)) {
-+        dtls_debug("dtls_prepare_record() : encrypt using TLS_ECDH_anon_WITH_AES_128_CBC_SHA\n");
-     } else {
-       dtls_debug("dtls_prepare_record(): encrypt using unknown cipher\n");
-     }
-@@ -1332,9 +1380,10 @@ dtls_prepare_record(dtls_peer_t *peer, dtls_security_parameters_t *security,
-     dtls_int_to_uint16(A_DATA + 11, res - 8); /* length */
-     
-     res = dtls_encrypt(start + 8, res - 8, start + 8, nonce,
--                     dtls_kb_local_write_key(security, peer->role),
--                     dtls_kb_key_size(security, peer->role),
--                     A_DATA, A_DATA_LEN);
-+               dtls_kb_local_write_key(security, peer->role),
-+               dtls_kb_key_size(security, peer->role),
-+               A_DATA, A_DATA_LEN,
-+               security->cipher);
-     if (res < 0)
-       return res;
-@@ -1753,8 +1802,8 @@ check_client_certificate_verify(dtls_context_t *ctx,
-   dtls_hash_finalize(sha256hash, &hs_hash);
--  ret = dtls_ecdsa_verify_sig_hash(config->keyx.ecdsa.other_pub_x, config->keyx.ecdsa.other_pub_y,
--                          sizeof(config->keyx.ecdsa.other_pub_x),
-+  ret = dtls_ecdsa_verify_sig_hash(config->keyx.ecc.other_pub_x, config->keyx.ecc.other_pub_y,
-+                          sizeof(config->keyx.ecc.other_pub_x),
-                           sha256hash, sizeof(sha256hash),
-                           result_r, result_s);
-@@ -1866,7 +1915,7 @@ dtls_send_server_hello(dtls_context_t *ctx, dtls_peer_t *peer)
- #ifdef DTLS_ECC
- static int
- dtls_send_certificate_ecdsa(dtls_context_t *ctx, dtls_peer_t *peer,
--                          const dtls_ecdsa_key_t *key)
-+                          const dtls_ecc_key_t *key)
- {
-   uint8 buf[DTLS_CE_LENGTH];
-   uint8 *p;
-@@ -1956,7 +2005,7 @@ dtls_add_ecdsa_signature_elem(uint8 *p, uint32_t *point_r, uint32_t *point_s)
- static int
- dtls_send_server_key_exchange_ecdh(dtls_context_t *ctx, dtls_peer_t *peer,
--                                 const dtls_ecdsa_key_t *key)
-+                                 const dtls_ecc_key_t *key)
- {
-   /* The ASN.1 Integer representation of an 32 byte unsigned int could be
-    * 33 bytes long add space for that */
-@@ -1967,9 +2016,11 @@ dtls_send_server_key_exchange_ecdh(dtls_context_t *ctx, dtls_peer_t *peer,
-   uint8 *ephemeral_pub_y;
-   uint32_t point_r[9];
-   uint32_t point_s[9];
-+  int ecdsa;
-   dtls_handshake_parameters_t *config = peer->handshake_params;
--  /* ServerKeyExchange 
-+  ecdsa = is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher);
-+  /* ServerKeyExchange
-    *
-    * Start message construction at beginning of buffer. */
-   p = buf;
-@@ -1998,18 +2049,20 @@ dtls_send_server_key_exchange_ecdh(dtls_context_t *ctx, dtls_peer_t *peer,
-   ephemeral_pub_y = p;
-   p += DTLS_EC_KEY_SIZE;
--  dtls_ecdsa_generate_key(config->keyx.ecdsa.own_eph_priv,
--                        ephemeral_pub_x, ephemeral_pub_y,
--                        DTLS_EC_KEY_SIZE);
-+  dtls_ecdsa_generate_key(config->keyx.ecc.own_eph_priv,
-+              ephemeral_pub_x, ephemeral_pub_y,
-+              DTLS_EC_KEY_SIZE);
--  /* sign the ephemeral and its paramaters */
--  dtls_ecdsa_create_sig(key->priv_key, DTLS_EC_KEY_SIZE,
--                     config->tmp.random.client, DTLS_RANDOM_LENGTH,
--                     config->tmp.random.server, DTLS_RANDOM_LENGTH,
--                     key_params, p - key_params,
--                     point_r, point_s);
-+  if(ecdsa) {
-+      /* sign the ephemeral and its paramaters */
-+           dtls_ecdsa_create_sig(key->priv_key, DTLS_EC_KEY_SIZE,
-+               config->tmp.random.client, DTLS_RANDOM_LENGTH,
-+               config->tmp.random.server, DTLS_RANDOM_LENGTH,
-+               key_params, p - key_params,
-+               point_r, point_s);
--  p = dtls_add_ecdsa_signature_elem(p, point_r, point_s);
-+      p = dtls_add_ecdsa_signature_elem(p, point_r, point_s);
-+  }
-   assert(p - buf <= sizeof(buf));
-@@ -2107,6 +2160,8 @@ static int
- dtls_send_server_hello_msgs(dtls_context_t *ctx, dtls_peer_t *peer)
- {
-   int res;
-+  int ecdsa;
-+  int ecdh_anon;
-   res = dtls_send_server_hello(ctx, peer);
-@@ -2115,9 +2170,20 @@ dtls_send_server_hello_msgs(dtls_context_t *ctx, dtls_peer_t *peer)
-     return res;
-   }
-+  ecdsa = is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher);
-+  ecdh_anon = is_tls_ecdh_anon_with_aes_128_cbc_sha(peer->handshake_params->cipher);
-+
- #ifdef DTLS_ECC
--  if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher)) {
--    const dtls_ecdsa_key_t *ecdsa_key;
-+  if(ecdh_anon) {
-+      res = dtls_send_server_key_exchange_ecdh(ctx, peer, NULL);
-+
-+      if (res < 0) {
-+        dtls_debug("dtls_server_hello(with ECDH): cannot prepare Server Key Exchange record\n");
-+        return res;
-+      }
-+  }
-+  else if (ecdsa) {
-+    const dtls_ecc_key_t *ecdsa_key;
-     res = CALL(ctx, get_ecdsa_key, &peer->session, &ecdsa_key);
-     if (res < 0) {
-@@ -2144,7 +2210,7 @@ dtls_send_server_hello_msgs(dtls_context_t *ctx, dtls_peer_t *peer)
-       res = dtls_send_server_certificate_request(ctx, peer);
-       if (res < 0) {
--        dtls_debug("dtls_server_hello: cannot prepare certificate Request record\n");
-+        dtls_debug("dtls_server_hello(with ECDSA): cannot prepare certificate Request record\n");
-         return res;
-       }
-     }
-@@ -2233,7 +2299,8 @@ dtls_send_client_key_exchange(dtls_context_t *ctx, dtls_peer_t *peer)
-   }
- #endif /* DTLS_PSK */
- #ifdef DTLS_ECC
--  case TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8: {
-+  case TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-+  case TLS_ECDH_anon_WITH_AES_128_CBC_SHA: {
-     uint8 *ephemeral_pub_x;
-     uint8 *ephemeral_pub_y;
-@@ -2249,7 +2316,7 @@ dtls_send_client_key_exchange(dtls_context_t *ctx, dtls_peer_t *peer)
-     ephemeral_pub_y = p;
-     p += DTLS_EC_KEY_SIZE;
--    dtls_ecdsa_generate_key(peer->handshake_params->keyx.ecdsa.own_eph_priv,
-+    dtls_ecdsa_generate_key(peer->handshake_params->keyx.ecc.own_eph_priv,
-                           ephemeral_pub_x, ephemeral_pub_y,
-                           DTLS_EC_KEY_SIZE);
-@@ -2270,7 +2337,7 @@ dtls_send_client_key_exchange(dtls_context_t *ctx, dtls_peer_t *peer)
- #ifdef DTLS_ECC
- static int
- dtls_send_certificate_verify_ecdh(dtls_context_t *ctx, dtls_peer_t *peer,
--                                 const dtls_ecdsa_key_t *key)
-+                                 const dtls_ecc_key_t *key)
- {
-   /* The ASN.1 Integer representation of an 32 byte unsigned int could be
-    * 33 bytes long add space for that */
-@@ -2342,16 +2409,32 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-   uint8 *p = buf;
-   uint8_t cipher_size;
-   uint8_t extension_size;
--  int psk;
--  int ecdsa;
-+  int psk = 0;
-+  int ecdsa = 0;
-+  int ecdh_anon = 0;
-   dtls_handshake_parameters_t *handshake = peer->handshake_params;
-   dtls_tick_t now;
--  psk = is_psk_supported(ctx);
--  ecdsa = is_ecdsa_supported(ctx, 1);
-+  switch(ctx->selected_cipher)
-+  {
-+      case TLS_PSK_WITH_AES_128_CCM_8:
-+        psk = is_psk_supported(ctx);
-+        break;
-+      case TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-+        ecdsa = is_ecdsa_supported(ctx, 1);
-+        break;
-+      case TLS_ECDH_anon_WITH_AES_128_CBC_SHA:
-+        ecdh_anon = is_ecdh_anon_supported(ctx);
-+        break;
-+      default:
-+        psk = is_psk_supported(ctx);
-+        ecdsa = is_ecdsa_supported(ctx, 1);
-+        ecdh_anon = is_ecdh_anon_supported(ctx);
-+        break;
-+   }
--  cipher_size = 2 + ((ecdsa) ? 2 : 0) + ((psk) ? 2 : 0);
--  extension_size = (ecdsa) ? 2 + 6 + 6 + 8 + 6: 0;
-+  cipher_size = 2 + (ecdsa ? 2 : 0) + (psk ? 2 : 0) + (ecdh_anon ? 2 : 0);
-+  extension_size = (ecdsa) ? (2 + 6 + 6 + 8 + 6) : 0;
-   if (cipher_size == 0) {
-     dtls_crit("no cipher callbacks implemented\n");
-@@ -2393,14 +2476,18 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-   dtls_int_to_uint16(p, cipher_size - 2);
-   p += sizeof(uint16);
--  if (ecdsa) {
--    dtls_int_to_uint16(p, TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8);
-+  if (ecdh_anon) {
-+    dtls_int_to_uint16(p, TLS_ECDH_anon_WITH_AES_128_CBC_SHA);
-     p += sizeof(uint16);
-   }
-   if (psk) {
-     dtls_int_to_uint16(p, TLS_PSK_WITH_AES_128_CCM_8);
-     p += sizeof(uint16);
-   }
-+  if (ecdsa) {
-+    dtls_int_to_uint16(p, TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8);
-+    p += sizeof(uint16);
-+  }
-   /* compression method */
-   dtls_int_to_uint8(p, 1);
-@@ -2611,18 +2698,18 @@ check_server_certificate(dtls_context_t *ctx,
-   }
-   data += sizeof(cert_asn1_header);
--  memcpy(config->keyx.ecdsa.other_pub_x, data,
--       sizeof(config->keyx.ecdsa.other_pub_x));
--  data += sizeof(config->keyx.ecdsa.other_pub_x);
-+  memcpy(config->keyx.ecc.other_pub_x, data,
-+       sizeof(config->keyx.ecc.other_pub_x));
-+  data += sizeof(config->keyx.ecc.other_pub_x);
--  memcpy(config->keyx.ecdsa.other_pub_y, data,
--       sizeof(config->keyx.ecdsa.other_pub_y));
--  data += sizeof(config->keyx.ecdsa.other_pub_y);
-+  memcpy(config->keyx.ecc.other_pub_y, data,
-+       sizeof(config->keyx.ecc.other_pub_y));
-+  data += sizeof(config->keyx.ecc.other_pub_y);
-   err = CALL(ctx, verify_ecdsa_key, &peer->session,
--           config->keyx.ecdsa.other_pub_x,
--           config->keyx.ecdsa.other_pub_y,
--           sizeof(config->keyx.ecdsa.other_pub_x));
-+           config->keyx.ecc.other_pub_x,
-+           config->keyx.ecc.other_pub_y,
-+           sizeof(config->keyx.ecc.other_pub_x));
-   if (err < 0) {
-     dtls_warn("The certificate was not accepted\n");
-     return err;
-@@ -2682,13 +2769,13 @@ check_server_key_exchange_ecdsa(dtls_context_t *ctx,
-   data += sizeof(uint8);
-   data_length -= sizeof(uint8);
--  memcpy(config->keyx.ecdsa.other_eph_pub_x, data, sizeof(config->keyx.ecdsa.other_eph_pub_y));
--  data += sizeof(config->keyx.ecdsa.other_eph_pub_y);
--  data_length -= sizeof(config->keyx.ecdsa.other_eph_pub_y);
-+  memcpy(config->keyx.ecc.other_eph_pub_x, data, sizeof(config->keyx.ecc.other_eph_pub_y));
-+  data += sizeof(config->keyx.ecc.other_eph_pub_y);
-+  data_length -= sizeof(config->keyx.ecc.other_eph_pub_y);
--  memcpy(config->keyx.ecdsa.other_eph_pub_y, data, sizeof(config->keyx.ecdsa.other_eph_pub_y));
--  data += sizeof(config->keyx.ecdsa.other_eph_pub_y);
--  data_length -= sizeof(config->keyx.ecdsa.other_eph_pub_y);
-+  memcpy(config->keyx.ecc.other_eph_pub_y, data, sizeof(config->keyx.ecc.other_eph_pub_y));
-+  data += sizeof(config->keyx.ecc.other_eph_pub_y);
-+  data_length -= sizeof(config->keyx.ecc.other_eph_pub_y);
-   ret = dtls_check_ecdsa_signature_elem(data, data_length, &result_r, &result_s);
-   if (ret < 0) {
-@@ -2697,8 +2784,8 @@ check_server_key_exchange_ecdsa(dtls_context_t *ctx,
-   data += ret;
-   data_length -= ret;
--  ret = dtls_ecdsa_verify_sig(config->keyx.ecdsa.other_pub_x, config->keyx.ecdsa.other_pub_y,
--                          sizeof(config->keyx.ecdsa.other_pub_x),
-+  ret = dtls_ecdsa_verify_sig(config->keyx.ecc.other_pub_x, config->keyx.ecc.other_pub_y,
-+                          sizeof(config->keyx.ecc.other_pub_x),
-                           config->tmp.random.client, DTLS_RANDOM_LENGTH,
-                           config->tmp.random.server, DTLS_RANDOM_LENGTH,
-                           key_params,
-@@ -2711,6 +2798,64 @@ check_server_key_exchange_ecdsa(dtls_context_t *ctx,
-   }
-   return 0;
- }
-+
-+static int
-+check_server_key_exchange_ecdh(dtls_context_t *ctx,
-+                              dtls_peer_t *peer,
-+                              uint8 *data, size_t data_length)
-+{
-+  dtls_handshake_parameters_t *config = peer->handshake_params;
-+
-+  update_hs_hash(peer, data, data_length);
-+
-+  assert(is_tls_ecdh_anon_with_aes_128_cbc_sha(config->cipher));
-+
-+  data += DTLS_HS_LENGTH;
-+
-+  if (data_length < DTLS_HS_LENGTH + DTLS_SKEXEC_ECDH_ANON_LENGTH) {
-+    dtls_alert("the packet length does not match the expected\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_DECODE_ERROR);
-+  }
-+
-+  if (dtls_uint8_to_int(data) != TLS_EC_CURVE_TYPE_NAMED_CURVE) {
-+    dtls_alert("Only named curves supported\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_HANDSHAKE_FAILURE);
-+  }
-+  data += sizeof(uint8);
-+  data_length -= sizeof(uint8);
-+
-+  if (dtls_uint16_to_int(data) != TLS_EXT_ELLIPTIC_CURVES_SECP256R1) {
-+    dtls_alert("secp256r1 supported\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_HANDSHAKE_FAILURE);
-+  }
-+  data += sizeof(uint16);
-+  data_length -= sizeof(uint16);
-+
-+  if (dtls_uint8_to_int(data) != 1 + 2 * DTLS_EC_KEY_SIZE) {
-+    dtls_alert("expected 65 bytes long public point\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_HANDSHAKE_FAILURE);
-+  }
-+  data += sizeof(uint8);
-+  data_length -= sizeof(uint8);
-+
-+  if (dtls_uint8_to_int(data) != 4) {
-+    dtls_alert("expected uncompressed public point\n");
-+    return dtls_alert_fatal_create(DTLS_ALERT_DECODE_ERROR);
-+  }
-+  data += sizeof(uint8);
-+  data_length -= sizeof(uint8);
-+
-+  memcpy(config->keyx.ecc.other_eph_pub_x, data, sizeof(config->keyx.ecc.other_eph_pub_x));
-+  data += sizeof(config->keyx.ecc.other_eph_pub_x);
-+  data_length -= sizeof(config->keyx.ecc.other_eph_pub_x);
-+
-+  memcpy(config->keyx.ecc.other_eph_pub_y, data, sizeof(config->keyx.ecc.other_eph_pub_y));
-+  data += sizeof(config->keyx.ecc.other_eph_pub_y);
-+  data_length -= sizeof(config->keyx.ecc.other_eph_pub_y);
-+
-+  return 0;
-+}
-+
- #endif /* DTLS_ECC */
- #ifdef DTLS_PSK
-@@ -2838,7 +2983,7 @@ check_server_hellodone(dtls_context_t *ctx,
- {
-   int res;
- #ifdef DTLS_ECC
--  const dtls_ecdsa_key_t *ecdsa_key;
-+  const dtls_ecc_key_t *ecdsa_key;
- #endif /* DTLS_ECC */
-   dtls_handshake_parameters_t *handshake = peer->handshake_params;
-@@ -2848,7 +2993,7 @@ check_server_hellodone(dtls_context_t *ctx,
-   update_hs_hash(peer, data, data_length);
- #ifdef DTLS_ECC
--  if (handshake->do_client_auth) {
-+  if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(handshake->cipher) && handshake->do_client_auth) {
-     res = CALL(ctx, get_ecdsa_key, &peer->session, &ecdsa_key);
-     if (res < 0) {
-@@ -2874,7 +3019,7 @@ check_server_hellodone(dtls_context_t *ctx,
-   }
- #ifdef DTLS_ECC
--  if (handshake->do_client_auth) {
-+  if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(handshake->cipher) && handshake->do_client_auth) {
-     res = dtls_send_certificate_verify_ecdh(ctx, peer, ecdsa_key);
-@@ -2961,12 +3106,13 @@ decrypt_verify(dtls_peer_t *peer, uint8 *packet, size_t length,
-     clen = dtls_decrypt(*cleartext, clen, *cleartext, nonce,
-                      dtls_kb_remote_write_key(security, peer->role),
-                      dtls_kb_key_size(security, peer->role),
--                     A_DATA, A_DATA_LEN);
-+                     A_DATA, A_DATA_LEN,
-+               security->cipher);
-     if (clen < 0)
-       dtls_warn("decryption failed\n");
-     else {
- #ifndef NDEBUG
--      printf("decrypt_verify(): found %i bytes cleartext\n", clen);
-+      dtls_debug("decrypt_verify(): found %i bytes cleartext\n", clen);
- #endif
-       dtls_security_params_free_other(peer);
-       dtls_debug_dump("cleartext", *cleartext, clen);
-@@ -3071,9 +3217,11 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-       return err;
-     }
-     if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher))
--      peer->state = DTLS_STATE_WAIT_SERVERCERTIFICATE;
-+      peer->state = DTLS_STATE_WAIT_SERVERCERTIFICATE; //ecdsa
-+    else if (is_tls_ecdh_anon_with_aes_128_cbc_sha(peer->handshake_params->cipher))
-+        peer->state = DTLS_STATE_WAIT_SERVERKEYEXCHANGE; //ecdh
-     else
--      peer->state = DTLS_STATE_WAIT_SERVERHELLODONE;
-+      peer->state = DTLS_STATE_WAIT_SERVERHELLODONE; //psk
-     /* update_hs_hash(peer, data, data_length); */
-     break;
-@@ -3109,6 +3257,13 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-       }
-       err = check_server_key_exchange_ecdsa(ctx, peer, data, data_length);
-     }
-+
-+    if (is_tls_ecdh_anon_with_aes_128_cbc_sha(peer->handshake_params->cipher)) {
-+      if (state != DTLS_STATE_WAIT_SERVERKEYEXCHANGE) {
-+        return dtls_alert_fatal_create(DTLS_ALERT_UNEXPECTED_MESSAGE);
-+      }
-+      err = check_server_key_exchange_ecdh(ctx, peer, data, data_length);
-+    }
- #endif /* DTLS_ECC */
- #ifdef DTLS_PSK
-     if (is_tls_psk_with_aes_128_ccm_8(peer->handshake_params->cipher)) {
-@@ -3218,9 +3373,9 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-     if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher) &&
-       is_ecdsa_client_auth_supported(ctx))
--      peer->state = DTLS_STATE_WAIT_CERTIFICATEVERIFY;
-+      peer->state = DTLS_STATE_WAIT_CERTIFICATEVERIFY; //ecdsa
-     else
--      peer->state = DTLS_STATE_WAIT_CHANGECIPHERSPEC;
-+      peer->state = DTLS_STATE_WAIT_CHANGECIPHERSPEC; //psk || ecdh_anon
-     break;
- #ifdef DTLS_ECC
-@@ -3341,9 +3496,9 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-     }
-     if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher) &&
-       is_ecdsa_client_auth_supported(ctx))
--      peer->state = DTLS_STATE_WAIT_CLIENTCERTIFICATE;
-+      peer->state = DTLS_STATE_WAIT_CLIENTCERTIFICATE; //ecdhe
-     else
--      peer->state = DTLS_STATE_WAIT_CLIENTKEYEXCHANGE;
-+      peer->state = DTLS_STATE_WAIT_CLIENTKEYEXCHANGE; //psk, ecdh_anon
-     /* after sending the ServerHelloDone, we expect the
-      * ClientKeyExchange (possibly containing the PSK id),
-diff --git a/extlibs/tinydtls/dtls.h b/extlibs/tinydtls/dtls.h
-index 7ebde6b..4d82f72 100644
---- a/extlibs/tinydtls/dtls.h
-+++ b/extlibs/tinydtls/dtls.h
-@@ -60,12 +60,12 @@ typedef enum dtls_credentials_type_t {
-   DTLS_PSK_HINT, DTLS_PSK_IDENTITY, DTLS_PSK_KEY
- } dtls_credentials_type_t;
--typedef struct dtls_ecdsa_key_t {
-+typedef struct dtls_ecc_key_t {
-   dtls_ecdh_curve curve;
-   const unsigned char *priv_key;      /** < private key as bytes > */
-   const unsigned char *pub_key_x;     /** < x part of the public key for the given private key > */
-   const unsigned char *pub_key_y;     /** < y part of the public key for the given private key > */
--} dtls_ecdsa_key_t;
-+} dtls_ecc_key_t;
- /** Length of the secret that is used for generating Hello Verify cookies. */
- #define DTLS_COOKIE_SECRET_LENGTH 12
-@@ -183,7 +183,7 @@ typedef struct {
-    */
-   int (*get_ecdsa_key)(struct dtls_context_t *ctx, 
-                      const session_t *session,
--                     const dtls_ecdsa_key_t **result);
-+                     const dtls_ecc_key_t **result);
-   /**
-    * Called during handshake to check the peer's pubic key in this
-@@ -238,6 +238,10 @@ typedef struct dtls_context_t {
-   dtls_handler_t *h;          /**< callback handlers */
-+  dtls_cipher_enable_t is_anon_ecdh_eabled;    /**< enable/disable the TLS_ECDH_anon_WITH_AES_128_CBC_SHA */
-+
-+  dtls_cipher_t selected_cipher; /**< selected ciper suite for handshake */
-+
-   unsigned char readbuf[DTLS_MAX_BUF];
- } dtls_context_t;
-@@ -263,6 +267,24 @@ static inline void dtls_set_handler(dtls_context_t *ctx, dtls_handler_t *h) {
-   ctx->h = h;
- }
-+ /**
-+  * @brief Enabling the TLS_ECDH_anon_WITH_AES_128_CBC_SHA
-+  *
-+  * @param ctx              The DTLS context to use.
-+  * @param is_enable    DTLS_CIPHER_ENABLE(1) or DTLS_CIPHER_DISABLE(0)
-+  */
-+void dtls_enables_anon_ecdh(dtls_context_t* ctx, dtls_cipher_enable_t is_enable);
-+
-+/**
-+ * @brief Select the cipher suite for handshake
-+ *
-+ * @param ctx              The DTLS context to use.
-+ * @param cipher         TLS_ECDH_anon_WITH_AES_128_CBC_SHA (0xC018)
-+ *                                  TLS_PSK_WITH_AES_128_CCM_8 (0xX0A8)
-+ *                                  TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 (0xC0AE)
-+ */
-+void dtls_select_cipher(dtls_context_t* ctx, const dtls_cipher_t cipher);
-+
- /**
-  * Establishes a DTLS channel with the specified remote peer @p dst.
-  * This function returns @c 0 if that channel already exists, a value
-diff --git a/extlibs/tinydtls/global.h b/extlibs/tinydtls/global.h
-index f0977c8..441710f 100644
---- a/extlibs/tinydtls/global.h
-+++ b/extlibs/tinydtls/global.h
-@@ -73,10 +73,16 @@ typedef unsigned char uint48[6];
- /** Known cipher suites.*/
- typedef enum { 
-   TLS_NULL_WITH_NULL_NULL = 0x0000,   /**< NULL cipher  */
-+  TLS_ECDH_anon_WITH_AES_128_CBC_SHA = 0xC018, /**< see RFC 4492 */
-   TLS_PSK_WITH_AES_128_CCM_8 = 0xC0A8, /**< see RFC 6655 */
-   TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 = 0xC0AE /**< see RFC 7251 */
- } dtls_cipher_t;
-+typedef enum {
-+    DTLS_CIPHER_DISABLE = 0,
-+    DTLS_CIPHER_ENABLE = 1
-+} dtls_cipher_enable_t;
-+
- /** Known compression suites.*/
- typedef enum {
-   TLS_COMPRESSION_NULL = 0x0000               /* NULL compression */
-diff --git a/extlibs/tinydtls/tests/dtls-client.c b/extlibs/tinydtls/tests/dtls-client.c
-index 65b0275..3a3e4ca 100644
---- a/extlibs/tinydtls/tests/dtls-client.c
-+++ b/extlibs/tinydtls/tests/dtls-client.c
-@@ -147,8 +147,8 @@ get_psk_info(struct dtls_context_t *ctx UNUSED_PARAM,
- static int
- get_ecdsa_key(struct dtls_context_t *ctx,
-             const session_t *session,
--            const dtls_ecdsa_key_t **result) {
--  static const dtls_ecdsa_key_t ecdsa_key = {
-+            const dtls_ecc_key_t **result) {
-+  static const dtls_ecc_key_t ecdsa_key = {
-     .curve = DTLS_ECDH_CURVE_SECP256R1,
-     .priv_key = ecdsa_priv_key,
-     .pub_key_x = ecdsa_pub_key_x,
-@@ -294,9 +294,9 @@ usage( const char *program, const char *version) {
-   fprintf(stderr, "%s v%s -- DTLS client implementation\n"
-         "(c) 2011-2014 Olaf Bergmann <bergmann@tzi.org>\n\n"
- #ifdef DTLS_PSK
--        "usage: %s [-i file] [-s file] [-k file] [-o file] [-p port] [-v num] addr [port]\n"
-+        "usage: %s [-i file] [-s file] [-k file] [-o file] [-p port] [-v num] [-c num] addr [port]\n"
- #else /*  DTLS_PSK */
--        "usage: %s [-o file] [-p port] [-v num] addr [port]\n"
-+        "usage: %s [-o file] [-p port] [-v num] [-c num] addr [port]\n"
- #endif /* DTLS_PSK */
- #ifdef DTLS_PSK
-         "\t-i file\t\tread PSK Client identity from file\n"
-@@ -305,7 +305,11 @@ usage( const char *program, const char *version) {
- #endif /* DTLS_PSK */
-         "\t-o file\t\toutput received data to this file (use '-' for STDOUT)\n"
-         "\t-p port\t\tlisten on specified port (default is %d)\n"
--        "\t-v num\t\tverbosity level (default: 3)\n",
-+        "\t-v num\t\tverbosity level (default: 3)\n"
-+          "\t-c num\t\tcipher suite (default: 1)\n"
-+          "\t\t\t1: TLS_ECDH_anon_WITH_AES_128_CBC_SHA \n"
-+          "\t\t\t2: TLS_PSK_WITH_AES_128_CCM_8\n"
-+          "\t\t\t3: TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8\n",
-          program, version, program, DEFAULT_PORT);
- }
-@@ -334,6 +338,8 @@ main(int argc, char **argv) {
-   log_t log_level = DTLS_LOG_WARN;
-   int fd, result;
-   int on = 1;
-+  dtls_cipher_t selected_cipher = TLS_ECDH_anon_WITH_AES_128_CBC_SHA;
-+  dtls_cipher_enable_t ecdh_anon_enalbe = DTLS_CIPHER_ENABLE;
-   int opt, res;
-   session_t dst;
-@@ -349,7 +355,7 @@ main(int argc, char **argv) {
-   memcpy(psk_key, PSK_DEFAULT_KEY, psk_key_length);
- #endif /* DTLS_PSK */
--  while ((opt = getopt(argc, argv, "p:o:v:" PSK_OPTIONS)) != -1) {
-+  while ((opt = getopt(argc, argv, "p:o:v:c:" PSK_OPTIONS)) != -1) {
-     switch (opt) {
- #ifdef DTLS_PSK
-     case 'i' : {
-@@ -399,6 +405,23 @@ main(int argc, char **argv) {
-     case 'v' :
-       log_level = strtol(optarg, NULL, 10);
-       break;
-+    case 'c':
-+      if( strcmp(optarg, "1") == 0)
-+      {
-+          selected_cipher = TLS_ECDH_anon_WITH_AES_128_CBC_SHA;
-+          ecdh_anon_enalbe = DTLS_CIPHER_ENABLE;
-+      }
-+      else if( strcmp(optarg, "2") == 0)
-+      {
-+          selected_cipher = TLS_PSK_WITH_AES_128_CCM_8 ;
-+          ecdh_anon_enalbe = DTLS_CIPHER_DISABLE;
-+      }
-+      else if( strcmp(optarg, "3") == 0)
-+      {
-+          selected_cipher = TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 ;
-+          ecdh_anon_enalbe = DTLS_CIPHER_DISABLE;
-+      }
-+      break;
-     default:
-       usage(argv[0], dtls_package_version());
-       exit(1);
-@@ -464,6 +487,13 @@ main(int argc, char **argv) {
-     exit(-1);
-   }
-+
-+  /* select cipher suite */
-+  dtls_select_cipher(dtls_context, selected_cipher);
-+
-+  /* enable/disable tls_ecdh_anon_with_aes_128_cbc_sha */
-+  dtls_enables_anon_ecdh(dtls_context, ecdh_anon_enalbe);
-+
-   dtls_set_handler(dtls_context, &cb);
-   dtls_connect(dtls_context, &dst);
-diff --git a/extlibs/tinydtls/tests/dtls-server.c b/extlibs/tinydtls/tests/dtls-server.c
-index ae1283e..d3da1a7 100644
---- a/extlibs/tinydtls/tests/dtls-server.c
-+++ b/extlibs/tinydtls/tests/dtls-server.c
-@@ -113,8 +113,8 @@ get_psk_info(struct dtls_context_t *ctx, const session_t *session,
- static int
- get_ecdsa_key(struct dtls_context_t *ctx,
-             const session_t *session,
--            const dtls_ecdsa_key_t **result) {
--  static const dtls_ecdsa_key_t ecdsa_key = {
-+            const dtls_ecc_key_t **result) {
-+  static const dtls_ecc_key_t ecdsa_key = {
-     .curve = DTLS_ECDH_CURVE_SECP256R1,
-     .priv_key = ecdsa_priv_key,
-     .pub_key_x = ecdsa_pub_key_x,
-@@ -249,10 +249,13 @@ usage(const char *program, const char *version) {
-   fprintf(stderr, "%s v%s -- DTLS server implementation\n"
-         "(c) 2011-2014 Olaf Bergmann <bergmann@tzi.org>\n\n"
--        "usage: %s [-A address] [-p port] [-v num]\n"
-+        "usage: %s [-A address] [-p port] [-v num] [-a enable|disable]\n"
-         "\t-A address\t\tlisten on specified address (default is ::)\n"
-         "\t-p port\t\tlisten on specified port (default is %d)\n"
--        "\t-v num\t\tverbosity level (default: 3)\n",
-+        "\t-v num\t\tverbosity level (default: 3)\n"
-+        "\t-a enable|disable\t(default: disable)\n"
-+        "\t\t\t\tenable:enable TLS_ECDH_anon_with_AES_128_CBC_SHA\n"
-+        "\t\t\t\tdisable:disable TLS_ECDH_anon_with_AES_128_CBC_SHA\n",
-          program, version, program, DEFAULT_PORT);
- }
-@@ -277,6 +280,7 @@ main(int argc, char **argv) {
-   struct timeval timeout;
-   int fd, opt, result;
-   int on = 1;
-+  int ecdh_anon_enalbe = DTLS_CIPHER_DISABLE;
-   struct sockaddr_in6 listen_addr;
-   memset(&listen_addr, 0, sizeof(struct sockaddr_in6));
-@@ -290,7 +294,7 @@ main(int argc, char **argv) {
-   listen_addr.sin6_port = htons(DEFAULT_PORT);
-   listen_addr.sin6_addr = in6addr_any;
--  while ((opt = getopt(argc, argv, "A:p:v:")) != -1) {
-+  while ((opt = getopt(argc, argv, "A:p:v:a:")) != -1) {
-     switch (opt) {
-     case 'A' :
-       if (resolve_address(optarg, (struct sockaddr *)&listen_addr) < 0) {
-@@ -304,6 +308,10 @@ main(int argc, char **argv) {
-     case 'v' :
-       log_level = strtol(optarg, NULL, 10);
-       break;
-+    case 'a':
-+      if( strcmp(optarg, "enable") == 0)
-+          ecdh_anon_enalbe = DTLS_CIPHER_ENABLE;
-+      break;
-     default:
-       usage(argv[0], dtls_package_version());
-       exit(1);
-@@ -348,6 +356,9 @@ main(int argc, char **argv) {
-   the_context = dtls_new_context(&fd);
-+  /* enable/disable tls_ecdh_anon_with_aes_128_cbc_sha */
-+  dtls_enables_anon_ecdh(the_context, ecdh_anon_enalbe);
-+
-   dtls_set_handler(the_context, &cb);
-   while (1) {
--- 
-1.7.9.5
-
diff --git a/extlibs/tinydtls/0001-Added-support-in-tinyDTLS-to-support-rehandshake.patch b/extlibs/tinydtls/0001-Added-support-in-tinyDTLS-to-support-rehandshake.patch
deleted file mode 100644 (file)
index fb9c71f..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-From c78aa91005b7b9542d595dc32d8c8fe020d2257d Mon Sep 17 00:00:00 2001
-From: Sachin Agrawal <sachin.agrawal@intel.com>
-Date: Wed, 21 Jan 2015 08:55:00 -0800
-Subject: [PATCH 1/1] Added support in tinyDTLS to support rehandshake
-
-As per RFC 6347 section 4.2.8, DTLS Server should support requests
-from clients who have silently abandoned the existing association
-and initiated a new handshake request by sending a ClientHello.
-Code is updated to detect this scenario and delete the old
-association when client successfully responds to HelloVerifyRequest.
-
-
-Change-Id: I6e256921215c1a22e9e5013499c4dfd98659f8cc
-Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
----
- extlibs/tinydtls/dtls.c |   74 +++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 68 insertions(+), 6 deletions(-)
-
-diff --git a/extlibs/tinydtls/dtls.c b/extlibs/tinydtls/dtls.c
-index 779e701..111a65d 100644
---- a/extlibs/tinydtls/dtls.c
-+++ b/extlibs/tinydtls/dtls.c
-@@ -529,6 +529,37 @@ known_cipher(dtls_context_t *ctx, dtls_cipher_t code, int is_client) {
-        (ecdsa && is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(code));
- }
-+/**
-+ * This method detects if we already have a established DTLS session with
-+ * peer and the peer is attempting to perform a fresh handshake by sending
-+ * messages with epoch = 0. This is to handle situations mentioned in
-+ * RFC 6347 - section 4.2.8.
-+ *
-+ * @param msg  The packet received from Client
-+ * @param msglen Packet length
-+ * @param peer peer who is the sender for this packet
-+ * @return @c 1 if this is a rehandshake attempt by
-+ * client
-+ */
-+static int
-+hs_attempt_with_existing_peer(uint8_t *msg, size_t msglen,
-+    dtls_peer_t *peer)
-+{
-+    if ((peer) && (peer->state == DTLS_STATE_CONNECTED)) {
-+      if (msg[0] == DTLS_CT_HANDSHAKE) {
-+        uint16_t msg_epoch = dtls_uint16_to_int(DTLS_RECORD_HEADER(msg)->epoch);
-+        if (msg_epoch == 0) {
-+          dtls_handshake_header_t * hs_header = DTLS_HANDSHAKE_HEADER(msg + DTLS_RH_LENGTH);
-+          if (hs_header->msg_type == DTLS_HT_CLIENT_HELLO ||
-+              hs_header->msg_type == DTLS_HT_HELLO_REQUEST) {
-+            return 1;
-+          }
-+        }
-+      }
-+    }
-+    return 0;
-+}
-+
- /** Dump out the cipher keys and IVs used for the symetric cipher. */
- static void dtls_debug_keyblock(dtls_security_parameters_t *config)
- {
-@@ -1540,6 +1571,7 @@ static int
- dtls_verify_peer(dtls_context_t *ctx, 
-                dtls_peer_t *peer, 
-                session_t *session,
-+               const dtls_state_t state,
-                uint8 *data, size_t data_length)
- {
-   uint8 buf[DTLS_HV_LENGTH + DTLS_COOKIE_LENGTH];
-@@ -1595,9 +1627,11 @@ dtls_verify_peer(dtls_context_t *ctx,
-   /* TODO use the same record sequence number as in the ClientHello,
-      see 4.2.1. Denial-of-Service Countermeasures */
--  err = dtls_send_handshake_msg_hash(ctx, peer, session,
--                                   DTLS_HT_HELLO_VERIFY_REQUEST,
--                                   buf, p - buf, 0);
-+  err = dtls_send_handshake_msg_hash(ctx,
-+                   state == DTLS_STATE_CONNECTED ? peer : NULL,
-+                   session,
-+                   DTLS_HT_HELLO_VERIFY_REQUEST,
-+                   buf, p - buf, 0);
-   if (err < 0) {
-     dtls_warn("cannot send HelloVerify request\n");
-   }
-@@ -3209,7 +3243,7 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-   case DTLS_HT_CLIENT_HELLO:
--    if ((peer && state != DTLS_STATE_CONNECTED) ||
-+    if ((peer && state != DTLS_STATE_CONNECTED && state != DTLS_STATE_WAIT_CLIENTHELLO) ||
-       (!peer && state != DTLS_STATE_WAIT_CLIENTHELLO)) {
-       return dtls_alert_fatal_create(DTLS_ALERT_UNEXPECTED_MESSAGE);
-     }
-@@ -3223,7 +3257,7 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-        Anything else will be rejected. Fragementation is not allowed
-        here as it would require peer state as well.
-     */
--    err = dtls_verify_peer(ctx, peer, session, data, data_length);
-+    err = dtls_verify_peer(ctx, peer, session, state, data, data_length);
-     if (err < 0) {
-       dtls_warn("error in dtls_verify_peer err: %i\n", err);
-       return err;
-@@ -3236,7 +3270,23 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-     /* At this point, we have a good relationship with this peer. This
-      * state is left for re-negotiation of key material. */
-+     /* As per RFC 6347 - section 4.2.8 if this is an attempt to
-+      * rehandshake, we can delete the existing key material
-+      * as the client has demonstrated reachibility by completing
-+      * the cookie exchange */
-+    if (peer && state == DTLS_STATE_WAIT_CLIENTHELLO) {
-+       dtls_debug("removing the peer\n");
-+#ifndef WITH_CONTIKI
-+       HASH_DEL_PEER(ctx->peers, peer);
-+#else  /* WITH_CONTIKI */
-+       list_remove(ctx->peers, peer);
-+#endif /* WITH_CONTIKI */
-+
-+       dtls_free_peer(peer);
-+       peer = NULL;
-+    }
-     if (!peer) {
-+      dtls_debug("creating new peer\n");
-       dtls_security_parameters_t *security;
-       /* msg contains a Client Hello with a valid cookie, so we can
-@@ -3594,6 +3644,7 @@ dtls_handle_message(dtls_context_t *ctx,
-   int data_length;            /* length of decrypted payload 
-                                  (without MAC and padding) */
-   int err;
-+  int bypass_epoch_check = 0;
-   /* check if we have DTLS state for addr/port/ifindex */
-   peer = dtls_get_peer(ctx, session);
-@@ -3613,6 +3664,15 @@ dtls_handle_message(dtls_context_t *ctx,
-     if (peer) {
-       data_length = decrypt_verify(peer, msg, rlen, &data);
-       if (data_length < 0) {
-+        if (hs_attempt_with_existing_peer(msg, rlen, peer)) {
-+          data = msg + DTLS_RH_LENGTH;
-+          data_length = rlen - DTLS_RH_LENGTH;
-+          state = DTLS_STATE_WAIT_CLIENTHELLO;
-+          role = DTLS_SERVER;
-+          /* Bypass epoch check as the epoch for incoming msg is 0
-+             and expected epoch MAY be different */
-+          bypass_epoch_check = 1;
-+        } else {
-       int err =  dtls_alert_fatal_create(DTLS_ALERT_DECRYPT_ERROR);
-         dtls_info("decrypt_verify() failed\n");
-       if (peer->state < DTLS_STATE_CONNECTED) {
-@@ -3623,8 +3683,10 @@ dtls_handle_message(dtls_context_t *ctx,
-       }
-         return err;
-       }
-+    } else {
-       role = peer->role;
-       state = peer->state;
-+      }
-     } else {
-       /* is_record() ensures that msg contains at least a record header */
-       data = msg + DTLS_RH_LENGTH;
-@@ -3677,7 +3739,7 @@ dtls_handle_message(dtls_context_t *ctx,
-       /* Handshake messages other than Finish must use the current
-        * epoch, Finish has epoch + 1. */
--      if (peer) {
-+      if (peer && !bypass_epoch_check) {
-       uint16_t expected_epoch = dtls_security_params(peer)->epoch;
-       uint16_t msg_epoch = 
-         dtls_uint16_to_int(DTLS_RECORD_HEADER(msg)->epoch);
--- 
-1.7.9.5
-
diff --git a/extlibs/tinydtls/0001-Adding-autoconf-generated-files-in-tinydtls-repo.patch b/extlibs/tinydtls/0001-Adding-autoconf-generated-files-in-tinydtls-repo.patch
deleted file mode 100644 (file)
index 263ed58..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-From b44aa20e0ff2763468bf82ff4e996dec03e872bd Mon Sep 17 00:00:00 2001
-From: Sachin Agrawal <sachin.agrawal@intel.com>
-Date: Thu, 2 Apr 2015 15:21:40 -0700
-Subject: [PATCH 1/1] Adding autoconf generated files in tinydtls repo
-
-tinydtls build system uses autotools while Iotivity uses
-scons build system. Since tinydtls contains few source files
-and header files, it seems  convenient for Iotivity to use
-scons to build tinydtls library.
-This patch is to add autoconf generated files so that tinydtls
-can be build using scons script.
-
-Note: Since this change is a custom change and specifically
-for Iotivity, I do not intend to submit this patch for
-upstreaming.
-
-Change-Id: I4da593a8abccd731466a88d365dca536f608c94a
-Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
----
- extlibs/tinydtls/dtls_config.h |  171 ++++++++++++++++++++++++++++++++++++++++
- extlibs/tinydtls/tinydtls.h    |   45 +++++++++++
- 2 files changed, 216 insertions(+)
- create mode 100644 extlibs/tinydtls/dtls_config.h
- create mode 100644 extlibs/tinydtls/tinydtls.h
-
-diff --git a/extlibs/tinydtls/dtls_config.h b/extlibs/tinydtls/dtls_config.h
-new file mode 100644
-index 0000000..39df8c9
---- /dev/null
-+++ b/extlibs/tinydtls/dtls_config.h
-@@ -0,0 +1,171 @@
-+/* dtls_config.h.  Generated from dtls_config.h.in by configure.  */
-+/* tinydtls -- a very basic DTLS implementation
-+ *
-+ * Copyright (C) 2011--2014 Olaf Bergmann <bergmann@tzi.org>
-+ * Copyright (C) 2013 Hauke Mehrtens <hauke@hauke-m.de>
-+ *
-+ * Permission is hereby granted, free of charge, to any person
-+ * obtaining a copy of this software and associated documentation
-+ * files (the "Software"), to deal in the Software without
-+ * restriction, including without limitation the rights to use, copy,
-+ * modify, merge, publish, distribute, sublicense, and/or sell copies
-+ * of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be
-+ * included in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ */
-+
-+/**
-+ * @file dtls_config.h
-+ * @brief internal configuration for tinydtls library
-+ *
-+ * This file has been generated by configure from dtls_config.h.in.
-+ */
-+
-+/* dummy definitions for PACKAGE_NAME and PACKAGE_VERSION */
-+#define PACKAGE_NAME "tinydtls"
-+#define PACKAGE_STRING "tinydtls 0.8.1"
-+#define PACKAGE_VERSION "0.8.1"
-+
-+#ifdef CONTIKI
-+#include "contiki.h"
-+#include "contiki-lib.h"
-+#include "contiki-net.h"
-+
-+#include "contiki-conf.h"
-+
-+/* global constants for constrained devices running Contiki */
-+#ifndef DTLS_PEER_MAX
-+/** The maximum number DTLS peers (i.e. sessions). */
-+#  define DTLS_PEER_MAX 1
-+#endif
-+
-+#ifndef DTLS_HANDSHAKE_MAX
-+/** The maximum number of concurrent DTLS handshakes. */
-+#  define DTLS_HANDSHAKE_MAX 1
-+#endif
-+
-+#ifndef DTLS_SECURITY_MAX
-+/** The maximum number of concurrently used cipher keys */
-+#  define DTLS_SECURITY_MAX (DTLS_PEER_MAX + DTLS_HANDSHAKE_MAX)
-+#endif
-+
-+#ifndef DTLS_HASH_MAX
-+/** The maximum number of hash functions that can be used in parallel. */
-+#  define DTLS_HASH_MAX (3 * DTLS_PEER_MAX)
-+#endif
-+#endif /* CONTIKI */
-+
-+/* Define to 1 if you have the <assert.h> header file. */
-+#define HAVE_ASSERT_H 1
-+
-+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-+   to 0 otherwise. */
-+#define HAVE_MALLOC 1
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#define HAVE_MEMORY_H 1
-+
-+/* Define to 1 if you have the `memset' function. */
-+#define HAVE_MEMSET 1
-+
-+/* Define to 1 if you have the <stddef.h> header file. */
-+#define HAVE_STDDEF_H 1
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#define HAVE_STDINT_H 1
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the `strdup' function. */
-+#define HAVE_STRDUP 1
-+
-+/* Define to 1 if you have the `strerror' function. */
-+#define HAVE_STRERROR 1
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#define HAVE_STRINGS_H 1
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Define to 1 if you have the `strnlen' function. */
-+#define HAVE_STRNLEN 1
-+
-+/* Define to 1 if you have the <time.h> header file. */
-+#define HAVE_TIME_H 1
-+
-+/* Define to 1 if you have the `vprintf' function. */
-+#define HAVE_VPRINTF 1
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT ""
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME "tinydtls"
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "tinydtls 0.8.1"
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME "tinydtls"
-+
-+/* Define to the home page for this package. */
-+#define PACKAGE_URL ""
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION "0.8.1"
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#define STDC_HEADERS 1
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+/* #undef inline */
-+#endif
-+
-+/* Define to rpl_malloc if the replacement function should be used. */
-+/* #undef malloc */
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
-+
-+/* #undef size_t */
-+
-+/************************************************************************/
-+/* Specific Contiki platforms                                           */
-+/************************************************************************/
-+
-+#ifdef CONTIKI
-+
-+#if CONTIKI_TARGET_ECONOTAG
-+#  include "platform-specific/config-econotag.h"
-+#endif /* CONTIKI_TARGET_ECONOTAG */
-+
-+#ifdef CONTIKI_TARGET_CC2538DK
-+#  include "platform-specific/config-cc2538dk.h"
-+#endif /* CONTIKI_TARGET_CC2538DK */
-+
-+#ifdef CONTIKI_TARGET_WISMOTE
-+#  include "platform-specific/config-wismote.h"
-+#endif /* CONTIKI_TARGET_WISMOTE */
-+
-+#ifdef CONTIKI_TARGET_SKY
-+#  include "platform-specific/config-sky.h"
-+#endif /* CONTIKI_TARGET_SKY */
-+
-+#ifdef CONTIKI_TARGET_MINIMAL_NET
-+#  include "platform-specific/config-minimal-net.h"
-+#endif /* CONTIKI_TARGET_MINIMAL_NET */
-+
-+#endif /* CONTIKI */
-diff --git a/extlibs/tinydtls/tinydtls.h b/extlibs/tinydtls/tinydtls.h
-new file mode 100644
-index 0000000..3fa228a
---- /dev/null
-+++ b/extlibs/tinydtls/tinydtls.h
-@@ -0,0 +1,45 @@
-+/* tinydtls.h.  Generated from tinydtls.h.in by configure.  */
-+/* tinydtls -- a very basic DTLS implementation
-+ *
-+ * Copyright (C) 2011--2014 Olaf Bergmann <bergmann@tzi.org>
-+ * Copyright (C) 2013 Hauke Mehrtens <hauke@hauke-m.de>
-+ *
-+ * Permission is hereby granted, free of charge, to any person
-+ * obtaining a copy of this software and associated documentation
-+ * files (the "Software"), to deal in the Software without
-+ * restriction, including without limitation the rights to use, copy,
-+ * modify, merge, publish, distribute, sublicense, and/or sell copies
-+ * of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be
-+ * included in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ */
-+
-+/**
-+ * @file tinydtls.h
-+ * @brief public tinydtls API
-+ */
-+
-+#ifndef _DTLS_TINYDTLS_H_
-+#define _DTLS_TINYDTLS_H_
-+
-+/** Defined to 1 if tinydtls is built with support for ECC */
-+/* #undef DTLS_ECC */
-+
-+/** Defined to 1 if tinydtls is built with support for PSK */
-+#define DTLS_PSK 1
-+
-+/** Defined to 1 if tinydtls is built for Contiki OS */
-+/* #undef WITH_CONTIKI */
-+
-+#endif /* _DTLS_TINYDTLS_H_ */
--- 
-1.7.9.5
-
diff --git a/extlibs/tinydtls/0001-Bug-Fix-in-earlier-rehandhsake-implementation.patch b/extlibs/tinydtls/0001-Bug-Fix-in-earlier-rehandhsake-implementation.patch
deleted file mode 100644 (file)
index c52b679..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-From e25d93dec6d2907430f3680ad5fbdfedc1ee94d8 Mon Sep 17 00:00:00 2001
-From: Sachin Agrawal <sachin.agrawal@intel.com>
-Date: Sun, 15 Feb 2015 22:16:43 -0800
-Subject: [PATCH 1/1] Bug Fix in earlier rehandhsake implementation
-
-Identified a corner case in earlier rehandshake implementation where if
-no data transfer takes place between client and Server before re-handshake
-is issued, re-handshake process was failing. DTLS state machine does not
-update it's state at Server until the first data packet was received from
-client. Updated logic to detect for 're-handshake' situation when epoch
-mis-match happens. Also updated dtls-client test app to conveniently test
-the feature. Use 'client:rehandshake' command for testing.
-
-Change-Id: Idfaad7d477508603c35ad7948ca7c8f05e3228d0
-Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
----
- extlibs/tinydtls/dtls.c              |   44 ++++++++++++++++++----------------
- extlibs/tinydtls/tests/dtls-client.c |   27 +++++++++++++++++++++
- 2 files changed, 50 insertions(+), 21 deletions(-)
-
-diff --git a/extlibs/tinydtls/dtls.c b/extlibs/tinydtls/dtls.c
-index a87d7f1..a923386 100644
---- a/extlibs/tinydtls/dtls.c
-+++ b/extlibs/tinydtls/dtls.c
-@@ -1562,6 +1562,7 @@ static void dtls_destroy_peer(dtls_context_t *ctx, dtls_peer_t *peer, int unlink
-  * \param ctx     The DTLS context.
-  * \param peer    The remote party we are talking to, if any.
-  * \param session Transport address of the remote peer.
-+ * \param state   Current state of the connection.
-  * \param msg     The received datagram.
-  * \param msglen  Length of \p msg.
-  * \return \c 1 if msg is a Client Hello with a valid cookie, \c 0 or
-@@ -3644,7 +3645,6 @@ dtls_handle_message(dtls_context_t *ctx,
-   int data_length;            /* length of decrypted payload 
-                                  (without MAC and padding) */
-   int err;
--  int bypass_epoch_check = 0;
-   /* check if we have DTLS state for addr/port/ifindex */
-   peer = dtls_get_peer(ctx, session);
-@@ -3668,24 +3668,21 @@ dtls_handle_message(dtls_context_t *ctx,
-           data = msg + DTLS_RH_LENGTH;
-           data_length = rlen - DTLS_RH_LENGTH;
-           state = DTLS_STATE_WAIT_CLIENTHELLO;
--          role = DTLS_SERVER;
--          /* Bypass epoch check as the epoch for incoming msg is 0
--             and expected epoch MAY be different */
--          bypass_epoch_check = 1;
-+          role = DTLS_SERVER;       
-         } else {
--      int err =  dtls_alert_fatal_create(DTLS_ALERT_DECRYPT_ERROR);
--        dtls_info("decrypt_verify() failed\n");
--      if (peer->state < DTLS_STATE_CONNECTED) {
--        dtls_alert_send_from_err(ctx, peer, &peer->session, err);
--        peer->state = DTLS_STATE_CLOSED;
--        /* dtls_stop_retransmission(ctx, peer); */
--        dtls_destroy_peer(ctx, peer, 1);
--      }
--        return err;
--      }
--    } else {
--      role = peer->role;
--      state = peer->state;
-+        int err =  dtls_alert_fatal_create(DTLS_ALERT_DECRYPT_ERROR);
-+          dtls_info("decrypt_verify() failed\n");
-+        if (peer->state < DTLS_STATE_CONNECTED) {
-+          dtls_alert_send_from_err(ctx, peer, &peer->session, err);
-+          peer->state = DTLS_STATE_CLOSED;
-+          /* dtls_stop_retransmission(ctx, peer); */
-+          dtls_destroy_peer(ctx, peer, 1);
-+        }
-+          return err;
-+        }
-+      } else {
-+        role = peer->role;
-+        state = peer->state;
-       }
-     } else {
-       /* is_record() ensures that msg contains at least a record header */
-@@ -3739,7 +3736,7 @@ dtls_handle_message(dtls_context_t *ctx,
-       /* Handshake messages other than Finish must use the current
-        * epoch, Finish has epoch + 1. */
--      if (peer && !bypass_epoch_check) {
-+      if (peer) {
-       uint16_t expected_epoch = dtls_security_params(peer)->epoch;
-       uint16_t msg_epoch = 
-         dtls_uint16_to_int(DTLS_RECORD_HEADER(msg)->epoch);
-@@ -3754,9 +3751,14 @@ dtls_handle_message(dtls_context_t *ctx,
-       }
-       if (expected_epoch != msg_epoch) {
--        dtls_warn("Wrong epoch, expected %i, got: %i\n",
-+          if (hs_attempt_with_existing_peer(msg, rlen, peer)) {
-+            state = DTLS_STATE_WAIT_CLIENTHELLO;
-+            role = DTLS_SERVER;
-+          } else {
-+          dtls_warn("Wrong epoch, expected %i, got: %i\n",
-                   expected_epoch, msg_epoch);
--        break;
-+          break;
-+        }
-       }
-       }
-diff --git a/extlibs/tinydtls/tests/dtls-client.c b/extlibs/tinydtls/tests/dtls-client.c
-index 306a380..05cb98f 100644
---- a/extlibs/tinydtls/tests/dtls-client.c
-+++ b/extlibs/tinydtls/tests/dtls-client.c
-@@ -44,6 +44,7 @@ typedef struct {
- static dtls_str output_file = { 0, NULL }; /* output file name */
- static dtls_context_t *dtls_context = NULL;
-+static dtls_context_t *orig_dtls_context = NULL;
- static const unsigned char ecdsa_priv_key[] = {
-@@ -235,6 +236,7 @@ dtls_handle_read(struct dtls_context_t *ctx) {
- static void dtls_handle_signal(int sig)
- {
-   dtls_free_context(dtls_context);
-+  dtls_free_context(orig_dtls_context);
-   signal(sig, SIG_DFL);
-   kill(getpid(), sig);
- }
-@@ -324,6 +326,12 @@ static dtls_handler_t cb = {
- #define DTLS_CLIENT_CMD_CLOSE "client:close"
- #define DTLS_CLIENT_CMD_RENEGOTIATE "client:renegotiate"
-+/* As per RFC 6347 section 4.2.8, DTLS Server should support requests
-+ * from clients who have silently abandoned the existing association
-+ * and initiated a new handshake request by sending a ClientHello.
-+ * Below command tests this feature.
-+ */
-+#define DTLS_CLIENT_CMD_REHANDSHAKE "client:rehandshake"
- int 
- main(int argc, char **argv) {
-   fd_set rfds, wfds;
-@@ -504,6 +512,24 @@ main(int argc, char **argv) {
-       printf("client: renegotiate connection\n");
-       dtls_renegotiate(dtls_context, &dst);
-       len = 0;
-+      } else if (len >= strlen(DTLS_CLIENT_CMD_REHANDSHAKE) &&
-+               !memcmp(buf, DTLS_CLIENT_CMD_REHANDSHAKE, strlen(DTLS_CLIENT_CMD_REHANDSHAKE))) {
-+      printf("client: rehandshake connection\n");
-+      if (orig_dtls_context == NULL) {
-+        /* Cache the current context. We cannot free the current context as it will notify 
-+         * the Server to close the connection (which we do not want).
-+         */
-+        orig_dtls_context = dtls_context;
-+        /* Now, Create a new context and attempt to initiate a handshake. */
-+        dtls_context = dtls_new_context(&fd);
-+        if (!dtls_context) {
-+          dtls_emerg("cannot create context\n");
-+          exit(-1);
-+          }
-+        dtls_set_handler(dtls_context, &cb);
-+        dtls_connect(dtls_context, &dst);
-+      }
-+      len = 0;
-       } else {
-       try_send(dtls_context, &dst);
-       }
-@@ -511,6 +537,7 @@ main(int argc, char **argv) {
-   }
-   
-   dtls_free_context(dtls_context);
-+  dtls_free_context(orig_dtls_context);
-   exit(0);
- }
--- 
-1.7.9.5
-
diff --git a/extlibs/tinydtls/0001-Fix-the-wrong-implementation-about-the-anonymous-cip.patch b/extlibs/tinydtls/0001-Fix-the-wrong-implementation-about-the-anonymous-cip.patch
deleted file mode 100644 (file)
index e2b8e65..0000000
+++ /dev/null
@@ -1,690 +0,0 @@
-From 1ee27820ccad59423711c83fb01ff58939511f3b Mon Sep 17 00:00:00 2001
-From: Sachin Agrawal <sachin.agrawal@intel.com>
-Date: Mon, 29 Jun 2015 22:26:21 -0700
-Subject: [PATCH 1/1] Fix the wrong implementation about the anonymous cipher
- suite of tinydtls. (NOTE : This patch has been modified
- based on RFC 5246)
-
-1. IV for CBC block operation
-   - Apply the random IV for CBC block operations according to section 6.2.3.2 of RFC 5246.
-
-2. MAC calculation
-   - Apply HMAC for DTLS MAC calculation according to section 6.2.3.1 of RFC 5246.
-
-3. CBC padding
-   - Apply PKCS#5 padding for CBC block cipher accroding to section 6.2.3.2 of RFC 5246.
-
-4. Change the cipher suite name TLS_ECDH_anon_WITH_AES_128_CBC_SHA
-   to TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256.
-
-5. Fix the minor bug in dtls sample.
-
-Change-Id: I8783caa6ac04fe2d46e242efe56e3205646b1038
-Signed-off-by: leechul <chuls.lee@samsung.com>
-Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
----
- extlibs/tinydtls/crypto.c                          |  100 +++++++++++++-----
- extlibs/tinydtls/crypto.h                          |    1 +
- extlibs/tinydtls/dtls.c                            |  111 +++++++++++++++-----
- extlibs/tinydtls/dtls.h                            |    6 +-
- extlibs/tinydtls/global.h                          |    2 +-
- extlibs/tinydtls/tests/dtls-client.c               |    8 +-
- extlibs/tinydtls/tests/dtls-server.c               |    8 +-
- resource/csdk/connectivity/api/cainterface.h       |    4 +-
- resource/csdk/connectivity/inc/caadapternetdtls.h  |    2 +-
- .../src/adapter_util/caadapternetdtls.c            |    2 +-
- .../provisioning/src/provisioningmanager.c         |    2 +-
- 11 files changed, 180 insertions(+), 66 deletions(-)
-
-diff --git a/extlibs/tinydtls/crypto.c b/extlibs/tinydtls/crypto.c
-index 5082535..3fbb993 100644
---- a/extlibs/tinydtls/crypto.c
-+++ b/extlibs/tinydtls/crypto.c
-@@ -58,6 +58,7 @@
- #include "sha2/sha2.h"
- #include "prng.h"
- #include "netq.h"
-+#include "hmac.h"
- #ifndef WITH_CONTIKI
- #include <pthread.h>
-@@ -329,6 +330,7 @@ dtls_ccm_decrypt(aes128_t *ccm_ctx, const unsigned char *src,
- static size_t
- dtls_cbc_encrypt(aes128_t *aes_ctx,
-+                 unsigned char *key, size_t keylen,
-                  const unsigned char *iv,
-                  const unsigned char *src, size_t srclen,
-                  unsigned char *buf) {
-@@ -336,18 +338,35 @@ dtls_cbc_encrypt(aes128_t *aes_ctx,
-     unsigned char cbc[DTLS_BLK_LENGTH];
-     unsigned char tmp[DTLS_BLK_LENGTH];
-     unsigned char *pos;
--    dtls_hash_ctx shactx;
-+    const unsigned char *dtls_hdr = NULL;
-     int i, j;
-     int blocks;
-+    dtls_hmac_context_t* hmac_ctx = NULL;
-+    int paddinglen = 0;
-     pos = buf;
--    dtls_hash_init(&shactx);
--    dtls_hash_update(&shactx, src, srclen);
--    dtls_hash_finalize(pos + srclen, &shactx);
-+    dtls_hdr = src - DTLS_CBC_IV_LENGTH - sizeof(dtls_record_header_t);
-+
-+    //Calculate MAC : Append the MAC code to end of content
-+    hmac_ctx = dtls_hmac_new(key, keylen);
-+    dtls_mac(hmac_ctx,
-+             dtls_hdr,
-+             src, srclen,
-+             buf + srclen);
-+    dtls_hmac_free(hmac_ctx);
-+    
-+    dtls_debug_dump("[MAC]",
-+                    buf + srclen,
-+                    DTLS_HMAC_DIGEST_SIZE);
-+
-+    paddinglen = DTLS_BLK_LENGTH - ((srclen + DTLS_HMAC_DIGEST_SIZE) % DTLS_BLK_LENGTH);
-+    
-+    //TLS padding
-+    memset(buf + (srclen + DTLS_HMAC_DIGEST_SIZE), paddinglen - 1, paddinglen);
-     memcpy(cbc, iv, DTLS_BLK_LENGTH);
--    blocks = (srclen + SHA256_DIGEST_LENGTH) / DTLS_BLK_LENGTH;
-+    blocks = (srclen + DTLS_HMAC_DIGEST_SIZE + paddinglen) / DTLS_BLK_LENGTH;
-     for (i = 0; i < blocks; i++) {
-         for (j = 0; j < DTLS_BLK_LENGTH; j++) {
-@@ -360,14 +379,17 @@ dtls_cbc_encrypt(aes128_t *aes_ctx,
-         pos += DTLS_BLK_LENGTH;
-     }
--    dtls_debug_dump("Encrypted Data:", buf, srclen + SHA256_DIGEST_LENGTH);
--
--    return srclen + SHA256_DIGEST_LENGTH;
-+    dtls_debug_dump("[Encrypted Data]",
-+                    buf,
-+                    srclen + DTLS_HMAC_DIGEST_SIZE + paddinglen);
-+    
-+    return srclen + DTLS_HMAC_DIGEST_SIZE + paddinglen;
- }
- static size_t
- dtls_cbc_decrypt(aes128_t *aes_ctx,
-+                 unsigned char *key, size_t keylen,
-                  const unsigned char *iv,
-                  const unsigned char *src, size_t srclen,
-                  unsigned char *buf) {
-@@ -375,14 +397,17 @@ dtls_cbc_decrypt(aes128_t *aes_ctx,
-     unsigned char cbc[DTLS_BLK_LENGTH];
-     unsigned char tmp[DTLS_BLK_LENGTH];
-     unsigned char tmp2[DTLS_BLK_LENGTH];
--    unsigned char msg_hash[SHA256_DIGEST_LENGTH];
-+    unsigned char mac_buf[DTLS_HMAC_DIGEST_SIZE] = {0,};
-+    const unsigned char *dtls_hdr = NULL;
-     unsigned char *pos;
--    dtls_hash_ctx shactx;
-     int i, j;
-     int blocks;
-+    int depaddinglen = 0;
-+    dtls_hmac_context_t* hmac_ctx = NULL;
-     pos = buf;
--    memcpy(pos, src, srclen);
-+
-+    dtls_hdr = src - DTLS_CBC_IV_LENGTH - sizeof(dtls_record_header_t);
-     memcpy(cbc, iv, DTLS_BLK_LENGTH);
-     blocks = srclen / DTLS_BLK_LENGTH;
-@@ -401,19 +426,46 @@ dtls_cbc_decrypt(aes128_t *aes_ctx,
-         pos += DTLS_BLK_LENGTH;
-     }
--    dtls_hash_init(&shactx);
--    dtls_hash_update(&shactx, buf, srclen - SHA256_DIGEST_LENGTH);
--    dtls_hash_finalize(msg_hash, &shactx);
--
--    dtls_debug_dump("decrypted data:", buf, srclen);
-+    //de-padding
-+    depaddinglen = buf[srclen -1];
--    if(memcmp(msg_hash, buf + (srclen - SHA256_DIGEST_LENGTH), SHA256_DIGEST_LENGTH) != 0)
-+    //Calculate MAC
-+    hmac_ctx = dtls_hmac_new(key, keylen);
-+    if(!hmac_ctx) {
-+        return -1;
-+    }
-+    dtls_mac(hmac_ctx, dtls_hdr, buf,
-+             srclen - DTLS_HMAC_DIGEST_SIZE - depaddinglen - 1,
-+             mac_buf);
-+    dtls_hmac_free(hmac_ctx);
-+
-+    dtls_debug_dump("[MAC]",
-+                    mac_buf,
-+                    DTLS_HMAC_DIGEST_SIZE);
-+    dtls_debug_dump("[Decrypted data]",
-+                    buf,
-+                    srclen - DTLS_HMAC_DIGEST_SIZE - depaddinglen - 1);
-+
-+    //verify the MAC
-+    if(memcmp(mac_buf,
-+              buf + (srclen - DTLS_HMAC_DIGEST_SIZE - depaddinglen - 1),
-+              DTLS_HMAC_DIGEST_SIZE) != 0)
-     {
--        dtls_warn("message is broken\n");
-+        dtls_crit("Failed to verification of MAC\n");
-         return -1;
-     }
--    return srclen - SHA256_DIGEST_LENGTH;
-+    //verify the padding bytes
-+    for (i =0; i < depaddinglen; i++)
-+    {
-+        if (buf[srclen - depaddinglen - 1 + i] != depaddinglen)
-+        {
-+            dtls_crit("Failed to verify padding bytes\n");
-+            return -1;
-+        }
-+    }
-+
-+    return srclen - DTLS_HMAC_DIGEST_SIZE - depaddinglen - 1;
- }
- #ifdef DTLS_PSK
-@@ -523,8 +575,6 @@ void
- dtls_ecdsa_create_sig_hash(const unsigned char *priv_key, size_t key_size,
-                          const unsigned char *sign_hash, size_t sign_hash_size,
-                          uint32_t point_r[9], uint32_t point_s[9]) {
--  int ret;
--
-   uint8_t privateKey[32];
-   uint8_t hashValue[32];
-   uint8_t sign[64];
-@@ -615,7 +665,7 @@ dtls_encrypt(const unsigned char *src, size_t length,
-         memmove(buf, src, length);
-       ret = dtls_ccm_encrypt(&ctx->data, src, length, buf, nounce, aad, la);
-   }
--  if(cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA) {
-+  if(cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256) {
-       ret = rijndael_set_key(&ctx->data.ctx, key, 8 * keylen);
-       if (ret < 0) {
-         /* cleanup everything in case the key has the wrong size */
-@@ -625,7 +675,7 @@ dtls_encrypt(const unsigned char *src, size_t length,
-       if (src != buf)
-         memmove(buf, src, length);
--      ret = dtls_cbc_encrypt(&ctx->data, nounce, src, length, buf);
-+      ret = dtls_cbc_encrypt(&ctx->data, key, keylen, nounce, src, length, buf);
-   }
- error:
-@@ -658,7 +708,7 @@ dtls_decrypt(const unsigned char *src, size_t length,
-       ret = dtls_ccm_decrypt(&ctx->data, src, length, buf, nounce, aad, la);
-   }
--  if(cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA) {
-+  if(cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256) {
-       ret = rijndael_set_key(&ctx->data.ctx, key, 8 * keylen);
-       if (ret < 0) {
-         /* cleanup everything in case the key has the wrong size */
-@@ -668,7 +718,7 @@ dtls_decrypt(const unsigned char *src, size_t length,
-       if (src != buf)
-         memmove(buf, src, length);
--      ret = dtls_cbc_decrypt(&ctx->data, nounce, src, length, buf);
-+      ret = dtls_cbc_decrypt(&ctx->data, key, keylen, nounce, src, length, buf);
-     }
- error:
-diff --git a/extlibs/tinydtls/crypto.h b/extlibs/tinydtls/crypto.h
-index dd13ffa..a81d306 100644
---- a/extlibs/tinydtls/crypto.h
-+++ b/extlibs/tinydtls/crypto.h
-@@ -46,6 +46,7 @@
- #define DTLS_BLK_LENGTH        16 /* AES-128 */
- #define DTLS_MAC_LENGTH        DTLS_HMAC_DIGEST_SIZE
- #define DTLS_IV_LENGTH         4  /* length of nonce_explicit */
-+#define DTLS_CBC_IV_LENGTH     16
- /** 
-  * Maximum size of the generated keyblock. Note that MAX_KEYBLOCK_LENGTH must 
-diff --git a/extlibs/tinydtls/dtls.c b/extlibs/tinydtls/dtls.c
-index 41e68a5..b5b8fd1 100644
---- a/extlibs/tinydtls/dtls.c
-+++ b/extlibs/tinydtls/dtls.c
-@@ -496,11 +496,11 @@ static inline int is_tls_psk_with_aes_128_ccm_8(dtls_cipher_t cipher)
- #endif /* DTLS_PSK */
- }
--/** returns true if the cipher matches TLS_ECDH_anon_WITH_AES_128_CBC_SHA */
--static inline int is_tls_ecdh_anon_with_aes_128_cbc_sha(dtls_cipher_t cipher)
-+/** returns true if the cipher matches TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256 */
-+static inline int is_tls_ecdh_anon_with_aes_128_cbc_sha_256(dtls_cipher_t cipher)
- {
- #ifdef DTLS_ECC
--    return cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA;
-+    return cipher == TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256;
- #else
-     return 0;
- #endif
-@@ -570,7 +570,7 @@ known_cipher(dtls_context_t *ctx, dtls_cipher_t code, int is_client) {
-   return (psk && is_tls_psk_with_aes_128_ccm_8(code)) ||
-        (ecdsa && is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(code)) ||
--       (ecdh_anon && is_tls_ecdh_anon_with_aes_128_cbc_sha(code));
-+       (ecdh_anon && is_tls_ecdh_anon_with_aes_128_cbc_sha_256(code));
- }
- /**
-@@ -719,7 +719,7 @@ calculate_key_block(dtls_context_t *ctx,
- #endif /* DTLS_PSK */
- #ifdef DTLS_ECC
-   case TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
--  case TLS_ECDH_anon_WITH_AES_128_CBC_SHA: {
-+  case TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256: {
-     pre_master_len = dtls_ecdh_pre_master_secret(handshake->keyx.ecc.own_eph_priv,
-                                                handshake->keyx.ecc.other_eph_pub_x,
-                                                handshake->keyx.ecc.other_eph_pub_y,
-@@ -1084,7 +1084,7 @@ check_client_keyexchange(dtls_context_t *ctx,
- #ifdef DTLS_ECC
-   if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(handshake->cipher) ||
--       is_tls_ecdh_anon_with_aes_128_cbc_sha(handshake->cipher) ) {
-+       is_tls_ecdh_anon_with_aes_128_cbc_sha_256(handshake->cipher) ) {
-     if (length < DTLS_HS_LENGTH + DTLS_CKXEC_LENGTH) {
-       dtls_debug("The client key exchange is too short\n");
-@@ -1286,6 +1286,51 @@ dtls_prepare_record(dtls_peer_t *peer, dtls_security_parameters_t *security,
-       p += data_len_array[i];
-       res += data_len_array[i];
-     }
-+  } else if (is_tls_ecdh_anon_with_aes_128_cbc_sha_256(security->cipher)) {
-+
-+    unsigned char nonce[DTLS_CBC_IV_LENGTH];
-+
-+    /** Add IV into body of packet in case of AES CBC mode according to RFC 5246, Section 6.2.3.2
-+     *
-+     *    opaque IV[SecurityParameters.record_iv_length];
-+     *    block-ciphered struct {
-+     *        opaque content[TLSCompressed.length];
-+     *        opaque MAC[SecurityParameters.mac_length];
-+     *        uint8 padding[GenericBlockCipher.padding_length];
-+     *        uint8 padding_length;
-+     * };
-+     *
-+     */
-+
-+    res = 0;
-+    dtls_prng(nonce, DTLS_CBC_IV_LENGTH);
-+    memcpy(p , nonce, DTLS_CBC_IV_LENGTH);
-+    p += DTLS_CBC_IV_LENGTH;
-+    res += DTLS_CBC_IV_LENGTH;
-+
-+    for (i = 0; i < data_array_len; i++) {
-+        /* check the minimum that we need for packets that are not encrypted */
-+        if (*rlen < res + DTLS_RH_LENGTH + data_len_array[i]) {
-+            dtls_debug("dtls_prepare_record: send buffer too small\n");
-+            return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-+        }
-+
-+        memcpy(p, data_array[i], data_len_array[i]);
-+        p += data_len_array[i];
-+        res += data_len_array[i];
-+     }
-+
-+     res = dtls_encrypt(start + DTLS_CBC_IV_LENGTH, res - DTLS_CBC_IV_LENGTH,
-+               start + DTLS_CBC_IV_LENGTH, nonce,
-+               dtls_kb_local_write_key(security, peer->role),
-+               dtls_kb_key_size(security, peer->role),
-+               NULL, 0,
-+               security->cipher);
-+     if (res < 0)
-+       return res;
-+
-+     res += DTLS_CBC_IV_LENGTH;
-+
-   } else { /* TLS_PSK_WITH_AES_128_CCM_8 or TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 */   
-     /** 
-      * length of additional_data for the AEAD cipher which consists of
-@@ -1299,8 +1344,6 @@ dtls_prepare_record(dtls_peer_t *peer, dtls_security_parameters_t *security,
-       dtls_debug("dtls_prepare_record(): encrypt using TLS_PSK_WITH_AES_128_CCM_8\n");
-     } else if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(security->cipher)) {
-       dtls_debug("dtls_prepare_record(): encrypt using TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8\n");
--    } else if (is_tls_ecdh_anon_with_aes_128_cbc_sha(security->cipher)) {
--        dtls_debug("dtls_prepare_record() : encrypt using TLS_ECDH_anon_WITH_AES_128_CBC_SHA\n");
-     } else {
-       dtls_debug("dtls_prepare_record(): encrypt using unknown cipher\n");
-     }
-@@ -1363,7 +1406,7 @@ dtls_prepare_record(dtls_peer_t *peer, dtls_security_parameters_t *security,
-     memset(nonce, 0, DTLS_CCM_BLOCKSIZE);
-     memcpy(nonce, dtls_kb_local_iv(security, peer->role),
--         dtls_kb_iv_size(security, peer->role));
-+        dtls_kb_iv_size(security, peer->role));
-     memcpy(nonce + dtls_kb_iv_size(security, peer->role), start, 8); /* epoch + seq_num */
-     dtls_debug_dump("nonce:", nonce, DTLS_CCM_BLOCKSIZE);
-@@ -1378,7 +1421,8 @@ dtls_prepare_record(dtls_peer_t *peer, dtls_security_parameters_t *security,
-     memcpy(A_DATA, &DTLS_RECORD_HEADER(sendbuf)->epoch, 8); /* epoch and seq_num */
-     memcpy(A_DATA + 8,  &DTLS_RECORD_HEADER(sendbuf)->content_type, 3); /* type and version */
-     dtls_int_to_uint16(A_DATA + 11, res - 8); /* length */
--    
-+
-+
-     res = dtls_encrypt(start + 8, res - 8, start + 8, nonce,
-                dtls_kb_local_write_key(security, peer->role),
-                dtls_kb_key_size(security, peer->role),
-@@ -1388,7 +1432,7 @@ dtls_prepare_record(dtls_peer_t *peer, dtls_security_parameters_t *security,
-     if (res < 0)
-       return res;
--    res += 8;                 /* increment res by size of nonce_explicit */
-+    res += 8; /* increment res by size of nonce_explicit */
-     dtls_debug_dump("message:", start, res);
-   }
-@@ -2172,7 +2216,7 @@ dtls_send_server_hello_msgs(dtls_context_t *ctx, dtls_peer_t *peer)
-   }
-   ecdsa = is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher);
--  ecdh_anon = is_tls_ecdh_anon_with_aes_128_cbc_sha(peer->handshake_params->cipher);
-+  ecdh_anon = is_tls_ecdh_anon_with_aes_128_cbc_sha_256(peer->handshake_params->cipher);
- #ifdef DTLS_ECC
-   if(ecdh_anon) {
-@@ -2301,7 +2345,7 @@ dtls_send_client_key_exchange(dtls_context_t *ctx, dtls_peer_t *peer)
- #endif /* DTLS_PSK */
- #ifdef DTLS_ECC
-   case TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
--  case TLS_ECDH_anon_WITH_AES_128_CBC_SHA: {
-+  case TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256: {
-     uint8 *ephemeral_pub_x;
-     uint8 *ephemeral_pub_y;
-@@ -2424,7 +2468,7 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-       case TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-         ecdsa = is_ecdsa_supported(ctx, 1);
-         break;
--      case TLS_ECDH_anon_WITH_AES_128_CBC_SHA:
-+      case TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256:
-         ecdh_anon = is_ecdh_anon_supported(ctx);
-         break;
-       default:
-@@ -2478,7 +2522,7 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-   p += sizeof(uint16);
-   if (ecdh_anon) {
--    dtls_int_to_uint16(p, TLS_ECDH_anon_WITH_AES_128_CBC_SHA);
-+    dtls_int_to_uint16(p, TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256);
-     p += sizeof(uint16);
-   }
-   if (psk) {
-@@ -2809,7 +2853,7 @@ check_server_key_exchange_ecdh(dtls_context_t *ctx,
-   update_hs_hash(peer, data, data_length);
--  assert(is_tls_ecdh_anon_with_aes_128_cbc_sha(config->cipher));
-+  assert(is_tls_ecdh_anon_with_aes_128_cbc_sha_256(config->cipher));
-   data += DTLS_HS_LENGTH;
-@@ -3069,6 +3113,23 @@ decrypt_verify(dtls_peer_t *peer, uint8 *packet, size_t length,
-   if (security->cipher == TLS_NULL_WITH_NULL_NULL) {
-     /* no cipher suite selected */
-     return clen;
-+  } else if (is_tls_ecdh_anon_with_aes_128_cbc_sha_256(security->cipher)) {
-+
-+    unsigned char nonce[DTLS_CBC_IV_LENGTH];
-+
-+    if (clen < (DTLS_CBC_IV_LENGTH + DTLS_HMAC_DIGEST_SIZE))          /* need at least IV and MAC */
-+      return -1;
-+
-+    memcpy(nonce, *cleartext , DTLS_CBC_IV_LENGTH);
-+    clen -= DTLS_CBC_IV_LENGTH;
-+    *cleartext += DTLS_CBC_IV_LENGTH ;
-+
-+    clen = dtls_decrypt(*cleartext, clen, *cleartext, nonce,
-+                     dtls_kb_remote_write_key(security, peer->role),
-+                     dtls_kb_key_size(security, peer->role),
-+                     NULL, 0,
-+                     security->cipher);
-+
-   } else { /* TLS_PSK_WITH_AES_128_CCM_8 or TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 */
-     /** 
-      * length of additional_data for the AEAD cipher which consists of
-@@ -3083,7 +3144,7 @@ decrypt_verify(dtls_peer_t *peer, uint8 *packet, size_t length,
-     memset(nonce, 0, DTLS_CCM_BLOCKSIZE);
-     memcpy(nonce, dtls_kb_remote_iv(security, peer->role),
--         dtls_kb_iv_size(security, peer->role));
-+        dtls_kb_iv_size(security, peer->role));
-     /* read epoch and seq_num from message */
-     memcpy(nonce + dtls_kb_iv_size(security, peer->role), *cleartext, 8);
-@@ -3108,17 +3169,19 @@ decrypt_verify(dtls_peer_t *peer, uint8 *packet, size_t length,
-                      dtls_kb_remote_write_key(security, peer->role),
-                      dtls_kb_key_size(security, peer->role),
-                      A_DATA, A_DATA_LEN,
--               security->cipher);
--    if (clen < 0)
--      dtls_warn("decryption failed\n");
--    else {
-+                     security->cipher);
-+  }
-+
-+  if (clen < 0)
-+    dtls_warn("decryption failed\n");
-+  else {
- #ifndef NDEBUG
-       dtls_debug("decrypt_verify(): found %i bytes cleartext\n", clen);
- #endif
-       dtls_security_params_free_other(peer);
-       dtls_debug_dump("cleartext", *cleartext, clen);
--    }
-   }
-+
-   return clen;
- }
-@@ -3219,7 +3282,7 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-     }
-     if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher))
-       peer->state = DTLS_STATE_WAIT_SERVERCERTIFICATE; //ecdsa
--    else if (is_tls_ecdh_anon_with_aes_128_cbc_sha(peer->handshake_params->cipher))
-+    else if (is_tls_ecdh_anon_with_aes_128_cbc_sha_256(peer->handshake_params->cipher))
-         peer->state = DTLS_STATE_WAIT_SERVERKEYEXCHANGE; //ecdh
-     else
-       peer->state = DTLS_STATE_WAIT_SERVERHELLODONE; //psk
-@@ -3259,7 +3322,7 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-       err = check_server_key_exchange_ecdsa(ctx, peer, data, data_length);
-     }
--    if (is_tls_ecdh_anon_with_aes_128_cbc_sha(peer->handshake_params->cipher)) {
-+    if (is_tls_ecdh_anon_with_aes_128_cbc_sha_256(peer->handshake_params->cipher)) {
-       if (state != DTLS_STATE_WAIT_SERVERKEYEXCHANGE) {
-         return dtls_alert_fatal_create(DTLS_ALERT_UNEXPECTED_MESSAGE);
-       }
-diff --git a/extlibs/tinydtls/dtls.h b/extlibs/tinydtls/dtls.h
-index a2ab86e..7d2bc19 100644
---- a/extlibs/tinydtls/dtls.h
-+++ b/extlibs/tinydtls/dtls.h
-@@ -238,7 +238,7 @@ typedef struct dtls_context_t {
-   dtls_handler_t *h;          /**< callback handlers */
--  dtls_cipher_enable_t is_anon_ecdh_eabled;    /**< enable/disable the TLS_ECDH_anon_WITH_AES_128_CBC_SHA */
-+  dtls_cipher_enable_t is_anon_ecdh_eabled;    /**< enable/disable the TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256 */
-   dtls_cipher_t selected_cipher; /**< selected ciper suite for handshake */
-@@ -268,7 +268,7 @@ static inline void dtls_set_handler(dtls_context_t *ctx, dtls_handler_t *h) {
- }
-  /**
--  * @brief Enabling the TLS_ECDH_anon_WITH_AES_128_CBC_SHA
-+  * @brief Enabling the TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256
-   *
-   * @param ctx              The DTLS context to use.
-   * @param is_enable    DTLS_CIPHER_ENABLE(1) or DTLS_CIPHER_DISABLE(0)
-@@ -279,7 +279,7 @@ void dtls_enables_anon_ecdh(dtls_context_t* ctx, dtls_cipher_enable_t is_enable)
-  * @brief Select the cipher suite for handshake
-  *
-  * @param ctx              The DTLS context to use.
-- * @param cipher         TLS_ECDH_anon_WITH_AES_128_CBC_SHA (0xC018)
-+ * @param cipher         TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256 (0xC018)
-  *                                  TLS_PSK_WITH_AES_128_CCM_8 (0xX0A8)
-  *                                  TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 (0xC0AE)
-  */
-diff --git a/extlibs/tinydtls/global.h b/extlibs/tinydtls/global.h
-index 441710f..169c726 100644
---- a/extlibs/tinydtls/global.h
-+++ b/extlibs/tinydtls/global.h
-@@ -73,7 +73,7 @@ typedef unsigned char uint48[6];
- /** Known cipher suites.*/
- typedef enum { 
-   TLS_NULL_WITH_NULL_NULL = 0x0000,   /**< NULL cipher  */
--  TLS_ECDH_anon_WITH_AES_128_CBC_SHA = 0xC018, /**< see RFC 4492 */
-+  TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256 = 0xC018, /**< see RFC 4492 */
-   TLS_PSK_WITH_AES_128_CCM_8 = 0xC0A8, /**< see RFC 6655 */
-   TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 = 0xC0AE /**< see RFC 7251 */
- } dtls_cipher_t;
-diff --git a/extlibs/tinydtls/tests/dtls-client.c b/extlibs/tinydtls/tests/dtls-client.c
-index 35521e9..dfc822a 100644
---- a/extlibs/tinydtls/tests/dtls-client.c
-+++ b/extlibs/tinydtls/tests/dtls-client.c
-@@ -309,7 +309,7 @@ usage( const char *program, const char *version) {
-         "\t-p port\t\tlisten on specified port (default is %d)\n"
-         "\t-v num\t\tverbosity level (default: 3)\n"
-           "\t-c num\t\tcipher suite (default: 1)\n"
--          "\t\t\t1: TLS_ECDH_anon_WITH_AES_128_CBC_SHA \n"
-+          "\t\t\t1: TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256 \n"
-           "\t\t\t2: TLS_PSK_WITH_AES_128_CCM_8\n"
-           "\t\t\t3: TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8\n",
-          program, version, program, DEFAULT_PORT);
-@@ -347,7 +347,7 @@ main(int argc, char **argv) {
-   log_t log_level = DTLS_LOG_WARN;
-   int fd, result;
-   int on = 1;
--  dtls_cipher_t selected_cipher = TLS_ECDH_anon_WITH_AES_128_CBC_SHA;
-+  dtls_cipher_t selected_cipher = TLS_NULL_WITH_NULL_NULL;
-   dtls_cipher_enable_t ecdh_anon_enalbe = DTLS_CIPHER_ENABLE;
-   int opt, res;
-   session_t dst;
-@@ -417,7 +417,7 @@ main(int argc, char **argv) {
-     case 'c':
-       if( strcmp(optarg, "1") == 0)
-       {
--          selected_cipher = TLS_ECDH_anon_WITH_AES_128_CBC_SHA;
-+          selected_cipher = TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256;
-           ecdh_anon_enalbe = DTLS_CIPHER_ENABLE;
-       }
-       else if( strcmp(optarg, "2") == 0)
-@@ -500,7 +500,7 @@ main(int argc, char **argv) {
-   /* select cipher suite */
-   dtls_select_cipher(dtls_context, selected_cipher);
--  /* enable/disable tls_ecdh_anon_with_aes_128_cbc_sha */
-+  /* enable/disable tls_ecdh_anon_with_aes_128_cbc_sha_256 */
-   dtls_enables_anon_ecdh(dtls_context, ecdh_anon_enalbe);
-   dtls_set_handler(dtls_context, &cb);
-diff --git a/extlibs/tinydtls/tests/dtls-server.c b/extlibs/tinydtls/tests/dtls-server.c
-index d3da1a7..5893084 100644
---- a/extlibs/tinydtls/tests/dtls-server.c
-+++ b/extlibs/tinydtls/tests/dtls-server.c
-@@ -254,8 +254,8 @@ usage(const char *program, const char *version) {
-         "\t-p port\t\tlisten on specified port (default is %d)\n"
-         "\t-v num\t\tverbosity level (default: 3)\n"
-         "\t-a enable|disable\t(default: disable)\n"
--        "\t\t\t\tenable:enable TLS_ECDH_anon_with_AES_128_CBC_SHA\n"
--        "\t\t\t\tdisable:disable TLS_ECDH_anon_with_AES_128_CBC_SHA\n",
-+        "\t\t\t\tenable:enable TLS_ECDH_anon_with_AES_128_CBC_SHA_256\n"
-+        "\t\t\t\tdisable:disable TLS_ECDH_anon_with_AES_128_CBC_SHA_256\n",
-          program, version, program, DEFAULT_PORT);
- }
-@@ -280,7 +280,7 @@ main(int argc, char **argv) {
-   struct timeval timeout;
-   int fd, opt, result;
-   int on = 1;
--  int ecdh_anon_enalbe = DTLS_CIPHER_DISABLE;
-+  dtls_cipher_enable_t ecdh_anon_enalbe = DTLS_CIPHER_DISABLE;
-   struct sockaddr_in6 listen_addr;
-   memset(&listen_addr, 0, sizeof(struct sockaddr_in6));
-@@ -356,7 +356,7 @@ main(int argc, char **argv) {
-   the_context = dtls_new_context(&fd);
--  /* enable/disable tls_ecdh_anon_with_aes_128_cbc_sha */
-+  /* enable/disable tls_ecdh_anon_with_aes_128_cbc_sha_256 */
-   dtls_enables_anon_ecdh(the_context, ecdh_anon_enalbe);
-   dtls_set_handler(the_context, &cb);
-diff --git a/resource/csdk/connectivity/api/cainterface.h b/resource/csdk/connectivity/api/cainterface.h
-index 760df09..2f10fd5 100644
---- a/resource/csdk/connectivity/api/cainterface.h
-+++ b/resource/csdk/connectivity/api/cainterface.h
-@@ -290,7 +290,7 @@ CAResult_t CAHandleRequestResponse();
-  * Select the cipher suite for dtls handshake
-  *
-  * @param[IN] cipher  cipher suite (Note : Make sure endianness)
-- *                               0xC018 : TLS_ECDH_anon_WITH_AES_128_CBC_SHA
-+ *                               0xC018 : TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256
-  *                               0xC0A8 : TLS_PSK_WITH_AES_128_CCM_8
-  *                               0xC0AE : TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8
-  *
-@@ -301,7 +301,7 @@ CAResult_t CAHandleRequestResponse();
- CAResult_t CASelectCipherSuite(const uint16_t cipher);
- /**
-- * Enable TLS_ECDH_anon_WITH_AES_128_CBC_SHA cipher suite in dtls
-+ * Enable TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256 cipher suite in dtls
-  *
-  * @param[IN] enable  TRUE/FALSE enables/disables anonymous cipher suite
-  *
-diff --git a/resource/csdk/connectivity/inc/caadapternetdtls.h b/resource/csdk/connectivity/inc/caadapternetdtls.h
-index f9f99d8..274321e 100644
---- a/resource/csdk/connectivity/inc/caadapternetdtls.h
-+++ b/resource/csdk/connectivity/inc/caadapternetdtls.h
-@@ -160,7 +160,7 @@ void CADTLSSetCredentialsCallback(CAGetDTLSCredentialsHandler credCallback);
-  * Select the cipher suite for dtls handshake
-  *
-  * @param[in] cipher    cipher suite
-- *                             0xC018 : TLS_ECDH_anon_WITH_AES_128_CBC_SHA
-+ *                             0xC018 : TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256
-  *                             0xC0A8 : TLS_PSK_WITH_AES_128_CCM_8
-  *                             0xC0AE : TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8
-  *
-diff --git a/resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c b/resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
-index 8f01c06..6fd83e8 100644
---- a/resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
-+++ b/resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
-@@ -598,7 +598,7 @@ CAResult_t CADtlsEnableAnonECDHCipherSuite(const bool enable)
-     dtls_enables_anon_ecdh(g_caDtlsContext->dtlsContext,
-         enable == true ? DTLS_CIPHER_ENABLE : DTLS_CIPHER_DISABLE);
-     ca_mutex_unlock(g_dtlsContextMutex);
--    OIC_LOG_V(DEBUG, NET_DTLS_TAG, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA  is %s",
-+    OIC_LOG_V(DEBUG, NET_DTLS_TAG, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256  is %s",
-         enable ? "enabled" : "disabled");
-     OIC_LOG(DEBUG, NET_DTLS_TAG, "OUT CADtlsEnablesAnonEcdh");
-diff --git a/resource/csdk/security/provisioning/src/provisioningmanager.c b/resource/csdk/security/provisioning/src/provisioningmanager.c
-index defe4e6..301614d 100644
---- a/resource/csdk/security/provisioning/src/provisioningmanager.c
-+++ b/resource/csdk/security/provisioning/src/provisioningmanager.c
-@@ -1031,7 +1031,7 @@ static SPResult updateOperationMode(unsigned short timeout, SPTargetDeviceInfo_t
-  */
- static SPResult initiateDtlsHandshake(const SPTargetDeviceInfo_t *deviceInfo)
- {
--    CAResult_t caresult = CASelectCipherSuite(TLS_ECDH_anon_WITH_AES_128_CBC_SHA);
-+    CAResult_t caresult = CASelectCipherSuite(TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256);
-     if (CA_STATUS_OK != caresult)
-     {
--- 
-1.7.9.5
-
diff --git a/extlibs/tinydtls/0001-Fixed-issue-to-pass-PSK-identity-hint-to-application.patch b/extlibs/tinydtls/0001-Fixed-issue-to-pass-PSK-identity-hint-to-application.patch
deleted file mode 100644 (file)
index 343c891..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From 116451f8fab0df90e87d394d1fa1ac9e739c7dbe Mon Sep 17 00:00:00 2001
-From: Sachin Agrawal <sachin.agrawal@intel.com>
-Date: Tue, 20 Jan 2015 15:57:40 -0800
-Subject: [PATCH 1/1] Fixed issue to pass PSK identity hint to application in
- callback
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In cases (with PSK ciphersuite) where Server is sending
-'PSK Identity Hint’ inside ServerKeyExchange message, DTLS library
-is not passing the ‘identity hint’ inside ‘desc’ argument in
-get_psk_info(DTLS_PSK_KEY, desc) callback. Instead, ‘desc’ contains
-the identity of the client itself. The reason for this is that the
-code inside dtls_send_client_key_exchange() method
-overwrites the ‘identity hint’ received earlier.
-
-Change-Id: Ibf447e3a6b33284118908a52aed4cf636038ab23
-Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
----
- extlibs/tinydtls/dtls.c |   17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/extlibs/tinydtls/dtls.c b/extlibs/tinydtls/dtls.c
-index 92222eb..9090f22 100644
---- a/extlibs/tinydtls/dtls.c
-+++ b/extlibs/tinydtls/dtls.c
-@@ -2164,6 +2164,7 @@ static int
- dtls_send_client_key_exchange(dtls_context_t *ctx, dtls_peer_t *peer)
- {
-   uint8 buf[DTLS_CKXEC_LENGTH];
-+  uint8 client_id[DTLS_PSK_MAX_CLIENT_IDENTITY_LEN];
-   uint8 *p;
-   dtls_handshake_parameters_t *handshake = peer->handshake_params;
-@@ -2175,28 +2176,24 @@ dtls_send_client_key_exchange(dtls_context_t *ctx, dtls_peer_t *peer)
-     int len;
-     len = CALL(ctx, get_psk_info, &peer->session, DTLS_PSK_IDENTITY,
--             handshake->keyx.psk.identity, handshake->keyx.psk.id_length,
--             buf + sizeof(uint16),
--             min(sizeof(buf) - sizeof(uint16),
--                 sizeof(handshake->keyx.psk.identity)));
-+               NULL, 0,
-+               client_id,
-+               sizeof(client_id));
-     if (len < 0) {
-       dtls_crit("no psk identity set in kx\n");
-       return len;
-     }
-     if (len + sizeof(uint16) > DTLS_CKXEC_LENGTH) {
--      memset(&handshake->keyx.psk, 0, sizeof(dtls_handshake_parameters_psk_t));
-       dtls_warn("the psk identity is too long\n");
-       return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-     }
--    handshake->keyx.psk.id_length = (unsigned int)len;
--    memcpy(handshake->keyx.psk.identity, p + sizeof(uint16), len);
--    dtls_int_to_uint16(p, handshake->keyx.psk.id_length);
-+    dtls_int_to_uint16(p, len);
-     p += sizeof(uint16);
--    memcpy(p, handshake->keyx.psk.identity, handshake->keyx.psk.id_length);
--    p += handshake->keyx.psk.id_length;
-+    memcpy(p, client_id, len);
-+    p += len;
-     break;
-   }
--- 
-1.7.9.5
-
diff --git a/extlibs/tinydtls/0001-Updated-tinyDTLS-test-apps-to-use-identity-hint.patch b/extlibs/tinydtls/0001-Updated-tinyDTLS-test-apps-to-use-identity-hint.patch
deleted file mode 100644 (file)
index 4470e1a..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-From 6b26519bea04167b9cf68069bf641af4651c87e0 Mon Sep 17 00:00:00 2001
-From: Sachin Agrawal <sachin.agrawal@intel.com>
-Date: Thu, 26 Feb 2015 09:28:06 -0800
-Subject: [PATCH 1/1] Updated tinyDTLS test apps to use identity hint
-
-dtls-server test is updated to pass 'psk hint' to tinyDTLS library so that
-it can send ServerKeyExchange packet. Similarly, dtls-client test
-is updated to retrieve PSK specific for the server whose identity was
-received via 'psk hint' packet.
-
-Change-Id: Ifba720f1505ed6afbf56dfc179d98790176ce0b0
-Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
----
- extlibs/tinydtls/tests/dtls-client.c |   45 ++++++++++++++++++++++------------
- extlibs/tinydtls/tests/dtls-server.c |   43 +++++++++++++++++++++-----------
- 2 files changed, 59 insertions(+), 29 deletions(-)
-
-diff --git a/extlibs/tinydtls/tests/dtls-client.c b/extlibs/tinydtls/tests/dtls-client.c
-index 96ed0fa..65b0275 100644
---- a/extlibs/tinydtls/tests/dtls-client.c
-+++ b/extlibs/tinydtls/tests/dtls-client.c
-@@ -22,9 +22,10 @@
- #define DEFAULT_PORT 20220
--#define PSK_DEFAULT_IDENTITY "Client_identity"
-+#define PSK_CLIENT_IDENTITY  "Client_identity"
-+#define PSK_SERVER_IDENTITY  "Server_identity"
- #define PSK_DEFAULT_KEY      "secretPSK"
--#define PSK_OPTIONS          "i:k:"
-+#define PSK_OPTIONS          "i:s:k:"
- #ifdef __GNUC__
- #define UNUSED_PARAM __attribute__((unused))
-@@ -93,8 +94,10 @@ read_from_file(char *arg, unsigned char *buf, size_t max_buf_len) {
- /* The PSK information for DTLS */
- #define PSK_ID_MAXLEN 256
- #define PSK_MAXLEN 256
--static unsigned char psk_id[PSK_ID_MAXLEN];
--static size_t psk_id_length = 0;
-+static unsigned char psk_client_id[PSK_ID_MAXLEN];
-+static size_t psk_client_id_length = 0;
-+static unsigned char psk_server_id[PSK_ID_MAXLEN];
-+static size_t psk_server_id_length = 0;
- static unsigned char psk_key[PSK_MAXLEN];
- static size_t psk_key_length = 0;
-@@ -114,15 +117,15 @@ get_psk_info(struct dtls_context_t *ctx UNUSED_PARAM,
-       dtls_debug("got psk_identity_hint: '%.*s'\n", id_len, id);
-     }
--    if (result_length < psk_id_length) {
-+    if (result_length < psk_client_id_length) {
-       dtls_warn("cannot set psk_identity -- buffer too small\n");
-       return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-     }
--    memcpy(result, psk_id, psk_id_length);
--    return psk_id_length;
-+    memcpy(result, psk_client_id, psk_client_id_length);
-+    return psk_client_id_length;
-   case DTLS_PSK_KEY:
--    if (id_len != psk_id_length || memcmp(psk_id, id, id_len) != 0) {
-+    if (id_len != psk_server_id_length || memcmp(psk_server_id, id, id_len) != 0) {
-       dtls_warn("PSK for unknown id requested, exiting\n");
-       return dtls_alert_fatal_create(DTLS_ALERT_ILLEGAL_PARAMETER);
-     } else if (result_length < psk_key_length) {
-@@ -291,12 +294,13 @@ usage( const char *program, const char *version) {
-   fprintf(stderr, "%s v%s -- DTLS client implementation\n"
-         "(c) 2011-2014 Olaf Bergmann <bergmann@tzi.org>\n\n"
- #ifdef DTLS_PSK
--        "usage: %s [-i file] [-k file] [-o file] [-p port] [-v num] addr [port]\n"
-+        "usage: %s [-i file] [-s file] [-k file] [-o file] [-p port] [-v num] addr [port]\n"
- #else /*  DTLS_PSK */
-         "usage: %s [-o file] [-p port] [-v num] addr [port]\n"
- #endif /* DTLS_PSK */
- #ifdef DTLS_PSK
--        "\t-i file\t\tread PSK identity from file\n"
-+        "\t-i file\t\tread PSK Client identity from file\n"
-+        "\t-s file\t\tread PSK Server identity from file\n"
-         "\t-k file\t\tread pre-shared key from file\n"
- #endif /* DTLS_PSK */
-         "\t-o file\t\toutput received data to this file (use '-' for STDOUT)\n"
-@@ -337,9 +341,11 @@ main(int argc, char **argv) {
-   snprintf(port_str, sizeof(port_str), "%d", port);
- #ifdef DTLS_PSK
--  psk_id_length = strlen(PSK_DEFAULT_IDENTITY);
-+  psk_client_id_length = strlen(PSK_CLIENT_IDENTITY);
-+  psk_server_id_length = strlen(PSK_SERVER_IDENTITY);
-   psk_key_length = strlen(PSK_DEFAULT_KEY);
--  memcpy(psk_id, PSK_DEFAULT_IDENTITY, psk_id_length);
-+  memcpy(psk_client_id, PSK_CLIENT_IDENTITY, psk_client_id_length);
-+  memcpy(psk_server_id, PSK_SERVER_IDENTITY, psk_server_id_length);
-   memcpy(psk_key, PSK_DEFAULT_KEY, psk_key_length);
- #endif /* DTLS_PSK */
-@@ -347,11 +353,20 @@ main(int argc, char **argv) {
-     switch (opt) {
- #ifdef DTLS_PSK
-     case 'i' : {
--      ssize_t result = read_from_file(optarg, psk_id, PSK_ID_MAXLEN);
-+      ssize_t result = read_from_file(optarg, psk_client_id, PSK_ID_MAXLEN);
-       if (result < 0) {
--      dtls_warn("cannot read PSK identity\n");
-+      dtls_warn("cannot read Client PSK identity\n");
-       } else {
--      psk_id_length = result;
-+      psk_client_id_length = result;
-+      }
-+      break;
-+    }
-+    case 's' : {
-+      ssize_t result = read_from_file(optarg, psk_server_id, PSK_ID_MAXLEN);
-+      if (result < 0) {
-+      dtls_warn("cannot read Server PSK identity\n");
-+      } else {
-+      psk_server_id_length = result;
-       }
-       break;
-     }
-diff --git a/extlibs/tinydtls/tests/dtls-server.c b/extlibs/tinydtls/tests/dtls-server.c
-index 3f030b1..ae1283e 100644
---- a/extlibs/tinydtls/tests/dtls-server.c
-+++ b/extlibs/tinydtls/tests/dtls-server.c
-@@ -47,6 +47,9 @@ handle_sigint(int signum) {
- #endif
- #ifdef DTLS_PSK
-+
-+#define PSK_SERVER_HINT  "Server_identity"
-+
- /* This function is the "key store" for tinyDTLS. It is called to
-  * retrieve a key for the given identity within this particular
-  * session. */
-@@ -70,23 +73,35 @@ get_psk_info(struct dtls_context_t *ctx, const session_t *session,
-       (unsigned char *)"", 1 }
-   };
--  if (type != DTLS_PSK_KEY) {
--    return 0;
--  }
-+  switch (type) {
-+  case DTLS_PSK_HINT:
-+    if (result_length < strlen(PSK_SERVER_HINT)) {
-+      dtls_warn("cannot set psk_hint -- buffer too small\n");
-+      return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-+    }
--  if (id) {
--    int i;
--    for (i = 0; i < sizeof(psk)/sizeof(struct keymap_t); i++) {
--      if (id_len == psk[i].id_length && memcmp(id, psk[i].id, id_len) == 0) {
--      if (result_length < psk[i].key_length) {
--        dtls_warn("buffer too small for PSK");
--        return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
--      }
--
--      memcpy(result, psk[i].key, psk[i].key_length);
--      return psk[i].key_length;
-+    memcpy(result, PSK_SERVER_HINT, strlen(PSK_SERVER_HINT));
-+    return strlen(PSK_SERVER_HINT);
-+
-+  case DTLS_PSK_KEY:
-+    if (id) {
-+      int i;
-+      for (i = 0; i < sizeof(psk)/sizeof(struct keymap_t); i++) {
-+        if (id_len == psk[i].id_length && memcmp(id, psk[i].id, id_len) == 0) {
-+        if (result_length < psk[i].key_length) {
-+          dtls_warn("buffer too small for PSK");
-+          return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
-+        }
-+
-+        memcpy(result, psk[i].key, psk[i].key_length);
-+        return psk[i].key_length;
-+        }
-       }
-     }
-+    break;
-+
-+  default:
-+    dtls_warn("unsupported request type: %d\n", type);
-   }
-   return dtls_alert_fatal_create(DTLS_ALERT_DECRYPT_ERROR);
--- 
-1.7.9.5
-
diff --git a/extlibs/tinydtls/0001-add-support-of-X.509-into-tinyDTLS-external-library.patch b/extlibs/tinydtls/0001-add-support-of-X.509-into-tinyDTLS-external-library.patch
deleted file mode 100644 (file)
index 6baafd8..0000000
+++ /dev/null
@@ -1,1960 +0,0 @@
-From 3a354d276c3375fd0ef20f5ced8f6c4d8c39c419 Mon Sep 17 00:00:00 2001
-From: Oleksii Udod <o.udod@samsung.com>
-Date: Wed, 12 Aug 2015 17:20:21 +0300
-Subject: [PATCH 1/1] add support of X.509 into tinyDTLS external library
-
-Change-Id: I560506e0c0828674969829c9e900ae08bacaeef1
-Signed-off-by: Oleksii Udod <o.udod@samsung.com>
----
- extlibs/tinydtls/SConscript          |   5 +-
- extlibs/tinydtls/configure.in        |   6 +
- extlibs/tinydtls/crypto.c            |   2 +-
- extlibs/tinydtls/crypto.h            |   4 +-
- extlibs/tinydtls/dtls.c              | 257 ++++++++++++++++++++-----
- extlibs/tinydtls/dtls.h              | 108 ++++++++++-
- extlibs/tinydtls/dtls_config.h       |  51 +++++
- extlibs/tinydtls/dtls_config.h.in    |   3 +
- extlibs/tinydtls/global.h            |   7 +-
- extlibs/tinydtls/netq.h              |   2 +-
- extlibs/tinydtls/tests/Makefile.in   |   4 +-
- extlibs/tinydtls/tests/dtls-client.c | 336 ++++++++++++++++++++++++++++++--
- extlibs/tinydtls/tests/dtls-server.c | 358 +++++++++++++++++++++++++++++++++--
- extlibs/tinydtls/tinydtls.h          |   3 +
- extlibs/tinydtls/tinydtls.h.in       |   3 +
- 15 files changed, 1065 insertions(+), 84 deletions(-)
-
-diff --git a/extlibs/tinydtls/SConscript b/extlibs/tinydtls/SConscript
-index 4c6b4e1..7ca5ae2 100644
---- a/extlibs/tinydtls/SConscript
-+++ b/extlibs/tinydtls/SConscript
-@@ -31,7 +31,6 @@ if(target_os) == 'arduino':
-       env.Replace(CFLAGS = env.get('CXXFLAGS'))
- root_dir = './'
--
- tinydtls_src_path = root_dir
- env.AppendUnique(CPPPATH = [root_dir])
-@@ -62,7 +61,7 @@ tinydtls_src = [
- env.AppendUnique(TINYDTLS_SRC = tinydtls_src)
- if not env.get('RELEASE'):
--      if(target_os) not in ['arduino']:
-+      if(target_os) not in ['android', 'arduino']:
-               env.AppendUnique(TINYDTLS_SRC = ['debug.c'])
-       else:
-               env.AppendUnique(CPPDEFINES = ['NDEBUG'])
-@@ -71,6 +70,7 @@ else:
- env.AppendUnique(CPPDEFINES = ['DTLSV12',  'WITH_SHA256', 'DTLS_CHECK_CONTENTTYPE'])
-+
- libtinydtls = env.StaticLibrary('libtinydtls', env.get('TINYDTLS_SRC'), OBJPREFIX='libtinydtls_')
- ######################################################################
-@@ -94,6 +94,7 @@ if not env.get('RELEASE'):
-       samples_env.PrependUnique(LIBS = ['tinydtls'])
-       Alias("samples", [dtlsserver, dtlsclient])
-+
-       samples_env.AppendTarget('samples')
- env.InstallTarget(libtinydtls, 'libtinydtls');
-diff --git a/extlibs/tinydtls/configure.in b/extlibs/tinydtls/configure.in
-index 70b9a54..c3ebbf3 100644
---- a/extlibs/tinydtls/configure.in
-+++ b/extlibs/tinydtls/configure.in
-@@ -69,6 +69,12 @@ AC_ARG_WITH(psk,
-   [AC_DEFINE(DTLS_PSK, 1, [Define to 1 if building with PSK support])
-    DTLS_PSK=1])
-+AC_ARG_WITH(x509,
-+  [AS_HELP_STRING([--with-x509],[use dtls as transport protocol])],
-+  [AC_DEFINE(DTLS_X509, 1, [Define to 1 if building with X.509 support])
-+   DTLS_X509=1],
-+  [])
-+
- CPPFLAGS="${CPPFLAGS} -DDTLSv12 -DWITH_SHA256"
- OPT_OBJS="${OPT_OBJS} sha2/sha2.o"
-diff --git a/extlibs/tinydtls/crypto.c b/extlibs/tinydtls/crypto.c
-index deaf581..7433432 100644
---- a/extlibs/tinydtls/crypto.c
-+++ b/extlibs/tinydtls/crypto.c
-@@ -493,7 +493,7 @@ dtls_psk_pre_master_secret(unsigned char *key, size_t keylen,
- }
- #endif /* DTLS_PSK */
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
- int dtls_ec_key_from_uint32_asn1(const uint32_t *key, size_t key_size,
-                                unsigned char *buf) {
-diff --git a/extlibs/tinydtls/crypto.h b/extlibs/tinydtls/crypto.h
-index f4cfc66..cade1b2 100644
---- a/extlibs/tinydtls/crypto.h
-+++ b/extlibs/tinydtls/crypto.h
-@@ -131,14 +131,14 @@ typedef struct {
-   dtls_cipher_t cipher;               /**< cipher type */
-   unsigned int do_client_auth:1;
--#ifdef DTLS_ECC && DTLS_PSK
-+#if defined(DTLS_ECC) && defined(DTLS_PSK)
-   struct keyx_t {
-     dtls_handshake_parameters_ecc_t ecc;
-     dtls_handshake_parameters_psk_t psk;
-   } keyx;
- #else /* DTLS_ECC && DTLS_PSK */
-   union {
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
-     dtls_handshake_parameters_ecc_t ecc;
- #endif /* DTLS_ECC */
- #ifdef DTLS_PSK
-diff --git a/extlibs/tinydtls/dtls.c b/extlibs/tinydtls/dtls.c
-index 6104a08..f1e2486 100644
---- a/extlibs/tinydtls/dtls.c
-+++ b/extlibs/tinydtls/dtls.c
-@@ -479,7 +479,7 @@ static uint8 compression_methods[] = {
- /** returns true if the cipher matches TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 */
- static inline int is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(dtls_cipher_t cipher)
- {
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
-   return cipher == TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8;
- #else
-   return 0;
-@@ -532,13 +532,24 @@ static inline int is_psk_supported(dtls_context_t *ctx)
- static inline int is_ecdsa_supported(dtls_context_t *ctx, int is_client)
- {
- #ifdef DTLS_ECC
--  return ctx && ctx->h && ((!is_client && ctx->h->get_ecdsa_key) || 
-+  return ctx && ctx->h && ((!is_client && ctx->h->get_ecdsa_key) ||
-                          (is_client && ctx->h->verify_ecdsa_key));
- #else
-   return 0;
- #endif /* DTLS_ECC */
- }
-+/** returns true if the application is configured for x509 */
-+static inline int is_x509_supported(dtls_context_t *ctx, int is_client)
-+{
-+#ifdef DTLS_X509
-+  return ctx && ctx->h && ((!is_client && ctx->h->get_x509_cert) ||
-+               (is_client && ctx->h->verify_x509_cert));
-+#else
-+  return 0;
-+#endif /* DTLS_X509 */
-+}
-+
- /** Returns true if the application is configured for ecdhe_ecdsa with
-   * client authentication */
- static inline int is_ecdsa_client_auth_supported(dtls_context_t *ctx)
-@@ -550,6 +561,17 @@ static inline int is_ecdsa_client_auth_supported(dtls_context_t *ctx)
- #endif /* DTLS_ECC */
- }
-+/** Returns true if the application is configured for x509 with
-+  * client authentication */
-+static inline int is_x509_client_auth_supported(dtls_context_t *ctx)
-+{
-+#ifdef DTLS_X509
-+  return ctx && ctx->h && ctx->h->get_x509_cert && ctx->h->verify_x509_cert;
-+#else
-+  return 0;
-+#endif /* DTLS_X509 */
-+}
-+
- /** returns true if ecdh_anon_with_aes_128_cbc_sha is supported */
- static inline int is_ecdh_anon_supported(dtls_context_t *ctx)
- {
-@@ -586,16 +608,19 @@ known_cipher(dtls_context_t *ctx, dtls_cipher_t code, int is_client) {
-   int ecdsa;
-   int ecdh_anon;
-   int ecdhe_psk;
-+  int x509;
-   psk = is_psk_supported(ctx);
-   ecdsa = is_ecdsa_supported(ctx, is_client);
-   ecdh_anon = is_ecdh_anon_supported(ctx);
-   ecdhe_psk = is_ecdhe_psk_supported(ctx);
-+  x509 = is_x509_supported(ctx, is_client);
-   return (psk && is_tls_psk_with_aes_128_ccm_8(code)) ||
-        (ecdsa && is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(code)) ||
-        (ecdh_anon && is_tls_ecdh_anon_with_aes_128_cbc_sha_256(code)) ||
--       (ecdhe_psk && is_tls_ecdhe_psk_with_aes_128_cbc_sha_256(code));
-+       (ecdhe_psk && is_tls_ecdhe_psk_with_aes_128_cbc_sha_256(code)) ||
-+     (x509 && is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(code));
- }
- /**
-@@ -744,7 +769,7 @@ calculate_key_block(dtls_context_t *ctx,
-     break;
-   }
- #endif /* DTLS_PSK */
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
-   case TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-   case TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256: {
-     pre_master_len = dtls_ecdh_pre_master_secret(handshake->keyx.ecc.own_eph_priv,
-@@ -870,8 +895,13 @@ static int verify_ext_cert_type(uint8 *data, size_t data_length) {
-     cert_type = dtls_uint8_to_int(data);
-     data += sizeof(uint8);
-+
-     if (cert_type == TLS_CERT_TYPE_RAW_PUBLIC_KEY)
--      return 0;
-+        return 0;
-+#ifdef DTLS_X509
-+    if (cert_type == TLS_CERT_TYPE_X509)
-+        return 0;
-+#endif
-   }
-   dtls_warn("no supported certificate type found\n");
-@@ -962,7 +992,12 @@ dtls_check_tls_extension(dtls_peer_t *peer,
-         if (verify_ext_cert_type(data, j))
-             goto error;
-         } else {
-+#ifndef DTLS_X509
-         if (dtls_uint8_to_int(data) != TLS_CERT_TYPE_RAW_PUBLIC_KEY)
-+#else
-+        if ((dtls_uint8_to_int(data) != TLS_CERT_TYPE_RAW_PUBLIC_KEY) &&
-+            (dtls_uint8_to_int(data) != TLS_CERT_TYPE_X509))
-+#endif
-           goto error;
-         }
-         break;
-@@ -972,7 +1007,12 @@ dtls_check_tls_extension(dtls_peer_t *peer,
-         if (verify_ext_cert_type(data, j))
-             goto error;
-         } else {
-+#ifndef DTLS_X509
-         if (dtls_uint8_to_int(data) != TLS_CERT_TYPE_RAW_PUBLIC_KEY)
-+#else
-+        if ((dtls_uint8_to_int(data) != TLS_CERT_TYPE_RAW_PUBLIC_KEY) &&
-+            (dtls_uint8_to_int(data) != TLS_CERT_TYPE_X509))
-+#endif
-           goto error;
-         }
-         break;
-@@ -1138,7 +1178,7 @@ check_client_keyexchange(dtls_context_t *ctx,
-                        dtls_handshake_parameters_t *handshake,
-                        uint8 *data, size_t length) {
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
-   if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(handshake->cipher) ||
-        is_tls_ecdh_anon_with_aes_128_cbc_sha_256(handshake->cipher) ) {
-@@ -1529,7 +1569,6 @@ dtls_prepare_record(dtls_peer_t *peer, dtls_security_parameters_t *security,
-     memcpy(A_DATA + 8,  &DTLS_RECORD_HEADER(sendbuf)->content_type, 3); /* type and version */
-     dtls_int_to_uint16(A_DATA + 11, res - 8); /* length */
--
-     res = dtls_encrypt(start + 8, res - 8, start + 8, nonce,
-                dtls_kb_local_write_key(security, peer->role),
-                dtls_kb_key_size(security, peer->role),
-@@ -1841,7 +1880,7 @@ dtls_verify_peer(dtls_context_t *ctx,
- #undef mycookie
- }
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
- static int
- dtls_check_ecdsa_signature_elem(uint8 *data, size_t data_length,
-                               unsigned char **result_r,
-@@ -2025,8 +2064,13 @@ dtls_send_server_hello(dtls_context_t *ctx, dtls_peer_t *peer)
-     /* length of this extension type */
-     dtls_int_to_uint16(p, 1);
-     p += sizeof(uint16);
-+#ifdef DTLS_X509
-+    if (CALL(ctx, is_x509_active) == 0)
-+      dtls_int_to_uint8(p, TLS_CERT_TYPE_X509);
-+    else
-+#endif /* DTLS_X509 */
-+      dtls_int_to_uint8(p, TLS_CERT_TYPE_RAW_PUBLIC_KEY);
--    dtls_int_to_uint8(p, TLS_CERT_TYPE_RAW_PUBLIC_KEY);
-     p += sizeof(uint8);
-     /* client certificate type extension */
-@@ -2037,7 +2081,13 @@ dtls_send_server_hello(dtls_context_t *ctx, dtls_peer_t *peer)
-     dtls_int_to_uint16(p, 1);
-     p += sizeof(uint16);
--    dtls_int_to_uint8(p, TLS_CERT_TYPE_RAW_PUBLIC_KEY);
-+#ifdef DTLS_X509
-+    if (CALL(ctx, is_x509_active) == 0)
-+      dtls_int_to_uint8(p, TLS_CERT_TYPE_X509);
-+    else
-+#endif /* DTLS_X509 */
-+      dtls_int_to_uint8(p, TLS_CERT_TYPE_RAW_PUBLIC_KEY);
-+
-     p += sizeof(uint8);
-     /* ec_point_formats */
-@@ -2072,7 +2122,7 @@ dtls_send_certificate_ecdsa(dtls_context_t *ctx, dtls_peer_t *peer,
-   uint8 buf[DTLS_CE_LENGTH];
-   uint8 *p;
--  /* Certificate 
-+  /* Certificate
-    *
-    * Start message construction at beginning of buffer. */
-   p = buf;
-@@ -2097,7 +2147,46 @@ dtls_send_certificate_ecdsa(dtls_context_t *ctx, dtls_peer_t *peer,
-   return dtls_send_handshake_msg(ctx, peer, DTLS_HT_CERTIFICATE,
-                                buf, p - buf);
- }
-+#endif /* DTLS_ECC */
-+
-+#ifdef DTLS_X509
-+static int
-+dtls_send_certificate_x509(dtls_context_t *ctx, dtls_peer_t *peer)
-+{
-+  uint8 buf[DTLS_MAX_CERT_SIZE];
-+  uint8 *p;
-+  int ret;
-+  unsigned char *cert;
-+  size_t cert_size;
-+
-+  dtls_info("\n dtls_send_certificate_ecdsa\n");
-+  ret = CALL(ctx, get_x509_cert, &peer->session,
-+          (const unsigned char **)&cert, &cert_size);
-+
-+  if (ret < 0) {
-+    dtls_alert_fatal_create(DTLS_ALERT_HANDSHAKE_FAILURE);
-+    return ret;
-+  }
-+
-+  /* Certificate
-+   *
-+   * Start message construction at beginning of buffer. */
-+  p = buf;
-+
-+  dtls_int_to_uint24(p, cert_size); /* certificates length */
-+  p += sizeof(uint24);
-+
-+  memcpy(p, cert, cert_size);
-+  p += cert_size;
-+
-+  assert(p - buf <= sizeof(buf));
-+
-+  return dtls_send_handshake_msg(ctx, peer, DTLS_HT_CERTIFICATE,
-+                               buf, p - buf);
-+}
-+#endif /* DTLS_X509 */
-+#if defined(DTLS_X509) || defined(DTLS_ECC)
- static uint8 *
- dtls_add_ecdsa_signature_elem(uint8 *p, uint32_t *point_r, uint32_t *point_s)
- {
-@@ -2204,7 +2293,6 @@ dtls_send_server_key_exchange_ecdh(dtls_context_t *ctx, dtls_peer_t *peer,
-   dtls_ecdsa_generate_key(config->keyx.ecc.own_eph_priv,
-               ephemeral_pub_x, ephemeral_pub_y,
-               DTLS_EC_KEY_SIZE);
--
-   if(ecdsa) {
-       /* sign the ephemeral and its paramaters */
-            dtls_ecdsa_create_sig(key->priv_key, DTLS_EC_KEY_SIZE,
-@@ -2221,7 +2309,7 @@ dtls_send_server_key_exchange_ecdh(dtls_context_t *ctx, dtls_peer_t *peer,
-   return dtls_send_handshake_msg(ctx, peer, DTLS_HT_SERVER_KEY_EXCHANGE,
-                                buf, p - buf);
- }
--#endif /* DTLS_ECC */
-+#endif /* defined(DTLS_X509) || defined(DTLS_ECC) */
- #if defined(DTLS_PSK) && defined(DTLS_ECC)
- static int dtls_send_server_key_exchange_ecdhe_psk(dtls_context_t *ctx, dtls_peer_t *peer,
-@@ -2327,7 +2415,7 @@ dtls_send_server_key_exchange_psk(dtls_context_t *ctx, dtls_peer_t *peer,
- }
- #endif /* DTLS_PSK */
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
- static int
- dtls_send_server_certificate_request(dtls_context_t *ctx, dtls_peer_t *peer)
- {
-@@ -2401,7 +2489,7 @@ dtls_send_server_hello_msgs(dtls_context_t *ctx, dtls_peer_t *peer)
-   ecdh_anon = is_tls_ecdh_anon_with_aes_128_cbc_sha_256(peer->handshake_params->cipher);
-   ecdhe_psk = is_tls_ecdhe_psk_with_aes_128_cbc_sha_256(peer->handshake_params->cipher);
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
-   if(ecdh_anon) {
-       res = dtls_send_server_key_exchange_ecdh(ctx, peer, NULL);
-@@ -2413,13 +2501,24 @@ dtls_send_server_hello_msgs(dtls_context_t *ctx, dtls_peer_t *peer)
-   else if (ecdsa) {
-     const dtls_ecc_key_t *ecdsa_key;
--    res = CALL(ctx, get_ecdsa_key, &peer->session, &ecdsa_key);
-+#ifdef DTLS_X509
-+    if (CALL(ctx, is_x509_active) == 0)
-+      res = CALL(ctx, get_x509_key, &peer->session, &ecdsa_key);
-+    else
-+#endif /* DTLS_X509 */
-+      res = CALL(ctx, get_ecdsa_key, &peer->session, &ecdsa_key);
-+
-     if (res < 0) {
--      dtls_crit("no ecdsa certificate to send in certificate\n");
-+        dtls_debug("no ecdsa key to send\n");
-       return res;
-     }
--    res = dtls_send_certificate_ecdsa(ctx, peer, ecdsa_key);
-+#ifdef DTLS_X509
-+    if (CALL(ctx, is_x509_active) == 0)
-+      res = dtls_send_certificate_x509(ctx, peer);
-+    else
-+#endif /* DTLS_X509 */
-+      res = dtls_send_certificate_ecdsa(ctx, peer, ecdsa_key);
-     if (res < 0) {
-       dtls_debug("dtls_server_hello: cannot prepare Certificate record\n");
-@@ -2434,9 +2533,8 @@ dtls_send_server_hello_msgs(dtls_context_t *ctx, dtls_peer_t *peer)
-     }
-     if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher) &&
--      is_ecdsa_client_auth_supported(ctx)) {
-+      (is_ecdsa_client_auth_supported(ctx) || (is_x509_client_auth_supported(ctx)))) {
-       res = dtls_send_server_certificate_request(ctx, peer);
--
-       if (res < 0) {
-         dtls_debug("dtls_server_hello(with ECDSA): cannot prepare certificate Request record\n");
-         return res;
-@@ -2554,7 +2652,7 @@ dtls_send_client_key_exchange(dtls_context_t *ctx, dtls_peer_t *peer)
-     break;
-   }
- #endif /* DTLS_PSK */
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
-   case TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-   case TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256: {
-     uint8 *ephemeral_pub_x;
-@@ -2644,7 +2742,7 @@ dtls_send_client_key_exchange(dtls_context_t *ctx, dtls_peer_t *peer)
-                                buf, p - buf);
- }
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
- static int
- dtls_send_certificate_verify_ecdh(dtls_context_t *ctx, dtls_peer_t *peer,
-                                  const dtls_ecc_key_t *key)
-@@ -2723,6 +2821,7 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-   int ecdsa = 0;
-   int ecdh_anon = 0;
-   int ecdhe_psk = 0;
-+  int x509 = 0;
-   dtls_handshake_parameters_t *handshake = peer->handshake_params;
-   dtls_tick_t now;
-@@ -2733,6 +2832,7 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-         break;
-       case TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-         ecdsa = is_ecdsa_supported(ctx, 1);
-+        x509 = is_x509_supported(ctx, 1);
-         break;
-       case TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256:
-         ecdh_anon = is_ecdh_anon_supported(ctx);
-@@ -2745,11 +2845,12 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-         ecdsa = is_ecdsa_supported(ctx, 1);
-         ecdh_anon = is_ecdh_anon_supported(ctx);
-         ecdhe_psk = is_ecdhe_psk_supported(ctx);
-+        x509 = is_x509_supported(ctx, 1);
-         break;
-    }
--  cipher_size = 2 + (ecdsa ? 2 : 0) + (psk ? 2 : 0) + (ecdh_anon ? 2 : 0) + (ecdhe_psk ? 2 : 0);
--  extension_size = (ecdsa) ? (2 + 6 + 6 + 8 + 6) : 0;
-+  cipher_size = 2 + ((ecdsa || x509) ? 2 : 0) + (psk ? 2 : 0) + (ecdh_anon ? 2 : 0) + (ecdhe_psk ? 2 : 0);
-+  extension_size = (ecdsa || x509) ? (2 + 6 + 6 + 8 + 6) : 0;
-   if (cipher_size == 0) {
-     dtls_crit("no cipher callbacks implemented\n");
-@@ -2799,7 +2900,7 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-     dtls_int_to_uint16(p, TLS_PSK_WITH_AES_128_CCM_8);
-     p += sizeof(uint16);
-   }
--  if (ecdsa) {
-+  if (ecdsa || x509) {
-     dtls_int_to_uint16(p, TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8);
-     p += sizeof(uint16);
-   }
-@@ -2821,7 +2922,7 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-     p += sizeof(uint16);
-   }
--  if (ecdsa) {
-+  if (ecdsa || x509) {
-     /* client certificate type extension */
-     dtls_int_to_uint16(p, TLS_EXT_CLIENT_CERTIFICATE_TYPE);
-     p += sizeof(uint16);
-@@ -2834,7 +2935,13 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-     dtls_int_to_uint8(p, 1);
-     p += sizeof(uint8);
--    dtls_int_to_uint8(p, TLS_CERT_TYPE_RAW_PUBLIC_KEY);
-+#ifdef DTLS_X509
-+    if (CALL(ctx, is_x509_active) == 0)
-+      dtls_int_to_uint8(p, TLS_CERT_TYPE_X509);
-+    else
-+#endif /* DTLS_X509 */
-+      dtls_int_to_uint8(p, TLS_CERT_TYPE_RAW_PUBLIC_KEY);
-+
-     p += sizeof(uint8);
-     /* client certificate type extension */
-@@ -2849,7 +2956,13 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
-     dtls_int_to_uint8(p, 1);
-     p += sizeof(uint8);
--    dtls_int_to_uint8(p, TLS_CERT_TYPE_RAW_PUBLIC_KEY);
-+#ifdef DTLS_X509
-+    if (CALL(ctx, is_x509_active) == 0)
-+      dtls_int_to_uint8(p, TLS_CERT_TYPE_X509);
-+    else
-+#endif /* DTLS_X509 */
-+      dtls_int_to_uint8(p, TLS_CERT_TYPE_RAW_PUBLIC_KEY);
-+
-     p += sizeof(uint8);
-     /* elliptic_curves */
-@@ -2985,8 +3098,9 @@ check_server_hello_verify_request(dtls_context_t *ctx,
- }
- #ifdef DTLS_ECC
-+
- static int
--check_server_certificate(dtls_context_t *ctx, 
-+check_peer_certificate(dtls_context_t *ctx,
-                        dtls_peer_t *peer,
-                        uint8 *data, size_t data_length)
- {
-@@ -3036,7 +3150,41 @@ check_server_certificate(dtls_context_t *ctx,
-   return 0;
- }
-+#endif /* DTLS_ECC */
-+
-+#ifdef DTLS_X509
-+static int
-+check_peer_certificate_x509(dtls_context_t *ctx,
-+                       dtls_peer_t *peer,
-+                       uint8 *data, size_t data_length)
-+{
-+  int ret;
-+  dtls_handshake_parameters_t *config = peer->handshake_params;
-+  int cert_length;
-+
-+  dtls_info("\n check_peer_certificate_x509\n");
-+  update_hs_hash(peer, data, data_length);
-+
-+  assert(is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(config->cipher));
-+
-+  data += DTLS_HS_LENGTH;
-+
-+  cert_length = dtls_uint24_to_int(data);
-+  data += sizeof(uint24);
-+
-+  ret = CALL(ctx, verify_x509_cert, &peer->session, data, cert_length,
-+          config->keyx.ecc.other_pub_x, sizeof(config->keyx.ecc.other_pub_x),
-+          config->keyx.ecc.other_pub_y, sizeof(config->keyx.ecc.other_pub_y));
-+  if (ret < 0) {
-+    dtls_warn("The certificate was not accepted\n");
-+    return ret;
-+  }
-+
-+  return 0;
-+}
-+#endif /* DTLS_X509 */
-+#if defined(DTLS_X509) || defined(DTLS_ECC)
- static int
- check_server_key_exchange_ecdsa(dtls_context_t *ctx,
-                               dtls_peer_t *peer,
-@@ -3385,13 +3533,17 @@ check_certificate_request(dtls_context_t *ctx,
- }
- static int
--check_server_hellodone(dtls_context_t *ctx, 
-+check_server_hellodone(dtls_context_t *ctx,
-                     dtls_peer_t *peer,
-                     uint8 *data, size_t data_length)
- {
--  int res;
-+  int res = 0;
- #ifdef DTLS_ECC
-   const dtls_ecc_key_t *ecdsa_key;
-+#ifdef DTLS_X509
-+  unsigned char *cert;
-+  size_t cert_size;
-+#endif /* DTLS_X509 */
- #endif /* DTLS_ECC */
-   dtls_handshake_parameters_t *handshake = peer->handshake_params;
-@@ -3400,16 +3552,25 @@ check_server_hellodone(dtls_context_t *ctx,
-   update_hs_hash(peer, data, data_length);
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
-   if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(handshake->cipher) && handshake->do_client_auth) {
--
--    res = CALL(ctx, get_ecdsa_key, &peer->session, &ecdsa_key);
-+#ifdef DTLS_X509
-+    if (CALL(ctx, is_x509_active) == 0)
-+      res = CALL(ctx, get_x509_key, &peer->session, &ecdsa_key);
-+    else
-+#endif /* DTLS_X509 */
-+      res = CALL(ctx, get_ecdsa_key, &peer->session, &ecdsa_key);
-     if (res < 0) {
--      dtls_crit("no ecdsa certificate to send in certificate\n");
-+      dtls_crit("no ecdsa key to use\n");
-       return res;
-     }
--    res = dtls_send_certificate_ecdsa(ctx, peer, ecdsa_key);
-+#ifdef DTLS_X509
-+    if (CALL(ctx, is_x509_active) == 0)
-+      res = dtls_send_certificate_x509(ctx, peer);
-+    else
-+#endif /* DTLS_X509 */
-+      res = dtls_send_certificate_ecdsa(ctx, peer, ecdsa_key);
-     if (res < 0) {
-       dtls_debug("dtls_server_hello: cannot prepare Certificate record\n");
-@@ -3428,7 +3589,6 @@ check_server_hellodone(dtls_context_t *ctx,
- #ifdef DTLS_ECC
-   if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(handshake->cipher) && handshake->do_client_auth) {
--
-     res = dtls_send_certificate_verify_ecdh(ctx, peer, ecdsa_key);
-     if (res < 0) {
-@@ -3655,16 +3815,21 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-     break;
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
-   case DTLS_HT_CERTIFICATE:
-     if ((role == DTLS_CLIENT && state != DTLS_STATE_WAIT_SERVERCERTIFICATE) ||
-         (role == DTLS_SERVER && state != DTLS_STATE_WAIT_CLIENTCERTIFICATE)) {
-       return dtls_alert_fatal_create(DTLS_ALERT_UNEXPECTED_MESSAGE);
-     }
--    err = check_server_certificate(ctx, peer, data, data_length);
-+#ifdef DTLS_X509
-+    if (CALL(ctx, is_x509_active) == 0)
-+      err = check_peer_certificate_x509(ctx, peer, data, data_length);
-+    else
-+#endif /* DTLS_X509 */
-+      err = check_peer_certificate(ctx, peer, data, data_length);
-     if (err < 0) {
--      dtls_warn("error in check_server_certificate err: %i\n", err);
-+      dtls_warn("error in check_peer_certificate err: %i\n", err);
-       return err;
-     }
-     if (role == DTLS_CLIENT) {
-@@ -3679,7 +3844,7 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-   case DTLS_HT_SERVER_KEY_EXCHANGE:
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
-     if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher)) {
-       if (state != DTLS_STATE_WAIT_SERVERKEYEXCHANGE) {
-         return dtls_alert_fatal_create(DTLS_ALERT_UNEXPECTED_MESSAGE);
-@@ -3811,13 +3976,13 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-     update_hs_hash(peer, data, data_length);
-     if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher) &&
--      is_ecdsa_client_auth_supported(ctx))
-+            (is_ecdsa_client_auth_supported(ctx) || (is_x509_client_auth_supported(ctx))))
-       peer->state = DTLS_STATE_WAIT_CERTIFICATEVERIFY; //ecdsa
-     else
-       peer->state = DTLS_STATE_WAIT_CHANGECIPHERSPEC; //psk || ecdh_anon
-     break;
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
-   case DTLS_HT_CERTIFICATE_VERIFY:
-     if (state != DTLS_STATE_WAIT_CERTIFICATEVERIFY) {
-@@ -3934,7 +4099,7 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, session_t *session,
-       return err;
-     }
-     if (is_tls_ecdhe_ecdsa_with_aes_128_ccm_8(peer->handshake_params->cipher) &&
--      is_ecdsa_client_auth_supported(ctx))
-+            (is_ecdsa_client_auth_supported(ctx) || (is_x509_client_auth_supported(ctx))))
-       peer->state = DTLS_STATE_WAIT_CLIENTCERTIFICATE; //ecdhe
-     else
-       peer->state = DTLS_STATE_WAIT_CLIENTKEYEXCHANGE; //psk, ecdh_anon
-@@ -4261,7 +4426,7 @@ dtls_handle_message(dtls_context_t *ctx,
-           data = msg + DTLS_RH_LENGTH;
-           data_length = rlen - DTLS_RH_LENGTH;
-           state = DTLS_STATE_WAIT_CLIENTHELLO;
--          role = DTLS_SERVER;       
-+          role = DTLS_SERVER;
-         } else {
-         int err =  dtls_alert_fatal_create(DTLS_ALERT_DECRYPT_ERROR);
-           dtls_info("decrypt_verify() failed\n");
-@@ -4506,7 +4671,7 @@ dtls_connect_peer(dtls_context_t *ctx, dtls_peer_t *peer) {
-   res = dtls_send_client_hello(ctx, peer, NULL, 0);
-   if (res < 0)
-     dtls_warn("cannot send ClientHello\n");
--  else 
-+  else
-     peer->state = DTLS_STATE_CLIENTHELLO;
-   return res;
-diff --git a/extlibs/tinydtls/dtls.h b/extlibs/tinydtls/dtls.h
-index 7d2bc19..c5a86df 100644
---- a/extlibs/tinydtls/dtls.h
-+++ b/extlibs/tinydtls/dtls.h
-@@ -56,6 +56,10 @@
- #define DTLS_VERSION 0xfefd   /* DTLS v1.2 */
- #endif
-+#ifdef DTLS_X509
-+#define DTLS_MAX_CERT_SIZE       1400
-+#endif
-+
- typedef enum dtls_credentials_type_t {
-   DTLS_PSK_HINT, DTLS_PSK_IDENTITY, DTLS_PSK_KEY
- } dtls_credentials_type_t;
-@@ -181,10 +185,11 @@ typedef struct {
-    *                session.
-    * @return @c 0 if result is set, or less than zero on error.
-    */
--  int (*get_ecdsa_key)(struct dtls_context_t *ctx, 
-+  int (*get_ecdsa_key)(struct dtls_context_t *ctx,
-                      const session_t *session,
-                      const dtls_ecc_key_t **result);
-+
-   /**
-    * Called during handshake to check the peer's pubic key in this
-    * session. If the public key matches the session and should be
-@@ -211,12 +216,111 @@ typedef struct {
-    *   return dtls_alert_fatal_create(DTLS_ALERT_CERTIFICATE_UNKNOWN);
-    *   return dtls_alert_fatal_create(DTLS_ALERT_UNKNOWN_CA);
-    */
--  int (*verify_ecdsa_key)(struct dtls_context_t *ctx, 
-+  int (*verify_ecdsa_key)(struct dtls_context_t *ctx,
-                         const session_t *session,
-                         const unsigned char *other_pub_x,
-                         const unsigned char *other_pub_y,
-                         size_t key_size);
- #endif /* DTLS_ECC */
-+#ifdef DTLS_X509
-+  /**
-+   * Called during handshake to get the server's or client's ecdsa
-+   * key used to authenticate this server or client in this
-+   * session. If found, the key must be stored in @p result and
-+   * the return value must be @c 0. If not found, @p result is
-+   * undefined and the return value must be less than zero.
-+   *
-+   * If ECDSA should not be supported, set this pointer to NULL.
-+   *
-+   * Implement this if you want to provide your own certificate to
-+   * the other peer. This is mandatory for a server providing X.509
-+   * support and optional for a client. A client doing DTLS client
-+   * authentication has to implementing this callback.
-+   *
-+   * @param ctx     The current dtls context.
-+   * @param session The session where the key will be used.
-+   * @param result  Must be set to the key object to used for the given
-+   *                session.
-+   * @return @c 0 if result is set, or less than zero on error.
-+   */
-+  int (*get_x509_key)(struct dtls_context_t *ctx,
-+               const session_t *session,
-+               const dtls_ecc_key_t **result);
-+  /**
-+   * Called during handshake to get the server's or client's
-+   * certificate used to authenticate this server or client in this
-+   * session. If found, the certificate must be stored in @p cert and
-+   * the return value must be @c 0. If not found, @p cert is
-+   * undefined and the return value must be less than zero.
-+   *
-+   * If X.509 should not be supported, set this pointer to NULL.
-+   *
-+   * Implement this if you want to provide your own certificate to
-+   * the other peer. This is mandatory for a server providing X.509
-+   * support and optional for a client. A client doing DTLS client
-+   * authentication has to implementing this callback.
-+   *
-+   * @param ctx       The current dtls context.
-+   * @param session   The session where the certificate will be used.
-+   * @param cert      Must be set to the certificate object to used for
-+   *                  the given session.
-+   * @param cert_size Size of certificate in bytes.
-+   * @return @c 0 if result is set, or less than zero on error.
-+   */
-+  int (*get_x509_cert)(struct dtls_context_t *ctx,
-+                      const session_t *session,
-+                      const unsigned char **cert,
-+                      size_t *cert_size);
-+
-+  /**
-+   * Called during handshake to check the peer's certificate in this
-+   * session. If the certificate matches the session and is valid the
-+   * return value must be @c 0. If not valid, the return value must be
-+   * less than zero.
-+   *
-+   * If X.509 should not be supported, set this pointer to NULL.
-+   *
-+   * Implement this if you want to verify the other peers certificate.
-+   * This is mandatory for a DTLS client doing based X.509
-+   * authentication. A server implementing this will request the
-+   * client to do DTLS client authentication.
-+   *
-+   * @param ctx       The current dtls context.
-+   * @param session   The session where the key will be used.
-+   * @param cert      Peer's certificate to check.
-+   * @param cert_size Size of certificate in bytes.
-+   * @param x         Allocated memory to store peer's public key part x.
-+   * @param x_size    Size of allocated memory to store peer's public key part x.
-+   * @param y         Allocated memory to store peer's public key part y.
-+   * @param y_size    Size of allocated memory to store peer's public key part y.
-+   * @return @c 0 if public key matches, or less than zero on error.
-+   * error codes:
-+   *   return dtls_alert_fatal_create(DTLS_ALERT_BAD_CERTIFICATE);
-+   *   return dtls_alert_fatal_create(DTLS_ALERT_UNSUPPORTED_CERTIFICATE);
-+   *   return dtls_alert_fatal_create(DTLS_ALERT_CERTIFICATE_REVOKED);
-+   *   return dtls_alert_fatal_create(DTLS_ALERT_CERTIFICATE_EXPIRED);
-+   *   return dtls_alert_fatal_create(DTLS_ALERT_CERTIFICATE_UNKNOWN);
-+   *   return dtls_alert_fatal_create(DTLS_ALERT_UNKNOWN_CA);
-+   */
-+  int (*verify_x509_cert)(struct dtls_context_t *ctx,
-+                         const session_t *session,
-+                         const unsigned char *cert,
-+                         size_t cert_size,
-+               unsigned char *x,
-+                         size_t x_size,
-+               unsigned char *y,
-+                         size_t y_size);
-+
-+  /**
-+   * Called during handshake to check if certificate format should be X.509
-+   *
-+   * If X.509 should not be supported, set this pointer to NULL.
-+   *
-+   * @param ctx       The current dtls context.
-+   * @return @c 0 if certificate format should be X.509, or less than zero on error.
-+   */
-+  int (*is_x509_active)(struct dtls_context_t *ctx);
-+#endif /* DTLS_X509 */
- } dtls_handler_t;
- /** Holds global information of the DTLS engine. */
-diff --git a/extlibs/tinydtls/dtls_config.h b/extlibs/tinydtls/dtls_config.h
-index 39df8c9..c6c4e39 100644
---- a/extlibs/tinydtls/dtls_config.h
-+++ b/extlibs/tinydtls/dtls_config.h
-@@ -66,9 +66,27 @@
- #endif
- #endif /* CONTIKI */
-+/* Define if building universal (internal helper macro) */
-+/* #undef AC_APPLE_UNIVERSAL_BUILD */
-+
-+/* Define to 1 if building with X.509 support */
-+#define DTLS_X509 1
-+
-+/* Define to 1 if you have the <arpa/inet.h> header file. */
-+#define HAVE_ARPA_INET_H 1
-+
- /* Define to 1 if you have the <assert.h> header file. */
- #define HAVE_ASSERT_H 1
-+/* Define to 1 if you have the <fcntl.h> header file. */
-+#define HAVE_FCNTL_H 1
-+
-+/* Define to 1 if you have the `fls' function. */
-+/* #undef HAVE_FLS */
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#define HAVE_INTTYPES_H 1
-+
- /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-    to 0 otherwise. */
- #define HAVE_MALLOC 1
-@@ -79,6 +97,21 @@
- /* Define to 1 if you have the `memset' function. */
- #define HAVE_MEMSET 1
-+/* Define to 1 if you have the <netdb.h> header file. */
-+#define HAVE_NETDB_H 1
-+
-+/* Define to 1 if you have the <netinet/in.h> header file. */
-+#define HAVE_NETINET_IN_H 1
-+
-+/* Define to 1 if you have the `select' function. */
-+#define HAVE_SELECT 1
-+
-+/* Define to 1 if struct sockaddr_in6 has a member sin6_len. */
-+/* #undef HAVE_SOCKADDR_IN6_SIN6_LEN */
-+
-+/* Define to 1 if you have the `socket' function. */
-+#define HAVE_SOCKET 1
-+
- /* Define to 1 if you have the <stddef.h> header file. */
- #define HAVE_STDDEF_H 1
-@@ -103,9 +136,27 @@
- /* Define to 1 if you have the `strnlen' function. */
- #define HAVE_STRNLEN 1
-+/* Define to 1 if you have the <sys/param.h> header file. */
-+#define HAVE_SYS_PARAM_H 1
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+#define HAVE_SYS_SOCKET_H 1
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#define HAVE_SYS_TIME_H 1
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
- /* Define to 1 if you have the <time.h> header file. */
- #define HAVE_TIME_H 1
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#define HAVE_UNISTD_H 1
-+
- /* Define to 1 if you have the `vprintf' function. */
- #define HAVE_VPRINTF 1
-diff --git a/extlibs/tinydtls/dtls_config.h.in b/extlibs/tinydtls/dtls_config.h.in
-index a29077c..adc8dc5 100644
---- a/extlibs/tinydtls/dtls_config.h.in
-+++ b/extlibs/tinydtls/dtls_config.h.in
-@@ -68,6 +68,9 @@
- /* Define if building universal (internal helper macro) */
- #undef AC_APPLE_UNIVERSAL_BUILD
-+/* Define to 1 if building with X.509 support */
-+#undef DTLS_X509
-+
- /* Define to 1 if you have the <arpa/inet.h> header file. */
- #undef HAVE_ARPA_INET_H
-diff --git a/extlibs/tinydtls/global.h b/extlibs/tinydtls/global.h
-index 8b3c518..048bacd 100644
---- a/extlibs/tinydtls/global.h
-+++ b/extlibs/tinydtls/global.h
-@@ -55,7 +55,7 @@ typedef unsigned char uint48[6];
-     When Peers are sending bigger messages this causes problems. Californium
-     with ECDSA needs at least 220 */
- #ifdef WITH_CONTIKI
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
- #define DTLS_MAX_BUF 200
- #else /* DTLS_ECC */
- #define DTLS_MAX_BUF 100
-@@ -96,7 +96,10 @@ typedef enum {
- #define TLS_EXT_SERVER_CERTIFICATE_TYPE       20 /* see RFC 7250 */
- #define TLS_EXT_ENCRYPT_THEN_MAC      22 /* see RFC 7366 */
--#define TLS_CERT_TYPE_RAW_PUBLIC_KEY  2 /* see RFC 7250 */
-+/* see http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#tls-extensiontype-values-3 */
-+#define TLS_CERT_TYPE_X509              0 /* see RFC 6091 */
-+#define TLS_CERT_TYPE_RAW_PUBLIC_KEY    2 /* see RFC 7250 */
-+
- #define TLS_EXT_ELLIPTIC_CURVES_SECP256R1     23 /* see RFC 4492 */
-diff --git a/extlibs/tinydtls/netq.h b/extlibs/tinydtls/netq.h
-index a771b23..fea7511 100644
---- a/extlibs/tinydtls/netq.h
-+++ b/extlibs/tinydtls/netq.h
-@@ -23,7 +23,7 @@
-  */
- #ifndef NETQ_MAXCNT
--#ifdef DTLS_ECC
-+#if defined(DTLS_ECC) || defined(DTLS_X509)
- #define NETQ_MAXCNT 5 /**< maximum number of elements in netq structure */
- #elif defined(DTLS_PSK)
- #define NETQ_MAXCNT 3 /**< maximum number of elements in netq structure */
-diff --git a/extlibs/tinydtls/tests/Makefile.in b/extlibs/tinydtls/tests/Makefile.in
-index 3a50695..a2d8ca4 100644
---- a/extlibs/tinydtls/tests/Makefile.in
-+++ b/extlibs/tinydtls/tests/Makefile.in
-@@ -41,9 +41,9 @@ SOURCES:= dtls-server.c ccm-test.c prf-test.c \
- OBJECTS:= $(patsubst %.c, %.o, $(SOURCES))
- PROGRAMS:= $(patsubst %.c, %, $(SOURCES))
- HEADERS:=
--CFLAGS:=-Wall @CFLAGS@ 
-+CFLAGS:=-Wall @CFLAGS@
- CPPFLAGS:=-I$(top_srcdir) @CPPFLAGS@
--LDFLAGS:=-L$(top_builddir) 
-+LDFLAGS:=-L$(top_builddir)
- LDLIBS:=-ltinydtls @LIBS@
- DISTDIR=$(top_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
- FILES:=Makefile.in $(SOURCES) ccm-testdata.c #cbc_aes128-testdata.c
-diff --git a/extlibs/tinydtls/tests/dtls-client.c b/extlibs/tinydtls/tests/dtls-client.c
-index dfd34c8..2c4eff9 100644
---- a/extlibs/tinydtls/tests/dtls-client.c
-+++ b/extlibs/tinydtls/tests/dtls-client.c
-@@ -16,9 +16,34 @@
- #include <netdb.h>
- #include <signal.h>
--#include "global.h" 
--#include "debug.h" 
--#include "dtls.h" 
-+#include "global.h"
-+#include "debug.h"
-+#include "dtls.h"
-+
-+/**
-+ * @struct byte_array
-+ *
-+ * General purpose byte array structure.
-+ *
-+ * Contains pointer to array of bytes and it's length.
-+ */
-+
-+typedef struct
-+{
-+    uint8_t *data;    /**< Pointer to the byte array */
-+    size_t len;      /**< Data size */
-+} byte_array;
-+
-+
-+/**@def BYTE_ARRAY_INITIALIZER
-+ *
-+ * Initializes of existing byte array pointer to \a NULL.
-+ */
-+#undef BYTE_ARRAY_INITIALIZER
-+#define BYTE_ARRAY_INITIALIZER {NULL, 0}
-+
-+#define DTLS_PRIVATE_KEY_SIZE        (32)
-+#define DTLS_PUBLIC_KEY_SIZE         (64)
- #define DEFAULT_PORT 20220
-@@ -26,6 +51,7 @@
- #define PSK_SERVER_IDENTITY  "Server_identity"
- #define PSK_DEFAULT_KEY      "secretPSK"
- #define PSK_OPTIONS          "i:s:k:"
-+#define X509_OPTIONS         "x:r:u:"
- #ifdef __GNUC__
- #define UNUSED_PARAM __attribute__((unused))
-@@ -46,7 +72,105 @@ static dtls_str output_file = { 0, NULL }; /* output file name */
- static dtls_context_t *dtls_context = NULL;
- static dtls_context_t *orig_dtls_context = NULL;
-+#ifdef DTLS_X509
-+#define CLIENT_CRT_LEN 293
-+static const unsigned char g_client_certificate[CLIENT_CRT_LEN] = {
-+        0x00, 0x01, 0x22,
-+        0x30, 0x82, 0x01, 0x1e, 0x30, 0x81, 0xc4, 0xa0,
-+        0x03, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x38,
-+        0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce,
-+        0x3d, 0x04, 0x03, 0x02, 0x05, 0x00, 0x30, 0x17,
-+        0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04,
-+        0x03, 0x0c, 0x0c, 0x4c, 0x6f, 0x63, 0x61, 0x6c,
-+        0x20, 0x49, 0x53, 0x53, 0x55, 0x45, 0x52, 0x30,
-+        0x1e, 0x17, 0x0d, 0x31, 0x33, 0x30, 0x31, 0x30,
-+        0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a,
-+        0x17, 0x0d, 0x34, 0x39, 0x30, 0x31, 0x30, 0x31,
-+        0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x30,
-+        0x17, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55,
-+        0x04, 0x03, 0x0c, 0x0c, 0x4c, 0x6f, 0x63, 0x61,
-+        0x6c, 0x20, 0x43, 0x4c, 0x49, 0x45, 0x4e, 0x54,
-+        0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86,
-+        0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a,
-+        0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03,
-+        0x42, 0x00, 0x04, 0xe3, 0xd1, 0x67, 0x1e, 0xdc,
-+        0x46, 0xf4, 0x19, 0x50, 0x15, 0x2e, 0x3a, 0x2f,
-+        0xd8, 0x68, 0x6b, 0x37, 0x32, 0x84, 0x9e, 0x83,
-+        0x81, 0xbf, 0x25, 0x5d, 0xbb, 0x18, 0x07, 0x3c,
-+        0xbd, 0xf3, 0xab, 0xd3, 0xbf, 0x53, 0x59, 0xc9,
-+        0x1e, 0xce, 0x5b, 0x39, 0x6a, 0xe5, 0x60, 0xf3,
-+        0x70, 0xdb, 0x66, 0xb6, 0x80, 0xcb, 0x65, 0x0b,
-+        0x35, 0x2a, 0x62, 0x44, 0x89, 0x63, 0x64, 0x6f,
-+        0x6f, 0xbd, 0xf0, 0x30, 0x0c, 0x06, 0x08, 0x2a,
-+        0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x05,
-+        0x00, 0x03, 0x47, 0x00, 0x30, 0x44, 0x02, 0x20,
-+        0x60, 0xdc, 0x45, 0x77, 0x7d, 0xcb, 0xc3, 0xb4,
-+        0xba, 0x60, 0x5a, 0x2e, 0xe5, 0x4e, 0x19, 0x8b,
-+        0x48, 0x8a, 0x87, 0xd4, 0x66, 0xb4, 0x1a, 0x86,
-+        0x23, 0x67, 0xb8, 0xb6, 0x50, 0xfe, 0x4d, 0xde,
-+        0x02, 0x20, 0x60, 0x68, 0x46, 0xff, 0x74, 0x11,
-+        0xfb, 0x36, 0x13, 0xf4, 0xa7, 0x3d, 0xb7, 0x35,
-+        0x79, 0x23, 0x29, 0x14, 0x6a, 0x28, 0x09, 0xff,
-+        0x8c, 0x19, 0x26, 0xe3, 0x41, 0xc8, 0xe4, 0x13,
-+        0xbc, 0x8e};
-+//default client's key pair
-+static const unsigned char x509_priv_key[] = {
-+        0xf9, 0x42, 0xb4, 0x16, 0x89, 0x10, 0xf4, 0x07,
-+        0x99, 0xb2, 0xe2, 0x9a, 0xed, 0xd4, 0x39, 0xb8,
-+        0xca, 0xd4, 0x9d, 0x76, 0x11, 0x43, 0x3a, 0xac,
-+        0x14, 0xba, 0x17, 0x9d, 0x3e, 0xbb, 0xbf, 0xbc};
-+
-+static const unsigned char x509_pub_key_x[] = {
-+        0xe3, 0xd1, 0x67, 0x1e, 0xdc, 0x46, 0xf4, 0x19,
-+        0x50, 0x15, 0x2e, 0x3a, 0x2f, 0xd8, 0x68, 0x6b,
-+        0x37, 0x32, 0x84, 0x9e, 0x83, 0x81, 0xbf, 0x25,
-+        0x5d, 0xbb, 0x18, 0x07, 0x3c, 0xbd, 0xf3, 0xab};
-+
-+static const unsigned char x509_pub_key_y[] = {
-+        0xd3, 0xbf, 0x53, 0x59, 0xc9, 0x1e, 0xce, 0x5b,
-+        0x39, 0x6a, 0xe5, 0x60, 0xf3, 0x70, 0xdb, 0x66,
-+        0xb6, 0x80, 0xcb, 0x65, 0x0b, 0x35, 0x2a, 0x62,
-+        0x44, 0x89, 0x63, 0x64, 0x6f, 0x6f, 0xbd, 0xf0};
-+
-+//default CA pub key
-+static const unsigned char x509_ca_pub_x[] = {
-+        0x57, 0x94, 0x7f, 0x98, 0x7a, 0x02, 0x67, 0x09,
-+        0x25, 0xc1, 0xcb, 0x5a, 0xf5, 0x46, 0xfb, 0xad,
-+        0xf7, 0x68, 0x94, 0x8c, 0xa7, 0xe3, 0xf0, 0x5b,
-+        0xc3, 0x6b, 0x5c, 0x9b, 0xd3, 0x7d, 0x74, 0x12
-+};
-+static const unsigned char x509_ca_pub_y[] = {
-+        0xce, 0x68, 0xbc, 0x55, 0xf5, 0xf8, 0x1b, 0x3d,
-+        0xef, 0xed, 0x1f, 0x2b, 0xd2, 0x69, 0x5d, 0xcf,
-+        0x79, 0x16, 0xa6, 0xbd, 0x97, 0x96, 0x27, 0x60,
-+        0x5d, 0xd1, 0xb7, 0x93, 0xa2, 0x4a, 0x62, 0x4d
-+};
-+
-+//default server's key pair
-+static const unsigned char serv_pub_key_x[] = {
-+        0x07, 0x88, 0x10, 0xdc, 0x62, 0xd7, 0xe6, 0x9b,
-+        0x7c, 0xad, 0x6e, 0x78, 0xb0, 0x5f, 0x9a, 0x00,
-+        0x11, 0x74, 0x2c, 0x8b, 0xaf, 0x09, 0x65, 0x7c,
-+        0x86, 0x8e, 0x55, 0xcb, 0x39, 0x55, 0x72, 0xc6};
-+
-+static const unsigned char serv_pub_key_y[] = {
-+        0x65, 0x71, 0xcd, 0x03, 0xdc, 0x2a, 0x4f, 0x46,
-+        0x5b, 0x14, 0xc8, 0x27, 0x74, 0xab, 0xf4, 0x1f,
-+        0xc1, 0x35, 0x0d, 0x42, 0xbc, 0xc2, 0x9f, 0xb5,
-+        0xc1, 0x79, 0xb6, 0x8b, 0xca, 0xdb, 0xff, 0x82};
-+
-+
-+static unsigned char x509_client_cert[DTLS_MAX_CERT_SIZE];
-+static size_t x509_client_cert_len = 0;
-+static unsigned char x509_client_priv[DTLS_PRIVATE_KEY_SIZE+1];
-+static size_t x509_client_priv_is_set = 0;
-+static unsigned char x509_ca_pub[DTLS_PUBLIC_KEY_SIZE+1];
-+static size_t x509_ca_pub_is_set = 0;
-+
-+static int x509_info_from_file = 0;
-+#endif /*DTLS_X509*/
-+#ifdef DTLS_ECC
- static const unsigned char ecdsa_priv_key[] = {
-                       0x41, 0xC1, 0xCB, 0x6B, 0x51, 0x24, 0x7A, 0x14,
-                       0x43, 0x21, 0x43, 0x5B, 0x7A, 0x80, 0xE7, 0x14,
-@@ -65,7 +189,8 @@ static const unsigned char ecdsa_pub_key_y[] = {
-                       0xE9, 0x3F, 0x98, 0x72, 0x09, 0xDA, 0xED, 0x0B,
-                       0x4F, 0xAB, 0xC3, 0x6F, 0xC7, 0x72, 0xF8, 0x29};
--#ifdef DTLS_PSK
-+#endif /*DTLS_ECC*/
-+#if defined(DTLS_PSK) || defined(DTLS_X509)
- ssize_t
- read_from_file(char *arg, unsigned char *buf, size_t max_buf_len) {
-   FILE *f;
-@@ -87,11 +212,11 @@ read_from_file(char *arg, unsigned char *buf, size_t max_buf_len) {
-     result += bytes_read;
-     max_buf_len -= bytes_read;
-   }
--
-   fclose(f);
-   return result;
- }
--
-+#endif /*DTLS_PSK||DTLS_X509*/
-+#ifdef DTLS_PSK
- /* The PSK information for DTLS */
- #define PSK_ID_MAXLEN 256
- #define PSK_MAXLEN 256
-@@ -149,13 +274,14 @@ static int
- get_ecdsa_key(struct dtls_context_t *ctx,
-             const session_t *session,
-             const dtls_ecc_key_t **result) {
-+    (void)ctx;
-+    (void)session;
-   static const dtls_ecc_key_t ecdsa_key = {
-     .curve = DTLS_ECDH_CURVE_SECP256R1,
-     .priv_key = ecdsa_priv_key,
-     .pub_key_x = ecdsa_pub_key_x,
-     .pub_key_y = ecdsa_pub_key_y
-   };
--
-   *result = &ecdsa_key;
-   return 0;
- }
-@@ -166,10 +292,115 @@ verify_ecdsa_key(struct dtls_context_t *ctx,
-                const unsigned char *other_pub_x,
-                const unsigned char *other_pub_y,
-                size_t key_size) {
-+  (void)ctx;
-+  (void)session;
-+  (void)other_pub_x;
-+  (void)other_pub_y;
-+  (void)key_size;
-   return 0;
- }
-+
- #endif /* DTLS_ECC */
-+#ifdef DTLS_X509
-+static int
-+get_x509_key(struct dtls_context_t *ctx,
-+          const session_t *session,
-+          const dtls_ecc_key_t **result) {
-+    (void)ctx;
-+    (void)session;
-+  static dtls_ecc_key_t ecdsa_key = {
-+    .curve = DTLS_ECDH_CURVE_SECP256R1,
-+    .priv_key = x509_priv_key,
-+    .pub_key_x = x509_pub_key_x,
-+    .pub_key_y = x509_pub_key_y
-+  };
-+  if (x509_info_from_file)
-+      ecdsa_key.priv_key = x509_client_priv;
-+  *result = &ecdsa_key;
-+  return 0;
-+}
-+
-+static int
-+get_x509_cert(struct dtls_context_t *ctx,
-+        const session_t *session,
-+        const unsigned char **cert,
-+        size_t *cert_size)
-+{
-+    (void)ctx;
-+    (void)session;
-+    if (x509_info_from_file)
-+    {
-+        *cert = x509_client_cert;
-+        *cert_size = x509_client_cert_len;
-+    }
-+    else
-+    {
-+        *cert = g_client_certificate;
-+        *cert_size = CLIENT_CRT_LEN;
-+    }
-+
-+    return 0;
-+}
-+
-+int check_certificate(byte_array cert_der_code, byte_array ca_public_key)
-+{
-+    (void)cert_der_code;
-+    (void)ca_public_key;
-+    return 0;
-+}
-+
-+static int verify_x509_cert(struct dtls_context_t *ctx, const session_t *session,
-+                                  const unsigned char *cert, size_t cert_size,
-+                                  unsigned char *x,
-+                                  size_t x_size,
-+                                  unsigned char *y,
-+                                  size_t y_size)
-+{
-+    int ret;
-+    const unsigned char *ca_pub_x;
-+    const unsigned char *ca_pub_y;
-+    byte_array cert_der_code = BYTE_ARRAY_INITIALIZER;
-+    byte_array ca_public_key = BYTE_ARRAY_INITIALIZER;
-+    unsigned char ca_pub_key[DTLS_PUBLIC_KEY_SIZE];
-+    (void)ctx;
-+    (void)session;
-+
-+    if (x509_info_from_file)
-+    {
-+        ca_pub_x = x509_ca_pub;
-+        ca_pub_y = x509_ca_pub + DTLS_PUBLIC_KEY_SIZE/2;
-+    }
-+    else
-+    {
-+        ca_pub_x = x509_ca_pub_x;
-+        ca_pub_y = x509_ca_pub_y;
-+    }
-+
-+    cert_der_code.data = (uint8_t *)cert;
-+    cert_der_code.len = cert_size;
-+
-+    ca_public_key.len = DTLS_PUBLIC_KEY_SIZE;
-+    ca_public_key.data = ca_pub_key;
-+    memcpy(ca_public_key.data, ca_pub_x, DTLS_PUBLIC_KEY_SIZE/2);
-+    memcpy(ca_public_key.data + DTLS_PUBLIC_KEY_SIZE/2, ca_pub_y, DTLS_PUBLIC_KEY_SIZE/2);
-+
-+    memcpy(x, serv_pub_key_x, x_size);
-+    memcpy(y, serv_pub_key_y, y_size);
-+
-+    ret = (int) check_certificate(cert_der_code, ca_public_key);
-+
-+    return -ret;
-+}
-+
-+static int is_x509_active(struct dtls_context_t *ctx)
-+{
-+    (void)ctx;
-+    return 0;
-+}
-+
-+#endif /* DTLS_X509 */
-+
- static void
- try_send(struct dtls_context_t *ctx, session_t *dst) {
-   int res;
-@@ -190,6 +421,8 @@ static int
- read_from_peer(struct dtls_context_t *ctx, 
-              session_t *session, uint8 *data, size_t len) {
-   size_t i;
-+  (void)ctx;
-+  (void)session;
-   for (i = 0; i < len; i++)
-     printf("%c", data[i]);
-   return 0;
-@@ -295,16 +528,24 @@ usage( const char *program, const char *version) {
-   fprintf(stderr, "%s v%s -- DTLS client implementation\n"
-         "(c) 2011-2014 Olaf Bergmann <bergmann@tzi.org>\n\n"
-+        "usage: %s"
- #ifdef DTLS_PSK
--        "usage: %s [-i file] [-s file] [-k file] [-o file] [-p port] [-v num] [-c num] addr [port]\n"
--#else /*  DTLS_PSK */
--        "usage: %s [-o file] [-p port] [-v num] [-c num] addr [port]\n"
-+          " [-i file] [-s file] [-k file]"
- #endif /* DTLS_PSK */
-+#ifdef DTLS_X509
-+          " [-x file] [-r file] [-u file]"
-+#endif /* DTLS_X509 */
-+          " [-o file] [-p port] [-v num] [-c num] addr [port]\n"
- #ifdef DTLS_PSK
-         "\t-i file\t\tread PSK Client identity from file\n"
-         "\t-s file\t\tread PSK Server identity from file\n"
-         "\t-k file\t\tread pre-shared key from file\n"
- #endif /* DTLS_PSK */
-+#ifdef DTLS_X509
-+          "\t-x file\tread Client certificate from file\n"
-+          "\t-r file\tread Client private key from file\n"
-+          "\t-u file\tread CA public key from file\n"
-+#endif /* DTLS_X509 */
-         "\t-o file\t\toutput received data to this file (use '-' for STDOUT)\n"
-         "\t-p port\t\tlisten on specified port (default is %d)\n"
-         "\t-v num\t\tverbosity level (default: 3)\n"
-@@ -325,8 +566,15 @@ static dtls_handler_t cb = {
- #endif /* DTLS_PSK */
- #ifdef DTLS_ECC
-   .get_ecdsa_key = get_ecdsa_key,
--  .verify_ecdsa_key = verify_ecdsa_key
-+  .verify_ecdsa_key = verify_ecdsa_key,
- #endif /* DTLS_ECC */
-+#ifdef DTLS_X509
-+  .get_x509_key = get_x509_key,
-+  .verify_x509_cert = verify_x509_cert,
-+  .get_x509_cert = get_x509_cert,
-+  .is_x509_active = is_x509_active,
-+#endif /* DTLS_X509 */
-+
- };
- #define DTLS_CLIENT_CMD_CLOSE "client:close"
-@@ -365,7 +613,7 @@ main(int argc, char **argv) {
-   memcpy(psk_key, PSK_DEFAULT_KEY, psk_key_length);
- #endif /* DTLS_PSK */
--  while ((opt = getopt(argc, argv, "p:o:v:c:" PSK_OPTIONS)) != -1) {
-+  while ((opt = getopt(argc, argv, "p:o:v:c:" PSK_OPTIONS X509_OPTIONS)) != -1) {
-     switch (opt) {
- #ifdef DTLS_PSK
-     case 'i' : {
-@@ -396,6 +644,47 @@ main(int argc, char **argv) {
-       break;
-     }
- #endif /* DTLS_PSK */
-+#ifdef DTLS_X509
-+    case 'x' :
-+    {
-+      ssize_t result = read_from_file(optarg, x509_client_cert, DTLS_MAX_CERT_SIZE);
-+      if (result < 0)
-+      {
-+          dtls_warn("Cannot read Client certificate. Using default\n");
-+      }
-+      else
-+      {
-+          x509_client_cert_len = result;
-+      }
-+      break;
-+    }
-+    case 'r' :
-+    {
-+      ssize_t result = read_from_file(optarg, x509_client_priv, DTLS_PRIVATE_KEY_SIZE+1);
-+      if (result < 0)
-+      {
-+          dtls_warn("Cannot read Client private key. Using default\n");
-+      }
-+      else
-+      {
-+          x509_client_priv_is_set = result;
-+      }
-+      break;
-+    }
-+    case 'u' :
-+    {
-+      ssize_t result = read_from_file(optarg, x509_ca_pub, DTLS_PUBLIC_KEY_SIZE+1);
-+      if (result < 0)
-+      {
-+          dtls_warn("Cannot read CA public key. Using default\n");
-+      }
-+      else
-+      {
-+          x509_ca_pub_is_set = result;
-+      }
-+      break;
-+    }
-+#endif /* DTLS_X509 */
-     case 'p' :
-       strncpy(port_str, optarg, NI_MAXSERV-1);
-       port_str[NI_MAXSERV - 1] = '\0';
-@@ -403,7 +692,7 @@ main(int argc, char **argv) {
-     case 'o' :
-       output_file.length = strlen(optarg);
-       output_file.s = (unsigned char *)malloc(output_file.length + 1);
--      
-+
-       if (!output_file.s) {
-       dtls_crit("cannot set output file: insufficient memory\n");
-       exit(-1);
-@@ -444,12 +733,29 @@ main(int argc, char **argv) {
-   }
-   dtls_set_log_level(log_level);
--  
-+
-   if (argc <= optind) {
-     usage(argv[0], dtls_package_version());
-     exit(1);
-   }
--  
-+
-+#ifdef DTLS_X509
-+  if (x509_client_cert_len && x509_client_priv_is_set && x509_ca_pub_is_set)
-+  {
-+      x509_info_from_file = 1;
-+  }
-+  else if(!(x509_client_cert_len || x509_client_priv_is_set || x509_ca_pub_is_set))
-+  {
-+      x509_info_from_file = 0;
-+  }
-+  else
-+  {
-+      fprintf(stderr,"please set -x, -r, -u options simultaneously");
-+      usage(argv[0], dtls_package_version());
-+      exit(1);
-+  }
-+#endif /* DTLS_X509 */
-+
-   memset(&dst, 0, sizeof(session_t));
-   /* resolve destination address where server should be sent */
-   res = resolve_address(argv[optind++], &dst.addr.sa);
-diff --git a/extlibs/tinydtls/tests/dtls-server.c b/extlibs/tinydtls/tests/dtls-server.c
-index 5893084..a3ede4d 100644
---- a/extlibs/tinydtls/tests/dtls-server.c
-+++ b/extlibs/tinydtls/tests/dtls-server.c
-@@ -14,12 +14,138 @@
- #include <netdb.h>
- #include <signal.h>
--#include "tinydtls.h" 
--#include "dtls.h" 
--#include "debug.h" 
-+#include "tinydtls.h"
-+#include "dtls.h"
-+#include "debug.h"
-+
-+#ifdef DTLS_X509
-+#define DTLS_PRIVATE_KEY_SIZE        (32)
-+#define DTLS_PUBLIC_KEY_SIZE         (64)
-+#endif
- #define DEFAULT_PORT 20220
-+/**
-+ * @struct byte_array
-+ *
-+ * General purpose byte array structure.
-+ *
-+ * Contains pointer to array of bytes and it's length.
-+ */
-+
-+typedef struct
-+{
-+    uint8_t *data;    /**< Pointer to the byte array */
-+    size_t len;      /**< Data size */
-+} byte_array;
-+
-+
-+/**@def BYTE_ARRAY_INITIALIZER
-+ *
-+ * Initializes of existing byte array pointer to \a NULL.
-+ */
-+#undef BYTE_ARRAY_INITIALIZER
-+#define BYTE_ARRAY_INITIALIZER {NULL, 0}
-+
-+#ifdef DTLS_X509
-+#define X509_OPTIONS         "x:r:u:"
-+#define SERVER_CRT_LEN 295
-+static const unsigned char g_server_certificate[SERVER_CRT_LEN] = {
-+        0x00, 0x01, 0x24,
-+        0x30, 0x82, 0x01, 0x20, 0x30, 0x81, 0xc4, 0xa0,
-+        0x03, 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x37,
-+        0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce,
-+        0x3d, 0x04, 0x03, 0x02, 0x05, 0x00, 0x30, 0x17,
-+        0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04,
-+        0x03, 0x0c, 0x0c, 0x4c, 0x6f, 0x63, 0x61, 0x6c,
-+        0x20, 0x49, 0x53, 0x53, 0x55, 0x45, 0x52, 0x30,
-+        0x1e, 0x17, 0x0d, 0x31, 0x33, 0x30, 0x31, 0x30,
-+        0x31, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a,
-+        0x17, 0x0d, 0x34, 0x39, 0x30, 0x31, 0x30, 0x31,
-+        0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x5a, 0x30,
-+        0x17, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55,
-+        0x04, 0x03, 0x0c, 0x0c, 0x4c, 0x6f, 0x63, 0x61,
-+        0x6c, 0x20, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52,
-+        0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86,
-+        0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a,
-+        0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03,
-+        0x42, 0x00, 0x04, 0x07, 0x88, 0x10, 0xdc, 0x62,
-+        0xd7, 0xe6, 0x9b, 0x7c, 0xad, 0x6e, 0x78, 0xb0,
-+        0x5f, 0x9a, 0x00, 0x11, 0x74, 0x2c, 0x8b, 0xaf,
-+        0x09, 0x65, 0x7c, 0x86, 0x8e, 0x55, 0xcb, 0x39,
-+        0x55, 0x72, 0xc6, 0x65, 0x71, 0xcd, 0x03, 0xdc,
-+        0x2a, 0x4f, 0x46, 0x5b, 0x14, 0xc8, 0x27, 0x74,
-+        0xab, 0xf4, 0x1f, 0xc1, 0x35, 0x0d, 0x42, 0xbc,
-+        0xc2, 0x9f, 0xb5, 0xc1, 0x79, 0xb6, 0x8b, 0xca,
-+        0xdb, 0xff, 0x82, 0x30, 0x0c, 0x06, 0x08, 0x2a,
-+        0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x05,
-+        0x00, 0x03, 0x49, 0x00, 0x30, 0x46, 0x02, 0x21,
-+        0x00, 0xb1, 0x81, 0x81, 0x92, 0x0e, 0x76, 0x7c,
-+        0xeb, 0xf5, 0x37, 0xde, 0x27, 0xc4, 0x01, 0xc8,
-+        0x96, 0xc3, 0xe5, 0x9f, 0x47, 0x7e, 0x25, 0x92,
-+        0xa4, 0xba, 0x22, 0x25, 0xa3, 0x81, 0x19, 0xcf,
-+        0x0d, 0x02, 0x21, 0x00, 0xca, 0x92, 0xbe, 0x79,
-+        0xc7, 0x82, 0x84, 0x64, 0xc4, 0xc4, 0xf4, 0x3d,
-+        0x69, 0x79, 0x68, 0xc0, 0xf1, 0xba, 0xaf, 0x6c,
-+        0xbb, 0xdd, 0x54, 0x7d, 0x07, 0xe7, 0x53, 0x3b,
-+        0xc3, 0x1b, 0x87, 0x04};
-+
-+//default server's key pair
-+static const unsigned char x509_priv_key[] = {
-+        0xaa, 0xa3, 0x46, 0xf1, 0x3c, 0x56, 0x5d, 0x08,
-+        0x5e, 0x59, 0xba, 0x7f, 0xd2, 0x21, 0x62, 0xc6,
-+        0xcc, 0x5d, 0xfa, 0x3f, 0xb5, 0x25, 0xa9, 0x89,
-+        0x4f, 0x32, 0xe8, 0x2a, 0xe0, 0xee, 0x9b, 0x4c};
-+
-+static const unsigned char x509_pub_key_x[] = {
-+        0x07, 0x88, 0x10, 0xdc, 0x62, 0xd7, 0xe6, 0x9b,
-+        0x7c, 0xad, 0x6e, 0x78, 0xb0, 0x5f, 0x9a, 0x00,
-+        0x11, 0x74, 0x2c, 0x8b, 0xaf, 0x09, 0x65, 0x7c,
-+        0x86, 0x8e, 0x55, 0xcb, 0x39, 0x55, 0x72, 0xc6};
-+
-+static const unsigned char x509_pub_key_y[] = {
-+        0x65, 0x71, 0xcd, 0x03, 0xdc, 0x2a, 0x4f, 0x46,
-+        0x5b, 0x14, 0xc8, 0x27, 0x74, 0xab, 0xf4, 0x1f,
-+        0xc1, 0x35, 0x0d, 0x42, 0xbc, 0xc2, 0x9f, 0xb5,
-+        0xc1, 0x79, 0xb6, 0x8b, 0xca, 0xdb, 0xff, 0x82};
-+
-+//default CA pub key
-+static const unsigned char x509_ca_pub_x[] = {
-+        0x57, 0x94, 0x7f, 0x98, 0x7a, 0x02, 0x67, 0x09,
-+        0x25, 0xc1, 0xcb, 0x5a, 0xf5, 0x46, 0xfb, 0xad,
-+        0xf7, 0x68, 0x94, 0x8c, 0xa7, 0xe3, 0xf0, 0x5b,
-+        0xc3, 0x6b, 0x5c, 0x9b, 0xd3, 0x7d, 0x74, 0x12
-+};
-+
-+static const unsigned char x509_ca_pub_y[] = {
-+        0xce, 0x68, 0xbc, 0x55, 0xf5, 0xf8, 0x1b, 0x3d,
-+        0xef, 0xed, 0x1f, 0x2b, 0xd2, 0x69, 0x5d, 0xcf,
-+        0x79, 0x16, 0xa6, 0xbd, 0x97, 0x96, 0x27, 0x60,
-+        0x5d, 0xd1, 0xb7, 0x93, 0xa2, 0x4a, 0x62, 0x4d
-+};
-+
-+static const unsigned char client_pub_key_x[] = {
-+        0xe3, 0xd1, 0x67, 0x1e, 0xdc, 0x46, 0xf4, 0x19,
-+        0x50, 0x15, 0x2e, 0x3a, 0x2f, 0xd8, 0x68, 0x6b,
-+        0x37, 0x32, 0x84, 0x9e, 0x83, 0x81, 0xbf, 0x25,
-+        0x5d, 0xbb, 0x18, 0x07, 0x3c, 0xbd, 0xf3, 0xab};
-+
-+static const unsigned char client_pub_key_y[] = {
-+        0xd3, 0xbf, 0x53, 0x59, 0xc9, 0x1e, 0xce, 0x5b,
-+        0x39, 0x6a, 0xe5, 0x60, 0xf3, 0x70, 0xdb, 0x66,
-+        0xb6, 0x80, 0xcb, 0x65, 0x0b, 0x35, 0x2a, 0x62,
-+        0x44, 0x89, 0x63, 0x64, 0x6f, 0x6f, 0xbd, 0xf0};
-+
-+static unsigned char x509_server_cert[DTLS_MAX_CERT_SIZE];
-+static size_t x509_server_cert_len = 0;
-+static unsigned char x509_server_priv[DTLS_PRIVATE_KEY_SIZE+1];
-+static size_t x509_server_priv_is_set = 0;
-+static unsigned char x509_ca_pub[DTLS_PUBLIC_KEY_SIZE+1];
-+static size_t x509_ca_pub_is_set = 0;
-+
-+static int x509_info_from_file = 0;
-+#endif /*DTLS_X509*/
-+#ifdef DTLS_ECC
- static const unsigned char ecdsa_priv_key[] = {
-                       0xD9, 0xE2, 0x70, 0x7A, 0x72, 0xDA, 0x6A, 0x05,
-                       0x04, 0x99, 0x5C, 0x86, 0xED, 0xDB, 0xE3, 0xEF,
-@@ -37,7 +163,7 @@ static const unsigned char ecdsa_pub_key_y[] = {
-                       0x1D, 0xDC, 0xF4, 0xF4, 0x2E, 0x2F, 0x26, 0x31,
-                       0xD0, 0x43, 0xB1, 0xFB, 0x03, 0xE2, 0x2F, 0x4D,
-                       0x17, 0xDE, 0x43, 0xF9, 0xF9, 0xAD, 0xEE, 0x70};
--
-+#endif /*DTLS_ECC*/
- #if 0
- /* SIGINT handler: set quit to 1 for graceful termination */
- void
-@@ -46,6 +172,34 @@ handle_sigint(int signum) {
- }
- #endif
-+#ifdef DTLS_X509
-+ssize_t
-+read_from_file(char *arg, unsigned char *buf, size_t max_buf_len) {
-+  FILE *f;
-+  ssize_t result = 0;
-+
-+  f = fopen(arg, "r");
-+  if (f == NULL)
-+    return -1;
-+
-+  while (!feof(f)) {
-+    size_t bytes_read;
-+    bytes_read = fread(buf, 1, max_buf_len, f);
-+    if (ferror(f)) {
-+      result = -1;
-+      break;
-+    }
-+
-+    buf += bytes_read;
-+    result += bytes_read;
-+    max_buf_len -= bytes_read;
-+  }
-+
-+  fclose(f);
-+  return result;
-+}
-+#endif /*DTLS_X509*/
-+
- #ifdef DTLS_PSK
- #define PSK_SERVER_HINT  "Server_identity"
-@@ -59,6 +213,8 @@ get_psk_info(struct dtls_context_t *ctx, const session_t *session,
-            const unsigned char *id, size_t id_len,
-            unsigned char *result, size_t result_length) {
-+  (void)ctx;
-+  (void)session;
-   struct keymap_t {
-     unsigned char *id;
-     size_t id_length;
-@@ -86,7 +242,7 @@ get_psk_info(struct dtls_context_t *ctx, const session_t *session,
-   case DTLS_PSK_KEY:
-     if (id) {
-       int i;
--      for (i = 0; i < sizeof(psk)/sizeof(struct keymap_t); i++) {
-+      for (i = 0; i < (int)(sizeof(psk)/sizeof(struct keymap_t)); i++) {
-         if (id_len == psk[i].id_length && memcmp(id, psk[i].id, id_len) == 0) {
-         if (result_length < psk[i].key_length) {
-           dtls_warn("buffer too small for PSK");
-@@ -114,6 +270,8 @@ static int
- get_ecdsa_key(struct dtls_context_t *ctx,
-             const session_t *session,
-             const dtls_ecc_key_t **result) {
-+    (void)ctx;
-+    (void)session;
-   static const dtls_ecc_key_t ecdsa_key = {
-     .curve = DTLS_ECDH_CURVE_SECP256R1,
-     .priv_key = ecdsa_priv_key,
-@@ -131,15 +289,120 @@ verify_ecdsa_key(struct dtls_context_t *ctx,
-                const unsigned char *other_pub_x,
-                const unsigned char *other_pub_y,
-                size_t key_size) {
-+  (void)ctx;
-+  (void)session;
-+  (void)other_pub_x;
-+  (void)other_pub_y;
-+  (void)key_size;
-   return 0;
- }
- #endif /* DTLS_ECC */
-+#ifdef DTLS_X509
-+static int
-+get_x509_key(struct dtls_context_t *ctx,
-+          const session_t *session,
-+          const dtls_ecc_key_t **result) {
-+    (void)ctx;
-+    (void)session;
-+  static dtls_ecc_key_t ecdsa_key = {
-+    .curve = DTLS_ECDH_CURVE_SECP256R1,
-+    .priv_key = x509_priv_key,
-+    .pub_key_x = x509_pub_key_x,
-+    .pub_key_y = x509_pub_key_y
-+  };
-+  if (x509_info_from_file)
-+      ecdsa_key.priv_key = x509_server_priv;
-+
-+  *result = &ecdsa_key;
-+  return 0;
-+}
-+
-+static int
-+get_x509_cert(struct dtls_context_t *ctx,
-+              const session_t *session,
-+              const unsigned char **cert,
-+              size_t *cert_size)
-+{
-+    (void)ctx;
-+    (void)session;
-+    if (x509_info_from_file)
-+    {
-+        *cert = x509_server_cert;
-+        *cert_size = x509_server_cert_len;
-+    }
-+    else
-+    {
-+        *cert = g_server_certificate;
-+        *cert_size = SERVER_CRT_LEN;
-+    }
-+
-+    return 0;
-+}
-+
-+static int check_certificate(byte_array cert_der_code, byte_array ca_public_key)
-+{
-+    (void)cert_der_code;
-+    (void)ca_public_key;
-+    return 0;
-+}
-+
-+static int verify_x509_cert(struct dtls_context_t *ctx, const session_t *session,
-+                                  const unsigned char *cert, size_t cert_size,
-+                                  unsigned char *x,
-+                                  size_t x_size,
-+                                  unsigned char *y,
-+                                  size_t y_size)
-+{
-+    int ret;
-+    const unsigned char *ca_pub_x;
-+    const unsigned char *ca_pub_y;
-+    byte_array cert_der_code = BYTE_ARRAY_INITIALIZER;
-+    byte_array ca_public_key = BYTE_ARRAY_INITIALIZER;
-+    unsigned char ca_pub_key[DTLS_PUBLIC_KEY_SIZE];
-+    (void)ctx;
-+    (void)session;
-+
-+    if (x509_info_from_file)
-+    {
-+        ca_pub_x = x509_ca_pub;
-+        ca_pub_y = x509_ca_pub + DTLS_PUBLIC_KEY_SIZE/2;
-+    }
-+    else
-+    {
-+        ca_pub_x = x509_ca_pub_x;
-+        ca_pub_y = x509_ca_pub_y;
-+    }
-+
-+    cert_der_code.data = (uint8_t *)cert;
-+    cert_der_code.len = cert_size;
-+
-+    ca_public_key.len = DTLS_PUBLIC_KEY_SIZE;
-+    ca_public_key.data = ca_pub_key;
-+    memcpy(ca_public_key.data, ca_pub_x, DTLS_PUBLIC_KEY_SIZE/2);
-+    memcpy(ca_public_key.data + DTLS_PUBLIC_KEY_SIZE/2, ca_pub_y, DTLS_PUBLIC_KEY_SIZE/2);
-+
-+    memcpy(x, client_pub_key_x, x_size);
-+    memcpy(y, client_pub_key_y, y_size);
-+
-+    ret = (int) check_certificate(cert_der_code, ca_public_key);
-+
-+  return -ret;
-+}
-+
-+static int is_x509_active(struct dtls_context_t *ctx)
-+{
-+    (void)ctx;
-+    return 0;
-+}
-+#endif /* DTLS_X509 */
-+
-+
- #define DTLS_SERVER_CMD_CLOSE "server:close"
- #define DTLS_SERVER_CMD_RENEGOTIATE "server:renegotiate"
- static int
--read_from_peer(struct dtls_context_t *ctx, 
-+read_from_peer(struct dtls_context_t *ctx,
-              session_t *session, uint8 *data, size_t len) {
-   size_t i;
-   for (i = 0; i < len; i++)
-@@ -190,7 +453,7 @@ dtls_handle_read(struct dtls_context_t *ctx) {
-   } else {
-     dtls_debug("got %d bytes from port %d\n", len, 
-            ntohs(session.addr.sin6.sin6_port));
--    if (sizeof(buf) < len) {
-+    if ((int)(sizeof(buf)) < len) {
-       dtls_warn("packet was truncated (%d bytes lost)\n", len - sizeof(buf));
-     }
-   }
-@@ -250,13 +513,21 @@ usage(const char *program, const char *version) {
-   fprintf(stderr, "%s v%s -- DTLS server implementation\n"
-         "(c) 2011-2014 Olaf Bergmann <bergmann@tzi.org>\n\n"
-         "usage: %s [-A address] [-p port] [-v num] [-a enable|disable]\n"
-+#ifdef DTLS_X509
-+      " [-x file] [-r file] [-u file]"
-+#endif /* DTLS_X509 */
-         "\t-A address\t\tlisten on specified address (default is ::)\n"
-         "\t-p port\t\tlisten on specified port (default is %d)\n"
-         "\t-v num\t\tverbosity level (default: 3)\n"
-         "\t-a enable|disable\t(default: disable)\n"
-         "\t\t\t\tenable:enable TLS_ECDH_anon_with_AES_128_CBC_SHA_256\n"
--        "\t\t\t\tdisable:disable TLS_ECDH_anon_with_AES_128_CBC_SHA_256\n",
--         program, version, program, DEFAULT_PORT);
-+        "\t\t\t\tdisable:disable TLS_ECDH_anon_with_AES_128_CBC_SHA_256\n"
-+#ifdef DTLS_X509
-+      "\t-x file\tread Server certificate from file\n"
-+      "\t-r file\tread Server private key from file\n"
-+      "\t-u file\tread CA public key from file\n"
-+#endif /* DTLS_X509 */
-+      ,program, version, program, DEFAULT_PORT);
- }
- static dtls_handler_t cb = {
-@@ -268,11 +539,18 @@ static dtls_handler_t cb = {
- #endif /* DTLS_PSK */
- #ifdef DTLS_ECC
-   .get_ecdsa_key = get_ecdsa_key,
--  .verify_ecdsa_key = verify_ecdsa_key
-+  .verify_ecdsa_key = verify_ecdsa_key,
- #endif /* DTLS_ECC */
-+#ifdef DTLS_X509
-+  .get_x509_key = get_x509_key,
-+  .verify_x509_cert = verify_x509_cert,
-+  .get_x509_cert = get_x509_cert,
-+  .is_x509_active = is_x509_active,
-+#endif
-+
- };
--int 
-+int
- main(int argc, char **argv) {
-   dtls_context_t *the_context = NULL;
-   log_t log_level = DTLS_LOG_WARN;
-@@ -312,6 +590,47 @@ main(int argc, char **argv) {
-       if( strcmp(optarg, "enable") == 0)
-           ecdh_anon_enalbe = DTLS_CIPHER_ENABLE;
-       break;
-+#ifdef DTLS_X509
-+    case 'x' :
-+    {
-+      ssize_t result = read_from_file(optarg, x509_server_cert, DTLS_MAX_CERT_SIZE);
-+      if (result < 0)
-+      {
-+          dtls_warn("Cannot read Server certificate. Using default\n");
-+      }
-+      else
-+      {
-+          x509_server_cert_len = result;
-+      }
-+      break;
-+    }
-+    case 'r' :
-+    {
-+      ssize_t result = read_from_file(optarg, x509_server_priv, DTLS_PRIVATE_KEY_SIZE+1);
-+      if (result < 0)
-+      {
-+          dtls_warn("Cannot read Server private key. Using default\n");
-+      }
-+      else
-+      {
-+          x509_server_priv_is_set = result;
-+      }
-+      break;
-+    }
-+    case 'u' :
-+    {
-+      ssize_t result = read_from_file(optarg, x509_ca_pub, DTLS_PUBLIC_KEY_SIZE+1);
-+      if (result < 0)
-+      {
-+          dtls_warn("Cannot read CA public key. Using default\n");
-+      }
-+      else
-+      {
-+          x509_ca_pub_is_set = result;
-+      }
-+      break;
-+    }
-+#endif /* DTLS_X509 */
-     default:
-       usage(argv[0], dtls_package_version());
-       exit(1);
-@@ -320,6 +639,23 @@ main(int argc, char **argv) {
-   dtls_set_log_level(log_level);
-+#ifdef DTLS_X509
-+  if (x509_server_cert_len && x509_server_priv_is_set && x509_ca_pub_is_set)
-+  {
-+      x509_info_from_file = 1;
-+  }
-+  else if(!(x509_server_cert_len || x509_server_priv_is_set || x509_ca_pub_is_set))
-+  {
-+      x509_info_from_file = 0;
-+  }
-+  else
-+  {
-+      fprintf(stderr,"please set -x, -r, -u options simultaneously");
-+      usage(argv[0], dtls_package_version());
-+      exit(1);
-+  }
-+#endif /* DTLS_X509 */
-+
-   /* init socket and set it to non-blocking */
-   fd = socket(listen_addr.sin6_family, SOCK_DGRAM, 0);
-diff --git a/extlibs/tinydtls/tinydtls.h b/extlibs/tinydtls/tinydtls.h
-index b1b8cdf..dd27c55 100644
---- a/extlibs/tinydtls/tinydtls.h
-+++ b/extlibs/tinydtls/tinydtls.h
-@@ -42,4 +42,7 @@
- /** Defined to 1 if tinydtls is built for Contiki OS */
- /* #undef WITH_CONTIKI */
-+/** Define to 1 if building with X.509 support */
-+#define DTLS_X509 1
-+
- #endif /* _DTLS_TINYDTLS_H_ */
-diff --git a/extlibs/tinydtls/tinydtls.h.in b/extlibs/tinydtls/tinydtls.h.in
-index a2e6685..10a8d9a 100644
---- a/extlibs/tinydtls/tinydtls.h.in
-+++ b/extlibs/tinydtls/tinydtls.h.in
-@@ -41,4 +41,7 @@
- /** Defined to 1 if tinydtls is built for Contiki OS */
- #undef WITH_CONTIKI
-+/** Define to 1 if building with X.509 support */
-+#undef DTLS_X509
-+
- #endif /* _DTLS_TINYDTLS_H_ */
--- 
-1.9.1
-
diff --git a/extlibs/tinydtls/Android.mk b/extlibs/tinydtls/Android.mk
deleted file mode 100644 (file)
index a507a51..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-APP_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_PATH = $(APP_PATH)
-LOCAL_MODULE := TinyDtls
-LOCAL_SRC_FILES := dtls.c crypto.c ccm.c hmac.c netq.c peer.c dtls_time.c session.c
-#LOCAL_SRC_FILES += debug.c
-LOCAL_SRC_FILES += aes/rijndael.c
-LOCAL_SRC_FILES += ecc/ecc.c
-LOCAL_SRC_FILES += sha2/sha2.c
-
-LOCAL_C_INCLUDES := $(APP_PATH) $(APP_PATH)/aes $(APP_PATH)/ecc $(APP_PATH)/sha2
-
-#LOCAL_CFLAGS := -DWITH_OICSTACK -fPIC
-LOCAL_CFLAGS += -DDTLSv12 -DWITH_SHA256 -DDTLS_CHECK_CONTENTTYPE -DHAVE_SYS_TIME_H -DNDEBUG
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/extlibs/tinydtls/LICENSE b/extlibs/tinydtls/LICENSE
deleted file mode 100644 (file)
index 2588fe2..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) 2011--2012 Olaf Bergmann <bergmann@tzi.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/extlibs/tinydtls/Makefile.in b/extlibs/tinydtls/Makefile.in
deleted file mode 100644 (file)
index 9a52e4c..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-# Makefile for tinydtls
-#
-# Copyright (C) 2011--2014 Olaf Bergmann <bergmann@tzi.org>
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use, copy,
-# modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# the library's version
-VERSION:=@PACKAGE_VERSION@
-
-# tools
-@SET_MAKE@
-SHELL = /bin/sh
-MKDIR = mkdir
-ETAGS = @ETAGS@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-abs_builddir = @abs_builddir@
-top_builddir = @top_builddir@
-libdir = @libdir@
-includedir = @includedir@/@PACKAGE_NAME@
-package = @PACKAGE_TARNAME@-@PACKAGE_VERSION@
-
-install := cp
-
-# files and flags
-SOURCES:= dtls.c crypto.c ccm.c hmac.c netq.c peer.c dtls_time.c session.c
-ifneq ("@NDEBUG@", "1")
-SOURCES += debug.c
-endif
-SUB_OBJECTS:=aes/rijndael.o @OPT_OBJS@
-OBJECTS:= $(patsubst %.c, %.o, $(SOURCES)) $(SUB_OBJECTS)
-HEADERS:=dtls.h hmac.h debug.h dtls_config.h uthash.h numeric.h crypto.h global.h ccm.h \
- netq.h t_list.h alert.h utlist.h prng.h peer.h state.h dtls_time.h session.h \
- tinydtls.h
-CFLAGS:=-Wall -pedantic -std=c99 @CFLAGS@
-CPPFLAGS:=@CPPFLAGS@ -DDTLS_CHECK_CONTENTTYPE
-SUBDIRS:=tests doc platform-specific sha2 aes ecc
-DISTSUBDIRS:=$(SUBDIRS) examples/contiki
-DISTDIR=$(top_builddir)/$(package)
-FILES:=Makefile.in configure configure.in dtls_config.h.in tinydtls.h.in \
-  Makefile.tinydtls $(SOURCES) $(HEADERS)
-LIB:=libtinydtls.a
-LDFLAGS:=@LIBS@
-ARFLAGS:=cru
-doc:=doc
-
-.PHONY: all dirs clean install dist distclean .gitignore doc TAGS
-
-ifneq ("@WITH_CONTIKI@", "1")
-.SUFFIXES:
-.SUFFIXES:      .c .o
-
-all:   $(LIB) dirs
-
-check: 
-       echo DISTDIR: $(DISTDIR)
-       echo top_builddir: $(top_builddir)
-       $(MAKE) -C tests check
-
-dirs:  $(SUBDIRS)
-       for dir in $^; do \
-               $(MAKE) -C $$dir ; \
-       done
-
-$(SUB_OBJECTS)::
-       $(MAKE) -C $(@D) $(@F)
-
-$(LIB):        $(OBJECTS)
-       $(AR) $(ARFLAGS) $@ $^ 
-       ranlib $@
-
-clean:
-       @rm -f $(PROGRAM) main.o $(LIB) $(OBJECTS)
-       for dir in $(SUBDIRS); do \
-               $(MAKE) -C $$dir clean ; \
-       done
-else  # WITH_CONTIKI
-all:
-       $(MAKE) -C examples/contiki $@
-endif # WITH_CONTIKI
-
-doc:   
-       $(MAKE) -C doc
-
-distclean:     clean
-       @rm -rf $(DISTDIR)
-       @rm -f *~ $(DISTDIR).tar.gz
-
-dist:  $(FILES) $(DISTSUBDIRS)
-       test -d $(DISTDIR) || mkdir $(DISTDIR)
-       cp $(FILES) $(DISTDIR)
-       for dir in $(DISTSUBDIRS); do \
-               $(MAKE) -C $$dir dist; \
-       done
-       tar czf $(package).tar.gz $(DISTDIR)
-
-install:       $(LIB) $(HEADERS) $(SUBDIRS)
-       test -d $(libdir) || mkdir -p $(libdir)
-       test -d $(includedir) || mkdir -p $(includedir)
-       $(install) $(LIB) $(libdir)/
-       $(install) $(HEADERS) $(includedir)/
-       for dir in $(SUBDIRS); do \
-               $(MAKE) -C $$dir install="$(install)" includedir=$(includedir) install; \
-       done
-
-TAGS:  
-       $(ETAGS) -o $@.new $(SOURCES) 
-       $(ETAGS) -a -o $@.new $(HEADERS) 
-       mv $@.new $@
-
-# files that should be ignored by git
-GITIGNOREDS:= core \*~ \*.[oa] \*.gz \*.cap \*.pcap Makefile \
- autom4te.cache/ config.h config.log config.status configure \
- doc/Doxyfile doc/doxygen.out doc/html/ $(LIB) tests/ccm-test \
- tests/dtls-client tests/dtls-server tests/prf-test $(package) \
- $(DISTDIR)/ TAGS \*.patch .gitignore ecc/testecc ecc/testfield \
- \*.d \*.hex \*.elf \*.map obj_\* tinydtls.h dtls_config.h \
- $(addprefix \*., $(notdir $(wildcard ../../platform/*))) \
- .project
-
-.gitignore:
-       echo $(GITIGNOREDS) | sed 's/ /\n/g' > $@
-
diff --git a/extlibs/tinydtls/Makefile.tinydtls b/extlibs/tinydtls/Makefile.tinydtls
deleted file mode 100644 (file)
index 88affc4..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-# This is a -*- Makefile -*-
-
-ifeq ($(TARGET), redbee-econotag)
-CFLAGS += -DSHA2_USE_INTTYPES_H=1 -DLITTLE_ENDIAN=3412 -DBYTE_ORDER=LITTLE_ENDIAN
-endif
-
-ifeq ($(TARGET), wismote)
-CFLAGS += -DSHA2_USE_INTTYPES_H=1 -DLITTLE_ENDIAN=3412 -DBYTE_ORDER=LITTLE_ENDIAN
-endif
-
-ifeq ($(TARGET), exp5438)
-CFLAGS += -DSHA2_USE_INTTYPES_H=1 -DLITTLE_ENDIAN=3412 -DBYTE_ORDER=LITTLE_ENDIAN
-endif
-
-ifeq ($(TARGET), native)
-CFLAGS += -DSHA2_USE_INTTYPES_H=1
-endif
-
-ifeq ($(TARGET), minimal-net)
-CFLAGS += -DSHA2_USE_INTTYPES_H=1
-endif
-
-CFLAGS += -DDTLSv12 -DWITH_SHA256 
-tinydtls_src = dtls.c crypto.c hmac.c rijndael.c sha2.c ccm.c netq.c ecc.c dtls_time.c peer.c session.c
-
-# This adds support for TLS_PSK_WITH_AES_128_CCM_8
-CFLAGS += -DDTLS_PSK
-
-# This adds support for TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8
-CFLAGS += -DDTLS_ECC
-tinydtls_src += ecc.c
-
-# This activates debugging support
-# CFLAGS += -DNDEBUG
-tinydtls_src += debug.c
-
diff --git a/extlibs/tinydtls/README b/extlibs/tinydtls/README
deleted file mode 100644 (file)
index 4f8fe55..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-CONTENTS
-
-This library contains functions and structures that can help
-constructing a single-threaded UDP server with DTLS support in
-C99. The following components are available:
-
-* dtls
-  Basic support for DTLS with pre-shared key mode.
-
-* tests
-  The subdirectory tests contains test programs that show how each
-  component is used.
-
-BUILDING
-
-When using the code from the git repository at sourceforge, invoke
-'autoreconf' to re-create the configure script. To build for Contiki,
-place tinydtls into Contiki's apps directory and call
-  ./configure --with-contiki.
-
-After configuration, invoke make to build the library and associated
-test programs. To add tinydtls as Contiki application, drop it into
-the apps directory and add the following line to your Makefile:
-
-  APPS += tinydtls/aes tinydtls/sha2 tinydtls/ecc tinydtls
-
diff --git a/extlibs/tinydtls/README_Iotivity b/extlibs/tinydtls/README_Iotivity
deleted file mode 100644 (file)
index 3d18404..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-SUPPORTED CIPHER-SUITES
-  TLS_PSK_WITH_AES_128_CCM_8(0xC0A8)
-  TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8(0xC0AE)
-  TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256(0xC037)
-  TLS_ECDH_anon_WITH_AES_128_CBC_SHA256(0xC018)
-
-TEST APPLICATIONS
-These applications can be build from Iotivity's root directory using below commands:
-scons extlibs/tinydtls/dtls-client SECURED=1 RELEASE=0
-scons extlibs/tinydtls/dtls-server SECURED=1 RELEASE=0
-
-
-INTER-OPERABILITY TESTING
-tinyDTLS's cipher-suite implementations can be verified for compatibility against other
-SSL libraries.
-Use below commands to perform compatibility testing against mBed SSL library.
-./ssl_server2 debug_level=5 dtls=1 psk=73656372657450534b psk_identity=Client_identity \
-    force_version=dtls1_2 force_ciphersuite=TLS-ECDHE-PSK-WITH-AES-128-CBC-SHA256
-./dtls-client -v 6 -c 4 localhost 4433
-
-./ssl_client2 debug_level=5 dtls=1 psk=73656372657450534b psk_identity=Client_identity \
-    force_version=dtls1_2 force_ciphersuite=TLS-ECDHE-PSK-WITH-AES-128-CBC-SHA256
-./dtls-server -v 6 localhost -p 4433
-
-Above commands can also be tested with TLS-PSK-WITH-AES-128-CCM-8 cipher suite.
-
diff --git a/extlibs/tinydtls/SConscript b/extlibs/tinydtls/SConscript
deleted file mode 100644 (file)
index 41e480e..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-# *****************************************************************
-#
-#  Copyright 2015 Samsung Electronics All Rights Reserved.
-#
-#
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-# *****************************************************************/
-##
-# Tinydtls build script
-##
-
-Import('env')
-
-print "Reading Tinydtls folder script"
-
-target_os = env.get('TARGET_OS')
-
-if(target_os) == 'arduino':
-       env.Replace(CFLAGS = env.get('CXXFLAGS'))
-
-root_dir = './'
-tinydtls_src_path = root_dir
-
-dtls_env = env.Clone()
-
-dtls_env.PrependUnique(CPPPATH = [root_dir])
-dtls_env.AppendUnique(CPPPATH = [root_dir+'aes/'])
-dtls_env.AppendUnique(CPPPATH = [root_dir+'ecc/'])
-dtls_env.AppendUnique(CPPPATH = [root_dir+'sha2/'])
-
-######################################################################
-# Source files and Target(s)
-######################################################################
-tinydtls_src = [
-                'dtls.c',
-                'crypto.c',
-                'ccm.c',
-                'hmac.c',
-                'netq.c',
-                'peer.c',
-                'dtls_time.c',
-                'session.c',
-                'aes/rijndael.c',
-                'ecc/ecc.c',
-                'sha2/sha2.c',
-        ]
-
-if not dtls_env.get('RELEASE'):
-       if(target_os) not in ['arduino']:
-               tinydtls_src += ['debug.c']
-       else:
-               dtls_env.AppendUnique(CPPDEFINES = ['NDEBUG'])
-else:
-       dtls_env.AppendUnique(CPPDEFINES = ['NDEBUG'])
-
-dtls_env.AppendUnique(CPPDEFINES = ['DTLSV12',  'WITH_SHA256', 'DTLS_CHECK_CONTENTTYPE', 'SHA2_USE_INTTYPES_H'])
-env.AppendUnique(CPPDEFINES = ['SHA2_USE_INTTYPES_H'])
-
-libtinydtls = dtls_env.StaticLibrary('tinydtls', tinydtls_src, OBJPREFIX='libtinydtls_')
-
-######################################################################
-# Generate tinydtls samples
-#
-# Note:
-# Currently there is a bug in debug.h/debug.c which fails compilation
-# of tinydtls samples in release mode. This bug is being tracked in
-# IOT-395
-######################################################################
-if not env.get('RELEASE'):
-       samples_env = dtls_env.Clone()
-
-       if target_os not in ['arduino', 'windows']:
-               samples_env.AppendUnique(CPPDEFINES = ['_GNU_SOURCE'])
-
-       dtlsserver = samples_env.Program('dtls-server', ['tests/dtls-server.c'])
-       dtlsclient = samples_env.Program('dtls-client', ['tests/dtls-client.c'])
-
-       samples_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-       samples_env.PrependUnique(LIBS = ['tinydtls'])
-
-       Alias("samples", [dtlsserver, dtlsclient])
-
-       samples_env.AppendTarget('samples')
-
-dtls_env.InstallTarget(libtinydtls, 'tinydtls');
-
diff --git a/extlibs/tinydtls/aes/Makefile.in b/extlibs/tinydtls/aes/Makefile.in
deleted file mode 100644 (file)
index 4cf29d4..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-# Makefile for tinydtls
-#
-# Copyright (C) 2011 Olaf Bergmann <bergmann@tzi.org>
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use, copy,
-# modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# the library's version
-VERSION:=@PACKAGE_VERSION@
-
-# tools
-@SET_MAKE@
-SHELL = /bin/sh
-MKDIR = mkdir
-
-abs_builddir = @abs_builddir@
-top_builddir = @top_builddir@
-top_srcdir:= @top_srcdir@
-
-SOURCES:= rijndael.c
-HEADERS:= rijndael.h
-OBJECTS:= $(patsubst %.c, %.o, $(SOURCES))
-CPPFLAGS=@CPPFLAGS@
-CFLAGS=-Wall -std=c99 -pedantic @CFLAGS@
-LDLIBS=@LIBS@
-FILES:=Makefile.in $(SOURCES) $(HEADERS) 
-DISTDIR=$(top_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@
-
-.PHONY: all dirs clean install dist distclean .gitignore doc
-
-.SUFFIXES:
-.SUFFIXES:      .c .o
-
-all:
-
-check: 
-       echo DISTDIR: $(DISTDIR)
-       echo top_builddir: $(top_builddir)
-
-clean:
-       @rm -f $(PROGRAMS) main.o $(LIB) $(OBJECTS)
-       for dir in $(SUBDIRS); do \
-               $(MAKE) -C $$dir clean ; \
-       done
-
-distclean:     clean
-       @rm -rf $(DISTDIR)
-       @rm -f *~ $(DISTDIR).tar.gz
-
-dist:  $(FILES)
-       test -d $(DISTDIR)/aes || mkdir $(DISTDIR)/aes
-       cp -p $(FILES) $(DISTDIR)/aes
-
-install:       $(HEADERS)
-       test -d $(includedir)/aes || mkdir -p $(includedir)/aes
-       $(install) $(HEADERS) $(includedir)/aes
-
-.gitignore:
-       echo "core\n*~\n*.[oa]\n*.gz\n*.cap\n$(PROGRAM)\n$(DISTDIR)\n.gitignore" >$@
diff --git a/extlibs/tinydtls/aes/rijndael.c b/extlibs/tinydtls/aes/rijndael.c
deleted file mode 100644 (file)
index 33001a8..0000000
+++ /dev/null
@@ -1,1287 +0,0 @@
-/*     $OpenBSD: rijndael.c,v 1.19 2008/06/09 07:49:45 djm Exp $ */
-
-/**
- * rijndael-alg-fst.c
- *
- * @version 3.0 (December 2000)
- *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * @author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* #include <sys/param.h> */
-/* #include <sys/systm.h> */
-
-#include "rijndael.h"
-
-#ifdef ARDUINO_AVR_MEGA2560
-       #include <pgmspace.h>
-#else
-       #define PROGMEM
-       #define pgm_read_dword *
-#endif
-
-#undef FULL_UNROLL
-
-/*
-Te0[x] = S [x].[02, 01, 01, 03];
-Te1[x] = S [x].[03, 02, 01, 01];
-Te2[x] = S [x].[01, 03, 02, 01];
-Te3[x] = S [x].[01, 01, 03, 02];
-Te4[x] = S [x].[01, 01, 01, 01];
-
-Td0[x] = Si[x].[0e, 09, 0d, 0b];
-Td1[x] = Si[x].[0b, 0e, 09, 0d];
-Td2[x] = Si[x].[0d, 0b, 0e, 09];
-Td3[x] = Si[x].[09, 0d, 0b, 0e];
-Td4[x] = Si[x].[01, 01, 01, 01];
-*/
-
-PROGMEM static const aes_u32 Te0[256] = {
-    0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
-    0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
-    0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
-    0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
-    0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
-    0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
-    0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
-    0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
-    0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
-    0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
-    0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
-    0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
-    0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
-    0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
-    0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
-    0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
-    0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
-    0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
-    0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
-    0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
-    0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
-    0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
-    0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
-    0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
-    0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
-    0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
-    0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
-    0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
-    0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
-    0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
-    0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
-    0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
-    0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
-    0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
-    0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
-    0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
-    0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
-    0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
-    0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
-    0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
-    0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
-    0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
-    0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
-    0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
-    0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
-    0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
-    0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
-    0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
-    0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
-    0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
-    0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
-    0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
-    0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
-    0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
-    0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
-    0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
-    0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
-    0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
-    0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
-    0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
-    0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
-    0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
-    0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
-    0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
-};
-PROGMEM static const aes_u32 Te1[256] = {
-    0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
-    0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
-    0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
-    0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
-    0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
-    0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
-    0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
-    0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
-    0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
-    0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
-    0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
-    0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
-    0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
-    0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
-    0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
-    0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
-    0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
-    0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
-    0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
-    0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
-    0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
-    0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
-    0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
-    0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
-    0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
-    0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
-    0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
-    0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
-    0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
-    0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
-    0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
-    0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
-    0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
-    0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
-    0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
-    0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
-    0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
-    0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
-    0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
-    0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
-    0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
-    0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
-    0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
-    0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
-    0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
-    0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
-    0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
-    0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
-    0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
-    0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
-    0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
-    0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
-    0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
-    0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
-    0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
-    0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
-    0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
-    0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
-    0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
-    0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
-    0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
-    0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
-    0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
-    0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
-};
-PROGMEM static const aes_u32 Te2[256] = {
-    0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
-    0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
-    0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
-    0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
-    0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
-    0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
-    0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
-    0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
-    0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
-    0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
-    0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
-    0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
-    0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
-    0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
-    0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
-    0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
-    0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
-    0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
-    0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
-    0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
-    0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
-    0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
-    0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
-    0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
-    0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
-    0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
-    0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
-    0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
-    0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
-    0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
-    0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
-    0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
-    0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
-    0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
-    0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
-    0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
-    0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
-    0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
-    0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
-    0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
-    0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
-    0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
-    0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
-    0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
-    0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
-    0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
-    0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
-    0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
-    0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
-    0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
-    0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
-    0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
-    0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
-    0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
-    0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
-    0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
-    0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
-    0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
-    0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
-    0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
-    0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
-    0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
-    0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
-    0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
-};
-PROGMEM static const aes_u32 Te3[256] = {
-    0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
-    0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
-    0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
-    0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
-    0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
-    0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
-    0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
-    0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
-    0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
-    0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
-    0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
-    0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
-    0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
-    0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
-    0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
-    0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
-    0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
-    0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
-    0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
-    0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
-    0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
-    0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
-    0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
-    0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
-    0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
-    0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
-    0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
-    0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
-    0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
-    0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
-    0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
-    0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
-    0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
-    0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
-    0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
-    0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
-    0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
-    0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
-    0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
-    0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
-    0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
-    0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
-    0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
-    0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
-    0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
-    0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
-    0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
-    0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
-    0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
-    0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
-    0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
-    0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
-    0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
-    0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
-    0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
-    0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
-    0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
-    0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
-    0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
-    0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
-    0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
-    0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
-    0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
-    0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
-};
-PROGMEM static const aes_u32 Te4[256] = {
-    0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU,
-    0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U,
-    0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU,
-    0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U,
-    0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU,
-    0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U,
-    0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU,
-    0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U,
-    0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U,
-    0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU,
-    0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U,
-    0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U,
-    0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U,
-    0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU,
-    0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U,
-    0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U,
-    0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU,
-    0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U,
-    0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U,
-    0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U,
-    0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU,
-    0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU,
-    0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U,
-    0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU,
-    0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU,
-    0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U,
-    0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU,
-    0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U,
-    0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU,
-    0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U,
-    0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U,
-    0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U,
-    0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU,
-    0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U,
-    0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU,
-    0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U,
-    0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU,
-    0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U,
-    0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U,
-    0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU,
-    0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU,
-    0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU,
-    0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U,
-    0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U,
-    0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU,
-    0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U,
-    0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU,
-    0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U,
-    0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU,
-    0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U,
-    0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU,
-    0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU,
-    0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U,
-    0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU,
-    0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U,
-    0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU,
-    0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U,
-    0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U,
-    0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U,
-    0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU,
-    0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU,
-    0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U,
-    0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU,
-    0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U,
-};
-
-#ifdef WITH_AES_DECRYPT
-
-PROGMEM static const aes_u32 Td0[256] = {
-    0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
-    0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
-    0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
-    0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
-    0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
-    0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
-    0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
-    0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
-    0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
-    0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
-    0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
-    0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
-    0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
-    0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
-    0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
-    0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
-    0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
-    0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
-    0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
-    0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
-    0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
-    0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
-    0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
-    0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
-    0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
-    0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
-    0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
-    0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
-    0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
-    0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
-    0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
-    0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
-    0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
-    0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
-    0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
-    0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
-    0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
-    0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
-    0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
-    0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
-    0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
-    0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
-    0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
-    0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
-    0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
-    0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
-    0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
-    0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
-    0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
-    0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
-    0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
-    0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
-    0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
-    0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
-    0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
-    0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
-    0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
-    0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
-    0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
-    0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
-    0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
-    0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
-    0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
-    0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
-};
-PROGMEM static const aes_u32 Td1[256] = {
-    0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
-    0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
-    0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
-    0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
-    0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
-    0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
-    0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
-    0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
-    0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
-    0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
-    0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
-    0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
-    0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
-    0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
-    0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
-    0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
-    0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
-    0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
-    0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
-    0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
-    0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
-    0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
-    0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
-    0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
-    0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
-    0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
-    0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
-    0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
-    0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
-    0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
-    0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
-    0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
-    0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
-    0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
-    0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
-    0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
-    0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
-    0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
-    0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
-    0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
-    0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
-    0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
-    0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
-    0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
-    0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
-    0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
-    0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
-    0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
-    0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
-    0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
-    0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
-    0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
-    0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
-    0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
-    0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
-    0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
-    0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
-    0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
-    0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
-    0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
-    0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
-    0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
-    0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
-    0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
-};
-PROGMEM static const aes_u32 Td2[256] = {
-    0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
-    0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
-    0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
-    0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
-    0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
-    0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
-    0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
-    0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
-    0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
-    0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
-    0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
-    0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
-    0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
-    0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
-    0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
-    0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
-    0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
-    0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
-    0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
-    0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
-    0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
-    0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
-    0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
-    0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
-    0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
-    0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
-    0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
-    0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
-    0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
-    0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
-    0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
-    0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
-    0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
-    0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
-    0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
-    0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
-    0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
-    0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
-    0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
-    0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
-    0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
-    0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
-    0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
-    0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
-    0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
-    0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
-    0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
-    0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
-    0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
-    0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
-    0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
-    0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
-    0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
-    0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
-    0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
-    0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
-    0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
-    0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
-    0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
-    0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
-    0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
-    0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
-    0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
-    0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
-};
-PROGMEM static const aes_u32 Td3[256] = {
-    0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
-    0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
-    0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
-    0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
-    0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
-    0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
-    0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
-    0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
-    0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
-    0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
-    0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
-    0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
-    0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
-    0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
-    0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
-    0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
-    0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
-    0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
-    0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
-    0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
-    0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
-    0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
-    0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
-    0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
-    0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
-    0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
-    0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
-    0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
-    0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
-    0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
-    0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
-    0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
-    0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
-    0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
-    0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
-    0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
-    0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
-    0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
-    0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
-    0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
-    0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
-    0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
-    0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
-    0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
-    0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
-    0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
-    0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
-    0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
-    0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
-    0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
-    0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
-    0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
-    0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
-    0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
-    0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
-    0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
-    0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
-    0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
-    0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
-    0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
-    0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
-    0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
-    0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
-    0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
-};
-PROGMEM static const aes_u32 Td4[256] = {
-    0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U,
-    0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U,
-    0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU,
-    0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU,
-    0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U,
-    0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U,
-    0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U,
-    0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU,
-    0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U,
-    0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU,
-    0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU,
-    0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU,
-    0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U,
-    0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U,
-    0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U,
-    0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U,
-    0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U,
-    0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U,
-    0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU,
-    0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U,
-    0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U,
-    0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU,
-    0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U,
-    0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U,
-    0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U,
-    0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU,
-    0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U,
-    0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U,
-    0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU,
-    0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U,
-    0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U,
-    0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU,
-    0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U,
-    0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU,
-    0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU,
-    0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U,
-    0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U,
-    0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U,
-    0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U,
-    0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU,
-    0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U,
-    0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U,
-    0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU,
-    0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU,
-    0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU,
-    0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U,
-    0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU,
-    0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U,
-    0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U,
-    0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U,
-    0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U,
-    0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU,
-    0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U,
-    0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU,
-    0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU,
-    0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU,
-    0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU,
-    0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U,
-    0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU,
-    0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U,
-    0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU,
-    0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U,
-    0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U,
-    0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU,
-};
-
-#endif /* WITH_AES_DECRYPT */
-
-PROGMEM static const aes_u32 rcon[] = {
-       0x01000000, 0x02000000, 0x04000000, 0x08000000,
-       0x10000000, 0x20000000, 0x40000000, 0x80000000,
-       0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
-};
-
-#define GETU32(pt) (((aes_u32)(pt)[0] << 24) ^ ((aes_u32)(pt)[1] << 16) ^ ((aes_u32)(pt)[2] <<  8) ^ ((aes_u32)(pt)[3]))
-#define PUTU32(ct, st) { (ct)[0] = (aes_u8)((st) >> 24); (ct)[1] = (aes_u8)((st) >> 16); (ct)[2] = (aes_u8)((st) >>  8); (ct)[3] = (aes_u8)(st); }
-
-/**
- * Expand the cipher key into the encryption key schedule.
- *
- * @return     the number of rounds for the given cipher key size.
- */
-int
-rijndaelKeySetupEnc(aes_u32 rk[/*4*(Nr + 1)*/], const aes_u8 cipherKey[], int keyBits)
-{
-       int i = 0;
-       aes_u32 temp;
-
-       rk[0] = GETU32(cipherKey     );
-       rk[1] = GETU32(cipherKey +  4);
-       rk[2] = GETU32(cipherKey +  8);
-       rk[3] = GETU32(cipherKey + 12);
-       if (keyBits == 128) {
-               for (;;) {
-                       temp  = rk[3];
-                       rk[4] = rk[0] ^
-                               (pgm_read_dword(&Te4[(temp >> 16) &0xff ]) & 0xff000000) ^
-                               (pgm_read_dword(&Te4[(temp >>  8) & 0xff]) & 0x00ff0000) ^
-                               (pgm_read_dword(&Te4[(temp      ) & 0xff]) & 0x0000ff00) ^
-                               (pgm_read_dword(&Te4[(temp >> 24)       ]) & 0x000000ff) ^
-                               (pgm_read_dword(&rcon[i]));
-                       rk[5] = rk[1] ^ rk[4];
-                       rk[6] = rk[2] ^ rk[5];
-                       rk[7] = rk[3] ^ rk[6];
-                       if (++i == 10) {
-                               return 10;
-                       }
-                       rk += 4;
-               }
-       }
-       rk[4] = GETU32(cipherKey + 16);
-       rk[5] = GETU32(cipherKey + 20);
-       if (keyBits == 192) {
-               for (;;) {
-                       temp = rk[ 5];
-                       rk[ 6] = rk[ 0] ^
-                               (pgm_read_dword(&Te4[(temp >> 16) & 0xff]) & 0xff000000) ^
-                               (pgm_read_dword(&Te4[(temp >>  8) & 0xff]) & 0x00ff0000) ^
-                               (pgm_read_dword(&Te4[(temp      ) & 0xff]) & 0x0000ff00) ^
-                               (pgm_read_dword(&Te4[(temp >> 24)       ]) & 0x000000ff) ^
-                               (pgm_read_dword(&rcon[i]));
-                       rk[ 7] = rk[ 1] ^ rk[ 6];
-                       rk[ 8] = rk[ 2] ^ rk[ 7];
-                       rk[ 9] = rk[ 3] ^ rk[ 8];
-                       if (++i == 8) {
-                               return 12;
-                       }
-                       rk[10] = rk[ 4] ^ rk[ 9];
-                       rk[11] = rk[ 5] ^ rk[10];
-                       rk += 6;
-               }
-       }
-       rk[6] = GETU32(cipherKey + 24);
-       rk[7] = GETU32(cipherKey + 28);
-       if (keyBits == 256) {
-               for (;;) {
-                       temp = rk[ 7];
-                       rk[ 8] = rk[ 0] ^
-                               (pgm_read_dword(&Te4[(temp >> 16) & 0xff]) & 0xff000000) ^
-                               (pgm_read_dword(&Te4[(temp >>  8) & 0xff]) & 0x00ff0000) ^
-                               (pgm_read_dword(&Te4[(temp      ) & 0xff]) & 0x0000ff00) ^
-                               (pgm_read_dword(&Te4[(temp >> 24)       ]) & 0x000000ff) ^
-                               (pgm_read_dword(&rcon[i]));
-                       rk[ 9] = rk[ 1] ^ rk[ 8];
-                       rk[10] = rk[ 2] ^ rk[ 9];
-                       rk[11] = rk[ 3] ^ rk[10];
-                       if (++i == 7) {
-                               return 14;
-                       }
-                       temp = rk[11];
-                       rk[12] = rk[ 4] ^
-                               (pgm_read_dword(&Te4[(temp >> 24)       ]) & 0xff000000) ^
-                               (pgm_read_dword(&Te4[(temp >> 16) & 0xff]) & 0x00ff0000) ^
-                               (pgm_read_dword(&Te4[(temp >>  8) & 0xff]) & 0x0000ff00) ^
-                               (pgm_read_dword(&Te4[(temp      ) & 0xff]) & 0x000000ff);
-                       rk[13] = rk[ 5] ^ rk[12];
-                       rk[14] = rk[ 6] ^ rk[13];
-                       rk[15] = rk[ 7] ^ rk[14];
-                       rk += 8;
-               }
-       }
-       return 0;
-}
-
-#ifdef WITH_AES_DECRYPT
-/**
- * Expand the cipher key into the decryption key schedule.
- *
- * @return     the number of rounds for the given cipher key size.
- */
-int
-rijndaelKeySetupDec(aes_u32 rk[/*4*(Nr + 1)*/], const aes_u8 cipherKey[], int keyBits)
-{
-       int Nr, i, j;
-       aes_u32 temp;
-
-       /* expand the cipher key: */
-       Nr = rijndaelKeySetupEnc(rk, cipherKey, keyBits);
-
-       /* invert the order of the round keys: */
-       for (i = 0, j = 4*Nr; i < j; i += 4, j -= 4) {
-               temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-               temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-               temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-               temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
-       }
-       /* apply the inverse MixColumn transform to all round keys but the first and the last: */
-       for (i = 1; i < Nr; i++) {
-               rk += 4;
-               rk[0] =
-                       pgm_read_dword(&Td0[pgm_read_dword(&Te4[(rk[0] >> 24)       ]) & 0xff]) ^
-                       pgm_read_dword(&Td1[pgm_read_dword(&Te4[(rk[0] >> 16) & 0xff]) & 0xff]) ^
-                       pgm_read_dword(&Td2[pgm_read_dword(&Te4[(rk[0] >>  8) & 0xff]) & 0xff]) ^
-                       pgm_read_dword(&Td3[pgm_read_dword(&Te4[(rk[0]      ) & 0xff]) & 0xff]);
-               rk[1] =
-                       pgm_read_dword(&Td0[pgm_read_dword(&Te4[(rk[1] >> 24)       ]) & 0xff]) ^
-                       pgm_read_dword(&Td1[pgm_read_dword(&Te4[(rk[1] >> 16) & 0xff]) & 0xff]) ^
-                       pgm_read_dword(&Td2[pgm_read_dword(&Te4[(rk[1] >>  8) & 0xff]) & 0xff]) ^
-                       pgm_read_dword(&Td3[pgm_read_dword(&Te4[(rk[1]      ) & 0xff]) & 0xff]);
-               rk[2] =
-                       pgm_read_dword(&Td0[pgm_read_dword(&Te4[(rk[2] >> 24)       ]) & 0xff]) ^
-                       pgm_read_dword(&Td1[pgm_read_dword(&Te4[(rk[2] >> 16) & 0xff]) & 0xff]) ^
-                       pgm_read_dword(&Td2[pgm_read_dword(&Te4[(rk[2] >>  8) & 0xff]) & 0xff]) ^
-                       pgm_read_dword(&Td3[pgm_read_dword(&Te4[(rk[2]      ) & 0xff]) & 0xff]);
-               rk[3] =
-                       pgm_read_dword(&Td0[pgm_read_dword(&Te4[(rk[3] >> 24)       ]) & 0xff]) ^
-                       pgm_read_dword(&Td1[pgm_read_dword(&Te4[(rk[3] >> 16) & 0xff]) & 0xff]) ^
-                       pgm_read_dword(&Td2[pgm_read_dword(&Te4[(rk[3] >>  8) & 0xff]) & 0xff]) ^
-                       pgm_read_dword(&Td3[pgm_read_dword(&Te4[(rk[3]      ) & 0xff]) & 0xff]);
-       }
-       return Nr;
-}
-#endif
-
-void
-rijndaelEncrypt(const aes_u32 rk[/*4*(Nr + 1)*/], int Nr, const aes_u8 pt[16],
-    aes_u8 ct[16])
-{
-       aes_u32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-    int r;
-#endif /* ?FULL_UNROLL */
-
-    /*
-        * map byte array block to cipher state
-        * and add initial round key:
-        */
-       s0 = GETU32(pt     ) ^ rk[0];
-       s1 = GETU32(pt +  4) ^ rk[1];
-       s2 = GETU32(pt +  8) ^ rk[2];
-       s3 = GETU32(pt + 12) ^ rk[3];
-#ifdef FULL_UNROLL
-    /* round 1: */
-       t0 = pgm_read_dword(&Te0[s0 >> 24]) ^ pgm_read_dword(&Te1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s3 & 0xff]) ^ rk[ 4];
-       t1 = pgm_read_dword(&Te0[s1 >> 24]) ^ pgm_read_dword(&Te1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s0 & 0xff]) ^ rk[ 5];
-       t2 = pgm_read_dword(&Te0[s2 >> 24]) ^ pgm_read_dword(&Te1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s1 & 0xff]) ^ rk[ 6];
-       t3 = pgm_read_dword(&Te0[s3 >> 24]) ^ pgm_read_dword(&Te1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s2 & 0xff]) ^ rk[ 7];
-       /* round 2: */
-       s0 = pgm_read_dword(&Te0[t0 >> 24]) ^ pgm_read_dword(&Te1[(t1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t3 & 0xff]) ^ rk[ 8];
-       s1 = pgm_read_dword(&Te0[t1 >> 24]) ^ pgm_read_dword(&Te1[(t2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t0 & 0xff]) ^ rk[ 9];
-       s2 = pgm_read_dword(&Te0[t2 >> 24]) ^ pgm_read_dword(&Te1[(t3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t1 & 0xff]) ^ rk[10];
-       s3 = pgm_read_dword(&Te0[t3 >> 24]) ^ pgm_read_dword(&Te1[(t0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t2 & 0xff]) ^ rk[11];
-    /* round 3: */
-       t0 = pgm_read_dword(&Te0[s0 >> 24]) ^ pgm_read_dword(&Te1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s3 & 0xff]) ^ rk[12];
-       t1 = pgm_read_dword(&Te0[s1 >> 24]) ^ pgm_read_dword(&Te1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s0 & 0xff]) ^ rk[13];
-       t2 = pgm_read_dword(&Te0[s2 >> 24]) ^ pgm_read_dword(&Te1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s1 & 0xff]) ^ rk[14];
-       t3 = pgm_read_dword(&Te0[s3 >> 24]) ^ pgm_read_dword(&Te1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s2 & 0xff]) ^ rk[15];
-       /* round 4: */
-       s0 = pgm_read_dword(&Te0[t0 >> 24]) ^ pgm_read_dword(&Te1[(t1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t3 & 0xff]) ^ rk[16];
-       s1 = pgm_read_dword(&Te0[t1 >> 24]) ^ pgm_read_dword(&Te1[(t2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t0 & 0xff]) ^ rk[17];
-       s2 = pgm_read_dword(&Te0[t2 >> 24]) ^ pgm_read_dword(&Te1[(t3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t1 & 0xff]) ^ rk[18];
-       s3 = pgm_read_dword(&Te0[t3 >> 24]) ^ pgm_read_dword(&Te1[(t0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t2 & 0xff]) ^ rk[19];
-    /* round 5: */
-       t0 = pgm_read_dword(&Te0[s0 >> 24]) ^ pgm_read_dword(&Te1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s3 & 0xff]) ^ rk[20];
-       t1 = pgm_read_dword(&Te0[s1 >> 24]) ^ pgm_read_dword(&Te1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s0 & 0xff]) ^ rk[21];
-       t2 = pgm_read_dword(&Te0[s2 >> 24]) ^ pgm_read_dword(&Te1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s1 & 0xff]) ^ rk[22];
-       t3 = pgm_read_dword(&Te0[s3 >> 24]) ^ pgm_read_dword(&Te1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s2 & 0xff]) ^ rk[23];
-       /* round 6: */
-       s0 = pgm_read_dword(&Te0[t0 >> 24]) ^ pgm_read_dword(&Te1[(t1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t3 & 0xff]) ^ rk[24];
-       s1 = pgm_read_dword(&Te0[t1 >> 24]) ^ pgm_read_dword(&Te1[(t2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t0 & 0xff]) ^ rk[25];
-       s2 = pgm_read_dword(&Te0[t2 >> 24]) ^ pgm_read_dword(&Te1[(t3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t1 & 0xff]) ^ rk[26];
-       s3 = pgm_read_dword(&Te0[t3 >> 24]) ^ pgm_read_dword(&Te1[(t0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t2 & 0xff]) ^ rk[27];
-    /* round 7: */
-       t0 = pgm_read_dword(&Te0[s0 >> 24]) ^ pgm_read_dword(&Te1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s3 & 0xff]) ^ rk[28];
-       t1 = pgm_read_dword(&Te0[s1 >> 24]) ^ pgm_read_dword(&Te1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s0 & 0xff]) ^ rk[29];
-       t2 = pgm_read_dword(&Te0[s2 >> 24]) ^ pgm_read_dword(&Te1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s1 & 0xff]) ^ rk[30];
-       t3 = pgm_read_dword(&Te0[s3 >> 24]) ^ pgm_read_dword(&Te1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s2 & 0xff]) ^ rk[31];
-       /* round 8: */
-       s0 = pgm_read_dword(&Te0[t0 >> 24]) ^ pgm_read_dword(&Te1[(t1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t3 & 0xff]) ^ rk[32];
-       s1 = pgm_read_dword(&Te0[t1 >> 24]) ^ pgm_read_dword(&Te1[(t2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t0 & 0xff]) ^ rk[33];
-       s2 = pgm_read_dword(&Te0[t2 >> 24]) ^ pgm_read_dword(&Te1[(t3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t1 & 0xff]) ^ rk[34];
-       s3 = pgm_read_dword(&Te0[t3 >> 24]) ^ pgm_read_dword(&Te1[(t0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t2 & 0xff]) ^ rk[35];
-    /* round 9: */
-       t0 = pgm_read_dword(&Te0[s0 >> 24]) ^ pgm_read_dword(&Te1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s3 & 0xff]) ^ rk[36];
-       t1 = pgm_read_dword(&Te0[s1 >> 24]) ^ pgm_read_dword(&Te1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s0 & 0xff]) ^ rk[37];
-       t2 = pgm_read_dword(&Te0[s2 >> 24]) ^ pgm_read_dword(&Te1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s1 & 0xff]) ^ rk[38];
-       t3 = pgm_read_dword(&Te0[s3 >> 24]) ^ pgm_read_dword(&Te1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s2 & 0xff]) ^ rk[39];
-    if (Nr > 10) {
-       /* round 10: */
-       s0 = pgm_read_dword(&Te0[t0 >> 24]) ^ pgm_read_dword(&Te1[(t1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t3 & 0xff]) ^ rk[40];
-       s1 = pgm_read_dword(&Te0[t1 >> 24]) ^ pgm_read_dword(&Te1[(t2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t0 & 0xff]) ^ rk[41];
-       s2 = pgm_read_dword(&Te0[t2 >> 24]) ^ pgm_read_dword(&Te1[(t3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t1 & 0xff]) ^ rk[42];
-       s3 = pgm_read_dword(&Te0[t3 >> 24]) ^ pgm_read_dword(&Te1[(t0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t2 & 0xff]) ^ rk[43];
-       /* round 11: */
-       t0 = pgm_read_dword(&Te0[s0 >> 24]) ^ pgm_read_dword(&Te1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s3 & 0xff]) ^ rk[44];
-       t1 = pgm_read_dword(&Te0[s1 >> 24]) ^ pgm_read_dword(&Te1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s0 & 0xff]) ^ rk[45];
-       t2 = pgm_read_dword(&Te0[s2 >> 24]) ^ pgm_read_dword(&Te1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s1 & 0xff]) ^ rk[46];
-       t3 = pgm_read_dword(&Te0[s3 >> 24]) ^ pgm_read_dword(&Te1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s2 & 0xff]) ^ rk[47];
-       if (Nr > 12) {
-           /* round 12: */
-           s0 = pgm_read_dword(&Te0[t0 >> 24]) ^ pgm_read_dword(&Te1[(t1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t3 & 0xff]) ^ rk[48];
-           s1 = pgm_read_dword(&Te0[t1 >> 24]) ^ pgm_read_dword(&Te1[(t2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t0 & 0xff]) ^ rk[49];
-           s2 = pgm_read_dword(&Te0[t2 >> 24]) ^ pgm_read_dword(&Te1[(t3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t1 & 0xff]) ^ rk[50];
-           s3 = pgm_read_dword(&Te0[t3 >> 24]) ^ pgm_read_dword(&Te1[(t0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(t1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[t2 & 0xff]) ^ rk[51];
-           /* round 13: */
-           t0 = pgm_read_dword(&Te0[s0 >> 24]) ^ pgm_read_dword(&Te1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s3 & 0xff]) ^ rk[52];
-           t1 = pgm_read_dword(&Te0[s1 >> 24]) ^ pgm_read_dword(&Te1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s0 & 0xff]) ^ rk[53];
-           t2 = pgm_read_dword(&Te0[s2 >> 24]) ^ pgm_read_dword(&Te1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s1 & 0xff]) ^ rk[54];
-           t3 = pgm_read_dword(&Te0[s3 >> 24]) ^ pgm_read_dword(&Te1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Te2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Te3[s2 & 0xff]) ^ rk[55];
-       }
-    }
-    rk += Nr << 2;
-#else  /* !FULL_UNROLL */
-    /*
-        * Nr - 1 full rounds:
-        */
-    r = Nr >> 1;
-    for (;;) {
-       t0 =
-           pgm_read_dword(&Te0[(s0 >> 24)       ]) ^
-           pgm_read_dword(&Te1[(s1 >> 16) & 0xff]) ^
-           pgm_read_dword(&Te2[(s2 >>  8) & 0xff]) ^
-           pgm_read_dword(&Te3[(s3      ) & 0xff]) ^
-           rk[4];
-       t1 =
-           pgm_read_dword(&Te0[(s1 >> 24)       ]) ^
-           pgm_read_dword(&Te1[(s2 >> 16) & 0xff]) ^
-           pgm_read_dword(&Te2[(s3 >>  8) & 0xff]) ^
-           pgm_read_dword(&Te3[(s0      ) & 0xff]) ^
-           rk[5];
-       t2 =
-           pgm_read_dword(&Te0[(s2 >> 24)       ]) ^
-           pgm_read_dword(&Te1[(s3 >> 16) & 0xff]) ^
-           pgm_read_dword(&Te2[(s0 >>  8) & 0xff]) ^
-           pgm_read_dword(&Te3[(s1      ) & 0xff]) ^
-           rk[6];
-       t3 =
-           pgm_read_dword(&Te0[(s3 >> 24)       ]) ^
-           pgm_read_dword(&Te1[(s0 >> 16) & 0xff]) ^
-           pgm_read_dword(&Te2[(s1 >>  8) & 0xff]) ^
-           pgm_read_dword(&Te3[(s2      ) & 0xff]) ^
-           rk[7];
-
-       rk += 8;
-       if (--r == 0) {
-           break;
-       }
-
-       s0 =
-           pgm_read_dword(&Te0[(t0 >> 24)       ]) ^
-           pgm_read_dword(&Te1[(t1 >> 16) & 0xff]) ^
-           pgm_read_dword(&Te2[(t2 >>  8) & 0xff]) ^
-           pgm_read_dword(&Te3[(t3      ) & 0xff]) ^
-           rk[0];
-       s1 =
-           pgm_read_dword(&Te0[(t1 >> 24)       ]) ^
-           pgm_read_dword(&Te1[(t2 >> 16) & 0xff]) ^
-           pgm_read_dword(&Te2[(t3 >>  8) & 0xff]) ^
-           pgm_read_dword(&Te3[(t0      ) & 0xff]) ^
-           rk[1];
-       s2 =
-           pgm_read_dword(&Te0[(t2 >> 24)       ]) ^
-           pgm_read_dword(&Te1[(t3 >> 16) & 0xff]) ^
-           pgm_read_dword(&Te2[(t0 >>  8) & 0xff]) ^
-           pgm_read_dword(&Te3[(t1      ) & 0xff]) ^
-           rk[2];
-       s3 =
-           pgm_read_dword(&Te0[(t3 >> 24)       ]) ^
-           pgm_read_dword(&Te1[(t0 >> 16) & 0xff]) ^
-           pgm_read_dword(&Te2[(t1 >>  8) & 0xff]) ^
-           pgm_read_dword(&Te3[(t2      ) & 0xff]) ^
-           rk[3];
-    }
-#endif /* ?FULL_UNROLL */
-    /*
-        * apply last round and
-        * map cipher state to byte array block:
-        */
-       s0 =
-               (pgm_read_dword(&Te4[(t0 >> 24)       ]) & 0xff000000) ^
-               (pgm_read_dword(&Te4[(t1 >> 16) & 0xff]) & 0x00ff0000) ^
-               (pgm_read_dword(&Te4[(t2 >>  8) & 0xff]) & 0x0000ff00) ^
-               (pgm_read_dword(&Te4[(t3      ) & 0xff]) & 0x000000ff) ^
-               rk[0];
-       PUTU32(ct     , s0);
-       s1 =
-               (pgm_read_dword(&Te4[(t1 >> 24)       ]) & 0xff000000) ^
-               (pgm_read_dword(&Te4[(t2 >> 16) & 0xff]) & 0x00ff0000) ^
-               (pgm_read_dword(&Te4[(t3 >>  8) & 0xff]) & 0x0000ff00) ^
-               (pgm_read_dword(&Te4[(t0      ) & 0xff]) & 0x000000ff) ^
-               rk[1];
-       PUTU32(ct +  4, s1);
-       s2 =
-               (pgm_read_dword(&Te4[(t2 >> 24)       ]) & 0xff000000) ^
-               (pgm_read_dword(&Te4[(t3 >> 16) & 0xff]) & 0x00ff0000) ^
-               (pgm_read_dword(&Te4[(t0 >>  8) & 0xff]) & 0x0000ff00) ^
-               (pgm_read_dword(&Te4[(t1      ) & 0xff]) & 0x000000ff) ^
-               rk[2];
-       PUTU32(ct +  8, s2);
-       s3 =
-               (pgm_read_dword(&Te4[(t3 >> 24)       ]) & 0xff000000) ^
-               (pgm_read_dword(&Te4[(t0 >> 16) & 0xff]) & 0x00ff0000) ^
-               (pgm_read_dword(&Te4[(t1 >>  8) & 0xff]) & 0x0000ff00) ^
-               (pgm_read_dword(&Te4[(t2      ) & 0xff]) & 0x000000ff) ^
-               rk[3];
-       PUTU32(ct + 12, s3);
-}
-
-#ifdef WITH_AES_DECRYPT
-static void
-rijndaelDecrypt(const aes_u32 rk[/*4*(Nr + 1)*/], int Nr, const aes_u8 ct[16],
-    aes_u8 pt[16])
-{
-       aes_u32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-    int r;
-#endif /* ?FULL_UNROLL */
-
-    /*
-        * map byte array block to cipher state
-        * and add initial round key:
-        */
-    s0 = GETU32(ct     ) ^ rk[0];
-    s1 = GETU32(ct +  4) ^ rk[1];
-    s2 = GETU32(ct +  8) ^ rk[2];
-    s3 = GETU32(ct + 12) ^ rk[3];
-#ifdef FULL_UNROLL
-    /* round 1: */
-    t0 = pgm_read_dword(&Td0[s0 >> 24]) ^ pgm_read_dword(&Td1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s1 & 0xff]) ^ rk[ 4];
-    t1 = pgm_read_dword(&Td0[s1 >> 24]) ^ pgm_read_dword(&Td1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s2 & 0xff]) ^ rk[ 5];
-    t2 = pgm_read_dword(&Td0[s2 >> 24]) ^ pgm_read_dword(&Td1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s3 & 0xff]) ^ rk[ 6];
-    t3 = pgm_read_dword(&Td0[s3 >> 24]) ^ pgm_read_dword(&Td1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s0 & 0xff]) ^ rk[ 7];
-    /* round 2: */
-    s0 = pgm_read_dword(&Td0[t0 >> 24]) ^ pgm_read_dword(&Td1[(t3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t1 & 0xff]) ^ rk[ 8];
-    s1 = pgm_read_dword(&Td0[t1 >> 24]) ^ pgm_read_dword(&Td1[(t0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t2 & 0xff]) ^ rk[ 9];
-    s2 = pgm_read_dword(&Td0[t2 >> 24]) ^ pgm_read_dword(&Td1[(t1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t3 & 0xff]) ^ rk[10];
-    s3 = pgm_read_dword(&Td0[t3 >> 24]) ^ pgm_read_dword(&Td1[(t2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t0 & 0xff]) ^ rk[11];
-    /* round 3: */
-    t0 = pgm_read_dword(&Td0[s0 >> 24]) ^ pgm_read_dword(&Td1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s1 & 0xff]) ^ rk[12];
-    t1 = pgm_read_dword(&Td0[s1 >> 24]) ^ pgm_read_dword(&Td1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s2 & 0xff]) ^ rk[13];
-    t2 = pgm_read_dword(&Td0[s2 >> 24]) ^ pgm_read_dword(&Td1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s3 & 0xff]) ^ rk[14];
-    t3 = pgm_read_dword(&Td0[s3 >> 24]) ^ pgm_read_dword(&Td1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s0 & 0xff]) ^ rk[15];
-    /* round 4: */
-    s0 = pgm_read_dword(&Td0[t0 >> 24]) ^ pgm_read_dword(&Td1[(t3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t1 & 0xff]) ^ rk[16];
-    s1 = pgm_read_dword(&Td0[t1 >> 24]) ^ pgm_read_dword(&Td1[(t0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t2 & 0xff]) ^ rk[17];
-    s2 = pgm_read_dword(&Td0[t2 >> 24]) ^ pgm_read_dword(&Td1[(t1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t3 & 0xff]) ^ rk[18];
-    s3 = pgm_read_dword(&Td0[t3 >> 24]) ^ pgm_read_dword(&Td1[(t2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t0 & 0xff]) ^ rk[19];
-    /* round 5: */
-    t0 = pgm_read_dword(&Td0[s0 >> 24]) ^ pgm_read_dword(&Td1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s1 & 0xff]) ^ rk[20];
-    t1 = pgm_read_dword(&Td0[s1 >> 24]) ^ pgm_read_dword(&Td1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s2 & 0xff]) ^ rk[21];
-    t2 = pgm_read_dword(&Td0[s2 >> 24]) ^ pgm_read_dword(&Td1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s3 & 0xff]) ^ rk[22];
-    t3 = pgm_read_dword(&Td0[s3 >> 24]) ^ pgm_read_dword(&Td1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s0 & 0xff]) ^ rk[23];
-    /* round 6: */
-    s0 = pgm_read_dword(&Td0[t0 >> 24]) ^ pgm_read_dword(&Td1[(t3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t1 & 0xff]) ^ rk[24];
-    s1 = pgm_read_dword(&Td0[t1 >> 24]) ^ pgm_read_dword(&Td1[(t0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t2 & 0xff]) ^ rk[25];
-    s2 = pgm_read_dword(&Td0[t2 >> 24]) ^ pgm_read_dword(&Td1[(t1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t3 & 0xff]) ^ rk[26];
-    s3 = pgm_read_dword(&Td0[t3 >> 24]) ^ pgm_read_dword(&Td1[(t2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t0 & 0xff]) ^ rk[27];
-    /* round 7: */
-    t0 = pgm_read_dword(&Td0[s0 >> 24]) ^ pgm_read_dword(&Td1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s1 & 0xff]) ^ rk[28];
-    t1 = pgm_read_dword(&Td0[s1 >> 24]) ^ pgm_read_dword(&Td1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s2 & 0xff]) ^ rk[29];
-    t2 = pgm_read_dword(&Td0[s2 >> 24]) ^ pgm_read_dword(&Td1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s3 & 0xff]) ^ rk[30];
-    t3 = pgm_read_dword(&Td0[s3 >> 24]) ^ pgm_read_dword(&Td1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s0 & 0xff]) ^ rk[31];
-    /* round 8: */
-    s0 = pgm_read_dword(&Td0[t0 >> 24]) ^ pgm_read_dword(&Td1[(t3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t1 & 0xff]) ^ rk[32];
-    s1 = pgm_read_dword(&Td0[t1 >> 24]) ^ pgm_read_dword(&Td1[(t0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t2 & 0xff]) ^ rk[33];
-    s2 = pgm_read_dword(&Td0[t2 >> 24]) ^ pgm_read_dword(&Td1[(t1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t3 & 0xff]) ^ rk[34];
-    s3 = pgm_read_dword(&Td0[t3 >> 24]) ^ pgm_read_dword(&Td1[(t2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t0 & 0xff]) ^ rk[35];
-    /* round 9: */
-    t0 = pgm_read_dword(&Td0[s0 >> 24]) ^ pgm_read_dword(&Td1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s1 & 0xff]) ^ rk[36];
-    t1 = pgm_read_dword(&Td0[s1 >> 24]) ^ pgm_read_dword(&Td1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s2 & 0xff]) ^ rk[37];
-    t2 = pgm_read_dword(&Td0[s2 >> 24]) ^ pgm_read_dword(&Td1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s3 & 0xff]) ^ rk[38];
-    t3 = pgm_read_dword(&Td0[s3 >> 24]) ^ pgm_read_dword(&Td1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s0 & 0xff]) ^ rk[39];
-    if (Nr > 10) {
-       /* round 10: */
-       s0 = pgm_read_dword(&Td0[t0 >> 24]) ^ pgm_read_dword(&Td1[(t3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t1 & 0xff]) ^ rk[40];
-       s1 = pgm_read_dword(&Td0[t1 >> 24]) ^ pgm_read_dword(&Td1[(t0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t2 & 0xff]) ^ rk[41];
-       s2 = pgm_read_dword(&Td0[t2 >> 24]) ^ pgm_read_dword(&Td1[(t1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t3 & 0xff]) ^ rk[42];
-       s3 = pgm_read_dword(&Td0[t3 >> 24]) ^ pgm_read_dword(&Td1[(t2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t0 & 0xff]) ^ rk[43];
-       /* round 11: */
-       t0 = pgm_read_dword(&Td0[s0 >> 24]) ^ pgm_read_dword(&Td1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s1 & 0xff]) ^ rk[44];
-       t1 = pgm_read_dword(&Td0[s1 >> 24]) ^ pgm_read_dword(&Td1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s2 & 0xff]) ^ rk[45];
-       t2 = pgm_read_dword(&Td0[s2 >> 24]) ^ pgm_read_dword(&Td1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s3 & 0xff]) ^ rk[46];
-       t3 = pgm_read_dword(&Td0[s3 >> 24]) ^ pgm_read_dword(&Td1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s0 & 0xff]) ^ rk[47];
-       if (Nr > 12) {
-           /* round 12: */
-           s0 = pgm_read_dword(&Td0[t0 >> 24]) ^ pgm_read_dword(&Td1[(t3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t1 & 0xff]) ^ rk[48];
-           s1 = pgm_read_dword(&Td0[t1 >> 24]) ^ pgm_read_dword(&Td1[(t0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t2 & 0xff]) ^ rk[49];
-           s2 = pgm_read_dword(&Td0[t2 >> 24]) ^ pgm_read_dword(&Td1[(t1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t3 & 0xff]) ^ rk[50];
-           s3 = pgm_read_dword(&Td0[t3 >> 24]) ^ pgm_read_dword(&Td1[(t2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(t1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[t0 & 0xff]) ^ rk[51];
-           /* round 13: */
-           t0 = pgm_read_dword(&Td0[s0 >> 24]) ^ pgm_read_dword(&Td1[(s3 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s2 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s1 & 0xff]) ^ rk[52];
-           t1 = pgm_read_dword(&Td0[s1 >> 24]) ^ pgm_read_dword(&Td1[(s0 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s3 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s2 & 0xff]) ^ rk[53];
-           t2 = pgm_read_dword(&Td0[s2 >> 24]) ^ pgm_read_dword(&Td1[(s1 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s0 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s3 & 0xff]) ^ rk[54];
-           t3 = pgm_read_dword(&Td0[s3 >> 24]) ^ pgm_read_dword(&Td1[(s2 >> 16) & 0xff]) ^ pgm_read_dword(&Td2[(s1 >>  8) & 0xff]) ^ pgm_read_dword(&Td3[s0 & 0xff]) ^ rk[55];
-       }
-    }
-       rk += Nr << 2;
-#else  /* !FULL_UNROLL */
-    /*
-     * Nr - 1 full rounds:
-     */
-    r = Nr >> 1;
-    for (;;) {
-       t0 =
-           pgm_read_dword(&Td0[(s0 >> 24)       ]) ^
-           pgm_read_dword(&Td1[(s3 >> 16) & 0xff]) ^
-           pgm_read_dword(&Td2[(s2 >>  8) & 0xff]) ^
-           pgm_read_dword(&Td3[(s1      ) & 0xff]) ^
-           rk[4];
-       t1 =
-           pgm_read_dword(&Td0[(s1 >> 24)       ]) ^
-           pgm_read_dword(&Td1[(s0 >> 16) & 0xff]) ^
-           pgm_read_dword(&Td2[(s3 >>  8) & 0xff]) ^
-           pgm_read_dword(&Td3[(s2      ) & 0xff]) ^
-           rk[5];
-       t2 =
-           pgm_read_dword(&Td0[(s2 >> 24)       ]) ^
-           pgm_read_dword(&Td1[(s1 >> 16) & 0xff]) ^
-           pgm_read_dword(&Td2[(s0 >>  8) & 0xff]) ^
-           pgm_read_dword(&Td3[(s3      ) & 0xff]) ^
-           rk[6];
-       t3 =
-           pgm_read_dword(&Td0[(s3 >> 24)       ]) ^
-           pgm_read_dword(&Td1[(s2 >> 16) & 0xff]) ^
-           pgm_read_dword(&Td2[(s1 >>  8) & 0xff]) ^
-           pgm_read_dword(&Td3[(s0      ) & 0xff]) ^
-           rk[7];
-
-       rk += 8;
-       if (--r == 0) {
-           break;
-       }
-
-       s0 =
-           pgm_read_dword(&Td0[(t0 >> 24)       ]) ^
-           pgm_read_dword(&Td1[(t3 >> 16) & 0xff]) ^
-           pgm_read_dword(&Td2[(t2 >>  8) & 0xff]) ^
-           pgm_read_dword(&Td3[(t1      ) & 0xff]) ^
-           rk[0];
-       s1 =
-           pgm_read_dword(&Td0[(t1 >> 24)       ]) ^
-           pgm_read_dword(&Td1[(t0 >> 16) & 0xff]) ^
-           pgm_read_dword(&Td2[(t3 >>  8) & 0xff]) ^
-           pgm_read_dword(&Td3[(t2      ) & 0xff]) ^
-           rk[1];
-       s2 =
-           pgm_read_dword(&Td0[(t2 >> 24)       ]) ^
-           pgm_read_dword(&Td1[(t1 >> 16) & 0xff]) ^
-           pgm_read_dword(&Td2[(t0 >>  8) & 0xff]) ^
-           pgm_read_dword(&Td3[(t3      ) & 0xff]) ^
-           rk[2];
-       s3 =
-           pgm_read_dword(&Td0[(t3 >> 24)       ]) ^
-           pgm_read_dword(&Td1[(t2 >> 16) & 0xff]) ^
-           pgm_read_dword(&Td2[(t1 >>  8) & 0xff]) ^
-           pgm_read_dword(&Td3[(t0      ) & 0xff]) ^
-           rk[3];
-    }
-#endif /* ?FULL_UNROLL */
-    /*
-        * apply last round and
-        * map cipher state to byte array block:
-        */
-       s0 =
-               (pgm_read_dword(&Td4[(t0 >> 24)       ]) & 0xff000000) ^
-               (pgm_read_dword(&Td4[(t3 >> 16) & 0xff]) & 0x00ff0000) ^
-               (pgm_read_dword(&Td4[(t2 >>  8) & 0xff]) & 0x0000ff00) ^
-               (pgm_read_dword(&Td4[(t1      ) & 0xff]) & 0x000000ff) ^
-               rk[0];
-       PUTU32(pt     , s0);
-       s1 =
-               (pgm_read_dword(&Td4[(t1 >> 24)       ]) & 0xff000000) ^
-               (pgm_read_dword(&Td4[(t0 >> 16) & 0xff]) & 0x00ff0000) ^
-               (pgm_read_dword(&Td4[(t3 >>  8) & 0xff]) & 0x0000ff00) ^
-               (pgm_read_dword(&Td4[(t2      ) & 0xff]) & 0x000000ff) ^
-               rk[1];
-       PUTU32(pt +  4, s1);
-       s2 =
-               (pgm_read_dword(&Td4[(t2 >> 24)       ]) & 0xff000000) ^
-               (pgm_read_dword(&Td4[(t1 >> 16) & 0xff]) & 0x00ff0000) ^
-               (pgm_read_dword(&Td4[(t0 >>  8) & 0xff]) & 0x0000ff00) ^
-               (pgm_read_dword(&Td4[(t3      ) & 0xff]) & 0x000000ff) ^
-               rk[2];
-       PUTU32(pt +  8, s2);
-       s3 =
-               (pgm_read_dword(&Td4[(t3 >> 24)       ]) & 0xff000000) ^
-               (pgm_read_dword(&Td4[(t2 >> 16) & 0xff]) & 0x00ff0000) ^
-               (pgm_read_dword(&Td4[(t1 >>  8) & 0xff]) & 0x0000ff00) ^
-               (pgm_read_dword(&Td4[(t0      ) & 0xff]) & 0x000000ff) ^
-               rk[3];
-       PUTU32(pt + 12, s3);
-}
-#endif
-
-/* setup key context for encryption only */
-int
-rijndael_set_key_enc_only(rijndael_ctx *ctx, const u_char *key, int bits)
-{
-       int rounds;
-
-       rounds = rijndaelKeySetupEnc(ctx->ek, key, bits);
-       if (rounds == 0)
-               return -1;
-
-       ctx->Nr = rounds;
-#ifdef WITH_AES_DECRYPT
-       ctx->enc_only = 1;
-#endif
-
-       return 0;
-}
-
-#ifdef WITH_AES_DECRYPT
-/* setup key context for both encryption and decryption */
-int
-rijndael_set_key(rijndael_ctx *ctx, const u_char *key, int bits)
-{
-       int rounds;
-
-       rounds = rijndaelKeySetupEnc(ctx->ek, key, bits);
-       if (rounds == 0)
-               return -1;
-       if (rijndaelKeySetupDec(ctx->dk, key, bits) != rounds)
-               return -1;
-
-       ctx->Nr = rounds;
-       ctx->enc_only = 0;
-
-       return 0;
-}
-
-void
-rijndael_decrypt(rijndael_ctx *ctx, const u_char *src, u_char *dst)
-{
-       rijndaelDecrypt(ctx->dk, ctx->Nr, src, dst);
-}
-#endif
-
-void
-rijndael_encrypt(rijndael_ctx *ctx, const u_char *src, u_char *dst)
-{
-       rijndaelEncrypt(ctx->ek, ctx->Nr, src, dst);
-}
diff --git a/extlibs/tinydtls/aes/rijndael.h b/extlibs/tinydtls/aes/rijndael.h
deleted file mode 100644 (file)
index 712798b..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*     $OpenBSD: rijndael.h,v 1.13 2008/06/09 07:49:45 djm Exp $ */
-
-/**
- * rijndael-alg-fst.h
- *
- * @version 3.0 (December 2000)
- *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * @author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef __RIJNDAEL_H
-#define __RIJNDAEL_H
-
-#include <stdint.h>
-
-#define WITH_AES_DECRYPT 1
-#define AES_MAXKEYBITS (256)
-#define AES_MAXKEYBYTES        (AES_MAXKEYBITS>>3)
-/* for 256-bit keys we need 14 rounds for a 128 we only need 10 round */
-#define AES_MAXROUNDS  14
-
-/* bergmann: to avoid conflicts with typedefs from certain Contiki platforms,
- * the following type names have been prefixed with "aes_": */
-typedef unsigned char  u_char;
-typedef uint8_t                aes_u8;
-typedef uint16_t       aes_u16;
-typedef uint32_t       aes_u32;
-
-/*  The structure for key information */
-typedef struct {
-#ifdef WITH_AES_DECRYPT
-       int     enc_only;               /* context contains only encrypt schedule */
-#endif
-       int     Nr;                     /* key-length-dependent number of rounds */
-       aes_u32 ek[4*(AES_MAXROUNDS + 1)];      /* encrypt key schedule */
-#ifdef WITH_AES_DECRYPT
-       aes_u32 dk[4*(AES_MAXROUNDS + 1)];      /* decrypt key schedule */
-#endif
-} rijndael_ctx;
-
-int     rijndael_set_key(rijndael_ctx *, const u_char *, int);
-int     rijndael_set_key_enc_only(rijndael_ctx *, const u_char *, int);
-void    rijndael_decrypt(rijndael_ctx *, const u_char *, u_char *);
-void    rijndael_encrypt(rijndael_ctx *, const u_char *, u_char *);
-
-int    rijndaelKeySetupEnc(aes_u32 rk[/*4*(Nr + 1)*/], const aes_u8 cipherKey[], int keyBits);
-int    rijndaelKeySetupDec(aes_u32 rk[/*4*(Nr + 1)*/], const aes_u8 cipherKey[], int keyBits);
-void   rijndaelEncrypt(const aes_u32 rk[/*4*(Nr + 1)*/], int Nr, const aes_u8 pt[16], aes_u8 ct[16]);
-
-#endif /* __RIJNDAEL_H */
diff --git a/extlibs/tinydtls/alert.h b/extlibs/tinydtls/alert.h
deleted file mode 100644 (file)
index a589dd7..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/* alert.h -- DTLS alert protocol
- *
- * Copyright (C) 2012 Olaf Bergmann <bergmann@tzi.org>
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/**
- * @file alert.h
- * @brief DTLS alert protocol
- */
-
-#ifndef _DTLS_ALERT_H_
-#define _DTLS_ALERT_H_
-
-typedef enum {
-  DTLS_ALERT_LEVEL_WARNING=1,
-  DTLS_ALERT_LEVEL_FATAL=2
-} dtls_alert_level_t;
-
-typedef enum {
-  DTLS_ALERT_CLOSE_NOTIFY = 0,                 /* close_notify */
-  DTLS_ALERT_UNEXPECTED_MESSAGE = 10,          /* unexpected_message */
-  DTLS_ALERT_BAD_RECORD_MAC = 20,              /* bad_record_mac */
-  DTLS_ALERT_RECORD_OVERFLOW = 22,             /* record_overflow */
-  DTLS_ALERT_DECOMPRESSION_FAILURE = 30,       /* decompression_failure */
-  DTLS_ALERT_HANDSHAKE_FAILURE = 40,           /* handshake_failure */
-  DTLS_ALERT_BAD_CERTIFICATE = 42,             /* bad_certificate */
-  DTLS_ALERT_UNSUPPORTED_CERTIFICATE = 43,     /* unsupported_certificate */
-  DTLS_ALERT_CERTIFICATE_REVOKED = 44,         /* certificate_revoked */
-  DTLS_ALERT_CERTIFICATE_EXPIRED = 45,         /* certificate_expired */
-  DTLS_ALERT_CERTIFICATE_UNKNOWN = 46,         /* certificate_unknown */
-  DTLS_ALERT_ILLEGAL_PARAMETER = 47,           /* illegal_parameter */
-  DTLS_ALERT_UNKNOWN_CA = 48,                  /* unknown_ca */
-  DTLS_ALERT_ACCESS_DENIED = 49,               /* access_denied */
-  DTLS_ALERT_DECODE_ERROR = 50,                        /* decode_error */
-  DTLS_ALERT_DECRYPT_ERROR = 51,               /* decrypt_error */
-  DTLS_ALERT_PROTOCOL_VERSION = 70,            /* protocol_version */
-  DTLS_ALERT_INSUFFICIENT_SECURITY = 71,       /* insufficient_security */
-  DTLS_ALERT_INTERNAL_ERROR = 80,              /* internal_error */
-  DTLS_ALERT_USER_CANCELED = 90,               /* user_canceled */
-  DTLS_ALERT_NO_RENEGOTIATION = 100,           /* no_renegotiation */
-  DTLS_ALERT_UNSUPPORTED_EXTENSION = 110       /* unsupported_extension */
-} dtls_alert_t;
-
-#define DTLS_EVENT_CONNECT        0x01DC /**< initiated handshake */
-#define DTLS_EVENT_CONNECTED      0x01DE /**< handshake or re-negotiation
-                                         * has finished */
-#define DTLS_EVENT_RENEGOTIATE    0x01DF /**< re-negotiation has started */
-
-INLINE_API int
-dtls_alert_create(dtls_alert_level_t level, dtls_alert_t desc)
-{
-  return -((level << 8) | desc);
-}
-
-INLINE_API int
-dtls_alert_fatal_create(dtls_alert_t desc)
-{
-  return dtls_alert_create(DTLS_ALERT_LEVEL_FATAL, desc);
-}
-
-#endif /* _DTLS_ALERT_H_ */
diff --git a/extlibs/tinydtls/ccm.c b/extlibs/tinydtls/ccm.c
deleted file mode 100644 (file)
index 1366145..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-/* dtls -- a very basic DTLS implementation
- *
- * Copyright (C) 2011--2014 Olaf Bergmann <bergmann@tzi.org>
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <string.h>
-
-#include "dtls_config.h"
-#include "global.h"
-#include "numeric.h"
-#include "ccm.h"
-
-#ifdef HAVE_ASSERT_H
-# include <assert.h>
-#endif
-
-#define CCM_FLAGS(A,M,L) (((A > 0) << 6) | (((M - 2)/2) << 3) | (L - 1))
-
-#define MASK_L(_L) ((1 << 8 * _L) - 1)
-
-#define SET_COUNTER(A,L,cnt,C) {                                       \
-    int i;                                                             \
-    memset((A) + DTLS_CCM_BLOCKSIZE - (L), 0, (L));                    \
-    (C) = (cnt) & MASK_L(L);                                           \
-    for (i = DTLS_CCM_BLOCKSIZE - 1; (C) && (i > (L)); --i, (C) >>= 8) \
-      (A)[i] |= (C) & 0xFF;                                            \
-  }
-
-INLINE_API void 
-block0(size_t M,       /* number of auth bytes */
-       size_t L,       /* number of bytes to encode message length */
-       size_t la,      /* l(a) octets additional authenticated data */
-       size_t lm,      /* l(m) message length */
-       unsigned char nonce[DTLS_CCM_BLOCKSIZE],
-       unsigned char *result) {
-  int i;
-
-  result[0] = CCM_FLAGS(la, M, L);
-
-  /* copy the nonce */
-  memcpy(result + 1, nonce, DTLS_CCM_BLOCKSIZE - L);
-  
-  for (i=0; i < L; i++) {
-    result[15-i] = lm & 0xff;
-    lm >>= 8;
-  }
-}
-
-/** 
- * Creates the CBC-MAC for the additional authentication data that
- * is sent in cleartext. 
- *
- * \param ctx  The crypto context for the AES encryption.
- * \param msg  The message starting with the additional authentication data.
- * \param la   The number of additional authentication bytes in \p msg.
- * \param B    The input buffer for crypto operations. When this function
- *             is called, \p B must be initialized with \c B0 (the first
- *             authentication block.
- * \param X    The output buffer where the result of the CBC calculation
- *             is placed.
- * \return     The result is written to \p X.
- */
-static void
-add_auth_data(rijndael_ctx *ctx, const unsigned char *msg, size_t la,
-             unsigned char B[DTLS_CCM_BLOCKSIZE], 
-             unsigned char X[DTLS_CCM_BLOCKSIZE]) {
-  size_t i,j; 
-
-  rijndael_encrypt(ctx, B, X);
-
-  memset(B, 0, DTLS_CCM_BLOCKSIZE);
-
-  if (!la)
-    return;
-
-#ifndef WITH_CONTIKI
-    if (la < 0xFF00) {         /* 2^16 - 2^8 */
-      j = 2;
-      dtls_int_to_uint16(B, la);
-  } else if (la <= UINT32_MAX) {
-      j = 6;
-      dtls_int_to_uint16(B, 0xFFFE);
-      dtls_int_to_uint32(B+2, la);
-    } else {
-      j = 10;
-      dtls_int_to_uint16(B, 0xFFFF);
-      dtls_int_to_uint64(B+2, la);
-    }
-#else /* WITH_CONTIKI */
-  /* With Contiki, we are building for small devices and thus
-   * anticipate that the number of additional authentication bytes
-   * will not exceed 65280 bytes (0xFF00) and we can skip the
-   * workarounds required for j=6 and j=10 on devices with a word size
-   * of 32 bits or 64 bits, respectively.
-   */
-
-  assert(la < 0xFF00);
-  j = 2;
-  dtls_int_to_uint16(B, la);
-#endif /* WITH_CONTIKI */
-
-    i = min(DTLS_CCM_BLOCKSIZE - j, la);
-    memcpy(B + j, msg, i);
-    la -= i;
-    msg += i;
-    
-    memxor(B, X, DTLS_CCM_BLOCKSIZE);
-  
-  rijndael_encrypt(ctx, B, X);
-  
-  while (la > DTLS_CCM_BLOCKSIZE) {
-    for (i = 0; i < DTLS_CCM_BLOCKSIZE; ++i)
-      B[i] = X[i] ^ *msg++;
-    la -= DTLS_CCM_BLOCKSIZE;
-
-    rijndael_encrypt(ctx, B, X);
-  }
-  
-  if (la) {
-    memset(B, 0, DTLS_CCM_BLOCKSIZE);
-    memcpy(B, msg, la);
-    memxor(B, X, DTLS_CCM_BLOCKSIZE);
-
-    rijndael_encrypt(ctx, B, X);  
-  } 
-}
-
-INLINE_API void
-encrypt(rijndael_ctx *ctx, size_t L, unsigned long counter,
-       unsigned char *msg, size_t len,
-       unsigned char A[DTLS_CCM_BLOCKSIZE],
-       unsigned char S[DTLS_CCM_BLOCKSIZE]) {
-
-  static unsigned long counter_tmp;
-
-  SET_COUNTER(A, L, counter, counter_tmp);    
-  rijndael_encrypt(ctx, A, S);
-  memxor(msg, S, len);
-}
-
-INLINE_API void
-mac(rijndael_ctx *ctx, 
-    unsigned char *msg, size_t len,
-    unsigned char B[DTLS_CCM_BLOCKSIZE],
-    unsigned char X[DTLS_CCM_BLOCKSIZE]) {
-  size_t i;
-
-  for (i = 0; i < len; ++i)
-    B[i] = X[i] ^ msg[i];
-
-  rijndael_encrypt(ctx, B, X);
-
-}
-
-long int
-dtls_ccm_encrypt_message(rijndael_ctx *ctx, size_t M, size_t L, 
-                        unsigned char nonce[DTLS_CCM_BLOCKSIZE], 
-                        unsigned char *msg, size_t lm, 
-                        const unsigned char *aad, size_t la) {
-  size_t i, len;
-  unsigned long counter_tmp;
-  unsigned long counter = 1; /* \bug does not work correctly on ia32 when
-                                    lm >= 2^16 */
-  unsigned char A[DTLS_CCM_BLOCKSIZE]; /* A_i blocks for encryption input */
-  unsigned char B[DTLS_CCM_BLOCKSIZE]; /* B_i blocks for CBC-MAC input */
-  unsigned char S[DTLS_CCM_BLOCKSIZE]; /* S_i = encrypted A_i blocks */
-  unsigned char X[DTLS_CCM_BLOCKSIZE]; /* X_i = encrypted B_i blocks */
-
-  len = lm;                    /* save original length */
-  /* create the initial authentication block B0 */
-  block0(M, L, la, lm, nonce, B);
-  add_auth_data(ctx, aad, la, B, X);
-
-  /* initialize block template */
-  A[0] = L-1;
-
-  /* copy the nonce */
-  memcpy(A + 1, nonce, DTLS_CCM_BLOCKSIZE - L);
-  
-  while (lm >= DTLS_CCM_BLOCKSIZE) {
-    /* calculate MAC */
-    mac(ctx, msg, DTLS_CCM_BLOCKSIZE, B, X);
-
-    /* encrypt */
-    encrypt(ctx, L, counter, msg, DTLS_CCM_BLOCKSIZE, A, S);
-
-    /* update local pointers */
-    lm -= DTLS_CCM_BLOCKSIZE;
-    msg += DTLS_CCM_BLOCKSIZE;
-    counter++;
-  }
-
-  if (lm) {
-    /* Calculate MAC. The remainder of B must be padded with zeroes, so
-     * B is constructed to contain X ^ msg for the first lm bytes (done in
-     * mac() and X ^ 0 for the remaining DTLS_CCM_BLOCKSIZE - lm bytes
-     * (i.e., we can use memcpy() here).
-     */
-    memcpy(B + lm, X + lm, DTLS_CCM_BLOCKSIZE - lm);
-    mac(ctx, msg, lm, B, X);
-
-    /* encrypt */
-    encrypt(ctx, L, counter, msg, lm, A, S);
-
-    /* update local pointers */
-    msg += lm;
-  }
-  
-  /* calculate S_0 */  
-  SET_COUNTER(A, L, 0, counter_tmp);
-  rijndael_encrypt(ctx, A, S);
-
-  for (i = 0; i < M; ++i)
-    *msg++ = X[i] ^ S[i];
-
-  return len + M;
-}
-
-long int
-dtls_ccm_decrypt_message(rijndael_ctx *ctx, size_t M, size_t L,
-                        unsigned char nonce[DTLS_CCM_BLOCKSIZE], 
-                        unsigned char *msg, size_t lm, 
-                        const unsigned char *aad, size_t la) {
-  
-  size_t len;
-  unsigned long counter_tmp;
-  unsigned long counter = 1; /* \bug does not work correctly on ia32 when
-                                    lm >= 2^16 */
-  unsigned char A[DTLS_CCM_BLOCKSIZE]; /* A_i blocks for encryption input */
-  unsigned char B[DTLS_CCM_BLOCKSIZE]; /* B_i blocks for CBC-MAC input */
-  unsigned char S[DTLS_CCM_BLOCKSIZE]; /* S_i = encrypted A_i blocks */
-  unsigned char X[DTLS_CCM_BLOCKSIZE]; /* X_i = encrypted B_i blocks */
-
-  if (lm < M)
-    goto error;
-
-  len = lm;          /* save original length */
-  lm -= M;           /* detract MAC size*/
-
-  /* create the initial authentication block B0 */
-  block0(M, L, la, lm, nonce, B);
-  add_auth_data(ctx, aad, la, B, X);
-
-  /* initialize block template */
-  A[0] = L-1;
-
-  /* copy the nonce */
-  memcpy(A + 1, nonce, DTLS_CCM_BLOCKSIZE - L);
-  
-  while (lm >= DTLS_CCM_BLOCKSIZE) {
-    /* decrypt */
-    encrypt(ctx, L, counter, msg, DTLS_CCM_BLOCKSIZE, A, S);
-    
-    /* calculate MAC */
-    mac(ctx, msg, DTLS_CCM_BLOCKSIZE, B, X);
-
-    /* update local pointers */
-    lm -= DTLS_CCM_BLOCKSIZE;
-    msg += DTLS_CCM_BLOCKSIZE;
-    counter++;
-  }
-
-  if (lm) {
-    /* decrypt */
-    encrypt(ctx, L, counter, msg, lm, A, S);
-
-    /* Calculate MAC. Note that msg ends in the MAC so we must
-     * construct B to contain X ^ msg for the first lm bytes (done in
-     * mac() and X ^ 0 for the remaining DTLS_CCM_BLOCKSIZE - lm bytes
-     * (i.e., we can use memcpy() here).
-     */
-    memcpy(B + lm, X + lm, DTLS_CCM_BLOCKSIZE - lm);
-    mac(ctx, msg, lm, B, X); 
-
-    /* update local pointers */
-    msg += lm;
-  }
-  
-  /* calculate S_0 */  
-  SET_COUNTER(A, L, 0, counter_tmp);
-  rijndael_encrypt(ctx, A, S);
-
-  memxor(msg, S, M);
-
-  /* return length if MAC is valid, otherwise continue with error handling */
-  if (equals(X, msg, M))
-    return len - M;
-  
- error:
-  return -1;
-}
diff --git a/extlibs/tinydtls/ccm.h b/extlibs/tinydtls/ccm.h
deleted file mode 100644 (file)
index c3949d2..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/* dtls -- a very basic DTLS implementation
- *
- * Copyright (C) 2011--2012 Olaf Bergmann <bergmann@tzi.org>
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef _DTLS_CCM_H_
-#define _DTLS_CCM_H_
-
-#include "aes/rijndael.h"
-
-/* implementation of Counter Mode CBC-MAC, RFC 3610 */
-
-#define DTLS_CCM_BLOCKSIZE  16 /**< size of hmac blocks */
-#define DTLS_CCM_MAX        16 /**< max number of bytes in digest */
-#define DTLS_CCM_NONCE_SIZE 12 /**< size of nonce */
-
-/** 
- * Authenticates and encrypts a message using AES in CCM mode. Please
- * see also RFC 3610 for the meaning of \p M, \p L, \p lm and \p la.
- * 
- * \param ctx The initialized rijndael_ctx object to be used for AES operations.
- * \param M   The number of authentication octets.
- * \param L   The number of bytes used to encode the message length.
- * \param N   The nonce value to use. You must provide \c DTLS_CCM_BLOCKSIZE 
- *            nonce octets, although only the first \c 16 - \p L are used.
- * \param msg The message to encrypt. The first \p la octets are additional
- *            authentication data that will be cleartext. Note that the 
- *            encryption operation modifies the contents of \p msg and adds 
- *            \p M bytes MAC. Therefore, the buffer must be at least
- *            \p lm + \p M bytes large.
- * \param lm  The actual length of \p msg.
- * \param aad A pointer to the additional authentication data (can be \c NULL if
- *            \p la is zero).
- * \param la  The number of additional authentication octets (may be zero).
- * \return FIXME
- */
-long int
-dtls_ccm_encrypt_message(rijndael_ctx *ctx, size_t M, size_t L, 
-                        unsigned char nonce[DTLS_CCM_BLOCKSIZE], 
-                        unsigned char *msg, size_t lm, 
-                        const unsigned char *aad, size_t la);
-
-long int
-dtls_ccm_decrypt_message(rijndael_ctx *ctx, size_t M, size_t L, 
-                        unsigned char nonce[DTLS_CCM_BLOCKSIZE], 
-                        unsigned char *msg, size_t lm, 
-                        const unsigned char *aad, size_t la);
-
-#endif /* _DTLS_CCM_H_ */
diff --git a/extlibs/tinydtls/configure.in b/extlibs/tinydtls/configure.in
deleted file mode 100644 (file)
index b341497..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-#
-# Copyright (C) 2011--2014 Olaf Bergmann <bergmann@tzi.org>
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use, copy,
-# modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-AC_PREREQ([2.65])
-AC_INIT([tinydtls], [0.8.1])
-AC_CONFIG_SRCDIR([dtls.c])
-dnl AC_CONFIG_HEADERS([config.h])
-
-AC_ARG_WITH(contiki,
-  [AS_HELP_STRING([--with-contiki],[build libtinydtls for the Contiki OS])],
-  [AC_DEFINE(WITH_CONTIKI,1,[Define to 1 if building for Contiki.])
-   WITH_CONTIKI=1],
-  [])
-
-AC_PATH_PROG(DOXYGEN, doxygen, [:])
-AC_PATH_PROG(ETAGS, etags, [/bin/false])
-
-if test "${with_contiki}" != "yes" ; then
-# Checks for programs.
-AC_PROG_MAKE_SET
-AC_PROG_CC
-AC_PROG_RANLIB
-
-AC_C_BIGENDIAN
-
-# Checks for libraries.
-AC_SEARCH_LIBS([gethostbyname], [nsl])
-AC_SEARCH_LIBS([socket], [socket])
-fi
-
-AC_ARG_WITH(debug,
-  [AS_HELP_STRING([--without-debug],[disable all debug output and assertions])],
-  [CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-   NDEBUG=1], 
-  [])
-
-AC_ARG_WITH(ecc,
-  [AS_HELP_STRING([--without-ecc],[disable support for TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8])],
-  [],
-  [AC_DEFINE(DTLS_ECC, 1, [Define to 1 if building with ECC support.])
-   OPT_OBJS="${OPT_OBJS} ecc/ecc.o"
-   DTLS_ECC=1])
-
-AC_ARG_WITH(psk,
-  [AS_HELP_STRING([--without-psk],[disable support for TLS_PSK_WITH_AES_128_CCM_8])],
-  [],
-  [AC_DEFINE(DTLS_PSK, 1, [Define to 1 if building with PSK support])
-   DTLS_PSK=1])
-
-AC_ARG_WITH(x509,
-  [AS_HELP_STRING([--with-x509],[use dtls as transport protocol])],
-  [AC_DEFINE(DTLS_X509, 1, [Define to 1 if building with X.509 support])
-   DTLS_X509=1],
-  [])
-
-AC_ARG_WITH(hal,
-  [AS_HELP_STRING([--with-hal],[use a hardware abstraction layer for crypto functions])],
-  [AC_DEFINE(DTLS_CRYPTO_HAL, 1, [Define to 1 if building with Hardware Abstraction Layer])
-   DTLS_CRYPTO_HAL=1],
-  [])
-
-CPPFLAGS="${CPPFLAGS} -DDTLSv12 -DWITH_SHA256"
-OPT_OBJS="${OPT_OBJS} sha2/sha2.o"
-
-AC_SUBST(OPT_OBJS)
-AC_SUBST(NDEBUG)
-AC_SUBST(WITH_CONTIKI)
-AC_SUBST(DTLS_ECC)
-AC_SUBST(DTLS_PSK)
-
-if test "${with_contiki}" = "yes" ; then
-  AC_MSG_NOTICE([skipping header checks for Contiki])
-else
-  # Checks for header files.
-  AC_CHECK_HEADERS([assert.h arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/param.h sys/socket.h unistd.h])
-
-  AC_CHECK_HEADERS([sys/time.h time.h])
-  AC_CHECK_HEADERS([sys/types.h sys/stat.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_SIZE_T
-
-AC_CHECK_MEMBER([struct sockaddr_in6.sin6_len],
-               [AC_DEFINE(HAVE_SOCKADDR_IN6_SIN6_LEN, [1], 
-                  [Define to 1 if struct sockaddr_in6 has a member sin6_len.])], [], 
-               [#include <netinet/in.h>])
-
-# Checks for library functions.
-AC_FUNC_MALLOC
-AC_CHECK_FUNCS([memset select socket strdup strerror strnlen fls vprintf])
-fi
-
-AC_CONFIG_HEADERS([dtls_config.h tinydtls.h])
-
-AC_CONFIG_FILES([Makefile
-                 doc/Makefile
-                 doc/Doxyfile
-                 tests/Makefile
-                 examples/contiki/Makefile
-                 platform-specific/Makefile
-                sha2/Makefile
-                aes/Makefile
-                ecc/Makefile])
-AC_OUTPUT
diff --git a/extlibs/tinydtls/crypto.c b/extlibs/tinydtls/crypto.c
deleted file mode 100644 (file)
index f1e8542..0000000
+++ /dev/null
@@ -1,801 +0,0 @@
-/* dtls -- a very basic DTLS implementation
- *
- * Copyright (C) 2011--2012 Olaf Bergmann <bergmann@tzi.org>
- * Copyright (C) 2013 Hauke Mehrtens <hauke@hauke-m.de>
- *
- *
- * Modified source code for micro-ecc porting,
- *
- * Following functions are removed:
- *   - dtls_ec_key_to_uint32
- *   - dtls_ec_key_from_uint32
- * Following functions are modified:
- *   - dtls_ecdh_pre_master_secret
- *   - dtls_ecdsa_generate_key
- *   - dtls_ecdsa_create_sig_hash
- *   - dtls_ecdsa_verify_sig_hash
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdio.h>
-
-#include "tinydtls.h"
-#include "dtls_config.h"
-
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#else
-#define assert(x)
-#endif
-
-#include "global.h"
-#include "debug.h"
-#include "numeric.h"
-#include "dtls.h"
-#include "crypto.h"
-#include "ccm.h"
-#include "ecc/ecc.h"
-#include "aes/rijndael.h"
-#include "sha2/sha2.h"
-#include "prng.h"
-#include "netq.h"
-#include "hmac.h"
-
-#if !defined(WITH_CONTIKI) && !defined(_WIN32)
-#include <pthread.h>
-#endif
-
-#define HMAC_UPDATE_SEED(Context,Seed,Length)          \
-  if (Seed) dtls_hmac_update(Context, (Seed), (Length))
-
-static struct dtls_cipher_context_t cipher_context;
-#if !defined(WITH_CONTIKI) && !defined(_WIN32)
-static pthread_mutex_t cipher_context_mutex = PTHREAD_MUTEX_INITIALIZER;
-#endif
-
-static struct dtls_cipher_context_t *dtls_cipher_context_get(void)
-{
-#if !defined(WITH_CONTIKI) && !defined(_WIN32)
-  pthread_mutex_lock(&cipher_context_mutex);
-#endif
-  return &cipher_context;
-}
-
-static void dtls_cipher_context_release(void)
-{
-#if !defined(WITH_CONTIKI) && !defined(_WIN32)
-  pthread_mutex_unlock(&cipher_context_mutex);
-#endif
-}
-
-#ifndef WITH_CONTIKI
-void crypto_init()
-{
-}
-
-static dtls_handshake_parameters_t *dtls_handshake_malloc() {
-  return malloc(sizeof(dtls_handshake_parameters_t));
-}
-
-static void dtls_handshake_dealloc(dtls_handshake_parameters_t *handshake) {
-  free(handshake);
-}
-
-static dtls_security_parameters_t *dtls_security_malloc() {
-  return malloc(sizeof(dtls_security_parameters_t));
-}
-
-static void dtls_security_dealloc(dtls_security_parameters_t *security) {
-  free(security);
-}
-#else /* WITH_CONTIKI */
-
-#include "memb.h"
-MEMB(handshake_storage, dtls_handshake_parameters_t, DTLS_HANDSHAKE_MAX);
-MEMB(security_storage, dtls_security_parameters_t, DTLS_SECURITY_MAX);
-
-void crypto_init() {
-  memb_init(&handshake_storage);
-  memb_init(&security_storage);
-}
-
-static dtls_handshake_parameters_t *dtls_handshake_malloc() {
-  return memb_alloc(&handshake_storage);
-}
-
-static void dtls_handshake_dealloc(dtls_handshake_parameters_t *handshake) {
-  memb_free(&handshake_storage, handshake);
-}
-
-static dtls_security_parameters_t *dtls_security_malloc() {
-  return memb_alloc(&security_storage);
-}
-
-static void dtls_security_dealloc(dtls_security_parameters_t *security) {
-  memb_free(&security_storage, security);
-}
-#endif /* WITH_CONTIKI */
-
-dtls_handshake_parameters_t *dtls_handshake_new()
-{
-  dtls_handshake_parameters_t *handshake;
-
-  handshake = dtls_handshake_malloc();
-  if (!handshake) {
-    dtls_crit("can not allocate a handshake struct\n");
-    return NULL;
-  }
-
-  memset(handshake, 0, sizeof(*handshake));
-
-  if (handshake) {
-    /* initialize the handshake hash wrt. the hard-coded DTLS version */
-    dtls_debug("DTLSv12: initialize HASH_SHA256\n");
-    /* TLS 1.2:  PRF(secret, label, seed) = P_<hash>(secret, label + seed) */
-    /* FIXME: we use the default SHA256 here, might need to support other
-              hash functions as well */
-    dtls_hash_init(&handshake->hs_state.hs_hash);
-  }
-  return handshake;
-}
-
-void dtls_handshake_free(dtls_handshake_parameters_t *handshake)
-{
-  if (!handshake)
-    return;
-
-  netq_delete_all(handshake->reorder_queue);
-  dtls_handshake_dealloc(handshake);
-}
-
-dtls_security_parameters_t *dtls_security_new()
-{
-  dtls_security_parameters_t *security;
-
-  security = dtls_security_malloc();
-  if (!security) {
-    dtls_crit("can not allocate a security struct\n");
-    return NULL;
-  }
-
-  memset(security, 0, sizeof(*security));
-
-  if (security) {
-    security->cipher = TLS_NULL_WITH_NULL_NULL;
-    security->compression = TLS_COMPRESSION_NULL;
-  }
-  return security;
-}
-
-void dtls_security_free(dtls_security_parameters_t *security)
-{
-  if (!security)
-    return;
-
-  dtls_security_dealloc(security);
-}
-
-size_t
-dtls_p_hash(dtls_hashfunc_t h,
-           const unsigned char *key, size_t keylen,
-           const unsigned char *label, size_t labellen,
-           const unsigned char *random1, size_t random1len,
-           const unsigned char *random2, size_t random2len,
-           unsigned char *buf, size_t buflen) {
-  dtls_hmac_context_t *hmac_a, *hmac_p;
-
-  unsigned char A[DTLS_HMAC_DIGEST_SIZE];
-  unsigned char tmp[DTLS_HMAC_DIGEST_SIZE];
-  size_t dlen;                 /* digest length */
-  size_t len = 0;                      /* result length */
-
-  hmac_a = dtls_hmac_new(key, keylen);
-  if (!hmac_a)
-    return 0;
-
-  /* calculate A(1) from A(0) == seed */
-  HMAC_UPDATE_SEED(hmac_a, label, labellen);
-  HMAC_UPDATE_SEED(hmac_a, random1, random1len);
-  HMAC_UPDATE_SEED(hmac_a, random2, random2len);
-
-  dlen = dtls_hmac_finalize(hmac_a, A);
-
-  hmac_p = dtls_hmac_new(key, keylen);
-  if (!hmac_p)
-    goto error;
-
-  while (len + dlen < buflen) {
-
-    /* FIXME: rewrite loop to avoid superflous call to dtls_hmac_init() */
-    dtls_hmac_init(hmac_p, key, keylen);
-    dtls_hmac_update(hmac_p, A, dlen);
-
-    HMAC_UPDATE_SEED(hmac_p, label, labellen);
-    HMAC_UPDATE_SEED(hmac_p, random1, random1len);
-    HMAC_UPDATE_SEED(hmac_p, random2, random2len);
-
-    len += dtls_hmac_finalize(hmac_p, tmp);
-    memcpy(buf, tmp, dlen);
-    buf += dlen;
-
-    /* calculate A(i+1) */
-    dtls_hmac_init(hmac_a, key, keylen);
-    dtls_hmac_update(hmac_a, A, dlen);
-    dtls_hmac_finalize(hmac_a, A);
-  }
-
-  dtls_hmac_init(hmac_p, key, keylen);
-  dtls_hmac_update(hmac_p, A, dlen);
-
-  HMAC_UPDATE_SEED(hmac_p, label, labellen);
-  HMAC_UPDATE_SEED(hmac_p, random1, random1len);
-  HMAC_UPDATE_SEED(hmac_p, random2, random2len);
-
-  dtls_hmac_finalize(hmac_p, tmp);
-  memcpy(buf, tmp, buflen - len);
-
- error:
-  dtls_hmac_free(hmac_a);
-  dtls_hmac_free(hmac_p);
-
-  return buflen;
-}
-
-size_t
-dtls_prf(const unsigned char *key, size_t keylen,
-        const unsigned char *label, size_t labellen,
-        const unsigned char *random1, size_t random1len,
-        const unsigned char *random2, size_t random2len,
-        unsigned char *buf, size_t buflen) {
-
-  /* Clear the result buffer */
-  memset(buf, 0, buflen);
-  return dtls_p_hash(HASH_SHA256,
-                    key, keylen,
-                    label, labellen,
-                    random1, random1len,
-                    random2, random2len,
-                    buf, buflen);
-}
-
-void
-dtls_mac(dtls_hmac_context_t *hmac_ctx,
-        const unsigned char *record,
-        const unsigned char *packet, size_t length,
-        unsigned char *buf) {
-  uint16 L;
-  dtls_int_to_uint16(L, length);
-
-  assert(hmac_ctx);
-  dtls_hmac_update(hmac_ctx, record +3, sizeof(uint16) + sizeof(uint48));
-  dtls_hmac_update(hmac_ctx, record, sizeof(uint8) + sizeof(uint16));
-  dtls_hmac_update(hmac_ctx, L, sizeof(uint16));
-  dtls_hmac_update(hmac_ctx, packet, length);
-
-  dtls_hmac_finalize(hmac_ctx, buf);
-}
-
-static size_t
-dtls_ccm_encrypt(aes128_t *ccm_ctx, const unsigned char *src, size_t srclen,
-                unsigned char *buf,
-                unsigned char *nounce,
-                const unsigned char *aad, size_t la) {
-  long int len;
-
-  assert(ccm_ctx);
-
-  len = dtls_ccm_encrypt_message(&ccm_ctx->ctx, 8 /* M */,
-                                max(2, 15 - DTLS_CCM_NONCE_SIZE),
-                                nounce,
-                                buf, srclen,
-                                aad, la);
-  return len;
-}
-
-static size_t
-dtls_ccm_decrypt(aes128_t *ccm_ctx, const unsigned char *src,
-                size_t srclen, unsigned char *buf,
-                unsigned char *nounce,
-                const unsigned char *aad, size_t la) {
-  long int len;
-
-  assert(ccm_ctx);
-
-  len = dtls_ccm_decrypt_message(&ccm_ctx->ctx, 8 /* M */,
-                                max(2, 15 - DTLS_CCM_NONCE_SIZE),
-                                nounce,
-                                buf, srclen,
-                                aad, la);
-  return len;
-}
-
-static size_t
-dtls_cbc_encrypt(aes128_t *aes_ctx,
-                 unsigned char *mac_key, size_t mac_keylen,
-                 const unsigned char *iv,
-                 const unsigned char *src, size_t srclen,
-                 unsigned char *buf) {
-
-    unsigned char cbc[DTLS_BLK_LENGTH];
-    unsigned char tmp[DTLS_BLK_LENGTH];
-    unsigned char *pos;
-    const unsigned char *dtls_hdr = NULL;
-    int i, j;
-    int blocks;
-    dtls_hmac_context_t* hmac_ctx = NULL;
-    int paddinglen = 0;
-
-    pos = buf;
-
-    dtls_hdr = src - DTLS_CBC_IV_LENGTH - sizeof(dtls_record_header_t);
-
-    //Calculate MAC : Append the MAC code to end of content
-    hmac_ctx = dtls_hmac_new(mac_key, mac_keylen);
-    dtls_mac(hmac_ctx,
-             dtls_hdr,
-             src, srclen,
-             buf + srclen);
-    dtls_hmac_free(hmac_ctx);
-    
-    dtls_debug_dump("[MAC]",
-                    buf + srclen,
-                    DTLS_HMAC_DIGEST_SIZE);
-
-    paddinglen = DTLS_BLK_LENGTH - ((srclen + DTLS_HMAC_DIGEST_SIZE) % DTLS_BLK_LENGTH);
-    
-    //TLS padding
-    memset(buf + (srclen + DTLS_HMAC_DIGEST_SIZE), paddinglen - 1, paddinglen);
-
-    memcpy(cbc, iv, DTLS_BLK_LENGTH);
-    blocks = (srclen + DTLS_HMAC_D