Fix to rebase branch on current master

IDE/iotsafe/Makefile

@@ -62,6 +62,7 @@ WOLFSSL_OBJS += 	\
 	$(WOLFSSL_BUILD)/wolfcrypt/poly1305.o  \
 	$(WOLFSSL_BUILD)/wolfcrypt/pwdbased.o  \
 	$(WOLFSSL_BUILD)/wolfcrypt/random.o  \
+	$(WOLFSSL_BUILD)/wolfcrypt/kdf.o  \
 	$(WOLFSSL_BUILD)/wolfcrypt/sha.o  \
 	$(WOLFSSL_BUILD)/wolfcrypt/sha256.o  \
 	$(WOLFSSL_BUILD)/wolfcrypt/sha512.o  \

IDE/iotsafe/user_settings.h

@@ -26,7 +26,7 @@
 #include <stdint.h>
 
 /* Uncomment next line to enable 2-bytes ID demo */
-#define TWO_BYTES_ID_DEMO
+/* #define TWO_BYTES_ID_DEMO */
 
 
 /* IOT-Safe slot configurations for this example: