diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3d7f062
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,41 @@
+.config
+*.o
+*.pyc
+
+
+# Example project files
+examples/**/sdkconfig
+examples/**/sdkconfig.old
+examples/**/build
+
+# emacs
+.dir-locals.el
+
+# eclipse setting
+.settings
+
+# vscode
+.vscode
+
+# Doc build artifacts
+docs/*/_build/
+docs/*/doxygen-warning-log.txt
+docs/*/sphinx-warning-log.txt
+docs/*/sphinx-warning-log-sanitized.txt
+docs/*/xml/
+docs/*/xml_in/
+docs/*/man/
+docs/doxygen_sqlite3.db
+
+# MacOS directory files
+.DS_Store
+
+# Tools
+tools/factory_nvs_gen/*.bin
+tools/factory_nvs_gen/*.csv
+
+# Patch files
+*.patch
+
+#CTags
+tags
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..9ea704f
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,92 @@
+stages:
+  - build
+
+build_homekit_examples:
+  stage: build
+  image: $CI_DOCKER_REGISTRY/esp32-ci-env
+  tags:
+    - build
+
+  variables:
+    IDF_PATH: "$CI_PROJECT_DIR/esp-idf"
+    GIT_STRATEGY: clone
+    
+  artifacts:
+    paths:
+      - examples/fan/build/*.bin
+      - examples/fan/build/*.elf
+      - examples/fan/build/*.map
+      - examples/fan/build/bootloader/*.bin
+    expire_in: 6 mos
+
+  before_script:
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - echo -n $GITLAB_KEY >> ~/.ssh/id_rsa_base64
+    - base64 --decode --ignore-garbage ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa
+    - chmod 600 ~/.ssh/id_rsa
+    - echo -e "Host gitlab.espressif.cn\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+
+  script:
+    - git submodule update --init --recursive
+    # Cloning esp-idf
+    - git clone -b release/v4.2 --recursive --depth 1 https://github.com/espressif/esp-idf.git
+    - cd esp-idf
+    - ./install.sh
+    - . export.sh
+
+    - cd ../examples/fan
+    - idf.py build
+    - cd ../bridge
+    - idf.py build
+    - cd ../lightbulb
+    - idf.py build
+    - cd ../smart_outlet
+    - idf.py build
+    - cd ../data_tlv8
+    - idf.py build
+    - cd ../aws-iot
+    - mkdir components
+    - cd components
+    - git clone --depth 1 --single-branch --recursive https://github.com/espressif/esp-aws-iot.git
+    - export AWS_IOT_PATH=$PWD/esp-aws-iot
+    - cd ..
+    - touch main/certs/device.crt main/certs/device.key
+    - idf.py build
+    - cd ../emulator
+    - idf.py build
+    - cd ../ethernet_bridge
+    - idf.py build
+    - cd ../fan
+    - rm -rf build sdkconfig sdkconfig.old
+    - make defconfig
+    - make -j4
+    - cd ../bridge
+    - rm -rf build sdkconfig sdkconfig.old
+    - make defconfig
+    - make -j4
+    - cd ../lightbulb
+    - rm -rf build sdkconfig sdkconfig.old
+    - make defconfig
+    - make -j4
+    - cd ../smart_outlet
+    - rm -rf build sdkconfig sdkconfig.old
+    - make defconfig
+    - make -j4
+    - cd ../data_tlv8
+    - rm -rf build sdkconfig sdkconfig.old
+    - make defconfig
+    - make -j4
+    - cd ../aws-iot
+    - rm -rf build sdkconfig sdkconfig.old
+    - touch main/certs/device.crt main/certs/device.key
+    - make defconfig
+    - make -j4
+    - cd ../emulator
+    - rm -rf build sdkconfig sdkconfig.old
+    - make defconfig
+    - make -j4
+    - cd ../ethernet_bridge
+    - rm -rf build sdkconfig sdkconfig.old
+    - make defconfig
+    - make -j4
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..c3b42fc
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "components/homekit/json_parser/upstream"]
+	path = components/homekit/json_parser/upstream
+	url = https://github.com/shahpiyushv/json_parser.git
+[submodule "components/homekit/json_generator/upstream"]
+	path = components/homekit/json_generator/upstream
+	url = https://github.com/shahpiyushv/json_generator.git
diff --git a/MFI_README.md b/MFI_README.md
new file mode 100644
index 0000000..6b3e156
--- /dev/null
+++ b/MFI_README.md
@@ -0,0 +1,3 @@
+# ESP HomeKit SDK (MFi)
+
+The Open source variant of esp-homekit-sdk cannot be used for commercial products. If you want to build commercial products and have an MFi License already, please get in touch with us by visiting [here](https://www.espressif.com/en/products/sdks/esp-homekit-sdk).
diff --git a/README.md b/README.md
index d0df919..133b944 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,129 @@
 # ESP HomeKit SDK
+## Introduction
 
-Espressif HomeKit SDK developed in-house
\ No newline at end of file
+[HomeKit](https://developer.apple.com/homekit/) is a framework developed by Apple for communicating with and controlling connected accessories in a user’s home using iOS devices.
+ESP HomeKit SDK has been developed in-house by Espressif to build Apple HomeKit compatible accessories using ESP32/ESP32-S2 SoCs.
+
+> Note: If you want to use HomeKit for commercial products, please check [here](https://www.espressif.com/en/products/sdks/esp-homekit-sdk) for access to the MFi variant of this SDK. It has the exact same APIs as this and so, moving to it should be easy.
+
+> If you want to use a port of Apple's ADK instead, please check [here](https://github.com/espressif/esp-apple-homekit-adk)
+
+Features of this SDK:
+
+* Easy APIs to implement all standard HomeKit profiles defined by Apple.
+* Facility to add customised accessory specific Services and Characteristics.
+* Samples (Fan, Lightbulb, Outlet, Bridge, Data-TLV8, Ethernet) to enable quick accessory development.
+* Support for ESP Unified Provisioning.
+
+## Get Started
+
+### Set up Host environment
+
+Set up the host environment and ESP IDF (**master** branch) as per the steps given [here](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/index.html).
+
+### Get esp-homekit-sdk
+
+Please clone this repository using the below command:
+
+```text
+git clone --recursive https://github.com/espressif/esp-homekit-sdk.git
+```
+
+> Note the --recursive option. This is required to pull in the JSON dependencies into esp-homekit-sdk. In case you have already cloned the repository without this option, execute this to pull in the submodules:
+> `git submodule update --init --recursive`
+
+
+### Compile and Flash
+
+You can use esp-homekit-sdk with any ESP32 or ESP32-S2 board. We have provided multiple examples for reference. Compile and flash as below (fan used as example):
+
+```text
+$ cd /path/to/esp-homekit-sdk/examples/fan
+$ export ESPPORT=/dev/tty.SLAB_USBtoUART #Set your board's serial port here
+$ idf.py set-target <esp32/esp32s2>
+$ idf.py flash monitor
+```
+
+As the device boots up, you will see two QR codes, a small one for HomeKit and a larger one for Wi-Fi provisioning. Please use any of the [Espressif Provisioning Apps](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/provisioning/provisioning.html#provisioning-tools) for Wi-Fi provisioning.
+
+> Note: For the Open source HomeKit SDK, the HomeKit QR code cannot be used for provisioning from the Home app. It can be used only for pairing, after the Wi-Fi provisioning is done. For provisioning from Home app, you will need the MFi variant of the SDK.
+
+> Note: If you want to use hard-coded credentials instead of Provisioning, please set the ssid and passphrase by navigating to `idf.py menuconfig -> App Wi-Fi -> Source of Wi-Fi Credentials -> Use Hardcoded`
+
+After the device connects to your Home Wi-Fi network it can be added in the Home app
+
+### Add acccessory in the Home app
+
+Open the Home app on your iPhone/iPad and follow these steps
+
+- Tap on "Add Accessory" and scan the small QR code mentioned above.
+- If QR code is not visible correctly, you may use the link printed on the serial terminal or follow these steps:
+    - Choose the "I Don't Have a Code or Cannot Scan" option.
+    - Tap on "Esp-Fan-xxxxxx" in the list of Nearby Accessories.
+    - Select the "Add Anyway" option for the "Uncertified Accessory" prompt.
+    - Enter 11122333 as the Setup code.
+- You should eventually see the "Esp-Fan-xxxxxx added" message.
+- Give a custom name, assign to a room, create scenes as required and you are done.
+
+### Changing the Setup Code
+
+The HomeKit setup code can be changed by using the `CONFIG_EXAMPLE_SETUP_CODE` config option (`idf.py menuconfig -> Example Configuration -> HomeKit Setup Code`). Please also refer the [HomeKit Setup Configuration](#homeKit-setup-configuration) below.
+
+
+## Using Standard Apple HomeKit Profiles
+The examples provided in the SDK are for fan, outlet, lightbulb. For using any other standard profiles, please refer the files under `components/homekit/hap_apple_profiles/`.
+
+## Adding Custom Profiles
+Please refer the Firmware Upgrades Custom Profile (`components/homekit/extras/`) to see how to add your own profile. You can use some UUID generator like [this](https://www.uuidgenerator.net/) to generate your own UUIDs for the services and characteristics.
+ 
+## HomeKit Setup Configuration
+
+As per the HomeKit requirements, the raw setup code should not be stored on the accessory. Instead, the SRP Salt and Verifier generated from the code should be stored. This salt-verifier combination, called as setup info in the ESP HomeKit SDK, needs to be unique for every accessory. This can be provided to the HAP Core using the `hap_set_setup_info()` API. Another parameter required for setup is the setup id, which also needs to be unique. It is provided to the HAP Core using `hap_set_setup_id()` API. 
+
+In order to ease the task of providing unique setup info and setup id for each accessory, instead of using the above APIs, the same information can be stored in a separate flash partition called factory\_nvs (Please see the `partitions_hap.csv` file in any example). This allows to keep the same firmware image and just flash different factory\_nvs images for different accessories. The factory\_nvs image fan\_factory.bin has been provided for Fan, which can be flashed using esptool. Custom images can be created using the `factory_nvs_gen` utility in tools/ as below
+
+Usage:
+
+```
+./factory_nvs_gen.py 11122333 ES32 factory
+```
+
+> Replace ES32 and 11122333 with the setup code and setup id of your choice. This has been tested with **Python 3.7.3**.
+
+Flash this using the esptool as below.
+
+```text
+$ esptool.py -p $ESPPORT write_flash 0x340000 factory.bin
+```
+
+To use the setup info from this image, you will have to disable the hardcoded setup code by setting `CONFIG_EXAMPLE_SETUP_CODE=n` (`idf.py menuconfig -> Example Configuration -> Use hard-coded setup code -> disable`). 
+
+The factory\_nvs partition can also hold other information like serial numbers, cloud credentials, firmware verification keys, etc. For that, just create a CSV file as per the requirements of [NVS Partition Generator Utility](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/storage/nvs_partition_gen.html#) and provide it to the `factory_nvs_gen` using the `--infile` option. These variables (if stored as binary data) can then be read in the accessory code using `hap_factory_keystore_get()` API.
+
+Sample CSV (say sample.csv)
+
+```
+key,type,encoding,value
+app,namespace,,
+serial_num,data,binary,12345
+```
+
+Usage:
+
+```
+./factory_nvs_gen.py --infile sample.csv 11122333 ES32 factory
+```
+
+Flash this using the same command given above.
+
+```text
+$ esptool.py -p $ESPPORT write_flash 0x340000 factory.bin
+```
+
+## Additional MFi requirements
+
+If you have access to the MFi variant of esp-homekit-sdk, please check additional information [here](MFI_README.md).
+
+## Reporting issues
+
+You can report issues directly on [Github issues](https://github.com/espressif/esp-homekit-sdk/issues).
diff --git a/components/button/CMakeLists.txt b/components/button/CMakeLists.txt
new file mode 100644
index 0000000..1135b6d
--- /dev/null
+++ b/components/button/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(COMPONENT_ADD_INCLUDEDIRS ./button/include)
+
+# Edit following two lines to set component requirements (see docs)
+set(COMPONENT_REQUIRES )
+set(COMPONENT_PRIV_REQUIRES )
+
+set(COMPONENT_SRCS ./button/button.c ./button/button_obj.cpp)
+
+register_component()
diff --git a/components/button/Kconfig b/components/button/Kconfig
new file mode 100644
index 0000000..8125118
--- /dev/null
+++ b/components/button/Kconfig
@@ -0,0 +1,6 @@
+menu "Button"
+    config IO_GLITCH_FILTER_TIME_MS
+        int "IO glitch filter timer ms (10~100)"
+        range 10 100
+        default 50
+endmenu
\ No newline at end of file
diff --git a/components/button/button/button.c b/components/button/button/button.c
new file mode 100644
index 0000000..a8a4144
--- /dev/null
+++ b/components/button/button/button.c
@@ -0,0 +1,363 @@
+/*
+ * ESPRSSIF MIT License
+ *
+ * Copyright (c) 2015 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is 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 <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <freertos/queue.h>
+#include <freertos/timers.h>
+#include <esp_log.h>
+#include <driver/gpio.h>
+#include <iot_button.h>
+
+#define IOT_CHECK(tag, a, ret)  if(!(a)) {                                             \
+        ESP_LOGE(tag,"%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__);      \
+        return (ret);                                                                   \
+        }
+#define ERR_ASSERT(tag, param)  IOT_CHECK(tag, (param) == ESP_OK, ESP_FAIL)
+#define POINT_ASSERT(tag, param, ret)    IOT_CHECK(tag, (param) != NULL, (ret))
+
+typedef enum {
+    BUTTON_STATE_IDLE = 0,
+    BUTTON_STATE_PUSH,
+    BUTTON_STATE_PRESSED,
+} button_status_t;
+
+typedef struct button_dev button_dev_t;
+typedef struct btn_cb button_cb_t;
+
+struct btn_cb{
+    TickType_t interval;
+    button_cb cb;
+    void* arg;
+    uint8_t on_press;
+    TimerHandle_t tmr;
+    button_dev_t *pbtn;
+    button_cb_t *next_cb;
+};
+
+struct button_dev{
+    uint8_t io_num;
+    uint8_t active_level;
+    uint32_t serial_thres_sec;
+    uint8_t taskq_on;
+    QueueHandle_t taskq;
+    QueueHandle_t argq;
+    button_status_t state;
+    button_cb_t tap_short_cb;
+    button_cb_t tap_psh_cb;
+    button_cb_t tap_rls_cb;
+    button_cb_t press_serial_cb;
+    button_cb_t* cb_head;
+};
+
+#define BUTTON_GLITCH_FILTER_TIME_MS   CONFIG_IO_GLITCH_FILTER_TIME_MS
+static const char* TAG = "button";
+
+static void button_press_cb(xTimerHandle tmr)
+{
+    button_cb_t* btn_cb = (button_cb_t*) pvTimerGetTimerID(tmr);
+    button_dev_t* btn = btn_cb->pbtn;
+    // low, then restart
+    if (btn->active_level == gpio_get_level(btn->io_num)) {
+        btn->state = BUTTON_STATE_PRESSED;
+        if (btn->taskq != NULL && btn->argq != NULL && btn->taskq_on && !btn_cb->on_press) {
+            void *tmp = btn_cb->cb;
+            xQueueOverwrite(btn->taskq, &tmp);
+            xQueueOverwrite(btn->argq, &btn_cb->arg);
+        } else if (btn_cb->cb) {
+            btn_cb->cb(btn_cb->arg);
+        }
+    }
+}
+
+static void button_tap_psh_cb(xTimerHandle tmr)
+{
+    button_cb_t* btn_cb = (button_cb_t*) pvTimerGetTimerID(tmr);
+    button_dev_t* btn = btn_cb->pbtn;
+    xTimerStop(btn->tap_rls_cb.tmr, portMAX_DELAY);
+    int lv = gpio_get_level(btn->io_num);
+
+    if (btn->active_level == lv) {
+        // True implies key is pressed
+        btn->state = BUTTON_STATE_PUSH;
+        if (btn->press_serial_cb.tmr) {
+            xTimerChangePeriod(btn->press_serial_cb.tmr, btn->serial_thres_sec*1000 / portTICK_PERIOD_MS, portMAX_DELAY);
+            xTimerReset(btn->press_serial_cb.tmr, portMAX_DELAY);
+        }
+        if (btn->tap_psh_cb.cb) {
+            btn->tap_psh_cb.cb(btn->tap_psh_cb.arg);
+        }
+    } else {
+        // 50ms, check if this is a real key up
+        if (btn->tap_rls_cb.tmr) {
+            xTimerStop(btn->tap_rls_cb.tmr, portMAX_DELAY);
+            xTimerReset(btn->tap_rls_cb.tmr, portMAX_DELAY);
+        }
+    }
+}
+
+static void button_tap_rls_cb(xTimerHandle tmr)
+{
+    button_cb_t* btn_cb = (button_cb_t*) pvTimerGetTimerID(tmr);
+    button_dev_t* btn = btn_cb->pbtn;
+    xTimerStop(btn->tap_rls_cb.tmr, portMAX_DELAY);
+    if (btn->active_level == gpio_get_level(btn->io_num)) {
+
+    } else {
+        // high, then key is up
+        button_cb_t *pcb = btn->cb_head;
+        while (pcb != NULL) {
+            if (pcb->tmr != NULL) {
+                xTimerStop(pcb->tmr, portMAX_DELAY);
+            }
+            pcb = pcb->next_cb;
+        }
+        if (btn->taskq != NULL && btn->argq != NULL && btn->taskq_on && uxQueueMessagesWaiting(btn->taskq) != 0 && btn->state != BUTTON_STATE_IDLE) {
+            void (*task)(void*);
+            void *arg;
+            xQueueReceive(btn->taskq, &task, 0);
+            xQueueReceive(btn->argq, &arg, 0);
+            task(arg);
+        }
+        if (btn->press_serial_cb.tmr && btn->press_serial_cb.tmr != NULL) {
+            xTimerStop(btn->press_serial_cb.tmr, portMAX_DELAY);
+        }
+        if (btn->tap_short_cb.cb && btn->state == BUTTON_STATE_PUSH) {
+            btn->tap_short_cb.cb(btn->tap_short_cb.arg);
+        }
+        if(btn->tap_rls_cb.cb && btn->state != BUTTON_STATE_IDLE) {
+            btn->tap_rls_cb.cb(btn->tap_rls_cb.arg);
+        }
+        btn->state = BUTTON_STATE_IDLE;
+    }
+}
+
+static void button_press_serial_cb(xTimerHandle tmr)
+{
+    button_dev_t* btn = (button_dev_t*) pvTimerGetTimerID(tmr);
+    if (btn->press_serial_cb.cb) {
+        btn->press_serial_cb.cb(btn->press_serial_cb.arg);
+    }
+    xTimerChangePeriod(btn->press_serial_cb.tmr, btn->press_serial_cb.interval, portMAX_DELAY);
+    xTimerReset(btn->press_serial_cb.tmr, portMAX_DELAY);
+}
+
+static void button_gpio_isr_handler(void* arg)
+{
+    button_dev_t* btn = (button_dev_t*) arg;
+    portBASE_TYPE HPTaskAwoken = pdFALSE;
+    int level = gpio_get_level(btn->io_num);
+    if (level == btn->active_level) {
+        if (btn->tap_psh_cb.tmr) {
+            xTimerStopFromISR(btn->tap_psh_cb.tmr, &HPTaskAwoken);
+            xTimerResetFromISR(btn->tap_psh_cb.tmr, &HPTaskAwoken);
+        }
+
+        button_cb_t *pcb = btn->cb_head;
+        while (pcb != NULL) {
+            if (pcb->tmr != NULL) {
+                xTimerStopFromISR(pcb->tmr, &HPTaskAwoken);
+                xTimerResetFromISR(pcb->tmr, &HPTaskAwoken);
+            }
+            pcb = pcb->next_cb;
+        }
+    } else {
+        // 50ms, check if this is a real key up
+        if (btn->tap_rls_cb.tmr) {
+            xTimerStopFromISR(btn->tap_rls_cb.tmr, &HPTaskAwoken);
+            xTimerResetFromISR(btn->tap_rls_cb.tmr, &HPTaskAwoken);
+        }
+    }
+    if(HPTaskAwoken == pdTRUE) {
+        portYIELD_FROM_ISR();
+    }
+}
+
+static void button_free_tmr(xTimerHandle* tmr)
+{
+    if (tmr && *tmr) {
+        xTimerStop(*tmr, portMAX_DELAY);
+        xTimerDelete(*tmr, portMAX_DELAY);
+        *tmr = NULL;
+    }
+}
+
+esp_err_t iot_button_delete(button_handle_t btn_handle)
+{
+    POINT_ASSERT(TAG, btn_handle, ESP_ERR_INVALID_ARG);
+    button_dev_t* btn = (button_dev_t*) btn_handle;
+    gpio_set_intr_type(btn->io_num, GPIO_INTR_DISABLE);
+    gpio_isr_handler_remove(btn->io_num);
+
+    button_free_tmr(&btn->tap_rls_cb.tmr);
+    button_free_tmr(&btn->tap_psh_cb.tmr);
+    button_free_tmr(&btn->tap_short_cb.tmr);
+    button_free_tmr(&btn->press_serial_cb.tmr);
+
+    button_cb_t *pcb = btn->cb_head;
+    while (pcb != NULL) {
+        button_cb_t *cb_next = pcb->next_cb;
+        button_free_tmr(&pcb->tmr);
+        free(pcb);
+        pcb = cb_next;
+    }
+    free(btn);
+    return ESP_OK;
+}
+
+button_handle_t iot_button_create(gpio_num_t gpio_num, button_active_t active_level)
+{
+    IOT_CHECK(TAG, gpio_num < GPIO_NUM_MAX, NULL);
+    button_dev_t* btn = (button_dev_t*) calloc(1, sizeof(button_dev_t));
+    POINT_ASSERT(TAG, btn, NULL);
+    btn->active_level = active_level;
+    btn->io_num = gpio_num;
+    btn->state = BUTTON_STATE_IDLE;
+    btn->taskq_on = 0;
+    btn->taskq = xQueueCreate(1, sizeof(void*));
+    btn->argq = xQueueCreate(1, sizeof(void *));
+    btn->tap_rls_cb.arg = NULL;
+    btn->tap_rls_cb.cb = NULL;
+    btn->tap_rls_cb.interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_PERIOD_MS;
+    btn->tap_rls_cb.pbtn = btn;
+    btn->tap_rls_cb.tmr = xTimerCreate("btn_rls_tmr", btn->tap_rls_cb.interval, pdFALSE,
+            &btn->tap_rls_cb, button_tap_rls_cb);
+    btn->tap_psh_cb.arg = NULL;
+    btn->tap_psh_cb.cb = NULL;
+    btn->tap_psh_cb.interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_PERIOD_MS;
+    btn->tap_psh_cb.pbtn = btn;
+    btn->tap_psh_cb.tmr = xTimerCreate("btn_psh_tmr", btn->tap_psh_cb.interval, pdFALSE,
+            &btn->tap_psh_cb, button_tap_psh_cb);
+    gpio_install_isr_service(0);
+    gpio_config_t gpio_conf;
+    gpio_conf.intr_type = GPIO_INTR_ANYEDGE;
+    gpio_conf.mode = GPIO_MODE_INPUT;
+    gpio_conf.pin_bit_mask = (1 << gpio_num);
+    gpio_conf.pull_down_en = GPIO_PULLDOWN_DISABLE;
+    gpio_conf.pull_up_en = GPIO_PULLUP_ENABLE;
+    gpio_config(&gpio_conf);
+    gpio_isr_handler_add(gpio_num, button_gpio_isr_handler, btn);
+    return (button_handle_t) btn;
+}
+
+esp_err_t iot_button_rm_cb(button_handle_t btn_handle, button_cb_type_t type)
+{
+    button_dev_t* btn = (button_dev_t*) btn_handle;
+    button_cb_t* btn_cb = NULL;
+    if (type == BUTTON_CB_PUSH) {
+        btn_cb = &btn->tap_psh_cb;
+    } else if (type == BUTTON_CB_RELEASE) {
+        btn_cb = &btn->tap_rls_cb;
+    } else if (type == BUTTON_CB_TAP) {
+        btn_cb = &btn->tap_short_cb;
+    } else if (type == BUTTON_CB_SERIAL) {
+        btn_cb = &btn->press_serial_cb;
+    }
+    btn_cb->cb = NULL;
+    btn_cb->arg = NULL;
+    btn_cb->pbtn = btn;
+    button_free_tmr(&btn_cb->tmr);
+    return ESP_OK;
+}
+
+esp_err_t iot_button_set_serial_cb(button_handle_t btn_handle, uint32_t start_after_sec, TickType_t interval_tick, button_cb cb, void* arg)
+{
+    button_dev_t* btn = (button_dev_t*) btn_handle;
+    btn->serial_thres_sec = start_after_sec;
+    if (btn->press_serial_cb.tmr == NULL) {
+        btn->press_serial_cb.tmr = xTimerCreate("btn_serial_tmr", btn->serial_thres_sec*1000 / portTICK_PERIOD_MS,
+                            pdFALSE, btn, button_press_serial_cb);
+    }
+    btn->press_serial_cb.arg = arg;
+    btn->press_serial_cb.cb = cb;
+    btn->press_serial_cb.interval = interval_tick;
+    btn->press_serial_cb.pbtn = btn;
+    xTimerChangePeriod(btn->press_serial_cb.tmr, btn->serial_thres_sec*1000 / portTICK_PERIOD_MS, portMAX_DELAY);
+    return ESP_OK;
+}
+
+esp_err_t iot_button_set_evt_cb(button_handle_t btn_handle, button_cb_type_t type, button_cb cb, void* arg)
+{
+    POINT_ASSERT(TAG, btn_handle, ESP_ERR_INVALID_ARG);
+    button_dev_t* btn = (button_dev_t*) btn_handle;
+    if (type == BUTTON_CB_PUSH) {
+        btn->tap_psh_cb.arg = arg;
+        btn->tap_psh_cb.cb = cb;
+        btn->tap_psh_cb.interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_RATE_MS;
+        btn->tap_psh_cb.pbtn = btn;
+        xTimerChangePeriod(btn->tap_psh_cb.tmr, btn->tap_psh_cb.interval, portMAX_DELAY);
+    } else if (type == BUTTON_CB_RELEASE) {
+        btn->tap_rls_cb.arg = arg;
+        btn->tap_rls_cb.cb = cb;
+        btn->tap_rls_cb.interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_RATE_MS;
+        btn->tap_rls_cb.pbtn = btn;
+        xTimerChangePeriod(btn->tap_rls_cb.tmr, btn->tap_psh_cb.interval, portMAX_DELAY);
+    } else if (type == BUTTON_CB_TAP) {
+        btn->tap_short_cb.arg = arg;
+        btn->tap_short_cb.cb = cb;
+        btn->tap_short_cb.interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_RATE_MS;
+        btn->tap_short_cb.pbtn = btn;
+    } else if (type == BUTTON_CB_SERIAL) {
+        iot_button_set_serial_cb(btn_handle, 1, 1000 / portTICK_RATE_MS, cb, arg);
+    }
+    return ESP_OK;
+}
+
+esp_err_t iot_button_add_on_press_cb(button_handle_t btn_handle, uint32_t press_sec, button_cb cb, void* arg)
+{
+    POINT_ASSERT(TAG, btn_handle, ESP_ERR_INVALID_ARG);
+    IOT_CHECK(TAG, press_sec != 0, ESP_ERR_INVALID_ARG);
+    button_dev_t* btn = (button_dev_t*) btn_handle;
+    button_cb_t* cb_new = (button_cb_t*) calloc(1, sizeof(button_cb_t));
+    POINT_ASSERT(TAG, cb_new, ESP_FAIL);
+    cb_new->on_press = 1;
+    cb_new->arg = arg;
+    cb_new->cb = cb;
+    cb_new->interval = press_sec * 1000 / portTICK_PERIOD_MS;
+    cb_new->pbtn = btn;
+    cb_new->tmr = xTimerCreate("btn_press_tmr", cb_new->interval, pdFALSE, cb_new, button_press_cb);
+    cb_new->next_cb = btn->cb_head;
+    btn->cb_head = cb_new;
+    return ESP_OK;
+}
+
+esp_err_t iot_button_add_on_release_cb(button_handle_t btn_handle, uint32_t press_sec, button_cb cb, void* arg)
+{
+    POINT_ASSERT(TAG, btn_handle, ESP_ERR_INVALID_ARG);
+    IOT_CHECK(TAG, press_sec != 0, ESP_ERR_INVALID_ARG);
+    button_dev_t* btn = (button_dev_t*) btn_handle;
+    button_cb_t* cb_new = (button_cb_t*) calloc(1, sizeof(button_cb_t));
+    POINT_ASSERT(TAG, cb_new, ESP_FAIL);
+    btn->taskq_on = 1;
+    cb_new->arg = arg;
+    cb_new->cb = cb;
+    cb_new->interval = press_sec * 1000 / portTICK_PERIOD_MS;
+    cb_new->pbtn = btn;
+    cb_new->tmr = xTimerCreate("btn_press_tmr", cb_new->interval, pdFALSE, cb_new, button_press_cb);
+    cb_new->next_cb = btn->cb_head;
+    btn->cb_head = cb_new;
+    return ESP_OK;
+}
+
diff --git a/components/button/button/button_obj.cpp b/components/button/button/button_obj.cpp
new file mode 100644
index 0000000..8a1f287
--- /dev/null
+++ b/components/button/button/button_obj.cpp
@@ -0,0 +1,64 @@
+/*
+  * ESPRESSIF MIT License
+  *
+  * Copyright (c) 2017 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+  *
+  * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+  * it is 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 <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <esp_system.h>
+#include <iot_button.h>
+
+CButton::CButton(gpio_num_t gpio_num, button_active_t active_level)
+{
+    m_btn_handle = iot_button_create(gpio_num, active_level);
+}
+
+CButton::~CButton()
+{
+    iot_button_delete(m_btn_handle);
+    m_btn_handle = NULL;
+}
+
+esp_err_t CButton::set_evt_cb(button_cb_type_t type, button_cb cb, void* arg)
+{
+    return iot_button_set_evt_cb(m_btn_handle, type, cb, arg);
+}
+
+esp_err_t CButton::set_serial_cb(button_cb cb, void* arg, TickType_t interval_tick, uint32_t start_after_sec)
+{
+    return iot_button_set_serial_cb(m_btn_handle, start_after_sec, interval_tick, cb, arg);
+}
+
+esp_err_t CButton::add_on_press_cb(uint32_t press_sec, button_cb cb, void* arg)
+{
+    return iot_button_add_on_press_cb(m_btn_handle, press_sec, cb, arg);
+}
+
+esp_err_t CButton::add_on_release_cb(uint32_t press_sec, button_cb cb, void* arg)
+{
+    return iot_button_add_on_release_cb(m_btn_handle, press_sec, cb, arg);
+}
+
+esp_err_t CButton::rm_cb(button_cb_type_t type)
+{
+    return iot_button_rm_cb(m_btn_handle, type);
+}
diff --git a/components/button/button/component.mk b/components/button/button/component.mk
new file mode 100644
index 0000000..a98f634
--- /dev/null
+++ b/components/button/button/component.mk
@@ -0,0 +1,4 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/components/button/button/include/iot_button.h b/components/button/button/include/iot_button.h
new file mode 100644
index 0000000..3f5de51
--- /dev/null
+++ b/components/button/button/include/iot_button.h
@@ -0,0 +1,280 @@
+/*
+ * ESPRSSIF MIT License
+ *
+ * Copyright (c) 2015 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS ESP8266 only, in which case,
+ * it is 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 _IOT_BUTTON_H_
+#define _IOT_BUTTON_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <driver/gpio.h>
+#include <freertos/portmacro.h>
+typedef void (* button_cb)(void*);
+typedef void* button_handle_t;
+
+typedef enum {
+    BUTTON_ACTIVE_HIGH = 1,    /*!<button active level: high level*/
+    BUTTON_ACTIVE_LOW = 0,     /*!<button active level: low level*/
+} button_active_t;
+
+typedef enum {
+    BUTTON_CB_PUSH = 0,   /*!<button push callback event */
+    BUTTON_CB_RELEASE,    /*!<button release callback event */
+    BUTTON_CB_TAP,        /*!<button quick tap callback event(will not trigger if there already is a "PRESS" event) */
+    BUTTON_CB_SERIAL,     /*!<button serial trigger callback event */
+} button_cb_type_t;
+
+/**
+ * @brief Init button functions
+ *
+ * @param gpio_num GPIO index of the pin that the button uses
+ * @param active_level button hardware active level.
+ *        For "BUTTON_ACTIVE_LOW" it means when the button pressed, the GPIO will read low level.
+ *
+ * @return A button_handle_t handle to the created button object, or NULL in case of error.
+ */
+button_handle_t iot_button_create(gpio_num_t gpio_num, button_active_t active_level);
+
+/**
+ * @brief Register a callback function for a serial trigger event.
+ *
+ * @param btn_handle handle of the button object
+ * @param start_after_sec define the time after which to start serial trigger action
+ * @param interval_tick serial trigger interval
+ * @param cb callback function for "TAP" action.
+ * @param arg Parameter for callback function
+ * @note
+ *        Button callback functions execute in the context of the timer service task.
+ *        It is therefore essential that button callback functions never attempt to block.
+ *        For example, a button callback function must not call vTaskDelay(), vTaskDelayUntil(),
+ *        or specify a non zero block time when accessing a queue or a semaphore.
+ * @return
+ *     - ESP_OK Success
+ *     - ESP_FAIL Parameter error
+ */
+esp_err_t iot_button_set_serial_cb(button_handle_t btn_handle, uint32_t start_after_sec, TickType_t interval_tick, button_cb cb, void* arg);
+
+/**
+ * @brief Register a callback function for a button_cb_type_t action.
+ *
+ * @param btn_handle handle of the button object
+ * @param type callback function type
+ * @param cb callback function for "TAP" action.
+ * @param arg Parameter for callback function
+ * @note
+ *        Button callback functions execute in the context of the timer service task.
+ *        It is therefore essential that button callback functions never attempt to block.
+ *        For example, a button callback function must not call vTaskDelay(), vTaskDelayUntil(),
+ *        or specify a non zero block time when accessing a queue or a semaphore.
+ * @return
+ *     - ESP_OK Success
+ *     - ESP_FAIL Parameter error
+ */
+esp_err_t iot_button_set_evt_cb(button_handle_t btn_handle, button_cb_type_t type, button_cb cb, void* arg);
+
+/**
+ * @brief Callbacks invoked as timer events occur while button is pressed.
+ *        Example: If a button is configured for 2 sec, 5 sec and 7 sec callbacks and if the button is pressed for 6 sec then 2 sec callback would be invoked at 2 sec event and 5 sec callback would be invoked at 5 sec event
+ *
+ * @param btn_handle handle of the button object
+ * @param press_sec the callback function would be called if you press the button for a specified period of time
+ * @param cb callback function for "PRESS and HOLD" action.
+ * @param arg Parameter for callback function
+ *
+ * @note
+ *        Button callback functions execute in the context of the timer service task.
+ *        It is therefore essential that button callback functions never attempt to block.
+ *        For example, a button callback function must not call vTaskDelay(), vTaskDelayUntil(),
+ *        or specify a non zero block time when accessing a queue or a semaphore.
+ * @return
+ *     - ESP_OK Success
+ *     - ESP_FAIL Parameter error
+ */
+esp_err_t iot_button_add_on_press_cb(button_handle_t btn_handle, uint32_t press_sec, button_cb cb, void* arg);
+
+/**
+ * @brief Single callback invoked according to the latest timer event on button release. 
+ *        Example: If a button is configured for 2 sec, 5 sec and 7 sec callbacks and if the button is released at 6 sec then only 5 sec callback would be invoked
+ *
+ * @param btn_handle handle of the button object
+ * @param press_sec the callback function would be called if you press the button for a specified period of time
+ * @param cb callback function for "PRESS and RELEASE" action.
+ * @param arg Parameter for callback function
+ * 
+ * @note
+ *        Button callback functions execute in the context of the timer service task.
+ *        It is therefore essential that button callback functions never attempt to block.
+ *        For example, a button callback function must not call vTaskDelay(), vTaskDelayUntil(),
+ *        or specify a non zero block time when accessing a queue or a semaphore.
+ * @return
+ *     - ESP_OK Success
+ *     - ESP_FAIL Parameter error
+ */
+esp_err_t iot_button_add_on_release_cb(button_handle_t btn_handle, uint32_t press_sec, button_cb cb, void* arg);
+
+/**
+ * @brief Delete button object and free memory
+ * @param btn_handle handle of the button object
+ *
+ * @return
+ *     - ESP_OK Success
+ *     - ESP_FAIL Parameter error
+ */
+esp_err_t iot_button_delete(button_handle_t btn_handle);
+
+/**
+ * @brief Remove callback
+ *
+ * @param btn_handle The handle of the button object
+ * @param type callback function event type
+ *
+ * @return
+ *     - ESP_OK Success
+ */
+esp_err_t iot_button_rm_cb(button_handle_t btn_handle, button_cb_type_t type);
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef __cplusplus
+
+/**
+ * class of button
+ * simple usage:
+ * CButton* btn = new CButton(BUTTON_IO_NUM, BUTTON_ACTIVE_LEVEL, BUTTON_SERIAL_TRIGGER, 3);
+ * btn->add_cb(BUTTON_CB_PUSH, button_tap_cb, (void*) push, 50 / portTICK_PERIOD_MS);
+ * btn->add_custom_cb(5, button_press_5s_cb, NULL);
+ * ......
+ * delete btn;
+ */
+class CButton
+{
+private:
+    button_handle_t m_btn_handle;
+
+    /**
+     * prevent copy constructing
+     */
+    CButton(const CButton&);
+    CButton& operator = (const CButton&);
+public:
+
+    /**
+     * @brief constructor of CButton
+     * 
+     * @param gpio_num GPIO index of the pin that the button uses
+     * @param active_level button hardware active level.
+     *        For "BUTTON_ACTIVE_LOW" it means when the button pressed, the GPIO will read low level.
+     */
+    CButton(gpio_num_t gpio_num, button_active_t active_level = BUTTON_ACTIVE_LOW);
+    
+    ~CButton();
+
+    /**
+     * @brief Register a callback function for a button_cb_type_t action.
+     *
+     * @param type callback function type
+     * @param cb callback function for "TAP" action.
+     * @param arg Parameter for callback function
+     * @note
+     *        Button callback functions execute in the context of the timer service task.
+     *        It is therefore essential that button callback functions never attempt to block.
+     *        For example, a button callback function must not call vTaskDelay(), vTaskDelayUntil(),
+     *        or specify a non zero block time when accessing a queue or a semaphore.
+     * @return
+     *     - ESP_OK Success
+     *     - ESP_FAIL Parameter error
+     */
+    esp_err_t set_evt_cb(button_cb_type_t type, button_cb cb, void* arg);
+
+    /**
+     * @brief Register a callback function for a serial trigger event.
+     *
+     * @param btn_handle handle of the button object
+     * @param start_after_sec define the time after which to start serial trigger action
+     * @param interval_tick serial trigger interval
+     * @param cb callback function for "TAP" action.
+     * @param arg Parameter for callback function
+     * @note
+     *        Button callback functions execute in the context of the timer service task.
+     *        It is therefore essential that button callback functions never attempt to block.
+     *        For example, a button callback function must not call vTaskDelay(), vTaskDelayUntil(),
+     *        or specify a non zero block time when accessing a queue or a semaphore.
+     * @return
+     *     - ESP_OK Success
+     *     - ESP_FAIL Parameter error
+     */
+    esp_err_t set_serial_cb(button_cb cb, void* arg, TickType_t interval_tick, uint32_t start_after_sec);
+
+    /**
+     * @brief Callbacks invoked as timer events occur while button is pressed
+     *
+     * @param press_sec the callback function would be called if you press the button for a specified period of time
+     * @param cb callback function for "PRESS and HOLD" action.
+     * @param arg Parameter for callback function
+     *
+     * @note
+     *        Button callback functions execute in the context of the timer service task.
+     *        It is therefore essential that button callback functions never attempt to block.
+     *        For example, a button callback function must not call vTaskDelay(), vTaskDelayUntil(),
+     *        or specify a non zero block time when accessing a queue or a semaphore.
+     * @return
+     *     - ESP_OK Success
+     *     - ESP_FAIL Parameter error
+     */
+    esp_err_t add_on_press_cb(uint32_t press_sec, button_cb cb, void* arg);
+    
+    /**
+     * @brief Single callback invoked according to the latest timer event on button release.
+     *
+     * @param press_sec the callback function would be called if you press the button for a specified period of time
+     * @param cb callback function for "PRESS and RELEASE" action.
+     * @param arg Parameter for callback function
+     *
+     * @note
+     *        Button callback functions execute in the context of the timer service task.
+     *        It is therefore essential that button callback functions never attempt to block.
+     *        For example, a button callback function must not call vTaskDelay(), vTaskDelayUntil(),
+     *        or specify a non zero block time when accessing a queue or a semaphore.
+     * @return
+     *     - ESP_OK Success
+     *     - ESP_FAIL Parameter error
+     */
+    esp_err_t add_on_release_cb(uint32_t press_sec, button_cb cb, void* arg);
+    
+    /**
+     * @brief Remove callback
+     *
+     * @param type callback function event type
+     *
+     * @return
+     *     - ESP_OK Success
+     */
+    esp_err_t rm_cb(button_cb_type_t type);
+};
+#endif
+
+#endif
diff --git a/components/button/component.mk b/components/button/component.mk
new file mode 100644
index 0000000..a456816
--- /dev/null
+++ b/components/button/component.mk
@@ -0,0 +1,2 @@
+COMPONENT_ADD_INCLUDEDIRS := ./button/include
+COMPONENT_SRCDIRS := ./button
diff --git a/components/homekit/esp_hap_apple_profiles/CMakeLists.txt b/components/homekit/esp_hap_apple_profiles/CMakeLists.txt
new file mode 100644
index 0000000..e5f6b8d
--- /dev/null
+++ b/components/homekit/esp_hap_apple_profiles/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(COMPONENT_ADD_INCLUDEDIRS include)
+
+# Edit following two lines to set component requirements (see docs)
+set(COMPONENT_REQUIRES esp_hap_core)
+set(COMPONENT_PRIV_REQUIRES )
+
+set(COMPONENT_SRCS src/hap_apple_chars.c src/hap_apple_servs.c)
+
+register_component()
+component_compile_options(-Wno-unused-function)
diff --git a/components/homekit/esp_hap_apple_profiles/component.mk b/components/homekit/esp_hap_apple_profiles/component.mk
new file mode 100644
index 0000000..bc14fc5
--- /dev/null
+++ b/components/homekit/esp_hap_apple_profiles/component.mk
@@ -0,0 +1,6 @@
+#
+# Component Makefile
+#
+CFLAGS += -Wno-unused-function
+COMPONENT_SRCDIRS := src
+COMPONENT_ADD_INCLUDEDIRS := include
diff --git a/components/homekit/esp_hap_apple_profiles/include/hap_apple_chars.h b/components/homekit/esp_hap_apple_profiles/include/hap_apple_chars.h
new file mode 100644
index 0000000..e734a6e
--- /dev/null
+++ b/components/homekit/esp_hap_apple_profiles/include/hap_apple_chars.h
@@ -0,0 +1,1422 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+/** HAP Apple Characteristics
+ *
+ * This offers helper APIs for all the standard HomeKit Characteristics defined by Apple
+ */
+#ifndef _HAP_APPLE_CHARS_H_
+#define _HAP_APPLE_CHARS_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include <hap.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define HAP_CHAR_UUID_ADMINISTRATOR_ONLY_ACCESS                 "1"
+#define HAP_CHAR_UUID_BRIGHTNESS                                "8"
+#define HAP_CHAR_UUID_COOLING_THRESHOLD_TEMPERATURE             "D"
+#define HAP_CHAR_UUID_CURRENT_DOOR_STATE                        "E"
+#define HAP_CHAR_UUID_CURRENT_HEATING_COOLING_STATE             "F"
+#define HAP_CHAR_UUID_CURRENT_RELATIVE_HUMIDITY                 "10"
+#define HAP_CHAR_UUID_CURRENT_TEMPERATURE                       "11"
+#define HAP_CHAR_UUID_FIRMWARE_REVISION                         "52"
+#define HAP_CHAR_UUID_HARDWARE_REVISION                         "53"
+#define HAP_CHAR_UUID_HEATING_THRESHOLD_TEMPERATURE             "12"
+#define HAP_CHAR_UUID_HUE                                       "13"
+#define HAP_CHAR_UUID_IDENTIFY                                  "14"
+#define HAP_CHAR_UUID_LOCK_CONTROL_POINT                        "19"
+#define HAP_CHAR_UUID_LOCK_CURRENT_STATE                        "1D"
+#define HAP_CHAR_UUID_LOCK_LAST_KNOWN_ACTION                    "1C"
+#define HAP_CHAR_UUID_LOCK_MANAGEMENT_AUTO_SECURITY_TIMEOUT     "1A"
+#define HAP_CHAR_UUID_LOCK_TARGET_STATE                         "1E"
+#define HAP_CHAR_UUID_LOGS                                      "1F"
+#define HAP_CHAR_UUID_MANUFACTURER                              "20"
+#define HAP_CHAR_UUID_MODEL                                     "21"
+#define HAP_CHAR_UUID_MOTION_DETECTED                           "22"
+#define HAP_CHAR_UUID_NAME                                      "23"
+#define HAP_CHAR_UUID_OBSTRUCTION_DETECTED                      "24"
+#define HAP_CHAR_UUID_ON                                        "25"
+#define HAP_CHAR_UUID_OUTLET_IN_USE                             "26"
+#define HAP_CHAR_UUID_ROTATION_DIRECTION                        "28"
+#define HAP_CHAR_UUID_ROTATION_SPEED                            "29"
+#define HAP_CHAR_UUID_SATURATION                                "2F"
+#define HAP_CHAR_UUID_SERIAL_NUMBER                             "30"
+#define HAP_CHAR_UUID_TARGET_DOOR_STATE                         "32"
+#define HAP_CHAR_UUID_TARGET_HEATING_COOLING_STATE              "33"
+#define HAP_CHAR_UUID_TARGET_RELATIVE_HUMIDITY                  "34"
+#define HAP_CHAR_UUID_TARGET_TEMPERATURE                        "35"
+#define HAP_CHAR_UUID_TEMPERATURE_DISPLAY_UNITS                 "36"
+#define HAP_CHAR_UUID_VERSION                                   "37"
+#define HAP_CHAR_UUID_AIR_PARTICULATE_DENSITY                   "64"
+#define HAP_CHAR_UUID_AIR_PARTICULATE_SIZE                      "65"
+#define HAP_CHAR_UUID_SECURITY_SYSTEM_CURRENT_STATE             "66"
+#define HAP_CHAR_UUID_SECURITY_SYSTEM_TARGET_STATE              "67"
+#define HAP_CHAR_UUID_BATTERY_LEVEL                             "68"
+#define HAP_CHAR_UUID_CARBON_MONOXIDE_DETECTED                  "69"
+#define HAP_CHAR_UUID_CONTACT_SENSOR_STATE                      "6A"
+#define HAP_CHAR_UUID_CURRENT_AMBIENT_LIGHT_LEVEL               "6B"
+#define HAP_CHAR_UUID_CURRENT_HORIZONTAL_TILT_ANGLE             "6C"
+#define HAP_CHAR_UUID_CURRENT_POSITION                          "6D"
+#define HAP_CHAR_UUID_CURRENT_VERTICAL_TILT_ANGLE               "6E"
+#define HAP_CHAR_UUID_HOLD_POSITION                             "6F"
+#define HAP_CHAR_UUID_LEAK_DETECTED                             "70"
+#define HAP_CHAR_UUID_OCCUPANCY_DETECTED                        "71"
+#define HAP_CHAR_UUID_POSITION_STATE                            "72"
+#define HAP_CHAR_UUID_PROGRAMMABLE_SWITCH_EVENT                 "73"
+#define HAP_CHAR_UUID_STATUS_ACTIVE                             "75"
+#define HAP_CHAR_UUID_SMOKE_DETECTED                            "76"
+#define HAP_CHAR_UUID_STATUS_FAULT                              "77"
+#define HAP_CHAR_UUID_STATUS_JAMMED                             "78"
+#define HAP_CHAR_UUID_STATUS_LOW_BATTERY                        "79"
+#define HAP_CHAR_UUID_STATUS_TAMPERED                           "7A"
+#define HAP_CHAR_UUID_TARGET_HORIZONTAL_TILT_ANGLE              "7B"
+#define HAP_CHAR_UUID_TARGET_POSITION                           "7C"
+#define HAP_CHAR_UUID_TARGET_VERTICAL_TILT_ANGLE                "7D"
+#define HAP_CHAR_UUID_STATUS_SECURITY_SYSTEM_ALARM_TYPE         "8E"
+#define HAP_CHAR_UUID_CHARGING_STATE                            "8F"
+#define HAP_CHAR_UUID_CARBON_MONOXIDE_LEVEL                     "90"
+#define HAP_CHAR_UUID_CARBON_MONOXIDE_PEAK_LEVEL                "91"
+#define HAP_CHAR_UUID_CARBON_DIOXIDE_DETECTED                   "92"
+#define HAP_CHAR_UUID_CARBON_DIOXIDE_LEVEL                      "93"
+#define HAP_CHAR_UUID_CARBON_DIOXIDE_PEAK_LEVEL                 "94"
+#define HAP_CHAR_UUID_AIR_QUALITY                               "95"
+#define HAP_CHAR_UUID_ACCESSORY_FLAGS                           "A6"
+#define HAP_CHAR_UUID_LOCK_PHYSICAL_CONTROLS                    "A7"
+#define HAP_CHAR_UUID_CURRENT_AIR_PURIFIER_STATE                "A9"
+#define HAP_CHAR_UUID_CURRENT_SLAT_STATE                        "AA"
+#define HAP_CHAR_UUID_SLAT_TYPE                                 "C0"
+#define HAP_CHAR_UUID_FILTER_LIFE_LEVEL                         "AB"
+#define HAP_CHAR_UUID_FILTER_CHANGE_INDICATION                  "AC"
+#define HAP_CHAR_UUID_RESET_FILTER_INDICATION                   "AD"
+#define HAP_CHAR_UUID_TARGET_AIR_PURIFIER_STATE                 "A8"
+#define HAP_CHAR_UUID_TARGET_FAN_STATE                          "BF"
+#define HAP_CHAR_UUID_CURRENT_FAN_STATE                         "AF"
+#define HAP_CHAR_UUID_ACTIVE                                    "B0"
+#define HAP_CHAR_UUID_SWING_MODE                                "B6"
+#define HAP_CHAR_UUID_CURRENT_TILT_ANGLE                        "C1"
+#define HAP_CHAR_UUID_TARGET_TILT_ANGLE                         "C2"
+#define HAP_CHAR_UUID_OZONE_DENSITY                             "C3"
+#define HAP_CHAR_UUID_NITROGEN_DIOXIDE_DENSITY                  "C4"
+#define HAP_CHAR_UUID_SULPHUR_DIOXIDE_DENSITY                   "C5"
+#define HAP_CHAR_UUID_PM_2_5_DENSITY                            "C6"
+#define HAP_CHAR_UUID_PM_10_DENSITY                             "C7"
+#define HAP_CHAR_UUID_VOC_DENSITY                               "C8"
+#define HAP_CHAR_UUID_SERVICE_LABEL_INDEX                       "CB"
+#define HAP_CHAR_UUID_SERVICE_LABEL_NAMESPACE                   "CD"
+#define HAP_CHAR_UUID_COLOR_TEMPERATURE                         "CE"
+#define HAP_CHAR_UUID_CURRENT_HEATER_COOLER_STATE               "B1"
+#define HAP_CHAR_UUID_TARGET_HEATER_COOLER_STATE                "B2"
+#define HAP_CHAR_UUID_CURRENT_HUMIDIFIER_DEHUMIDIFIER_STATE     "B3"
+#define HAP_CHAR_UUID_TARGET_HUMIDIFIER_DEHUMIDIFIER_STATE      "B4"
+#define HAP_CHAR_UUID_WATER_LEVEL                               "B5"
+#define HAP_CHAR_UUID_RELATIVE_HUMIDITY_DEHUMIDIFIER_THRESHOLD  "C9"
+#define HAP_CHAR_UUID_RELATIVE_HUMIDITY_HUMIDIFIER_THRESHOLD    "CA"
+#define HAP_CHAR_UUID_PROGRAM_MODE                              "D1"
+#define HAP_CHAR_UUID_IN_USE                                    "D2"
+#define HAP_CHAR_UUID_SET_DURATION                              "D3"
+#define HAP_CHAR_UUID_REMAINING_DURATION                        "D4"
+#define HAP_CHAR_UUID_VALVE_TYPE                                "D5"
+#define HAP_CHAR_UUID_IS_CONFIGURED                             "D6"
+#define HAP_CHAR_UUID_PRODUCT_DATA                              "220"
+
+/** Create Brightness Characteristic
+ *
+ * This API creates the Brightness characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] brightness Initial value of brightness
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_brightness_create(int brightness);
+
+/** Cooling Threshold Temperature Characteristic
+ *
+ * This API creates the Cooling Threshold Temperature characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] cooling_threshold_temp Cooling Threshold Value of Cooling Threshold Temperature characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_cooling_threshold_temperature_create(float cooling_threshold_temp);
+
+/** Create Current Door State Characteristic
+ *
+ * This API creates the Current Door State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] curr_door_state Initial value of Current Door State
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_door_state_create(uint8_t curr_door_state);
+
+/** Create Current Heating Cooling State Characteristic
+ *
+ * This API creates the Current Heating Cooling State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] curr_heating_cooling_state Initial value of current heating cooling state characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_heating_cooling_state_create(uint8_t curr_heating_cooling_state);
+
+/** Current Relative Humidity Characteristic
+ *
+ * This API creates the Current Relative Humidity characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] curr_rel_humidity Current Relative Humidity Value
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_relative_humidity_create(float curr_rel_humidity);
+
+/** Current Temperature Characteristic
+ *
+ * This API creates the Current Temperature characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] curr_temp Initial value of current temperature characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_temperature_create(float curr_temp);
+
+/** Create Firmware Revision Characteristic
+ *
+ * This API creates the firmware revision characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] fw_rev Firmware Revision string
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_firmware_revision_create(char *fw_rev);
+
+/** Create Hardware Revision Characteristic
+ *
+ * This API creates the name characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] hw_rev Hardware Revision string
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_hardware_revision_create(char *hw_rev);
+
+/** Heating Threshold Temperature Characteristic
+ *
+ * This API creates the Heating Threshold Temperature characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] heating_threshold_temp Heating Threshold Value of Heating Threshold Temperature characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_heating_threshold_temperature_create(float heating_threshold_temp);
+
+/** Create Hue Characteristic
+ *
+ * This API creates the hue characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] hue Initial value of hue
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_hue_create(float hue);
+
+/** Create Identify Characteristic
+ *
+ * This API creates the Identify characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_identify_create(void);
+
+/** Lock Current State Characteristic
+ *
+ * This API creates the Lock Current State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] lock_curr_state  Current lock state value of characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_lock_current_state_create(uint8_t lock_curr_state);
+
+/** Lock Target State Characteristic
+ *
+ * This API creates the Lock Target State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] lock_targ_state  Target lock state value of characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_lock_target_state_create(uint8_t lock_targ_state);
+
+/** Create Manufacturer Characteristic
+ *
+ * This API creates the Manufacturer characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] manufacturer Manufacturer string
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_manufacturer_create(char *manufacturer);
+
+/** Create Model Characteristic
+ *
+ * This API creates the Model characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] model Model string
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_model_create(char *model);
+
+/** Create Motion Detected Characteristic
+ *
+ * This API creates the Motion Detected characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] motion_detected   Value of Motion Detected Charateristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_motion_detected_create(bool motion_detected);
+
+/** Create Name Characteristic
+ *
+ * This API creates the Name characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] name Name string
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_name_create(char *name);
+
+/** Create Obstruction Detected Characteristic
+ *
+ * This API creates the Obstruction Detected characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] obstr_detect Initial value of obstruction detected characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_obstruction_detect_create(bool obstr_detect);
+
+/** Create On Characteristic
+ *
+ * This API creates the On characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] on Initial value of on
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_on_create(bool on);
+
+/** Create Outlet in Use Characteristic
+ *
+ * This API creates the Outlet in Use characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] outlet_in_use Initial value of outlet in use
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_outlet_in_use_create(bool outlet_in_use);
+
+/** Create Rotation Direction Characteristic
+ *
+ * This API creates the Rotation Direction characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] rotation_direction Initial value of Rotation Direction
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_rotation_direction_create(int rotation_direction);
+
+/** Create Rotation Speed Characteristic
+ *
+ * This API creates the Rotation Speed characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] rotation_speed Initial value of Rotation Speed
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_rotation_speed_create(float rotation_speed);
+
+/** Create Saturation Characteristic
+ *
+ * This API creates the saturation characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] saturation Initial value of saturation
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_saturation_create(float saturation);
+
+/** Create Serial Number Characteristic
+ *
+ * This API creates the serial number characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] serial_num Serial Number string
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_serial_number_create(char *serial_num);
+
+/** Create Target Door State Characteristic
+ *
+ * This API creates the Target Door State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] targ_door_state Initial value of Target Door State
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_target_door_state_create(uint8_t targ_door_state);
+
+/** Create Target Heating Cooling State Characteristic
+ *
+ * This API creates the Target Heating Cooling State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] targ_heating_cooling_state Value of target heating cooling state characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_target_heating_cooling_state_create(uint8_t targ_heating_cooling_state);
+
+/** Target Relative Humidity Characteristic
+ *
+ * This API creates the Target Relative Humidity characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] targ_rel_humidity Target Relative Humidity Value
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_target_relative_humidity_create(float targ_rel_humidity);
+
+/** Target Temperature Characteristic
+ *
+ * This API creates the Target Temperature characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] targ_temp Target value of target temperature characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_target_temperature_create(float targ_temp);
+
+/** Temperature Display Units Characteristic
+ *
+ * This API creates the Temperature Display Units characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] temp_disp_units Initial value of Temperature Display Units characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_temperature_display_units_create(uint8_t temp_disp_units);
+
+/** Create Version Characteristic
+ *
+ * This API creates the version characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] version Version String
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_version_create(char *version);
+
+/** Create Security System Current State Characteristic
+ *
+ * This API creates the Security System Current State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] security_sys_curr_state  Initial value of Security System Current State characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_security_system_current_state_create(uint8_t security_sys_curr_state);
+
+/** Create Security System Target State Characteristic
+ *
+ * This API creates the Security System Target State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] security_sys_targ_state  Initial value of Security System Target State characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_security_system_target_state_create(uint8_t security_sys_targ_state);
+
+/** Create Battery Level Characteristic
+ *
+ * This API creates the Battery Level characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] battery_level  Initial value of Battery Level characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_battery_level_create(uint8_t battery_level);
+
+/** Current Position Characteristic
+ *
+ * This API creates the Current Position characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] curr_pos  Initial value of Cuurent Position characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_position_create(uint8_t curr_pos);
+
+/** Current Vertical Tilt Angle Characteristic
+ *
+ * This API creates the Current Vertical Tilt Angle characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  curr_vert_tilt_angle Initial value of Current Vertical Tilt Angle characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_vertical_tilt_angle_create(int curr_vert_tilt_angle);
+
+/** Hold Position Characteristic
+ *
+ * This API creates the Hold Position characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] hold_pos  Initial value of Hold Position characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_hold_position_create(bool hold_pos);
+
+/** Leak Detected Characteristic
+ *
+ * This API creates the Leak Detected characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] leak_detected  Initial value of Leak Detected characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_leak_detected_create(uint8_t leak_detected);
+
+/** Occupancy Detected Characteristic
+ *
+ * This API creates the Occupancy Detected characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] occupancy_detected  Initial value of Occupancy Detected characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_occupancy_detected_create(uint8_t occupancy_detected);
+
+/** Status Active Characteristic
+ *
+ * This API creates the Status Active characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] status_active  Initial value of Status Active characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_status_active_create(bool status_active);
+
+/** Smoke Detected Characteristic
+ *
+ * This API creates the Smoke Detected characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] smoke_detected  Initial value of Smoke Detected characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_smoke_detected_create(uint8_t smoke_detected);
+
+/** Status Fault Characteristic
+ *
+ * This API creates the Status Fault characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] status_fault  Initial value of Status Fault characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_status_fault_create(uint8_t status_fault);
+
+/** Status Low Battery Characteristic
+ *
+ * This API creates the Status Low Battery characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] status_low_battery  Initial value of Status Low Battery characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_status_low_battery_create(uint8_t status_low_battery);
+
+/** Status Tampered Characteristic
+ *
+ * This API creates the Status Tampered characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] status_tampered  Initial value of Status Tampered characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_status_tampered_create(uint8_t status_tampered);
+
+/** Target Horizontal Tilt Angle Characteristic
+ *
+ * This API creates the Target Horizontal Tilt Angle characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  targ_horiz_tilt_angle     Initial value of Target Horizontal Tilt Angle characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_target_horizontal_tilt_angle_create(int targ_horiz_tilt_angle);
+
+/** Target Position Characteristic
+ *
+ * This API creates the Target Position characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] targ_pos  Initial value of Target Position characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_target_position_create(uint8_t targ_pos);
+
+/** Target Vertical Tilt Angle Characteristic
+ *
+ * This API creates the Target Vertical Tilt Angle characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  targ_vert_tilt_angle  Initial value of Target Vertical Tilt Angle characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_target_vertical_tilt_angle_create(int targ_vert_tilt_angle);
+
+/** Security System Alarm Type Characteristic
+ *
+ * This API creates the Security System Alarm Type characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] security_sys_alarm_type  Initial value of Security System Alarm Type characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_security_system_alarm_type_create(uint8_t security_sys_alarm_type);
+
+/** Charging State Characteristic
+ *
+ * This API creates the Charging State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  charging_state   Charging State characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_charging_state_create(uint8_t charging_state);
+
+/** Carbon Monoxide Level Characteristic
+ *
+ * This API creates the Carbon Monoxide Level characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] carbon_monoxide_level  Initial value of Carbon Monoxide Level characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_carbon_monoxide_level_create(float carbon_monoxide_level);
+
+/** Carbon Monoxide Peak Level Characteristic
+ *
+ * This API creates the Carbon Monoxide Peak Level characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] carbon_monoxide_peak_level  Initial value of Carbon Monoxide Peak Level characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_carbon_monoxide_peak_level_create(float carbon_monoxide_peak_level);
+
+/** Carbon Dioxide Detected Characteristic
+ *
+ * This API creates the Carbon Dioxide Detected characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] carbon_dioxide_detected  Initial value of Carbon Dioxide Detected characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_carbon_dioxide_detected_create(uint8_t carbon_dioxide_detected);
+
+/** Carbon Dioxide Level Characteristic
+ *
+ * This API creates the Carbon Dioxide Level characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] carbon_dioxide_level  Initial value of Carbon Dioxide Level characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_carbon_dioxide_level_create(float carbon_dioxide_level);
+
+/** Carbon Dioxide Peak Level Characteristic
+ *
+ * This API creates the Carbon Dioxide Peak Level characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] carbon_dioxide_peak_level  Initial value of Carbon Dioxide Peak Level characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_carbon_dioxide_peak_level_create(float carbon_dioxide_peak_level);
+
+/** Carbon Monoxide Detected Characteristic
+ *
+ * This API creates the Carbon Monoxide Detected characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] carbon_monoxide_detected  Initial value of Carbon Monoxide Detected characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_carbon_monoxide_detected_create(uint8_t carbon_monoxide_detected);
+
+/** Contact Sensor State Characteristic
+ *
+ * This API creates the Contact Sensor State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] contact_sensor_state  Initial value of Contact Sensor State characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_contact_sensor_state_create(uint8_t contact_sensor_state);
+
+/** Current Ambient Light Level Characteristic
+ *
+ * This API creates the Current Ambient Light Level characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  curr_ambient_light_level  Initial value of Current Ambient Light Level characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_ambient_light_level_create(float curr_ambient_light_level);
+
+/** Current Horizontal Tilt Angle Characteristic
+ *
+ * This API creates the Current Horizontal Tilt Angle characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]   curr_horiz_tilt_angle   Initial value of Current Horizontal Tilt Angle characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_horizontal_tilt_angle_create(int curr_horiz_tilt_angle);
+
+/** Air Quality Characteristic
+ *
+ * This API creates the Air Quality characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] air_quality  Initial value of Air Quality characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_air_quality_create(uint8_t air_quality);
+
+/** Create Accessory Flags Characteristic
+ *
+ * This API creates the Accessory Flags characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] flags Initial value of flags
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_accessory_flags_create(uint32_t flags);
+
+
+/** Create Product Data Characteristic
+ *
+ * This API creates the Product Data characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] product_data Value of the product data
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_product_data_create(hap_data_val_t *product_data);
+
+/** Create Lock Physical Controls Characteristic
+ *
+ * This API creates the Lock Physical Controls characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] lock_physical_controls Initial value of Lock Physical Controls characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_lock_physical_controls_create(uint8_t lock_physical_controls);
+
+/** Current Air Purifier State Characteristic
+ *
+ * This API creates the Current Air Purifier State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]   curr_air_purifier_state Initial value of Current Air Purifier State characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_air_purifier_state_create(uint8_t curr_air_purifier_state);
+
+/** Current Slat State Characteristic
+ *
+ * This API creates the Current Slat State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] curr_slat_state  Initial value of Current Slat State characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_slat_state_create(uint8_t curr_slat_state);
+
+/** Slat Type Characteristic
+ *
+ * This API creates the Slat Type characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] slat_type  Value of Slat Type characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_slat_type_create(uint8_t slat_type);
+
+/** Filter Life Level Characteristic
+ *
+ * This API creates the Filter Life Level characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  filter_life_level  Initial value of Filter Life Level characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_filter_life_level_create(float filter_life_level);
+
+/** Current Filter Change Indication Characteristic
+ *
+ * This API creates the Filter Change Indication characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  filter_change_indication  Initial value of Filter Change Indication characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_filter_change_indication_create(uint8_t filter_change_indication);
+
+/** Reset Filter Indication Characteristic
+ *
+ * This API creates the Reset Filter Indication characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  reset_filter_indication  Initial value of Reset Filter Indication characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_reset_filter_indication_create(uint8_t reset_filter_indication);
+
+/** Target Air Purifier State Characteristic
+ *
+ * This API creates the Target Air Purifier State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]   targ_air_purifier_state Initial value of Target Air Purifier State characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_target_air_purifier_state_create(uint8_t targ_air_purifier_state);
+
+/** Target Fan State Characteristic
+ *
+ * This API creates the Target Fan State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]   targ_fan_state  Initial value of Target Fan State characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_target_fan_state_create(uint8_t targ_fan_state);
+
+/** Current Fan State Characteristic
+ *
+ * This API creates the Current Fan State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]   curr_fan_state  Initial value of Current Fan State characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_fan_state_create(uint8_t curr_fan_state);
+
+/** Position State Characteristic
+ *
+ * This API creates the Position State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] pos_state  Initial value of Position State characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_position_state_create(uint8_t pos_state);
+
+/** Programmable Switch Event Characteristic
+ *
+ * This API creates the Programmable Switch Event characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] programmable_switch_event  Initial value of Programmable Switch Event characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_programmable_switch_event_create(uint8_t programmable_switch_event);
+
+/** Active Characteristic
+ *
+ * This API creates the Active characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]   active  Initial value of active characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_active_create(uint8_t active);
+
+/** Swing Mode Characteristic
+ *
+ * This API creates the Swing Mode characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]   swing_mode  Initial value of Swing Mode characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_swing_mode_create(uint8_t swing_mode);
+
+/** Current Tilt Angle Characteristic
+ *
+ * This API creates the Current Tilt Angle characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]   curr_tilt_angle Initial value of Current Tilt Angle characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_tilt_angle_create(int curr_tilt_angle);
+
+/** Target Tilt Angle Characteristic
+ *
+ * This API creates the Target Tilt Angle characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]   targ_tilt_angle Initial value of Target Tilt Angle characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+ hap_char_t *hap_char_target_tilt_angle_create(int targ_tilt_angle);
+
+/** Ozone Density Characteristic
+ *
+ * This API creates the Ozone Density characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  ozone_density     Initial value of Ozone Density characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_ozone_density_create(float ozone_density);
+
+/** Nitrogen Dioxide Density Characteristic
+ *
+ * This API creates the Nitrogen Dioxide Density characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  nitrogen_dioxide_density  Initial value of Nitrogen Dioxide Density characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_nitrogen_dioxide_density_create(float nitrogen_dioxide_density);
+
+/** Sulphur Dioxide Density Characteristic
+ *
+ * This API creates the Sulphur Dioxide Density characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  sulphur_dioxide_density   Initial value of Sulphur Dioxide Density characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_sulphur_dioxide_density_create(float sulphur_dioxide_density);
+
+/** PM2.5 Density Characteristic
+ *
+ * This API creates the PM2.5 Density characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  pm_2_5_density    Initial value of PM2.5 Density characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_pm_2_5_density_create(float pm_2_5_density);
+
+/** PM10 Density Characteristic
+ *
+ * This API creates the PM10 Density characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  pm_10_density   Initial value of PM10 Density characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_pm_10_density_create(float pm_10_density);
+
+/** VOC Density Characteristic
+ *
+ * This API creates the VOC Density characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in]  voc_density   Initial value of VOC Density characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_voc_density_create(float voc_density);
+
+/** Create Service Label Index Characteristic
+ *
+ * This API creates the Service Label Index characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] service_label_index Initial value of Service Label Index characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_service_label_index_create(uint8_t service_label_index);
+
+/** Create Service Label Namespace Characteristic
+ *
+ * This API creates the Service Label Namespace characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] service_label_namespace Initial value of Service Label Namespace characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_service_label_namespace_create(uint8_t service_label_namespace);
+
+/** Create Color Temperature Characteristic
+ *
+ * This API creates the color temperature characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] color_temp Initial value of Color Temperature
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_color_temperature_create(uint32_t color_temp);
+
+/** Create Curr Heater Cooler State Characteristic
+ *
+ * This API creates the Curr Heater Cooler State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] curr_heater_cooler_state  Initial value of Curr Heater Cooler State
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_heater_cooler_state_create(uint8_t curr_heater_cooler_state);
+
+/** Create Target Heater Cooler State Characteristic
+ *
+ * This API creates the Target Heater Cooler State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] targ_heater_cooler_state  Initial value of Target Heater Cooler State
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_target_heater_cooler_state_create(uint8_t targ_heater_cooler_state);
+
+/** Create Current Humidifier Dehumidifier State Characteristic
+ *
+ * This API creates the Current Humidifier Dehumidifier State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] curr_humidifier_dehumidifier_state Initial value of Current Humidifier Dehumidifier State characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_current_humidifier_dehumidifier_state_create(uint8_t curr_humidifier_dehumidifier_state);
+
+/** Create Target Humidifier Dehumidifier State Characteristic
+ *
+ * This API creates the Target Humidifier Dehumidifier State characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] targ_humidifier_dehumidifier_state Initial value of Target Humidifier Dehumidifier State characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_target_humidifier_dehumidifier_state_create(uint8_t targ_humidifier_dehumidifier_state);
+
+/** Create Water Level Characteristic
+ *
+ * This API creates the Water Level characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] water_level Initial value of Water Level characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_water_level_create(float water_level);
+
+/** Create Relative Humidity Dehumidifier Threshold Characteristic
+ *
+ * This API creates the Relative Humidity Dehumidifier Threshold characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] rel_humidity_dehumidifier_threshold Initial value of Relative Humidity Dehumidifier Threshold characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_relative_humidity_dehumidifier_threshold_create(float rel_humidity_dehumidifier_threshold);
+
+/** Create Relative Humidity Humidifier Threshold Characteristic
+ *
+ * This API creates the Relative Humidity Humidifier Threshold characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] rel_humidity_humidifier_threshold Initial value of Relative Humidity Humidifier Threshold characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_relative_humidity_humidifier_threshold_create(float rel_humidity_humidifier_threshold);
+
+/** Create Program Mode Characteristic
+ *
+ * This API creates the Program Mode characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] prog_mode Initial value of Program Mode characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_program_mode_create(uint8_t prog_mode);
+
+/** Create In Use Characteristic
+ *
+ * This API creates the In Use characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] in_use Initial value of In Use characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_in_use_create(uint8_t in_use);
+
+/** Create Set Duration Characteristic
+ *
+ * This API creates the Set Duration characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] set_duration Initial value of Set Duration characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_set_duration_create(uint32_t set_duration);
+
+/** Create Remaining Duration Characteristic
+ *
+ * This API creates the Remaining Duration characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] remaining_duration Initial value of Remaining Duration characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_remaining_duration_create(uint32_t remaining_duration);
+
+/** Create Valve Type Characteristic
+ *
+ * This API creates the Valve Type characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] valve_type Initial value of Valve Type characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_valve_type_create(uint8_t valve_type);
+
+/** Create Is Configured Characteristic
+ *
+ * This API creates the Is Configured characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] is_configured Initial value of Is Configured characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_is_configured_create(uint8_t is_configured);
+
+/** Status Jammed Characteristic
+ *
+ * This API creates the Status Jammed characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] status_jammed  Initial value of Status Jammed characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_status_jammed_create(uint8_t status_jammed);
+
+/** Administrator Only Access Characteristic
+ *
+ * This API creates the Administrator Only Access characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] administrator_only_access  Initial value of Administrator Only Access characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_administrator_only_access_create(bool administrator_only_access);
+
+/** Lock Control Point Characteristic
+ *
+ * This API creates the Lock Control Point characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] lock_control_point  Initial value of Lock Control Point characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_lock_control_point_create(hap_tlv8_val_t *lock_control_point);
+
+/** Lock Last Known Action Characteristic
+ *
+ * This API creates the Lock Last Known Action characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] lock_last_known_action  Initial value of Lock Last Known Action characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_lock_last_known_action_create(uint8_t lock_last_known_action);
+
+/** Lock Management Auto Security Timeout Characteristic
+ *
+ * This API creates the Lock Management Auto Security Timeout characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] lock_management_auto_security_timeout  Initial value of Lock Management Auto Security Timeout characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_lock_management_auto_security_timeout_create(uint32_t lock_management_auto_security_timeout);
+
+/** Logs Characteristic
+ *
+ * This API creates the Logs characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] logs  Initial value of Logs characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_logs_create(hap_tlv8_val_t *logs);
+
+/** Air Particulate Density Characteristic
+ *
+ * This API creates the Air Particulate Density characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] air_particulate_density  Initial value of Air Particulate Density characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_air_particulate_density_create(float air_particulate_density);
+
+/** Air Particulate Size Characteristic
+ *
+ * This API creates the Air Particulate Size characteristic object with other metadata
+ * (format, constraints, permissions, etc.) set as per the HAP Specs
+ *
+ * @param[in] air_particulate_size  Initial value of Air Particulate Size characteristic
+ *
+ * @return Pointer to the characteristic object on success
+ * @return NULL on failure
+ */
+hap_char_t *hap_char_air_particulate_size_create(uint8_t air_particulate_size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _HAP_APPLE_CHARS_H_ */
diff --git a/components/homekit/esp_hap_apple_profiles/include/hap_apple_servs.h b/components/homekit/esp_hap_apple_profiles/include/hap_apple_servs.h
new file mode 100644
index 0000000..e3f6101
--- /dev/null
+++ b/components/homekit/esp_hap_apple_profiles/include/hap_apple_servs.h
@@ -0,0 +1,560 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+/** HAP Apple Services
+ *
+ * This offers helper APIs for all the standard HomeKit Services defined by Apple
+ */
+#ifndef _HAP_APPLE_SERVS_H_
+#define _HAP_APPLE_SERVS_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include <hap.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define HAP_SERV_UUID_ACCESSORY_INFORMATION         "3E"
+#define HAP_SERV_UUID_PROTOCOL_INFORMATION          "A2"
+#define HAP_SERV_UUID_FAN                           "40"
+#define HAP_SERV_UUID_GARAGE_DOOR_OPENER            "41"
+#define HAP_SERV_UUID_LIGHTBULB                     "43"
+#define HAP_SERV_UUID_LOCK_MANAGEMENT               "44"
+#define HAP_SERV_UUID_LOCK_MECHANISM                "45"
+#define HAP_SERV_UUID_SWITCH                        "49"
+#define HAP_SERV_UUID_OUTLET                        "47"
+#define HAP_SERV_UUID_THERMOSTAT                    "4A"
+#define HAP_SERV_UUID_AIR_QUALITY_SENSOR            "8D"
+#define HAP_SERV_UUID_SECURITY_SYSTEM               "7E"
+#define HAP_SERV_UUID_CARBON_MONOXIDE_SENSOR        "7F"
+#define HAP_SERV_UUID_CONTACT_SENSOR                "80"
+#define HAP_SERV_UUID_DOOR                          "81"
+#define HAP_SERV_UUID_HUMIDITY_SENSOR               "82"
+#define HAP_SERV_UUID_LEAK_SENSOR                   "83"
+#define HAP_SERV_UUID_LIGHT_SENSOR                  "84"
+#define HAP_SERV_UUID_MOTION_SENSOR                 "85"
+#define HAP_SERV_UUID_OCCUPANCY_SENSOR              "86"
+#define HAP_SERV_UUID_SMOKE_SENSOR                  "87"
+#define HAP_SERV_UUID_STATLESS_PROGRAMMABLE_SWITCH  "89"
+#define HAP_SERV_UUID_TEMPERATURE_SENSOR            "8A"
+#define HAP_SERV_UUID_WINDOW                        "8B"
+#define HAP_SERV_UUID_WINDOW_COVERING               "8C"
+#define HAP_SERV_UUID_BATTERY_SERVICE               "96"
+#define HAP_SERV_UUID_CARBON_DIOXIDE_SENSOR         "97"
+#define HAP_SERV_UUID_FAN_V2                        "B7"
+#define HAP_SERV_UUID_SLAT                          "B9"
+#define HAP_SERV_UUID_FILTER_MAINTENANCE            "BA"
+#define HAP_SERV_UUID_AIR_PURIFIER                  "BB"
+#define HAP_SERV_UUID_HEATER_COOLER                 "BC"
+#define HAP_SERV_UUID_HUMIDIFIER_DEHUMIDIFIER       "BD"
+#define HAP_SERV_UUID_SERVICE_LABEL                 "CC"
+#define HAP_SERV_UUID_IRRIGATION_SYSTEM             "CF"
+#define HAP_SERV_UUID_VALVE                         "D0"
+#define HAP_SERV_UUID_FAUCET                        "D7"
+
+/** Create Accessory Information Service
+ *
+ * This API will create the Accessory Information Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] cfg The accessory configuration to be used to create the service
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_accessory_information_create(hap_acc_cfg_t *cfg);
+
+/** Create Protocol Information Service
+ *
+ * This API will create the Protocol Information Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] version The Protocol Version string
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_protocol_information_create(char *version);
+
+/** Create Fan Service
+ *
+ * This API will create the Fan Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] on Initial "On" state of the service
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_fan_create(bool on);
+
+/** Create Garage Door Opener Service
+ *
+ * This API will create the Garage Door Opener Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] curr_door_state Initial value of the current door state characteristic
+ * @param[in] targ_door_state Value of the target door state characteristic
+ * @param[in] obstr_detect Value of the obstruction detected characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_garage_door_opener_create(uint8_t curr_door_state, uint8_t targ_door_state, bool obstr_detect)
+;
+
+/** Create Light Bulb Service
+ *
+ * This API will create the Light Bulb Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] on Initial "On" state of the service
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_lightbulb_create(bool on);
+
+/** Create Lock Management Service
+ *
+ * This API will create the Lock Management Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] lock_control_point Accepts data from TLV8 commands
+ * @param[in] version The Protocol Version string
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_lock_management_create(hap_tlv8_val_t *lock_control_point, char * version);
+
+/** Create Lock Mechanism Service
+ *
+ * This API will create the Lock Mechanism Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] lock_curr_state Current lock state of the service
+ * @param[in] lock_targ_state Target lock state of the service
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_lock_mechanism_create(uint8_t lock_curr_state, uint8_t lock_targ_state);
+
+/** Create Outlet Service
+ *
+ * This API will create the Outlet Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] on Initial "On" state of the service
+ * @param[in] outlet_in_use Initial value of the outlet in use characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_outlet_create(bool on, bool outlet_in_use);
+
+/** Create Switch Service
+ *
+ * This API will create the Switch Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] on Initial "On" state of the service
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_switch_create(bool on);
+
+/** Create Thermostat Service
+ *
+ * This API will create the Thermostat Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] curr_heating_cooling_state Initial value of Current Heating Cooling State characteristic
+ * @param[in] targ_heating_cooling_state Initial value of Target Heating Cooling State characteristic
+ * @param[in] curr_temp Initial value of Current Temperature characteristic
+ * @param[in] targ_temp Initial value of Target Temperature  characteristic
+ * @param[in] temp_disp_units Initial value of Temperature Display Units characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_thermostat_create(uint8_t curr_heating_cooling_state, uint8_t targ_heating_cooling_state, float curr_temp, float targ_temp, uint8_t temp_disp_units);
+
+/** Create Air Quality Sensor Service
+ *
+ * This API will create the Air Quality Sensor Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] air_quality Initial value of Air Quality characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_air_quality_sensor_create(uint8_t air_quality);
+
+/** Create Security System Current State Service
+ *
+ * This API will create the Security System Current State Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] security_sys_curr_state Initial value of Security System Current State characteristic
+ * @param[in] security_sys_targ_state Initial value of Security System Target State characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_security_system_create(uint8_t security_sys_curr_state, uint8_t security_sys_targ_state);
+
+/** Create Carbon Monoxide Sensor Service
+ *
+ * This API will create the Carbon Monoxide Sensor Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] carbon_monoxide_detected Initial value of Carbon Monoxide Sensor characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_carbon_monoxide_sensor_create(uint8_t carbon_monoxide_detected);
+
+/** Create Contact Sensor Service
+ *
+ * This API will create the Contact Sensor Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] contact_sensor_state Initial value of Contact Sensor State characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_contact_sensor_create(uint8_t contact_sensor_state);
+
+/** Create Door Service
+ *
+ * This API will create the Door Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in]  curr_pos   Initial value of Current Position characteristic
+ * @param[in]  targ_pos   Initial value of Target Position characteristic
+ * @param[in]  pos_state  Initial value of Position State characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_door_create(uint8_t curr_pos, uint8_t targ_pos, uint8_t pos_state);
+
+/** Create Humidity Sensor Service
+ *
+ * This API will create the Humidity Sensor Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] curr_relative_humidity   Initial value of Humidity Sensor State characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_humidity_sensor_create(float curr_relative_humidity);
+
+/** Leak Sensor Service
+ *
+ * This API will create the Leak Sensor Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] leak_detected   Initial value of Leak Detected State characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_leak_sensor_create(uint8_t leak_detected);
+
+/** Light Sensor Service
+ *
+ * This API will create the Light Sensor Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] curr_ambient_light_level   Initial value of Current Ambient Light Level characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_light_sensor_create(float curr_ambient_light_level);
+
+/** Motion Sensor Service
+ *
+ * This API will create the Motion Sensor Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in]  motion_detected   Initial value of Motion Detected characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_motion_sensor_create(bool motion_detected);
+
+/** Occupancy Sensor Service
+ *
+ * This API will create the Occupancy Sensor Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in]  occupancy_detected   Initial value of Occupancy Detected characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_occupancy_sensor_create(uint8_t occupancy_detected);
+
+/** Smoke Sensor Service
+ *
+ * This API will create the Smoke Sensor Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in]  smoke_detected  Initial value of Smoke Detected characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_smoke_sensor_create(uint8_t smoke_detected);
+
+/** Stateless Programmable Switch Service
+ *
+ * This API will create the Stateless Programmable Switch Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in]  programmable_switch_event  Initial value of Programmable Switch Event characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_stateless_programmable_switch_create(uint8_t programmable_switch_event);
+
+/** Temperature Sensor Service
+ *
+ * This API will create the Temperature Sensor Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in]  curr_temp  Initial value of Current Temprature characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_temperature_sensor_create(float curr_temp);
+
+/** Window Service
+ *
+ * This API will create the Window Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in]  curr_pos   Initial value of Current Position characteristic
+ * @param[in]  targ_pos   Initial value of Target Position characteristic
+ * @param[in]  pos_state  Initial value of Position State characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_window_create(uint8_t curr_pos, uint8_t targ_pos, uint8_t pos_state);
+
+/** Window Covering Service
+ *
+ * This API will create the Window Covering  Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in]  targ_pos   Initial value of Target Position characteristic
+ * @param[in]  curr_pos   Initial value of Current Position characteristic
+ * @param[in]  pos_state  Initial value of Position State characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_window_covering_create(uint8_t targ_pos, uint8_t curr_pos, uint8_t pos_state);
+
+/** Battery Service
+ *
+ * This API will create the Battery Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in]  battery_level       Initial value of Battery Level characteristic
+ * @param[in]  charging_state      Initial value of Charging State characteristic
+ * @param[in]  status_low_battery  Initial value of Status Low Battery characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_battery_service_create(uint8_t battery_level, uint8_t charging_state, uint8_t status_low_battery);
+
+/** Create Carbon Dioxide Sensor Service
+ *
+ * This API will create the Carbon Dioxide Sensor Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] carbon_dioxide_detected Initial value of Carbon Dioxide Sensor characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_carbon_dioxide_sensor_create(uint8_t carbon_dioxide_detected);
+
+/** Fan v2 Service
+ *
+ * This API will create the Fan v2 Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] active   Value of Active characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_fan_v2_create(uint8_t active);
+
+/** Slat Service
+ *
+ * This API will create the Slat Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] curr_slat_state   Value of Current Slat State characteristic
+ * @param[in] slat_type   Value of Slat Type characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_slat_create(uint8_t curr_slat_state, uint8_t slat_type);
+
+/** Filter Maintenance Service
+ *
+ * This API will create the Filter Maintenance Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] filter_change_indication  Value of Filter Change Indication characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_filter_maintenance_create(uint8_t filter_change_indication);
+
+/** Air Purifier Service
+ *
+ * This API will create the Air Purifier Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] active Value of Active characteristic
+ * @param[in] curr_air_purifier_state Value of Current Air Purifier State characteristic
+ * @param[in] targ_air_purifier_state Value of Target Air Purifier State characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_air_purifier_create(uint8_t active, uint8_t curr_air_purifier_state, uint8_t
+        targ_air_purifier_state);
+
+/** Heater Cooler Service
+ *
+ * This API will create the Heater Cooler Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] active Value of Active characteristic
+ * @param[in] curr_temp Value of Current Temperature characteristic
+ * @param[in] curr_heater_cooler_state Value of Current Heater Cooler State characteristic
+ * @param[in] targ_heater_cooler_state Value of Target Heater Cooler State characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_heater_cooler_create(uint8_t active, float curr_temp, uint8_t curr_heater_cooler_state, uint8_t targ_heater_cooler_state);
+
+/** Create Humidifer Dehumidfier Service
+ *
+ * This API will create the Humidifer Dehumidfier Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] active  Initial value of Active characteristic
+ * @param[in] curr_rel_humid  Initial value of Current Relative Humidity characteristic
+ * @param[in] curr_humid_dehumid_state  Initial value of Current Humidifier Dehumidifier State characteristic
+ * @param[in] targ_humid_dehumid_state  Initial value of Target Humidifier Dehumidifier State characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_humidifier_dehumidifier_create(uint8_t active, float curr_rel_humid, uint8_t
+        curr_humid_dehumid_state, uint8_t targ_humid_dehumid_state);
+
+/** Create Service Label Service
+ *
+ * This API will create the Service Label Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] service_label_namespace Initial value of Service Label Service characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_service_label_create(uint8_t service_label_namespace);
+
+/** Create Irrigation System Service
+ *
+ * This API will create the Irrigation System Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] active Initial value of active characteristic
+ * @param[in] prog_mode Initial value of Program Mode characteristic
+ * @param[in] in_use Initial value of In Use characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_irrigation_system_create(uint8_t active, uint8_t prog_mode, uint8_t in_use);
+
+/** Create Valve Service
+ *
+ * This API will create the Valve Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] active      Initial value of active characteristic
+ * @param[in] in_use      Initial value of In Use characteristic
+ * @param[in] valve_type  Initial value of Valve Type characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_valve_create(uint8_t active, uint8_t in_use, uint8_t valve_type);
+
+/** Create Faucet Service
+ *
+ * This API will create the Faucet Service with the mandatory
+ * characteristics as per the HAP Specs.
+ *
+ * @param[in] active Initial value of active characteristic
+ *
+ * @return Pointer to the service object on success
+ * @return NULL on failure
+ */
+hap_serv_t *hap_serv_faucet_create(uint8_t active);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _HAP_APPLE_SERVS_H_ */
diff --git a/components/homekit/esp_hap_apple_profiles/src/hap_apple_chars.c b/components/homekit/esp_hap_apple_profiles/src/hap_apple_chars.c
new file mode 100644
index 0000000..55cdc27
--- /dev/null
+++ b/components/homekit/esp_hap_apple_profiles/src/hap_apple_chars.c
@@ -0,0 +1,1482 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <hap.h>
+#include <hap_apple_chars.h>
+
+/* Char: Brightness */
+hap_char_t *hap_char_brightness_create(int brightness)
+{
+    hap_char_t *hc = hap_char_int_create(HAP_CHAR_UUID_BRIGHTNESS,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, brightness);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 100, 1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_PERCENTAGE);
+
+    return hc;
+}
+
+/* Char: Cooling Threshold Temperature */
+hap_char_t *hap_char_cooling_threshold_temperature_create(float cooling_threshold_temp)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_COOLING_THRESHOLD_TEMPERATURE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, cooling_threshold_temp);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 10.0, 35.0, 0.1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_CELSIUS);
+
+    return hc;
+}
+
+/* Char: Current Door State */
+hap_char_t *hap_char_current_door_state_create(uint8_t curr_door_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_CURRENT_DOOR_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_door_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 4, 1);
+
+    return hc;
+}
+
+/* Char: Current Heating Cooling State */
+hap_char_t *hap_char_current_heating_cooling_state_create(uint8_t curr_heating_cooling_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_CURRENT_HEATING_COOLING_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_heating_cooling_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 2, 1);
+
+    return hc;
+}
+
+/* Char: Current Relative Humidity */
+hap_char_t *hap_char_current_relative_humidity_create(float curr_rel_humidity)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_CURRENT_RELATIVE_HUMIDITY,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_rel_humidity);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 100.0, 1.0);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_PERCENTAGE);
+
+    return hc;
+}
+
+/* Char: Current Temperature */
+hap_char_t *hap_char_current_temperature_create(float curr_temp)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_CURRENT_TEMPERATURE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_temp);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 100.0, 0.1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_CELSIUS);
+
+    return hc;
+}
+
+/* Char: Firmware Revision */
+hap_char_t *hap_char_firmware_revision_create(char *fw_rev)
+{
+    hap_char_t *hc = hap_char_string_create(HAP_CHAR_UUID_FIRMWARE_REVISION,
+                                            HAP_CHAR_PERM_PR, fw_rev);
+    if (!hc) {
+        return NULL;
+    }
+    return hc;
+}
+
+/* Char: Hardware Revision */
+hap_char_t *hap_char_hardware_revision_create(char *hw_rev)
+{
+    hap_char_t *hc = hap_char_string_create(HAP_CHAR_UUID_HARDWARE_REVISION,
+                                            HAP_CHAR_PERM_PR, hw_rev);
+    if (!hc) {
+        return NULL;
+    }
+    return hc;
+}
+
+/* Char: Heating Threshold Temperature */
+hap_char_t *hap_char_heating_threshold_temperature_create(float heating_threshold_temp)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_HEATING_THRESHOLD_TEMPERATURE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, heating_threshold_temp);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 25.0, 0.1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_CELSIUS);
+
+    return hc;
+}
+
+/* Char: Hue */
+hap_char_t *hap_char_hue_create(float hue)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_HUE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, hue);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 360.0, 1.0);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_ARCDEGREES);
+
+    return hc;
+}
+
+/* Char: Identify */
+hap_char_t *hap_char_identify_create(void)
+{
+    hap_char_t *hc = hap_char_bool_create(HAP_CHAR_UUID_IDENTIFY, HAP_CHAR_PERM_PW, false);
+    if (!hc) {
+        return NULL;
+    }
+    return hc;
+}
+
+/* Char: Lock Current State */
+hap_char_t *hap_char_lock_current_state_create(uint8_t lock_curr_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_LOCK_CURRENT_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, lock_curr_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 3, 1);
+
+    return hc;
+}
+
+/* Char: Lock Target State */
+hap_char_t *hap_char_lock_target_state_create(uint8_t lock_targ_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_LOCK_TARGET_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, lock_targ_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Manufacturer */
+hap_char_t *hap_char_manufacturer_create(char *manufacturer)
+{
+    hap_char_t *hc = hap_char_string_create(HAP_CHAR_UUID_MANUFACTURER,
+                                            HAP_CHAR_PERM_PR, manufacturer);
+    if (!hc) {
+        return NULL;
+    }
+    return hc;
+}
+
+/* Char: Model */
+hap_char_t *hap_char_model_create(char *model)
+{
+    hap_char_t *hc = hap_char_string_create(HAP_CHAR_UUID_MODEL,
+                                            HAP_CHAR_PERM_PR, model);
+    if (!hc) {
+        return NULL;
+    }
+    return hc;
+}
+
+/* Char: Motion Detected */
+hap_char_t *hap_char_motion_detected_create(bool motion_detected)
+{
+    hap_char_t *hc = hap_char_bool_create(HAP_CHAR_UUID_MOTION_DETECTED,
+                                          HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, motion_detected);
+    if (!hc) {
+        return NULL;
+    }
+
+    return hc;
+}
+
+/* Char: Name */
+hap_char_t *hap_char_name_create(char *name)
+{
+    hap_char_t *hc = hap_char_string_create(HAP_CHAR_UUID_NAME,
+                                            HAP_CHAR_PERM_PR, name);
+    if (!hc) {
+        return NULL;
+    }
+    return hc;
+}
+
+/* Char: Obstruction Detected */
+hap_char_t *hap_char_obstruction_detect_create(bool obstr_detect)
+{
+    hap_char_t *hc = hap_char_bool_create(HAP_CHAR_UUID_OBSTRUCTION_DETECTED,
+                                          HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, obstr_detect);
+    if (!hc) {
+        return NULL;
+    }
+
+    return hc;
+}
+
+/* Char: On */
+hap_char_t *hap_char_on_create(bool on)
+{
+    hap_char_t *hc = hap_char_bool_create(HAP_CHAR_UUID_ON,
+                                          HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, on);
+    if (!hc) {
+        return NULL;
+    }
+    return hc;
+}
+
+/* Char: Outlet in Use */
+hap_char_t *hap_char_outlet_in_use_create(bool outlet_in_use)
+{
+    hap_char_t *hc = hap_char_bool_create(HAP_CHAR_UUID_OUTLET_IN_USE,
+                                          HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, outlet_in_use);
+    if (!hc) {
+        return NULL;
+    }
+    return hc;
+}
+
+/* Char: Rotation Direction */
+hap_char_t *hap_char_rotation_direction_create(int rotation_direction)
+{
+    hap_char_t *hc = hap_char_int_create(HAP_CHAR_UUID_ROTATION_DIRECTION,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, rotation_direction);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Rotation Speed */
+hap_char_t *hap_char_rotation_speed_create(float rotation_speed)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_ROTATION_SPEED,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, rotation_speed);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 100.0, 1.0);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_PERCENTAGE);
+
+    return hc;
+}
+
+/* Char: Saturation */
+hap_char_t *hap_char_saturation_create(float saturation)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_SATURATION,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, saturation);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 100.0, 1.0);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_PERCENTAGE);
+
+    return hc;
+}
+
+/* Char: Serial Number */
+hap_char_t *hap_char_serial_number_create(char *serial_num)
+{
+    hap_char_t *hc = hap_char_string_create(HAP_CHAR_UUID_SERIAL_NUMBER,
+                                            HAP_CHAR_PERM_PR, serial_num);
+    if (!hc) {
+        return NULL;
+    }
+    return hc;
+}
+
+/* Char: Target Door State */
+hap_char_t *hap_char_target_door_state_create(uint8_t targ_door_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_TARGET_DOOR_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, targ_door_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Target Heating Cooling State */
+hap_char_t *hap_char_target_heating_cooling_state_create(uint8_t targ_heating_cooling_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_TARGET_HEATING_COOLING_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, targ_heating_cooling_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 3, 1);
+
+    return hc;
+}
+
+/* Char: Target Relative Humidity */
+hap_char_t *hap_char_target_relative_humidity_create(float targ_rel_humidity)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_TARGET_RELATIVE_HUMIDITY,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, targ_rel_humidity);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 100.0, 1.0);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_PERCENTAGE);
+
+    return hc;
+}
+
+/* Char: Target Temperature */
+hap_char_t *hap_char_target_temperature_create(float targ_temp)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_TARGET_TEMPERATURE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, targ_temp);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 10.0, 38.0, 0.1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_CELSIUS);
+
+    return hc;
+}
+
+/* Char: Temperature Display Units */
+hap_char_t *hap_char_temperature_display_units_create(uint8_t temp_disp_units)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_TEMPERATURE_DISPLAY_UNITS,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, temp_disp_units);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Version */
+hap_char_t *hap_char_version_create(char *version)
+{
+    hap_char_t *hc = hap_char_string_create(HAP_CHAR_UUID_VERSION,
+                                            HAP_CHAR_PERM_PR, version);
+    if (!hc) {
+        return NULL;
+    }
+    return hc;
+}
+
+/* Char: Security System Current State */
+hap_char_t *hap_char_security_system_current_state_create(uint8_t security_sys_curr_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_SECURITY_SYSTEM_CURRENT_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, security_sys_curr_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 4, 1);
+
+    return hc;
+}
+
+/* Char: Security System Target State */
+hap_char_t *hap_char_security_system_target_state_create(uint8_t security_sys_targ_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_SECURITY_SYSTEM_TARGET_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, security_sys_targ_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 3, 1);
+
+    return hc;
+}
+
+/* Char: Battery Level */
+hap_char_t *hap_char_battery_level_create(uint8_t battery_level)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_BATTERY_LEVEL,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, battery_level);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 100, 1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_PERCENTAGE);
+
+    return hc;
+}
+
+/* Char: Carbon Monoxide Detected */
+hap_char_t *hap_char_carbon_monoxide_detected_create(uint8_t carbon_monoxide_detected)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_CARBON_MONOXIDE_DETECTED,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, carbon_monoxide_detected);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Contact Sensor State */
+hap_char_t *hap_char_contact_sensor_state_create(uint8_t contact_sensor_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_CONTACT_SENSOR_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, contact_sensor_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Current Ambient Light Level */
+hap_char_t *hap_char_current_ambient_light_level_create(float curr_ambient_light_level)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_CURRENT_AMBIENT_LIGHT_LEVEL,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_ambient_light_level);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0001, 100000.0, 0.0);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_LUX);
+
+    return hc;
+}
+
+/* Char: Current Horizontal Tilt Angle */
+hap_char_t *hap_char_current_horizontal_tilt_angle_create(int curr_horiz_tilt_angle)
+{
+    hap_char_t *hc = hap_char_int_create(HAP_CHAR_UUID_CURRENT_HORIZONTAL_TILT_ANGLE,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_horiz_tilt_angle);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, -90, 90, 1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_ARCDEGREES);
+
+    return hc;
+}
+
+/* Char: Current Position */
+hap_char_t *hap_char_current_position_create(uint8_t curr_pos)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_CURRENT_POSITION,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_pos);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 100, 1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_PERCENTAGE);
+
+    return hc;
+}
+
+/* Char: Current Vertical Tilt Angle */
+hap_char_t *hap_char_current_vertical_tilt_angle_create(int curr_vert_tilt_angle)
+{
+    hap_char_t *hc = hap_char_int_create(HAP_CHAR_UUID_CURRENT_VERTICAL_TILT_ANGLE,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_vert_tilt_angle);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, -90, 90, 1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_ARCDEGREES);
+
+    return hc;
+}
+
+/* Char: Hold Position */
+hap_char_t *hap_char_hold_position_create(bool hold_pos)
+{
+    hap_char_t *hc = hap_char_bool_create(HAP_CHAR_UUID_HOLD_POSITION,
+                                          HAP_CHAR_PERM_PW, hold_pos);
+    if (!hc) {
+        return NULL;
+    }
+
+    return hc;
+}
+
+/* Char: Leak Detected */
+hap_char_t *hap_char_leak_detected_create(uint8_t leak_detected)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_LEAK_DETECTED,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, leak_detected);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Occupancy Detected */
+hap_char_t *hap_char_occupancy_detected_create(uint8_t occupancy_detected)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_OCCUPANCY_DETECTED,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, occupancy_detected);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Position State */
+hap_char_t *hap_char_position_state_create(uint8_t pos_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_POSITION_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, pos_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 2, 1);
+
+    return hc;
+}
+
+/* Char: Programmable Switch Event */
+hap_char_t *hap_char_programmable_switch_event_create(uint8_t programmable_switch_event)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_PROGRAMMABLE_SWITCH_EVENT,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV | HAP_CHAR_PERM_SPECIAL_READ,
+                                           programmable_switch_event);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 2, 1);
+
+    return hc;
+}
+
+/* Char: Status Active */
+hap_char_t *hap_char_status_active_create(bool status_active)
+{
+    hap_char_t *hc = hap_char_bool_create(HAP_CHAR_UUID_STATUS_ACTIVE,
+                                          HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, status_active);
+    if (!hc) {
+        return NULL;
+    }
+
+    return hc;
+}
+
+/* Char: Smoke Detected */
+hap_char_t *hap_char_smoke_detected_create(uint8_t smoke_detected)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_SMOKE_DETECTED,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, smoke_detected);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Status Fault */
+hap_char_t *hap_char_status_fault_create(uint8_t status_fault)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_STATUS_FAULT,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, status_fault);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Status Low Battery */
+hap_char_t *hap_char_status_low_battery_create(uint8_t status_low_battery)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_STATUS_LOW_BATTERY,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, status_low_battery);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Status Tampered */
+hap_char_t *hap_char_status_tampered_create(uint8_t status_tampered)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_STATUS_TAMPERED,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, status_tampered);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Target Horizontal Tilt Angle */
+hap_char_t *hap_char_target_horizontal_tilt_angle_create(int targ_horiz_tilt_angle)
+{
+    hap_char_t *hc = hap_char_int_create(HAP_CHAR_UUID_TARGET_HORIZONTAL_TILT_ANGLE,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, targ_horiz_tilt_angle);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, -90, 90, 1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_ARCDEGREES);
+
+    return hc;
+}
+
+/* Char: Target Position */
+hap_char_t *hap_char_target_position_create(uint8_t targ_pos)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_TARGET_POSITION,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, targ_pos);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 100, 1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_PERCENTAGE);
+
+    return hc;
+}
+
+/* Char: Target Vertical Tilt Angle */
+hap_char_t *hap_char_target_vertical_tilt_angle_create(int targ_vert_tilt_angle)
+{
+    hap_char_t *hc = hap_char_int_create(HAP_CHAR_UUID_TARGET_VERTICAL_TILT_ANGLE,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, targ_vert_tilt_angle);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, -90, 90, 1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_ARCDEGREES);
+
+    return hc;
+}
+
+/* Char: Security System Alarm Type */
+hap_char_t *hap_char_security_system_alarm_type_create(uint8_t security_sys_alarm_type)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_STATUS_SECURITY_SYSTEM_ALARM_TYPE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, security_sys_alarm_type);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Charging State */
+hap_char_t *hap_char_charging_state_create(uint8_t charging_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_CHARGING_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, charging_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 2, 1);
+
+    return hc;
+}
+
+/* Char: Carbon Monoxide Level */
+hap_char_t *hap_char_carbon_monoxide_level_create(float carbon_monoxide_level)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_CARBON_MONOXIDE_LEVEL,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, carbon_monoxide_level);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 100.0, 0.0);
+
+    return hc;
+}
+
+/* Char: Carbon Monoxide Peak Level */
+hap_char_t *hap_char_carbon_monoxide_peak_level_create(float carbon_monoxide_peak_level)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_CARBON_MONOXIDE_PEAK_LEVEL,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, carbon_monoxide_peak_level);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 100.0, 0.0);
+
+    return hc;
+}
+
+/* Char: Carbon Dioxide Detected */
+hap_char_t *hap_char_carbon_dioxide_detected_create(uint8_t carbon_dioxide_detected)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_CARBON_DIOXIDE_DETECTED,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, carbon_dioxide_detected);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Carbon Dioxide Level */
+hap_char_t *hap_char_carbon_dioxide_level_create(float carbon_dioxide_level)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_CARBON_DIOXIDE_LEVEL,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, carbon_dioxide_level);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 100000.0, 0.0);
+
+    return hc;
+}
+
+/* Char: Carbon Dioxide Peak Level */
+hap_char_t *hap_char_carbon_dioxide_peak_level_create(float carbon_dioxide_peak_level)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_CARBON_DIOXIDE_PEAK_LEVEL,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, carbon_dioxide_peak_level);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 100000.0, 0.0);
+
+    return hc;
+}
+
+
+/* Char: Air Quality */
+hap_char_t *hap_char_air_quality_create(uint8_t air_quality)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_AIR_QUALITY,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, air_quality);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 5, 1);
+
+    return hc;
+}
+
+/* Char: Accessory Flags */
+hap_char_t *hap_char_accessory_flags_create(uint32_t flags)
+{
+    hap_char_t *hc = hap_char_uint32_create(HAP_CHAR_UUID_ACCESSORY_FLAGS,
+                                            HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, flags);
+    if (!hc) {
+        return NULL;
+    }
+    return hc;
+}
+
+/* Char: Product Data */
+hap_char_t *hap_char_product_data_create(hap_data_val_t *product_data)
+{
+    hap_char_t *hc = hap_char_data_create(HAP_CHAR_UUID_PRODUCT_DATA,
+                                            HAP_CHAR_PERM_PR , product_data);
+    if (!hc) {
+        return NULL;
+    }
+    return hc;
+}
+
+/* Char: Lock Physical Controls */
+hap_char_t *hap_char_lock_physical_controls_create(uint8_t lock_physical_controls)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_LOCK_PHYSICAL_CONTROLS,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, lock_physical_controls);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Current Air Purifier State */
+hap_char_t *hap_char_current_air_purifier_state_create(uint8_t curr_air_purifier_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_CURRENT_AIR_PURIFIER_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_air_purifier_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 2, 1);
+
+    return hc;
+}
+
+/* Char: Current Slat State */
+hap_char_t *hap_char_current_slat_state_create(uint8_t curr_slat_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_CURRENT_SLAT_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_slat_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 2, 1);
+
+    return hc;
+}
+
+/* Char: Slat Type */
+hap_char_t *hap_char_slat_type_create(uint8_t slat_type)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_SLAT_TYPE,
+                                           HAP_CHAR_PERM_PR, slat_type);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Filter Life Level */
+hap_char_t *hap_char_filter_life_level_create(float filter_life_level)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_FILTER_LIFE_LEVEL,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, filter_life_level);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 100, 1);
+
+    return hc;
+}
+
+/* Char: Filter Change Indication */
+hap_char_t *hap_char_filter_change_indication_create(uint8_t filter_change_indication)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_FILTER_CHANGE_INDICATION,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, filter_change_indication);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Reset Filter Indication */
+hap_char_t *hap_char_reset_filter_indication_create(uint8_t reset_filter_indication)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_RESET_FILTER_INDICATION,
+                                           HAP_CHAR_PERM_PW, reset_filter_indication);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 1, 1, 0);
+
+    return hc;
+}
+
+/* Char: Target Air Purifier State */
+hap_char_t *hap_char_target_air_purifier_state_create(uint8_t targ_air_purifier_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_TARGET_AIR_PURIFIER_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, targ_air_purifier_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Target Fan State */
+hap_char_t *hap_char_target_fan_state_create(uint8_t targ_fan_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_TARGET_FAN_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, targ_fan_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Current Fan State */
+hap_char_t *hap_char_current_fan_state_create(uint8_t curr_fan_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_CURRENT_FAN_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_fan_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 2, 1);
+
+    return hc;
+}
+
+/* Char: Active State */
+hap_char_t *hap_char_active_create(uint8_t active)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_ACTIVE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, active);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Swing Mode */
+hap_char_t *hap_char_swing_mode_create(uint8_t swing_mode)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_SWING_MODE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, swing_mode);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Current Tilt Angle */
+hap_char_t *hap_char_current_tilt_angle_create(int curr_tilt_angle)
+{
+    hap_char_t *hc = hap_char_int_create(HAP_CHAR_UUID_CURRENT_TILT_ANGLE,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_tilt_angle);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, -90, 90, 1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_ARCDEGREES);
+
+    return hc;
+}
+
+/* Char: Target Tilt Angle */
+hap_char_t *hap_char_target_tilt_angle_create(int targ_tilt_angle)
+{
+    hap_char_t *hc = hap_char_int_create(HAP_CHAR_UUID_TARGET_TILT_ANGLE,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, targ_tilt_angle);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, -90, 90, 1);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_ARCDEGREES);
+
+    return hc;
+}
+
+/* Char: Ozone Density */
+hap_char_t *hap_char_ozone_density_create(float ozone_density)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_OZONE_DENSITY,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, ozone_density);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 1000.0, 0.0);
+
+    return hc;
+}
+
+/* Char: Nitrogen Dioxide Density */
+hap_char_t *hap_char_nitrogen_dioxide_density_create(float nitrogen_dioxide_density)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_NITROGEN_DIOXIDE_DENSITY,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, nitrogen_dioxide_density);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 1000.0, 0.0);
+
+    return hc;
+}
+
+/* Char: Sulphur Dioxide Density */
+hap_char_t *hap_char_sulphur_dioxide_density_create(float sulphur_dioxide_density)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_SULPHUR_DIOXIDE_DENSITY,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, sulphur_dioxide_density);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 1000.0, 0.0);
+
+    return hc;
+}
+
+/* Char: PM2.5 Density */
+hap_char_t *hap_char_pm_2_5_density_create(float pm_2_5_density)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_PM_2_5_DENSITY,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, pm_2_5_density);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 1000.0, 0.0);
+
+    return hc;
+}
+
+/* Char: PM10 Density */
+hap_char_t *hap_char_pm_10_density_create(float pm_10_density)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_PM_10_DENSITY,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, pm_10_density);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 1000.0, 0.0);
+
+    return hc;
+}
+
+/* Char: VOC Density */
+hap_char_t *hap_char_voc_density_create(float voc_density)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_VOC_DENSITY,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, voc_density);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 1000.0, 0.0);
+
+    return hc;
+}
+
+/* Char: Service Label Index */
+hap_char_t *hap_char_service_label_index_create(uint8_t service_label_index)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_SERVICE_LABEL_INDEX,
+                                         HAP_CHAR_PERM_PR, service_label_index);
+    if (!hc) {
+        return NULL;
+    }
+
+    return hc;
+}
+
+/* Char: Service Label Namespace */
+hap_char_t *hap_char_service_label_namespace_create(uint8_t service_label_namespace)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_SERVICE_LABEL_NAMESPACE,
+                                         HAP_CHAR_PERM_PR, service_label_namespace);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Color Temperature */
+hap_char_t *hap_char_color_temperature_create(uint32_t color_temp)
+{
+    hap_char_t *hc = hap_char_uint32_create(HAP_CHAR_UUID_COLOR_TEMPERATURE,
+                                            HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, color_temp);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 50, 400, 1);
+
+    return hc;
+}
+
+/* Char: Current Heater Cooler State */
+hap_char_t *hap_char_current_heater_cooler_state_create(uint8_t curr_heater_cooler_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_CURRENT_HEATER_COOLER_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_heater_cooler_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 3, 1);
+
+    return hc;
+}
+
+/* Char: Target Heater Cooler State */
+hap_char_t *hap_char_target_heater_cooler_state_create(uint8_t targ_heater_cooler_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_TARGET_HEATER_COOLER_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, targ_heater_cooler_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 2, 1);
+
+    return hc;
+}
+
+/* Char: Current Humidifier Dehumidifier State */
+hap_char_t *hap_char_current_humidifier_dehumidifier_state_create(uint8_t curr_humidifier_dehumidifier_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_CURRENT_HUMIDIFIER_DEHUMIDIFIER_STATE,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, curr_humidifier_dehumidifier_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 3, 1);
+
+    return hc;
+}
+
+/* Char: Target Humidifier Dehumidifier State */
+hap_char_t *hap_char_target_humidifier_dehumidifier_state_create(uint8_t targ_humidifier_dehumidifier_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_TARGET_HUMIDIFIER_DEHUMIDIFIER_STATE,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, targ_humidifier_dehumidifier_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 2, 1);
+
+    return hc;
+}
+
+/* Char: Water Level */
+hap_char_t *hap_char_water_level_create(float water_level)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_WATER_LEVEL,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, water_level);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 100.0, 1.0);
+
+    return hc;
+}
+
+/* Char: Relative Humidity Dehumidifier Threshold  */
+hap_char_t *hap_char_relative_humidity_dehumidifier_threshold_create(float rel_humidity_dehumidifier_threshold)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_RELATIVE_HUMIDITY_DEHUMIDIFIER_THRESHOLD,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, rel_humidity_dehumidifier_threshold);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 100.0, 1.0);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_PERCENTAGE);
+
+    return hc;
+}
+
+/* Char: Relative Humidity Humidifier Threshold  */
+hap_char_t *hap_char_relative_humidity_humidifier_threshold_create(float rel_humidity_humidifier_threshold)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_RELATIVE_HUMIDITY_HUMIDIFIER_THRESHOLD,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, rel_humidity_humidifier_threshold);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0.0, 100.0, 1.0);
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_PERCENTAGE);
+
+    return hc;
+}
+
+/* Char: Program Mode */
+hap_char_t *hap_char_program_mode_create(uint8_t prog_mode)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_PROGRAM_MODE,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, prog_mode);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 2, 1);
+
+    return hc;
+}
+
+/* Char: In Use */
+hap_char_t *hap_char_in_use_create(uint8_t in_use)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_IN_USE,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, in_use);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Set Duration */
+hap_char_t *hap_char_set_duration_create(uint32_t set_duration)
+{
+    hap_char_t *hc = hap_char_uint32_create(HAP_CHAR_UUID_SET_DURATION,
+                                            HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, set_duration);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 3600, 1);
+
+    return hc;
+}
+
+/* Char: Remaining Duration */
+hap_char_t *hap_char_remaining_duration_create(uint32_t remaining_duration)
+{
+    hap_char_t *hc = hap_char_uint32_create(HAP_CHAR_UUID_REMAINING_DURATION,
+                                            HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, remaining_duration);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 3600, 1);
+
+    return hc;
+}
+
+/* Char: Valve Type */
+hap_char_t *hap_char_valve_type_create(uint8_t valve_type)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_VALVE_TYPE,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, valve_type);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 3, 1);
+
+    return hc;
+}
+
+/* Char: Is Configured */
+hap_char_t *hap_char_is_configured_create(uint8_t is_configured)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_IS_CONFIGURED,
+                                         HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, is_configured);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Status Jammed */
+hap_char_t *hap_char_status_jammed_create(uint8_t status_jammed)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_STATUS_JAMMED,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, status_jammed);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
+
+/* Char: Administrator Only Access */
+hap_char_t *hap_char_administrator_only_access_create(bool administrator_only_access)
+{
+    hap_char_t *hc = hap_char_bool_create(HAP_CHAR_UUID_ADMINISTRATOR_ONLY_ACCESS,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, 
+                                           administrator_only_access);
+    if (!hc) {
+        return NULL;
+    }
+
+    return hc;
+}
+
+/* Char: Lock Control Point */
+hap_char_t *hap_char_lock_control_point_create(hap_tlv8_val_t *lock_control_point)
+{
+    hap_char_t *hc = hap_char_tlv8_create(HAP_CHAR_UUID_LOCK_CONTROL_POINT,
+                                           HAP_CHAR_PERM_PW , lock_control_point);
+    if (!hc) {
+        return NULL;
+    }
+
+    return hc;
+}
+
+/* Char: Lock Last Known Action */
+hap_char_t *hap_char_lock_last_known_action_create(uint8_t lock_last_known_action)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_LOCK_LAST_KNOWN_ACTION,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV , lock_last_known_action);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 8, 1);
+
+    return hc;
+}
+
+/* Char: Lock Management Auto Security Timeout */
+hap_char_t *hap_char_lock_management_auto_security_timeout_create(uint32_t lock_management_auto_security_timeout)
+{
+    hap_char_t *hc = hap_char_uint32_create(HAP_CHAR_UUID_LOCK_MANAGEMENT_AUTO_SECURITY_TIMEOUT,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV, 
+                                           lock_management_auto_security_timeout);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_add_unit(hc, HAP_CHAR_UNIT_SECONDS);
+
+    return hc;
+}
+
+/* Char: Logs */
+hap_char_t *hap_char_logs_create(hap_tlv8_val_t *logs)
+{
+    hap_char_t *hc = hap_char_tlv8_create(HAP_CHAR_UUID_LOGS,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV , logs);
+    if (!hc) {
+        return NULL;
+    }
+
+    return hc;
+}
+
+/* Char: Air Particulate Density */
+hap_char_t *hap_char_air_particulate_density_create(float air_particulate_density)
+{
+    hap_char_t *hc = hap_char_float_create(HAP_CHAR_UUID_AIR_PARTICULATE_DENSITY,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV , air_particulate_density);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_float_set_constraints(hc, 0, 1000, 0.0);
+
+    return hc;
+}
+
+/* Char: Air Particulate Size */
+hap_char_t *hap_char_air_particulate_size_create(uint8_t air_particulate_size)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_AIR_PARTICULATE_SIZE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV , air_particulate_size);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 1, 1);
+
+    return hc;
+}
diff --git a/components/homekit/esp_hap_apple_profiles/src/hap_apple_servs.c b/components/homekit/esp_hap_apple_profiles/src/hap_apple_servs.c
new file mode 100644
index 0000000..b878369
--- /dev/null
+++ b/components/homekit/esp_hap_apple_profiles/src/hap_apple_servs.c
@@ -0,0 +1,706 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <hap.h>
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+
+hap_serv_t *hap_serv_accessory_information_create(hap_acc_cfg_t *cfg)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_ACCESSORY_INFORMATION);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_name_create(cfg->name)) != HAP_SUCCESS) {
+        goto err;
+    }
+
+    if (hap_serv_add_char(hs, hap_char_model_create(cfg->model)) != HAP_SUCCESS) {
+        goto err;
+    }
+
+    if (hap_serv_add_char(hs, hap_char_manufacturer_create(cfg->manufacturer)) != HAP_SUCCESS) {
+        goto err;
+    }
+
+    if (hap_serv_add_char(hs, hap_char_serial_number_create(cfg->serial_num)) != HAP_SUCCESS) {
+        goto err;
+    }
+
+    if (hap_serv_add_char(hs, hap_char_firmware_revision_create(cfg->fw_rev)) != HAP_SUCCESS) {
+        goto err;
+    }
+
+    if (hap_serv_add_char(hs, hap_char_identify_create()) != HAP_SUCCESS) {
+        goto err;
+    }
+
+    if (cfg->hw_rev) {
+        if (hap_serv_add_char(hs, hap_char_hardware_revision_create(cfg->hw_rev)) != HAP_SUCCESS) {
+            goto err;
+        }
+    }
+
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_protocol_information_create(char *version)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_PROTOCOL_INFORMATION);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_version_create(version)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_fan_create(bool on)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_FAN);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_on_create(on)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_garage_door_opener_create(uint8_t curr_door_state, uint8_t targ_door_state, bool obstr_detect)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_GARAGE_DOOR_OPENER);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_door_state_create(curr_door_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_target_door_state_create(targ_door_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_obstruction_detect_create(obstr_detect)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_lightbulb_create(bool on)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_LIGHTBULB);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_on_create(on)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_lock_management_create(hap_tlv8_val_t *lock_control_point, char * version)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_LOCK_MANAGEMENT);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_lock_control_point_create(lock_control_point)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_version_create(version)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_lock_mechanism_create(uint8_t lock_curr_state, uint8_t lock_targ_state)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_LOCK_MECHANISM);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_lock_current_state_create(lock_curr_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_lock_target_state_create(lock_targ_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_outlet_create(bool on, bool outlet_in_use)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_OUTLET);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_on_create(on)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_outlet_in_use_create(outlet_in_use)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_switch_create(bool on)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_SWITCH);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_on_create(on)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_thermostat_create(uint8_t curr_heating_cooling_state, uint8_t targ_heating_cooling_state, float curr_temp,
+                                       float targ_temp, uint8_t temp_disp_units)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_THERMOSTAT);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_heating_cooling_state_create(curr_heating_cooling_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_target_heating_cooling_state_create(targ_heating_cooling_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_temperature_create(curr_temp)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_target_temperature_create(targ_temp)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_temperature_display_units_create(temp_disp_units)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_air_quality_sensor_create(uint8_t air_quality)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_AIR_QUALITY_SENSOR);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_air_quality_create(air_quality)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_security_system_create(uint8_t security_sys_curr_state, uint8_t security_sys_targ_state)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_SECURITY_SYSTEM);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_security_system_current_state_create(security_sys_curr_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_security_system_target_state_create(security_sys_targ_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_carbon_monoxide_sensor_create(uint8_t carbon_monoxide_detected)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_CARBON_MONOXIDE_SENSOR);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_carbon_monoxide_detected_create(carbon_monoxide_detected)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_contact_sensor_create(uint8_t contact_sensor_state)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_CONTACT_SENSOR);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_contact_sensor_state_create(contact_sensor_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_door_create(uint8_t curr_pos, uint8_t targ_pos, uint8_t pos_state)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_DOOR);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_position_create(curr_pos)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_target_position_create(targ_pos)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_position_state_create(pos_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_humidity_sensor_create(float curr_rel_humidity)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_HUMIDITY_SENSOR);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_relative_humidity_create(curr_rel_humidity)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_leak_sensor_create(uint8_t leak_detected)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_LEAK_SENSOR);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_leak_detected_create(leak_detected)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_light_sensor_create(float curr_ambient_light_level)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_LIGHT_SENSOR);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_ambient_light_level_create(curr_ambient_light_level)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_motion_sensor_create(bool motion_detected)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_MOTION_SENSOR);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_motion_detected_create(motion_detected)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_occupancy_sensor_create(uint8_t occupancy_detected)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_OCCUPANCY_SENSOR);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_occupancy_detected_create(occupancy_detected)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_smoke_sensor_create(uint8_t smoke_detected)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_SMOKE_SENSOR);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_smoke_detected_create(smoke_detected)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_stateless_programmable_switch_create(uint8_t programmable_switch_event)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_STATLESS_PROGRAMMABLE_SWITCH);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_programmable_switch_event_create(programmable_switch_event)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_temperature_sensor_create(float curr_temp)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_TEMPERATURE_SENSOR);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_temperature_create(curr_temp)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_window_create(uint8_t curr_pos, uint8_t targ_pos, uint8_t pos_state)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_WINDOW);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_position_create(curr_pos)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_target_position_create(targ_pos)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_position_state_create(pos_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_window_covering_create(uint8_t targ_pos, uint8_t curr_pos, uint8_t pos_state)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_WINDOW_COVERING);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_target_position_create(targ_pos)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_position_create(curr_pos)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_position_state_create(pos_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_battery_service_create(uint8_t battery_level, uint8_t charging_state, uint8_t status_low_battery)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_BATTERY_SERVICE);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_battery_level_create(battery_level)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_charging_state_create(charging_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_status_low_battery_create(status_low_battery)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_carbon_dioxide_sensor_create(uint8_t carbon_dioxide_detected)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_CARBON_DIOXIDE_SENSOR);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_carbon_dioxide_detected_create(carbon_dioxide_detected)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_fan_v2_create(uint8_t active)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_FAN_V2);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_active_create(active)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_slat_create(uint8_t curr_slat_state, uint8_t slat_type)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_SLAT);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_slat_state_create(curr_slat_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_slat_type_create(slat_type)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_filter_maintenance_create(uint8_t filter_change_indication)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_FILTER_MAINTENANCE);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_filter_change_indication_create(filter_change_indication)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_air_purifier_create(uint8_t active, uint8_t curr_air_purifier_state, uint8_t
+        targ_air_purifier_state)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_AIR_PURIFIER);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_active_create(active)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_air_purifier_state_create(curr_air_purifier_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_target_air_purifier_state_create(targ_air_purifier_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_heater_cooler_create(uint8_t active, float curr_temp, uint8_t curr_heater_cooler_state, uint8_t targ_heater_cooler_state)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_HEATER_COOLER);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_active_create(active)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_temperature_create(curr_temp)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_heater_cooler_state_create(curr_heater_cooler_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_target_heater_cooler_state_create(targ_heater_cooler_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_humidifier_dehumidifier_create(uint8_t active, float curr_rel_humidity, uint8_t
+        curr_humid_dehumid_state, uint8_t targ_humid_dehumid_state)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_HUMIDIFIER_DEHUMIDIFIER);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_active_create(active)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_relative_humidity_create(curr_rel_humidity)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_humidifier_dehumidifier_state_create(curr_humid_dehumid_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_target_humidifier_dehumidifier_state_create(targ_humid_dehumid_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_service_label_create(uint8_t service_label_namespace)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_SERVICE_LABEL);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_service_label_namespace_create(service_label_namespace)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_irrigation_system_create(uint8_t active, uint8_t prog_mode, uint8_t in_use)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_IRRIGATION_SYSTEM);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_active_create(active)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_program_mode_create(prog_mode)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_in_use_create(in_use)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_valve_create(uint8_t active, uint8_t in_use, uint8_t valve_type)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_VALVE);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_active_create(active)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_in_use_create(in_use)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_valve_type_create(valve_type)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+hap_serv_t *hap_serv_faucet_create(uint8_t active)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_FAUCET);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_active_create(active)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
diff --git a/components/homekit/esp_hap_core/CMakeLists.txt b/components/homekit/esp_hap_core/CMakeLists.txt
new file mode 100644
index 0000000..6b2886e
--- /dev/null
+++ b/components/homekit/esp_hap_core/CMakeLists.txt
@@ -0,0 +1,53 @@
+set(HAP_SDK_VER "4.0")
+execute_process (
+    COMMAND bash -c "git log --pretty=format:\"%h\" -1"
+    OUTPUT_VARIABLE GIT_COMMIT
+)
+#execute_process(COMMAND "git log --pretty=format:\"%h\"" -1 OUTPUT_VARIABLE GIT_COMMIT)
+set(MFI_VER ${HAP_SDK_VER}-${GIT_COMMIT})
+message(${MFI_VER})
+
+
+# CORE
+set(srcs src/byte_convert.c
+        src/esp_hap_acc.c
+        src/esp_hap_bct.c
+        src/esp_hap_char.c
+        src/esp_hap_controllers.c
+        src/esp_hap_database.c
+        src/esp_hap_ip_services.c
+        src/esp_hap_keystore.c
+        src/esp_hap_main.c
+        src/esp_hap_mdns.c
+        src/esp_hap_network_io.c
+        src/esp_hap_pair_common.c
+        src/esp_hap_pair_setup.c
+        src/esp_hap_pair_verify.c
+        src/esp_hap_pairings.c
+        src/esp_hap_serv.c
+        src/esp_hap_wifi.c
+        src/esp_hap_setup_payload.c
+        src/hexbin.c
+        src/hexdump.c
+        src/esp_mfi_debug.c)
+
+set(priv_includes src/priv_includes)
+
+if(CONFIG_HAP_MFI_ENABLE)
+    list(APPEND srcs src/mfi/esp_mfi_auth.c src/mfi/esp_mfi_coprocessor.c src/mfi/esp_mfi_element.c src/mfi/esp_mfi_sap.c src/mfi/esp_mfi_pair_setup.c src/mfi/esp_hap_secure_message.c src/mfi/esp_mfi_wac.c)
+    list(APPEND priv_includes src/mfi)
+else()
+    list(APPEND srcs src/esp_mfi_dummy.c)
+
+endif()
+
+idf_component_register(SRCS ${srcs}
+                       INCLUDE_DIRS "include"
+                       PRIV_INCLUDE_DIRS ${priv_includes}
+                       REQUIRES
+                       PRIV_REQUIRES libsodium esp_http_server hkdf-sha mu_srp json_generator json_parser esp_hap_platform esp_hap_apple_profiles mdns)
+component_compile_options(-Wno-unused-function)
+target_compile_definitions(${COMPONENT_TARGET} PRIVATE "-D MFI_VER=\"${MFI_VER}\"")
+# Added just to automatically trigger re-runs of CMake
+git_describe(ESP_HOMEKIT_VERSION ${COMPONENT_DIR})
+message("ESP HomeKit SDK Project commit: " ${ESP_HOMEKIT_VERSION})
diff --git a/components/homekit/esp_hap_core/Kconfig b/components/homekit/esp_hap_core/Kconfig
new file mode 100644
index 0000000..aa00537
--- /dev/null
+++ b/components/homekit/esp_hap_core/Kconfig
@@ -0,0 +1,10 @@
+menu "HomeKit"
+
+    config HAP_MFI_ENABLE
+        bool "Enable MFi"
+        default n
+        help
+            If you have the MFi variant of the SDK, set this to true to use features like
+            HW authentication, software token authentication and WAC.
+
+endmenu
diff --git a/components/homekit/esp_hap_core/component.mk b/components/homekit/esp_hap_core/component.mk
new file mode 100644
index 0000000..e2f97ad
--- /dev/null
+++ b/components/homekit/esp_hap_core/component.mk
@@ -0,0 +1,18 @@
+#
+# Component Makefile
+#
+HAP_SDK_VER := "4.0"
+COMPONENT_SRCDIRS := src
+COMPONENT_PRIV_INCLUDEDIRS := src/priv_includes
+MFI_VER := $(HAP_SDK_VER)-$(shell git log --pretty=format:"%h" -1)
+
+ifdef CONFIG_HAP_MFI_ENABLE
+COMPONENT_SRCDIRS += src/mfi
+COMPONENT_OBJEXCLUDE += src/esp_mfi_dummy.c
+COMPONENT_PRIV_INCLUDEDIRS += src/mfi
+endif
+
+CPPFLAGS += -D MFI_VER=\"$(MFI_VER)\"
+
+CFLAGS += -Wno-unused-function
+COMPONENT_ADD_INCLUDEDIRS := include
diff --git a/components/homekit/esp_hap_core/include/hap.h b/components/homekit/esp_hap_core/include/hap.h
new file mode 100644
index 0000000..fdd80f5
--- /dev/null
+++ b/components/homekit/esp_hap_core/include/hap.h
@@ -0,0 +1,1572 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_H_
+#define _HAP_H_
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <esp_event.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define HAP_CHAR_STRING_MAX_LEN        256
+#define HAP_CHAR_STRING_MAX_DEF_LEN    64
+
+#define HAP_SUCCESS     0
+#define HAP_FAIL        -1
+
+typedef enum  {
+    HAP_MFI_AUTH_NONE = 0,
+    HAP_MFI_AUTH_HW,
+    HAP_MFI_AUTH_SW
+} hap_mfi_auth_type_t;
+
+/** HomeKit Transports to be enabled */
+typedef enum {
+    /** Unknown. Default uninitialized value */
+    HAP_TRANSPORT_UNKNOWN          = 0x00,
+    /** HAP over Wi-Fi */
+    HAP_TRANSPORT_WIFI             = 0x01,
+    /** HAP Over Ethernet (Wi-Fi disabled).
+     * To enable both Wi-Fi and Ethernet, use (HAP_TRANSPORT_WIFI | HAP_TRANSPORT_ETHERNET) for hap_init()
+     */
+    HAP_TRANSPORT_ETHERNET         = 0x02,
+} hap_transport_t;
+
+/**
+ * HAP characteristic value formats
+ */
+typedef enum {
+    /** No Type/Invalid type */
+    HAP_CHAR_FORMAT_NONE = 0,
+    /** Boolean (true or false)*/
+	HAP_CHAR_FORMAT_BOOL,
+    /** Unsigned 8-bit integer */
+	HAP_CHAR_FORMAT_UINT8,
+    /** Unsigned 16-bit integer */
+	HAP_CHAR_FORMAT_UINT16,
+    /** Unsigned 32-bit integer */
+	HAP_CHAR_FORMAT_UINT32,
+    /** Unsigned 64-bit integer */
+    HAP_CHAR_FORMAT_UINT64,
+    /** Signed 32-bit integer */
+	HAP_CHAR_FORMAT_INT,
+    /** Signed 32-bit floating point number */
+	HAP_CHAR_FORMAT_FLOAT,
+    /** Unicode string */
+	HAP_CHAR_FORMAT_STRING,
+    /** Base64 encoded set of one or more TLV8s */
+    HAP_CHAR_FORMAT_TLV8,
+    /** base64 encoded data blob */
+    HAP_CHAR_FORMAT_DATA,
+} hap_char_format_t;
+
+/** Data value */
+typedef struct {
+    /** Pointer to an allocated buffer holding the data. This should remain valid
+     * throughout the lifetime of the characteristic.
+     */
+    uint8_t *buf;
+    /** Length of the data */
+    uint32_t buflen;
+} hap_data_val_t;
+
+/** TLV8 value (Same as \ref hap_data_val_t) */
+typedef hap_data_val_t hap_tlv8_val_t;
+
+/** HAP Value */
+typedef union {
+    /** Boolean */
+	bool b;
+    /** Unsigned integer (uint8, uint16, uint32) */
+    uint32_t u;
+    /** Signed integer */
+	int i;
+    /** 64 bit Unsigned integer */
+    uint64_t i64;
+    /** Floating point number */
+	float f;
+    /** Pointer to string */
+	char *s;
+    /** Structure for Data */
+    hap_data_val_t d;
+    /** Structure for TLV8 */
+    hap_tlv8_val_t t;
+} hap_val_t;
+
+/** Information about the Provisioned Network to which the accessory will connect */
+typedef struct {
+    /** SSID for the network */
+    uint8_t ssid[64];
+    /** Length of the SSID */
+    size_t ssid_len;
+    /** Password for the network. Can be NULL for Open networks */
+    uint8_t password[64];
+    /** Length of the Password. Can be 0 for Open networks */
+    size_t password_len;
+} hap_provisioned_nw_t;
+
+/**
+ * HAP characteristics unit types
+ */
+#define HAP_CHAR_UNIT_CELSIUS       "celsius"
+#define HAP_CHAR_UNIT_PERCENTAGE    "percentage"
+#define HAP_CHAR_UNIT_ARCDEGREES    "arcdegrees"
+#define HAP_CHAR_UNIT_LUX           "lux"
+#define HAP_CHAR_UNIT_SECONDS       "seconds"
+
+/** HAP Characteristic properties/permissions */
+/** Characteristic supports Paired Read */
+#define HAP_CHAR_PERM_PR        (1 << 0)
+/** Characteristic supports Paired Write */
+#define HAP_CHAR_PERM_PW        (1 << 1)
+/** Characteristic supports Event Notifications */
+#define HAP_CHAR_PERM_EV        (1 << 2)
+/** Characteristic supports Additional Authorization Data */
+#define HAP_CHAR_PERM_AA        (1 << 3)
+/** Characteristic supports Timed Writes */
+#define HAP_CHAR_PERM_TW        (1 << 4)
+/** Characteristic is hidden from the user */
+#define HAP_CHAR_PERM_HD        (1 << 5)
+/** Characterictic is of special read only type.
+ * Valid for characteristics like "Programmable Switch Event" wherein the value
+ * needs to be reported as NULL for a read, even when it is a uint8. Actual value
+ * is reported only using event notifications.
+ */
+#define HAP_CHAR_PERM_SPECIAL_READ    (1 << 6)
+
+/** HAP object handle */
+typedef size_t                  hap_handle_t;
+
+/** HAP Characteristic handle */
+typedef hap_handle_t            hap_char_t;
+/** HAP Service handle */
+typedef hap_handle_t            hap_serv_t;
+/** HAP Accessory handle */
+typedef hap_handle_t            hap_acc_t;
+
+/** HAP Status codes as per the HAP Specifications */
+typedef enum {
+    /** This specifies a success for the request. */
+    HAP_STATUS_SUCCESS = 0,
+    /** Request denied due to insufficient privileges. */
+	HAP_STATUS_NO_PRIVILEGE = -70401,
+    /** Unable to communicate with requested service. */
+	HAP_STATUS_COMM_ERR = -70402,
+    /** Resource is busy, try again. */
+	HAP_STATUS_RES_BUSY = -70403,
+    /** Cannot write to read only characteristic. */
+	HAP_STATUS_WR_ON_RDONLY = -70404,
+    /** Cannot read from a write only characteristic. */
+	HAP_STATUS_RD_ON_WRONLY = -70405,
+    /** Notification is not supported for characteristic */
+	HAP_STATUS_NO_NOTIF = -70406,
+    /** Out of resources to process request. */
+	HAP_STATUS_OO_RES = -70407,
+    /** Operation timed out. */
+	HAP_STATUS_TIMEOUT = -70408,
+    /** Resource does not exist. */
+	HAP_STATUS_RES_ABSENT = -70409,
+    /** Accessory received an invalid value in a write request. */
+	HAP_STATUS_VAL_INVALID = -70410,
+    /** Insufficient Authorization. */
+	HAP_STATUS_INSUFFICIENT_AUTH = -70411,
+} hap_status_t;
+
+typedef enum {
+    HAP_CID_NONE = 0,
+    HAP_CID_OTHER,
+    HAP_CID_BRIDGE,
+    HAP_CID_FAN,
+    HAP_CID_GARAGE_DOOR_OPENER,
+    HAP_CID_LIGHTING,
+    HAP_CID_LOCK,
+    HAP_CID_OUTLET,
+    HAP_CID_SWITCH,
+    HAP_CID_THERMOSTAT,
+    HAP_CID_SENSOR,
+    HAP_CID_SECURITY_SYSTEM,
+    HAP_CID_DOOR,
+    HAP_CID_WINDOW,
+    HAP_CID_WINDOW_COVERING,
+    HAP_CID_PROGRAMMABLE_SWITCH,
+    HAP_CID_RESERVED,
+    HAP_CID_IP_CAMERA,
+    HAP_CID_VIDEO_DOORBELL,
+    HAP_CID_AIR_PURIFIER,
+    HAP_CID_HEATER,
+    HAP_CID_AIR_CONDITIONER,
+    HAP_CID_HUMIDIFIER,
+    HAP_CID_DEHUMIDIFIER,
+    HAP_CID_MAX,
+} hap_cid_t;
+
+/** Prototype for Identify routine for the accessory
+ *
+ * @param[in] acc Handle of the accessory object
+ */
+typedef int (*hap_identify_routine_t) (hap_acc_t *acc);
+
+/** HAP Accessory configuration */
+typedef struct {
+    /** Name (Mandatory) */
+	char *name;
+    /** Model (Mandatory) */
+	char *model;
+    /** Manufacturer (Mandatory) */
+	char *manufacturer;
+    /** Serial Number (Mandatory) */
+	char *serial_num;
+    /** Firmware Revision number in format x[.y[.z]] (Mandatory) */
+	char *fw_rev;
+    /** Hardware revision number in format x[.y[.z]] (Optional. Can be NULL )*/
+	char *hw_rev;
+    /** HAP Protocol version supported by the accessory. Should be set to "1.1"
+     * @note The value set here will currently be ignored and assumed to be 1.1
+     * as it is the only protocol version currently supported.
+     * This is valid only for the Primary accessory.
+     */
+    char *pv;
+    /** Category Identifier for the Accessory. This is valid only for the
+     * primary accessory
+     */
+    hap_cid_t cid;
+    /** Identify routine for the accessory (Mandatory) */
+	hap_identify_routine_t identify_routine;
+} hap_acc_cfg_t;
+
+/** HomeKit Debug prints level
+ */
+typedef enum {
+    /** Basic information indicating what's happening in the HomeKit core */
+    HAP_DEBUG_LEVEL_INFO = 0,
+    /** Warnings for incidents that can affect behavior, but not necessarily cause a failure*/
+    HAP_DEBUG_LEVEL_WARN,
+    /** Errors which will affect the working, and may even halt the process */
+    HAP_DEBUG_LEVEL_ERR,
+    /** Asserts for failures which will definitely cause system to halt */
+    HAP_DEBUG_LEVEL_ASSERT
+} hap_debug_level_t;
+
+/**
+ * @brief Set the HomeKit Debug prints level.
+ *
+ * This indicates the maximum level for which the debug messages
+ * will be printed. Default value is \ref HAP_DEBUG_LEVEL_INFO which means
+ * that all information, warnings, errors and asserts will be printed, as
+ * this is the lowest level. You can change it to any suitable higher level
+ * to reduce the prints. For Eg. Setting this to HAP_DEBUG_LEVEL_WARN will
+ * print all warnings, errors and asserts, but not the basic information.
+ *
+ * @param[in] level Maximum debug print level as per \ref hap_debug_level_t
+ */
+void hap_set_debug_level(hap_debug_level_t level);
+
+/**
+ *
+ * @brief Get the HAP SDK Version from the hap core
+ *
+ * @return Pointer to a NULL terminated Version string (Eg. 2.0.r1-0136161)
+ */
+const char *hap_get_version();
+
+/** Unique Paramaters for HomeKit */
+typedef enum {
+    /** Nothing unique.
+     * Application code should ensure uniqueness of name and ssid.
+     * HAP Core will not change anything.
+     */
+    UNIQUE_NONE = 0,
+    /** Unique SSID (default configuration).
+     * 3 bytes of MAC will be added to accessory name to create unique WAC SSID (Eg. Name-xxyyzz) */
+    UNIQUE_SSID,
+    /** Unique Name.
+     * Name will be changed by adding 3 bytes of MAC to original name.
+     * Thi swill automatically make the SSID unique as the accessory name will be used as SSID.
+     */
+    UNIQUE_NAME,
+} hap_unique_param_t;
+
+/** HomeKit Configuration.
+ * Please do not change unless you understand the purpose of these */
+typedef struct {
+    /** Internal HomeKit Task's stack size */
+    uint32_t task_stack_size;
+    /** Internal HomeKit Task's priority */
+    uint8_t task_priority;
+    /** Maximum characteristics to which event notifications can be sent simultaneously.
+     * Default value is enough for standalone accessories. Change may be required only
+     * for bridges.
+     */
+    uint8_t max_event_notif_chars;
+    /** Indicates what paramaters will be made unique by the HAP Core */
+    hap_unique_param_t unique_param;
+    /** Timeout (in seconds) after which a socket data receive call will return for a pair verified
+     * socket, in case the call blocks. This has been added to avoid the webserver getting stalled on a read,
+     * especially in case wherein some garbage data is received on a pair verified connection.
+     */
+    uint8_t recv_timeout;
+    /** Timeout (in seconds) after which a socket data send call will return for a pair verified
+     * socket, in case the call blocks. This has been added to avoid the webserver getting stalled on a write.
+     */
+    uint8_t send_timeout;
+    /** Max length of the buffer to be used for handling SW Token Requests. The Default value has been kept
+     * as 1200 to help pass HCA Tests. This can be changed to 512 for practical purposes as the actual Apple
+     * tokens never really need more than that.
+     */
+    size_t sw_token_max_len;
+    /** By default, config number (c#) incremenents on addition/removal of every bridged accessory after
+     * hap_start(). Setting this flag to true will disable this. Use hap_update_config_number()
+     * to increment c#. Note thar c# will still increment on a firmware upgrade though.
+     */
+    bool disable_config_num_update;
+} hap_cfg_t;
+
+/** Get HomeKit Configuration
+ *
+ * Gets the configuration that will be used by the HomeKit core.
+ *
+ * @param[out] cfg Pointer to an allocated \ref hap_cfg_t structure which will be populated
+ * with the configuration information.
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on error
+ */
+int hap_get_config(hap_cfg_t *cfg);
+
+/** Set HomeKit Configuration
+ *
+ * This sets the HomeKit configuration. Please use hap_get_config() to get the old
+ * configuration first, before modifying any values. Eg.
+ *
+ * @code
+ *     hap_cfg_t hap_cfg;
+ *     hap_get_config(&hap_cfg);
+ *     hap_cfg.unique_param = UNIQUE_NAME;
+ *     hap_set_config(&hap_cfg);
+ * @endcode
+ *
+ * @note This should be called before hap_init().
+ *
+ * @param[in] cfg Pointer to an allocated \ref hap_cfg_t structure which has the new values
+ * to set.
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on error
+ */
+int hap_set_config(const hap_cfg_t *cfg);
+
+/* Update config number (c#)
+ *
+ * This increments the config number (c#) by 1
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on error
+ */
+int hap_update_config_number();
+
+/**
+ * @brief Initialize HAP Framework
+ *
+ * This internally initializes the MFi auth chip, TCP-IP stack, HomeKit Key Store,
+ * HomeKit database, Wi-Fi and mDNS.
+ *
+ * @return HAP_SUCCESS on success
+ * @return others on error
+ */
+int hap_init(hap_transport_t transport);
+
+/**
+ * @brief De-initialize HAP Framework.
+ *
+ * @note This currently does not do anything
+ *
+ * @return HAP_SUCCESS on success
+ * @return others on error
+ */
+int hap_deinit();
+
+/**
+ * @brief Start the HAP framework
+ *
+ * This starts the webserver and also initializes WAC or HomeKit services
+ * as per the state of the accessory.
+ *
+ * @return HAP_SUCCESS on success
+ * @return others on error
+ */
+int hap_start(void);
+
+/**
+ * @brief Stop HAP framework and free all relevant resources
+ *
+ * @note This currently does not do anything
+ *
+ * @return HAP_SUCCESS on success
+ * @return others on error
+ */
+int hap_stop(void);
+
+/**
+ * @brief Create a HAP accessory object
+ *
+ * @param[in] acc_cfg Pointer to the accessory configuration \ref hap_acc_cfg_t
+ *
+ * @return Handle for the accessory object pre-populated with
+ * the Accessory Information Service (and Protocol Information Service
+ * for the first accessory created)
+ *
+ * @return NULL on error
+ */
+hap_acc_t *hap_acc_create(hap_acc_cfg_t *acc_cfg);
+
+/**
+ * @brief Add Accessory flags to the Accessory Info service
+ *
+ * This adds the optional Accessory Information Flag to the given accessory,
+ * with the value set to the one specified. Typically, the flags will be
+ * initialised with a value of 1, meaning that additional manufacturer specific
+ * setup is required. Once the setup is done, the flags should be reset to 0
+ * using hap_acc_update_accessory_flags()
+ *
+ * @note Use of these flags requires explicit approval from Apple.
+ *
+ * @param[in] ha HAP Accessory object handle
+ * @param[in] flags Initial value of flags. Check the specs for valid values
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure
+ */
+int hap_acc_add_accessory_flags(hap_acc_t *ha, uint32_t flags);
+
+/**
+ * @brief Update the Accessory flags
+ *
+ * This updates the Accessory flags characteristic of the Accessory Info service
+ * of the given accessory, if it has been added using hap_acc_add_accessory_flags().
+ *
+ * @param[in] ha HAP Accessory object handle
+ * @param[in] flags New value of flags. Check the specs for valid values
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure
+ */
+int hap_acc_update_accessory_flags(hap_acc_t *ha, uint32_t flags);
+
+/**
+ * @brief Add Product data
+ *
+ * As per HAP specs R15, this is the 8 byte product data assigned to the Product Plan.
+ *
+ * @param[in] ha HAP Accessory object handle
+ * @param[in] product_data Pointer to the product data value buffer
+ * @param[in] data_size Size of the buffer (should be 8 as per HAP Spec R15)
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure
+ */
+int hap_acc_add_product_data(hap_acc_t *ha, uint8_t *product_data, size_t data_size);
+
+/**
+ * @brief Add accessory to the HAP Object database
+ *
+ * @param[in] ha HAP Accessory object handle
+ */
+void hap_add_accessory(hap_acc_t *ha);
+
+/**
+ * @brief Add a bridged accessory to the HAP Object database
+ *
+ * This adds a bridged accessory to the Homekit Object database and assigns
+ * it the given AID. HomeKit requires that each accessory gets assigned a unique aid.
+ * To ensure this, a helper API hap_get_unique_aid() has been provided. This API
+ * requires some unique identifier of the accessory, say mac address, serial number, etc.
+ *
+ * Example: hap_add_bridged_accessory(ha, hap_get_unique_aid(mac_addr));
+ *
+ * @param[in] aid The AID desired for the bridged accessory. If a 0 is passed, the
+ * next available AID will be assigned. However, this should be used only for
+ * evaluation, not production.
+ *
+ * @param[in] ha HAP Accessory object handle
+ */
+void hap_add_bridged_accessory(hap_acc_t *ha, int aid);
+
+/**
+ * @brief Remove a bridged accessory from the HAP Object database
+ *
+ * @param[in] ha HAP Accessory object handle
+ */
+void hap_remove_bridged_accessory(hap_acc_t *ha);
+
+/**
+ * @brief Delete HAP Accessory Object
+ *
+ * @note Primary accessory cannot be deleted
+ *
+ * @param[in] ha HAP Accessory object handle
+ *
+ */
+void hap_acc_delete(hap_acc_t *ha);
+
+/**
+ * @brief Delete all accessories
+ */
+void hap_delete_all_accessories(void);
+
+/**
+ * Get unique AID for the given identifier
+ *
+ * This API can be used to ensure that the same AID gets assigned to an accessory
+ * every time, even across reboots and irrespective of when it is added to the
+ * HomeKit database. It requires a unique identifier of the accessory, say a
+ * mac addtess, serial number, etc. If it is a new accessory, a new AID gets
+ * assigned and the id:aid combination gets stored in NVS (Non Volatile Storage).
+ * If the accessory was already added some time later, the original AID is fetched
+ * from the NVS and returned. This API should be used as the "aid" argument for
+ * hap_add_bridged_accessory()
+ *
+ * @param[in] id Unique identifier for the accessory
+ *
+ * @return Unique AID for the accessory
+ * @return -1 on error (NULL id)
+ */
+int hap_get_unique_aid(const char *id);
+
+/**
+ * @brief Get Accessory using AID
+ *
+ * @param[in] aid Accessory ID of the required accessory
+ *
+ * @return Handle for the accessory with given aid
+ * @return NULL if accessory not found
+ */
+hap_acc_t *hap_acc_get_by_aid(int32_t aid);
+
+/**
+ * @brief Get first accessory in the database
+ *
+ * @return Handle for the first accessory
+ */
+hap_acc_t *hap_get_first_acc();
+
+/**
+ * @brief Get next accessory in the database
+ *
+ * @param[in] ha Current HAP Accessory object handle
+ *
+ * @return Pointer to the next accessory
+ * @return NULL if the current accessory is the last
+ */
+hap_acc_t *hap_acc_get_next(hap_acc_t *ha);
+
+/**
+ * @brief Get Service using IID
+ *
+ * @param[in] ha HAP Accessory object handle in which the service should be searched
+ * @param[in] iid Instance ID of the required service
+ *
+ * @return Handle for the service with given iid
+ * @return NULL if service not found
+ */
+hap_serv_t *hap_acc_get_serv_by_iid(hap_acc_t *ha, int32_t iid);
+
+/**
+ * @brief Get Service using Type UUID
+ *
+ * @param[in] ha HAP Accessory object handle in which the service should be searched
+ * @param[in] type_uuid UUID of the required service
+ *
+ * @return Handle for the service with given type_uuid
+ * @return NULL if service not found
+ */
+hap_serv_t *hap_acc_get_serv_by_uuid(hap_acc_t *ha, const char *type_uuid);
+
+/**
+ * @brief Get characteristic using IID
+ *
+ * @param[in] ha HAP Accessory object handle in which the characteristic should be searched
+ * @param[in] iid Instance ID of the required characteristic
+ *
+ * @return Handle for the characteristic with given iid
+ * @return NULL if characteristic not found
+ */
+hap_char_t *hap_acc_get_char_by_iid(hap_acc_t *ha, int32_t iid);
+
+/**
+ * @brief Get first service in a given accessory object
+ *
+ * This is useful for iterating over all services of an accessory.
+ * The subsequent services of the accessory can be iterated by using
+ * hap_serv_get_next().
+ *
+ * @param[in] ha HAP Accessory object handle
+ *
+ * @return Handle for the first service in the accessory object
+ */
+hap_serv_t *hap_acc_get_first_serv(hap_acc_t *ha);
+
+/**
+ * @brief Create a Boolean Characteristic Object
+ *
+ * @param[in] type_uuid UUID for the characteristic as per the HAP Specs
+ * @param[in] perms Logically OR of the various permissions supported by the characteristic
+ * @param[in] val Initial value of the characteristic
+ *
+ * @return Handle for the characteristic object created
+ * @return NULL on error
+ */
+hap_char_t *hap_char_bool_create(char *type_uuid, uint16_t perms, bool val);
+
+/**
+ * @brief Create an 8-bit unsigned integer Characteristic Object
+ *
+ * @param[in] type_uuid UUID for the characteristic as per the HAP Specs
+ * @param[in] perms Logically OR of the various permissions supported by the characteristic
+ * @param[in] val Initial value of the characteristic
+ *
+ * @return Handle for the characteristic object created
+ * @return NULL on error
+ */
+hap_char_t *hap_char_uint8_create(char *type_uuid, uint16_t perms, uint8_t val);
+
+/**
+ * @brief Create a 16-bit unsigned integer Characteristic Object
+ *
+ * @param[in] type_uuid UUID for the characteristic as per the HAP Specs
+ * @param[in] perms Logically OR of the various permissions supported by the characteristic
+ * @param[in] val Initial value of the characteristic
+ *
+ * @return Handle for the characteristic object created
+ * @return NULL on error
+ */
+hap_char_t *hap_char_uint16_create(char *type_uuid, uint16_t perms, uint16_t val);
+
+/**
+ * @brief Create a 32-bit unsigned integer Characteristic Object
+ *
+ * @param[in] type_uuid UUID for the characteristic as per the HAP Specs
+ * @param[in] perms Logically OR of the various permissions supported by the characteristic
+ * @param[in] val Initial value of the characteristic
+ *
+ * @return Handle for the characteristic object created
+ * @return NULL on error
+ */
+hap_char_t *hap_char_uint32_create(char *type_uuid, uint16_t perms, uint32_t val);
+
+/**
+ * @brief Create a 64-bit unsigned integer Characteristic Object
+ *
+ * @param[in] type_uuid UUID for the characteristic as per the HAP Specs
+ * @param[in] perms Logically OR of the various permissions supported by the characteristic
+ * @param[in] val Initial value of the characteristic
+ *
+ * @return Handle for the characteristic object created
+ * @return NULL on error
+ */
+hap_char_t *hap_char_uint64_create(char *type_uuid, uint16_t perms, uint64_t val);
+
+/**
+ * @brief Create a 32-bit signed integer Characteristic Object
+ *
+ * @param[in] type_uuid UUID for the characteristic as per the HAP Specs
+ * @param[in] perms Logically OR of the various permissions supported by the characteristic
+ * @param[in] val Initial value of the characteristic
+ *
+ * @return Handle for the characteristic object created
+ * @return NULL on error
+ */
+hap_char_t *hap_char_int_create(char *type_uuid, uint16_t perms, int val);
+
+/**
+ * @brief Create a Floating point Characteristic Object
+ *
+ * @param[in] type_uuid UUID for the characteristic as per the HAP Specs
+ * @param[in] perms Logically OR of the various permissions supported by the characteristic
+ * @param[in] val Initial value of the characteristic
+ *
+ * @return Handle for the characteristic object created
+ * @return NULL on error
+ */
+hap_char_t *hap_char_float_create(char *type_uuid, uint16_t perms, float val);
+
+/**
+ * @brief Create a String Characteristic Object
+ *
+ * @param[in] type_uuid UUID for the characteristic as per the HAP Specs
+ * @param[in] perms Logically OR of the various permissions supported by the characteristic
+ * @param[in] val Initial value of the characteristic
+ *
+ * @return Handle for the characteristic object created
+ * @return NULL on error
+ */
+hap_char_t *hap_char_string_create(char *type_uuid, uint16_t perms, char *val);
+
+/**
+ * @brief Create a Data Characteristic Object
+ *
+ * @param[in] type_uuid UUID for the characteristic as per the HAP Specs
+ * @param[in] perms Logically OR of the various permissions supported by the characteristic
+ * @param[in] val Pointer to initial value of the characteristic
+ *
+ * @return Handle for the characteristic object created
+ * @return NULL on error
+ */
+hap_char_t *hap_char_data_create(char *type_uuid, uint16_t perms, hap_data_val_t *val);
+
+/**
+ * @brief Create a TLV8 Characteristic Object
+ *
+ * @param[in] type_uuid UUID for the characteristic as per the HAP Specs
+ * @param[in] perms Logically OR of the various permissions supported by the characteristic
+ * @param[in] val Pointer to initial value of the characteristic
+ *
+ * @return Handle for the characteristic object created
+ * @return NULL on error
+ */
+hap_char_t *hap_char_tlv8_create(char *type_uuid, uint16_t perms, hap_tlv8_val_t *val);
+
+/**
+ * @brief Delete a characteristic object
+ *
+ * @param[in] hc HAP Characteristic Object handle
+ */
+void hap_char_delete(hap_char_t *hc);
+
+/**
+ * @brief Create a HAP Service Object
+ *
+ * @param[in] type_uuid UUID for the service as per the HAP Specs
+ *
+ * @return Handle for the service object created
+ * @return NULL on error
+ */
+hap_serv_t *hap_serv_create(char *type_uuid);
+
+/**
+ * @brief Delete a service object
+ *
+ * @param[in] hs HAP Service Object handle
+ */
+void hap_serv_delete(hap_serv_t *hs);
+
+/**
+ * @brief Get the AID for the given accessory
+ *
+ * @param[in] ha HAP Accessory Object handle
+ *
+ * @return aid for the accessory
+ */
+uint32_t hap_acc_get_aid(hap_acc_t *ha);
+
+/**
+ * @brief Get Characteristic using Type UUID
+ *
+ * @param[in] hs HAP Service object handle in which the characteristic should be searched
+ * @param[in] type_uuid UUID of the required characteristic
+ *
+ * @return Handle for the characteristic with given type_uuid
+ * @return NULL if characteristic not found
+ */
+hap_char_t *hap_serv_get_char_by_uuid(hap_serv_t *hs, const char *type_uuid);
+
+/**
+ * @brief Get parent Accessory for given Service
+ *
+ * @param[in] hs HAP Service object handle
+ *
+ * @return Handle for the parent accessory
+ * @return NULL if the service is not added in any accessory
+ */
+hap_acc_t *hap_serv_get_parent(hap_serv_t *hs);
+
+/**
+ * @brief Get the next service in a given accessory object
+ *
+ * This is useful for iterating over all services of an accessory.
+ *
+ * @param[in] Current service object handle
+ *
+ * @return Handle for next service in the accessory object
+ * @return NULL if the current service was the last one in the accessory
+ */
+hap_serv_t *hap_serv_get_next(hap_serv_t *hs);
+
+/**
+ * @brief Get first characteristic in a given service object
+ *
+ * This is useful for iterating over all characteristics of a service.
+ * The subsequent characteristics of the service can be
+ * iterated by using hap_char_get_next().
+ *
+ * @param[in] hs HAP Service object handle
+ *
+ * @return Handle for the first chatracteristic in the service object
+ */
+hap_char_t *hap_serv_get_first_char(hap_serv_t *hs);
+
+/**
+ * @brief Get the IID for the given characteristic
+ *
+ * @param[in] hc HAP Characteristic Object handle
+ *
+ * @return iid for the characteristic
+ */
+uint32_t hap_char_get_iid(hap_char_t *hc);
+
+/**
+ * @brief Get the type UUID for the given characteristic
+ *
+ * @param[in] hc HAP Characteristic Object handle
+ *
+ * @return Type UUID for the characteristic
+ */
+const char * hap_char_get_type_uuid(hap_char_t *hc);
+
+
+/**
+ * @brief Get the Permissions for the given characteristic
+ *
+ * @param[in] hc HAP Characteristic Object handle
+ *
+ * @return The permissions for the characteristics, the same as the ones passed while creating it.
+ * It will be a logically OR of the various permissions supported by the characteristic.
+ */
+uint16_t hap_char_get_perm(hap_char_t *hc);
+
+
+/**
+ * @brief Get the format for the given characteristic
+ *
+ * @param[in] hc HAP Characteristic Object handle
+ *
+ * @return Format of the characteristic value
+ */
+hap_char_format_t hap_char_get_format(hap_char_t *hc);
+
+/**
+ * @brief Get the IID for the given service
+ *
+ * @param[in] hs HAP Service Object handle
+ *
+ * @return iid for the service
+ */
+uint32_t hap_serv_get_iid(hap_serv_t *hs);
+
+/**
+ * @brief Get the type UUID for the given service
+ *
+ * @param[in] hs HAP Service Object handle
+ *
+ * @return Type UUID for the service
+ */
+char *hap_serv_get_type_uuid(hap_serv_t *hs);
+/**
+ * @brief Get parent Service for given Characteristic
+ *
+ * @param[in] hc HAP Characteristic object handle
+ *
+ * @return Handle for the parent service
+ * @return NULL if the characteristic is not added in any service
+ */
+hap_serv_t *hap_char_get_parent(hap_char_t *hc);
+
+/**
+ * @brief Get the next characteristic in a given service object
+ *
+ * This is useful for iterating over all characteristics of a service.
+ *
+ * @param[in] Current characteristic object handle
+ *
+ * @return Handle for next characteristic in the service object
+ * @return NULL if the current characteristic was the last one in the service
+ */
+hap_char_t *hap_char_get_next(hap_char_t *hc);
+
+/**
+ * @brief Add Integer characteristic constraints
+ *
+ * @param[in] hc HAP Characteristic Object handle
+ * @param[in] min Minimum Value
+ * @param[in] max Maximum Value
+ * @param[in] step Step Value
+ */
+void hap_char_int_set_constraints(hap_char_t *hc, int min, int max, int step);
+
+/**
+ * @brief Add Integer characteristic constraints
+ *
+ * @param[in] hc HAP Characteristic Object handle
+ * @param[in] min Minimum Value
+ * @param[in] max Maximum Value
+ * @param[in] step Step Value
+ */
+void hap_char_float_set_constraints(hap_char_t *hc, float min, float max, float step);
+
+/**
+ * @brief Add String characteristic constraints
+ *
+ * @param[in] hc HAP Characteristic Object handle
+ * @param[in] maxlen Maximum Length of the string (default: 64, max: 256)
+ */
+void hap_char_string_set_maxlen(hap_char_t *hc, int maxlen);
+
+/**
+ * @brief Add Characteristic Description
+ *
+ * @param[in] hc HAP Characteristic Object handle
+ * @param[in] description Manufacturer defined String description for the characteristic
+ */
+void hap_char_add_description(hap_char_t *hc, const char *description);
+
+/**
+ * @brief Add Characteristic Unit
+ *
+ * @param[in] hc HAP Characteristic Object handle
+ * @param[in] unit Unit for the characteristic. Please see specs for valid strings.
+ */
+void hap_char_add_unit(hap_char_t *hc, const char *unit);
+
+/**
+ * @brief Add Valid Values for Characteristic
+ *
+ * Using this API will just add the valid-values metadata for a characteristic
+ *
+ * @param[in] hc HAP Characteristic Object handle
+ * @param[in] valid_vals Pointer to an array of valid values
+ * @param[in] valid_val_cnt Number of entries in the array
+ */
+void hap_char_add_valid_vals(hap_char_t *hc, const uint8_t *valid_vals, size_t valid_val_cnt);
+
+/**
+ * @brief Add Valid Values Range for Characteristic
+ *
+ * Using this API will just add the valid-values-range metadata for a characteristic
+ *
+ * @param[in] hc HAP Characteristic Object handle
+ * @param[in] start_val Start value of the range
+ * @param[in] end_val End value of the range
+ */
+void hap_char_add_valid_vals_range(hap_char_t *hc, uint8_t start_val, uint8_t end_val);
+/**
+ * @brief Set IID for a given characteristic
+ *
+ * HomeKit specifications require that the IID for a given characteristic should remain the same,
+ * even after a firmware upgrade. Since the HomeKit core assigns the IIDs internally,
+ * it is possible that a different IID is getting assigned because of removal of
+ * some old service/characteristic or addition of a newer one in between. In such a case,
+ * in order to maintain the same IID, this API can be used.
+ *
+ * @note This must be used only if actually required, and that too after adding all services/
+ * characteristics to an accessory, but before hap_start().
+ *
+ * @param[in] hc HAP Characteristic Object Handle
+ * @param[in] iid Desired IID
+ */
+void hap_char_set_iid(hap_char_t *hc, int32_t iid);
+
+/**
+ * @brief Add a characteristic to a service
+ *
+ * @param[in] hs HAP service object handle
+ * @param[in] hc HAP characteristic object handle
+ *
+ * @return 0 on success
+ * @return other on error
+ */
+int hap_serv_add_char(hap_serv_t *hs, hap_char_t *hc);
+
+/**
+ * @brief HAP add a service to an accessory
+ *
+ * @param[in] ha HAP Accessory object handle
+ * @param[in] hs HAP Service object handle
+ *
+ * @return 0 on success
+ * @return other on error
+ */
+int hap_acc_add_serv(hap_acc_t *ha, hap_serv_t *hs);
+
+/**
+ * @brief Update characteristic value
+ *
+ * This should be called within service read/write callbacks to update the
+ * value of characteristic maintained by the HAP Core. This can also be called
+ * from some other thread, for accessories like sensors that periodically
+ * monitor some paramters.
+ *
+ * @param[in] hc HAP characteristic object handle
+ * @param[in] val Pointer to new value
+ *
+ * @return 0 on success
+ * @return other on error
+ */
+int hap_char_update_val(hap_char_t *hc, hap_val_t *val);
+
+/**
+ * @brief Get the current value of characteristic
+ *
+ * @param[in] hc HAP characteristic object handle
+ *
+ * @return Pointer to the current value
+ */
+const hap_val_t *hap_char_get_val(hap_char_t *hc);
+
+/** Authorization Data received in a write reqest
+ */
+typedef struct {
+    /** Pointer to the data. Will be NULL if no auth data was present */
+    uint8_t *data;
+    /** Length of the data. Will be 0 if no auth data was present */
+    int len;
+} hap_auth_data_t;
+
+/** Write data for a characteristics received over HAP
+ */
+typedef struct {
+    /** Pointer to the characteristic object */
+    hap_char_t *hc;
+    /** Value received in the write request.
+     * Appropriate value in the \ref hap_val_t union will be set as per the format.
+     */
+    hap_val_t val;
+    /** Authorization data \ref hap_auth_data_t id any, received in the write request.
+     * It is the application's responsibility to handle and validate this data and
+     * report the status accordingly.
+     */
+    hap_auth_data_t auth_data;
+    /** Indicates if the received request was a remote write
+     */
+    bool remote;
+    /** This is an output parameter, which should be set in the service write
+     * routine as per the status of the write.
+     */
+    hap_status_t *status;
+} hap_write_data_t;
+
+/** Read data for a characteristic
+ */
+typedef struct {
+    /** Pointer to the characteristic object */
+    hap_char_t *hc;
+    /** This is an output parameter, which should be set in the service read
+     * routine as per the status of the read
+     */
+    hap_status_t *status;
+} hap_read_data_t;
+
+
+/** Service Write Function Prototype
+ *
+ * A function with this prototype must be registered with the HAP framework to handle
+ * writes for the characteristics in the given service
+ *
+ * @note For writes, an array is sent instead of individual writes to avoid cases wherein
+ * writes to multiple properties of a single accessory can cause unexpected behavior.
+ * Eg. For a light which is off, a write could ask it to be turned on at 50% brightness,
+ * with blue color. If 3 writes are issued for this, the light could first turn on to
+ * 100% with white color, then dim down to 50% and then change color. A single write will
+ * ensure that the hardware control takes care of all these at the same time.
+ *
+ * @param[in] write_data Array of characteristic write objects of type \ref hap_write_data_t
+ * which has relevant information like the characteristic object handle, new value received, etc.
+ * @param[in] count Number of entries in the write_data array.
+ * @param[in] serv_priv The private data for the service set using hap_serv_set_priv()
+ * @param[in] write_priv Can be used with hap_is_req_admin()
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL if an error is encountered even for a single characteristic. Actual error
+ * value must be reported in the status under \ref hap_write_data_t.
+ */
+typedef int (*hap_serv_write_t) (hap_write_data_t write_data[], int count,
+		void *serv_priv, void *write_priv);
+
+/** Service Read Function Prototype
+ *
+ * A function with this prototype must be registered with the HAP framework to handle
+ * reads for the characteristics in the given service. The new value must be set
+ * by invoking hap_char_update_val().
+ *
+ * @param[in] hc HAP Characteristic Object Handle.
+ * @param[out] status_code Status of the read, to be populated by the callback with
+ *  values from \ref hap_status_t.
+ * @param[in] serv_priv The private data for the service set using hap_serv_set_priv()
+ * @param[in] read_priv Can be used with hap_is_req_admin()
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL if an error is encountered while reading. Actual error
+ * value must be reported in the status_code
+ */
+typedef int (*hap_serv_read_t) (hap_char_t *hc, hap_status_t *status_code,
+		void *serv_priv, void *read_priv);
+
+/** Service Bulk Read Function Prototype
+ *
+ * A function with this prototype can be registered with the HAP framework to handle
+ * bulk reads for the characteristics in the given service. The new values must be set
+ * by invoking hap_char_update_val() for each characteristic.
+ *
+ * @note This should be used only under special circumstances for cases like
+ * bridges, wherein fetching individual values from bridged accessories could
+ * be time consuming. If this is used, it will override the handler of
+ * type \ref hap_serv_read_t registered for the same service.
+ *
+ * @param[in] read_data Array of characteristic write objects of type \ref hap_read_data_t
+ * which has characteristic object handle and read status pointer.
+ * @param[in] count Number of entries in the read_data array.
+ * @param[in] serv_priv The private data for the service set using hap_serv_set_priv()
+ * @param[in] read_priv Can be used with hap_is_req_admin()
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL if an error is encountered even for a single characteristic.
+ * Actual error value must be reported in the status under \ref hap_read_data_t.
+ */
+typedef int (*hap_serv_bulk_read_t) (hap_read_data_t read_data[], int count,
+        void *serv_priv, void *read_priv);
+
+/**
+ * @brief Register Service Write callback
+ *
+ * @param[in] hs HAP Service Object Handle
+ * @param[in] write Callback of type \ref hap_serv_write_t
+ */
+void hap_serv_set_write_cb(hap_serv_t *hs, hap_serv_write_t write);
+
+/**
+ * @brief Register Service Read callback
+ *
+ * @param[in] hs HAP Service Object Handle
+ * @param[in] read Callback of type \ref hap_serv_read_t
+ */
+void hap_serv_set_read_cb(hap_serv_t *hs, hap_serv_read_t read);
+
+/**
+ * @brief Register Service Bulk read callback
+ *
+ * @note This should be used only under special circumstances for cases like
+ * bridges, wherein fetching individual values from bridged accessories could
+ * be time consuming. If this is used, the callback registered using
+ * @ref hap_serv_set_read_cb() will be overriden.
+ *
+ * @param[in] hs HAP Service Object Handle
+ * @param[in] read Callback of type \ref hap_serv_bulk_read_t
+ */
+void hap_serv_set_bulk_read_cb(hap_serv_t *hs, hap_serv_bulk_read_t read);
+
+/**
+ * @brief Set service private data
+ *
+ * This will be available in the read/write callbacks
+ *
+ * @param[in] hs HAP Service Object Handle
+ * @param[in] priv Private data for the service
+ */
+void hap_serv_set_priv(hap_serv_t *hs, void *priv);
+
+/**
+ * @brief Get Service private
+ *
+ * This will get the private data associated with the service, which
+ * was set using hap_serv_set_priv().
+ *
+ * @param[in] hs HAP Service Object Handle
+ *
+ * @return Pointer to the private data (can be NULL)
+ */
+void *hap_serv_get_priv(hap_serv_t *hs);
+
+/**
+ * @brief Mark service as primary
+ *
+ * @param[in] hs HAP Service Object Handle
+ */
+void hap_serv_mark_primary(hap_serv_t *hs);
+
+/**
+ * @brief Mark service as hidden
+ *
+ * @param[in] hs HAP Service Object Handle
+ */
+void hap_serv_mark_hidden(hap_serv_t *hs);
+
+/**
+ * @brief Link a HomeKit service to other service
+ *
+ * @param[in] hs HAP Service Object Handle
+ * @param[in] linked_serv HAP Service Object Handle of the service to be linked
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure
+ */
+int hap_serv_link_serv(hap_serv_t *hs, hap_serv_t *linked_serv);
+
+/**
+ * @brief Set IID for a given sService
+ *
+ * HomeKit specifications require that the IID for a given service should remain the same,
+ * even after a firmware upgrade. Since the HomeKit core assigns the IIDs internally,
+ * it is possible that a different IID is getting assigned because of removal of
+ * some old service/characteristic or addition of a newer one in between. In such a case,
+ * in order to maintain the same IID, this API can be used.
+ *
+ * @note This must be used only if actually required, and that too after adding all services/
+ * characteristics to a service, but before hap_start().
+ *
+ * @param[in] hs HAP Service Object Handle
+ * @param[in] iid Desired IID
+ */
+void hap_serv_set_iid(hap_serv_t *hs, int32_t iid);
+
+/** HomeKit Setup Information */
+typedef struct {
+    /** SRP Salt */
+    uint8_t salt[16];
+    /** SRP Verifier */
+    uint8_t verifier[384];
+} hap_setup_info_t;
+
+/**
+ * @brief Set the Setup info for HomeKit Pairing
+ *
+ * HomeKit Pairing/Accessory Setup uses a Setup Code (Also called Pairing PIN).
+ * However, the specs recommend that, instead of storing the PIN on the accessory,
+ * the salt and verifier for the PIN should be stored.
+ *
+ * This API should be used to provide this information.
+ *
+ * @param[in] setup_info Pointer to the Setup Information structure which has
+ * the Salt and Verifier.
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure (like setup_info being NULL);
+ */
+int hap_set_setup_info(const hap_setup_info_t *setup_info);
+
+/**
+ * @brief Set the setup code (i.e. pairing pin)
+ *
+ * @note Ideally, the PIN should not be present in the firmware. Instead,
+ * the salt and verifier should be stored on the accessory and provided using
+ * hap_set_setup_info(). This API should be used only for testing purposes.
+ *
+ * Using this API overrides the setup information provided by hap_set_setup_info().
+ *
+ * @param[in] setup_code NULL terminated Setup code of the format xxx-xx-xxx where each
+ * x is a number
+ */
+void hap_set_setup_code(const char *setup_code);
+
+/**
+ * @brief Set the setup ID
+ *
+ * @param[in] setup_id NULL terminated Setup ID, which will be a 4 character
+ * long alpha numeric string (with capital alphabets)
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure
+ */
+int hap_set_setup_id(const char *setup_id);
+
+/**
+ * Check if the MFi authentication co-processor is connected
+ *
+ * @note This should be called before hap_init()
+ *
+ * @return HAP_SUCCESS if an MFi co-processor is detected
+ * @return HAP_FAIL if no MFi co-processor is detected
+ */
+int hap_check_mfi_chip();
+
+/**
+ * @brief Reboot the accessory
+ *
+ * This closes all the active HomeKit sessions and reboots the accessory.
+ * It is recommended to use this API instead of the standard platform reboot/restart
+ * APIs, for cleaner operation.
+ *
+ * @note This is an asynchronous API (actual action executed in HomeKit core thread context)
+ * and can be invoked even from interrupt context. The \ref HAP_EVENT_ACC_REBOOTING
+ * event will be invoked after this.
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure
+ */
+int hap_reboot_accessory();
+
+/**
+ * @brief Reset to Factory Settings
+ *
+ * This resets the accessory to factory settings and reboots it.
+ * All pairing information, network information and accessory specific information
+ * (like accessory ID, keys, config number, etc.) is erased. Even all application
+ * data written to NVS partition is erased.
+ *
+ * @note This is an asynchronous API (actual action executed in HomeKit core thread context)
+ * and can be invoked even from interrupt context. The \ref HAP_EVENT_ACC_REBOOTING
+ * event will be invoked after this.
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure
+ */
+int hap_reset_to_factory();
+
+/**
+ * @brief Reset the Network Credentials
+ *
+ * This resets only the network credntials (keeping the pairing and any other information
+ * intact) and reboots the accessory.
+ *
+ * @note This is an asynchronous API (actual action executed in HomeKit core thread context)
+ * and can be invoked even from interrupt context. The \ref HAP_EVENT_ACC_REBOOTING
+ * event will be invoked after this.
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure
+ */
+int hap_reset_network();
+
+/**
+ * @brief Reset HomeKit Data
+ *
+ * This resets all the data stored by the HomeKit Framework, which includes
+ * all pairing information, network information and accessory specific information
+ * (like accessory ID, keys, config number, etc.)
+ *
+ * @note This is an asynchronous API (actual action executed in HomeKit core thread context)
+ * and can be invoked even from interrupt context. The \ref HAP_EVENT_ACC_REBOOTING
+ * event will be invoked after this.
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure
+ */
+int hap_reset_homekit_data();
+
+/**
+ * @brief Reset HomeKit Pairings
+ *
+ * This API resets the HomeKit Pairing Information and also the accessory specific
+ * information (like accessory ID, keys, config number, etc.). The accessory id is
+ * reset because else, the paired controllers would consider the accessory as paired,
+ * as they would still have the keys for the given accessory id.
+ *
+ * @note This is an asynchronous API (actual action executed in HomeKit core thread context)
+ * and can be invoked even from interrupt context. The \ref HAP_EVENT_ACC_REBOOTING
+ * event will be invoked after this.
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure
+ */
+int hap_reset_pairings();
+
+/**
+ * @brief Check if the request is from Admin Controller
+ *
+ * This API can be used inside service read (\ref hap_serv_read_t) and service write
+ * (\ref hap_serv_write_t) callbacks to check if the request was from an admin controller.
+ * Pass the write_priv or read_priv pointer to this API
+ *
+ * @return true if request is from an admin controller
+ * @return false if request is from a non-admin controller
+ */
+bool hap_is_req_admin(void *priv);
+
+/**
+ * @brief Get the ID of the controller who sent the request
+ *
+ * This API can be used inside service read (\ref hap_serv_read_t) and service write
+ * (\ref hap_serv_write_t) callbacks to check the id of the controller who sent the request.
+ * Pass the write_priv or read_priv pointer to this API
+ *
+ * @return pointer to a null terminated controller id string on success.
+ * @return NULL on failure.
+ */
+char *hap_req_get_ctrl_id(void *priv);
+
+/**
+ *
+ * @brief Get a value from factory NVS keystore
+ *
+ * This API can be used to fetch information from the factory_nvs flash partition.
+ * This is treated as a Read-Only partition and so, no "set" API has been provided.
+ *
+ * @param[in] name_space NVS name space from which the value needs to be read.
+ * @param[in] key The NVS key for the value
+ * @param[out] val Buffer which will be used to hold the value, if found
+ * @param[in,out] val_size Holds the size of the val buffer. Will be populated with the length of
+ * the value by this function.
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure
+ */
+int hap_factory_keystore_get(const char *name_space, const char *key, uint8_t *val, size_t *val_size);
+
+/**
+ * Enable MFi authentication
+ *
+ * @param[in] auth_type The authentication type desired.
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL on failure
+ */
+int hap_enable_mfi_auth(hap_mfi_auth_type_t auth_type);
+
+/**
+ * @brief Enable Software Token based authentication.
+ *
+ * This is valid for HomeKit Accessory Protocol Spec R12 (or later) and works with iOS 11.3 (or later) only.
+ *
+ * This API enables the Software Token based authentication for HomeKit pairing. It requires the accessory
+ * UUID and Token to be programmed in the factory_nvs partition. Please check the README for more details.
+ *
+ * Please refer HomeKit Software Authentication Server Specification to understand the server side
+ * implications of using this method for HomeKit Pairing. The tokens fetched from Apple server need to
+ * be programmed on the accessory
+ *
+ * @note Software Authentication is not recommended for new accessories. It should be used only if HomeKit
+ * functionality needs to be enabled on accessories which are already in field, or if an existing hardware
+ * design needs to be re-used for cost or other considerations. For any other use cases, please get in touch
+ * with your Apple contact.
+ *
+ * @return HAP_SUCCESS on success
+ * @return HAP_FAIL if the correct UUID or Token is not provided in the factory_nvs partition
+ */
+static inline int hap_enable_software_auth()
+{
+    return hap_enable_mfi_auth(HAP_MFI_AUTH_SW);
+}
+
+#define HAP_REBOOT_REASON_UNKNOWN               "unknown"
+#define HAP_REBOOT_REASON_RESET_TO_FACTORY      "reset_to_factory"
+#define HAP_REBOOT_REASON_REBOOT_ACC            "reboot_acc"
+#define HAP_REBOOT_REASON_RESET_NETWORK         "reset_network"
+#define HAP_REBOOT_REASON_RESET_PAIRINGS        "reset_pairings"
+#define HAP_REBOOT_REASON_RESET_HOMEKIT_DATA    "reset_homekit_data"
+
+/** HomeKit Event Base */
+ESP_EVENT_DECLARE_BASE(HAP_EVENT);
+/** HomeKit Events */
+typedef enum {
+    /** A new controller was paired/added/modified.
+     * Associated data is a NULL terminated controller identifier string.
+     */
+    HAP_EVENT_CTRL_PAIRED = 1,
+    /** A controller was removed
+     * Associated data is a NULL terminated controller identifier string.
+     */
+    HAP_EVENT_CTRL_UNPAIRED,
+    /** A paired controller connected to the accessory (extablished a pair verified session).
+     * Associated data is a NULL terminated controller identifier string.
+     */
+    HAP_EVENT_CTRL_CONNECTED,
+    /** A controller disconnected from the accessory. This event is reported before the
+     * actual disconnection, because for cases like pair-remove, the controller information
+     * gets erased before the disconnection, and so the controller id is not available
+     * after disconnection.
+     * Associated data is a NULL terminated controller identifier string.
+     */
+    HAP_EVENT_CTRL_DISCONNECTED,
+    /** A Pair Setup attempt has started. Waiting for Setup Code */
+    HAP_EVENT_PAIRING_STARTED,
+    /** Pair Setup was aborted because of inactivity or a wrong setup code */
+    HAP_EVENT_PAIRING_ABORTED,
+    /** A GET on /accessories was successfully completed */
+    HAP_EVENT_GET_ACC_COMPLETED,
+    /** A GET on /characteristics was successfully completed */
+    HAP_EVENT_GET_CHAR_COMPLETED,
+    /** A PUT (Set value) on /characteristics was successfully completed.
+     * This event can also mean that notifications were enabled for some
+     * characteristics as the same is also done in PUT /characteristics */
+    HAP_EVENT_SET_CHAR_COMPLETED,
+    /* Accessory is about to reboot. Will be triggered for operations like hap_reset_to_factory(),
+     * hap_reboot_accessory(), hap_reset_network(), hap_reset_pairings() and hap_reset_homekit_data()
+     * just before rebooting. Associated data is a pointer to a string indicating the reboot reason.
+     * Reefer the HAP_REBOOT_REASON_* macros for possible values.
+     */
+    HAP_EVENT_ACC_REBOOTING,
+} hap_event_t;
+
+/** Prototype for HomeKit Event handler
+ *
+ * @param[in] event The event id of type \ref hap_event_t
+ * @param[in] data Data associated with the event (if applicable).
+ * Please refer \ref hap_event_t documentation for information regarding
+ * data for each event.
+ */
+typedef void (*hap_event_handler_t) (hap_event_t event, void *data);
+
+/** Register HomeKit Event Handler
+ *
+ * If applications are interested in HomeKit specific events, they can
+ * write their own event handler and register with HomeKit core using
+ * this API.
+ *
+ * @param[in] handler Application specific HomeKit event handler.
+ */
+void hap_register_event_handler(hap_event_handler_t handler);
+
+/** Get Paired controller count
+ *
+ * This API can be used to get a count of number of paired controllers.
+ * Thi can be used only after hap_init().
+ *
+ * @return Number of paired controllers
+ */
+int hap_get_paired_controller_count();
+
+/*
+ * Enable Simple HTTP Debugging
+ *
+ * Calling this API will enable HTTP Debugging which will show some HomeKit HTTP Debug
+ * info like the URL and data.
+ */
+void hap_http_debug_enable();
+
+/**
+ * Disable Simple HTTP Debugging
+ *
+ * Calling this API will disable HTTP Debugging which was enabled by hap_enable_http_debug()
+ */
+void hap_http_debug_disable();
+
+/** Get Setup payload
+ *
+ * This gives the setup payload for the given information
+ *
+ * @param[in] setup_code NULL terminated setup code. Eg. "111-22-333"
+ * @param[in] setup_id NULL terminated setup id. Eg. "ES32"
+ * @param[in] wac_support Boolean indicating if WAC provisioning is supported.
+ * @param[in] cid Accessory category identifier.
+ *
+ * @return On success, an allocated NULL terminal setup paylod string. Eg. "X-HM://003363Z4TES32". Should be freed by the caller.
+ * @return NULL on failure.
+ */
+char *esp_hap_get_setup_payload(char *setup_code, char *setup_id, bool wac_support, hap_cid_t cid);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _ESP_HAP_H_ */
diff --git a/components/homekit/esp_hap_core/include/hap_bct.h b/components/homekit/esp_hap_core/include/hap_bct.h
new file mode 100644
index 0000000..6a65e55
--- /dev/null
+++ b/components/homekit/esp_hap_core/include/hap_bct.h
@@ -0,0 +1,54 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_BCT_H_
+#define _HAP_BCT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Change the name of the Bonjour Service for BCT
+ *
+ * This is required as per the "Manual Name Change" step of "Tester Interaction"
+ * section of Bonjour Conformance Test.
+ *
+ * @param[in] name The desired new name for the service. For BCT 1.4 or earlier: "New - Bonjour Service Name".
+ * For BCT 1.5 or later: "New-BCT"
+ */
+void hap_bct_change_name(const char *name);
+
+/**
+ * @brief Trigger a Hot plug of the network interface for BCT
+ *
+ * This is required as per the "Cable Change Handling" and "Hot Plugging" steps
+ * of "Tester Interaction" section of Bonjout Conformance Test
+ */
+void hap_bct_hot_plug();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _HAP_BCT_H_ */
diff --git a/components/homekit/esp_hap_core/include/hap_wac.h b/components/homekit/esp_hap_core/include/hap_wac.h
new file mode 100644
index 0000000..e106c23
--- /dev/null
+++ b/components/homekit/esp_hap_core/include/hap_wac.h
@@ -0,0 +1,121 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_WAC_H_
+#define _HAP_WAC_H_
+#include <stdint.h>
+#include <esp_event.h>
+#include <esp_wifi.h>
+#include <esp_err.h>
+/** HomeKit Event Base */
+ESP_EVENT_DECLARE_BASE(HAP_WAC_EVENT);
+/** HomeKit Events */
+typedef enum {
+    /* WAC has started. Associated data is NULL */
+    HAP_WAC_EVENT_STARTED,
+    /** WAC has timed out because of inactivity. Associated data is NULL.
+     * Appropriate indications should be given to the user, so that the accessory can be rebooted
+     * for restarting WAC.
+     */
+    HAP_WAC_EVENT_TIMEOUT,
+    /** WAC was successful and will stop after some time. Associated data is NULL.
+     */
+    HAP_WAC_EVENT_SUCCESS,
+    /** WAC is requesting to start SoftAP. Associated data is a pointer to a NULL terminated SSID.
+     * Using this SSID isn't required, but recommended. The network security should be "Open" for
+     * WAC to work. If SoftAP has already been started, nothing needs to be done for this event.
+     * The helper function hap_wifi_softap_start() can be used for this.
+     */
+    HAP_WAC_EVENT_REQ_SOFTAP_START,
+    /** WAC is requesting to stop SoftAP. Associated data is NULL.
+     * The helper function hap_wifi_softap_stop() can be used for this.
+     */
+    HAP_WAC_EVENT_REQ_SOFTAP_STOP,
+    /** WAC has received the Wi-Fi credentials. Associated data is a pointer to wifi_config_t
+     * structure. This should be used to connect to the Wi-Fi network.
+     * The helper function hap_wifi_sta_connect() can be used for this.
+     */
+    HAP_WAC_EVENT_RECV_CRED,
+    /** WAC has stopped */
+    HAP_WAC_EVENT_STOPPED
+} hap_wac_event_t;
+
+/** Start WAC Provisioning.
+ *
+ * This should be called when the accessory boots up in an unprovisioned mode.
+ * The helper function hap_wifi_is_provisioned() function can be used to find
+ * if the accessory is provisioned or not.
+ *
+ * @return 0 on success.
+ * @return -1 on failure.
+ */
+int hap_wac_start(void);
+
+/** Stop WAC Provisioning.
+ *
+ * This should be used only if WAC needs to be stopped explicitly (say, after
+ * provisioning was done using some other means). Else, WAC stops automatically,
+ * either after the timeout or after successful provisioning.
+ *
+ * @return 0 on success.
+ * @return -1 on failure.
+ */
+int hap_wac_stop(void);
+
+/** Check is accessory is provisioned
+ *
+ * @param[out] provisioned Pointer to an allocated boolean variable. Will
+ *      be set to true if accessory is provisioned, else false.
+ *
+ * @return ESP_OK on success.
+ * @return error on failure.
+ */
+esp_err_t hap_wifi_is_provisioned(bool *provisioned);
+
+/** Start SoftAP
+ *
+ * @param[in] ssid NULL terminated ssid string.
+ *
+ * @return ESP_OK on success.
+ * @return error on failure.
+ */
+esp_err_t hap_wifi_softap_start(char *ssid);
+
+/** Stop Soft AP
+ *
+ * @return ESP_OK on success.
+ * @return error on failure.
+ */
+esp_err_t hap_wifi_softap_stop(void);
+
+/** Connect to Wi-Fi network with given configuration
+ *
+ * @param[in] config Pointer to \ref wifi_config_t structure.
+ *
+ * @return ESP_OK on success.
+ * @return error on failure.
+ */
+esp_err_t hap_wifi_sta_connect(wifi_config_t *config);
+
+#endif /* _HAP_WAC_H_ */
diff --git a/components/homekit/esp_hap_core/src/byte_convert.c b/components/homekit/esp_hap_core/src/byte_convert.c
new file mode 100644
index 0000000..57decd1
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/byte_convert.c
@@ -0,0 +1,173 @@
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// 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.
+#include <stdint.h>
+#include <ctype.h>
+
+/* Functions to convert Little Endian byte stream to
+ * uint16, uint32 and uint64
+ */
+uint16_t get_u16_le(const void *val_ptr)
+{
+	const uint8_t *p = (const uint8_t *)val_ptr;
+	uint16_t val;
+
+	val  = (uint16_t)p[0];
+	val |= (uint16_t)p[1] << 8;
+
+	return val;
+}
+
+uint32_t get_u32_le(const void *val_ptr)
+{
+	const uint8_t *p = (const uint8_t *)val_ptr;
+	uint32_t val;
+
+	val  = (uint32_t)p[0];
+	val |= (uint32_t)p[1] << 8;
+	val |= (uint32_t)p[2] << 16;
+	val |= (uint32_t)p[3] << 24;
+
+	return val;
+}
+
+uint64_t get_u64_le(const void *val_ptr)
+{
+	const uint8_t *p = (const uint8_t *)val_ptr;
+	uint64_t val;
+
+	val  = (uint64_t)p[0];
+	val |= (uint64_t)p[1] << 8;
+	val |= (uint64_t)p[2] << 16;
+	val |= (uint64_t)p[3] << 24;
+	val |= (uint64_t)p[4] << 32;
+	val |= (uint64_t)p[5] << 40;
+	val |= (uint64_t)p[6] << 48;
+	val |= (uint64_t)p[7] << 56;
+
+	return val;
+}
+
+/* Functions to convert Big Endian byte stream to
+ * uint16, uint32 and uint64
+ */
+uint16_t get_u16_be(const void *val_ptr)
+{
+	const uint8_t *p = (const uint8_t *)val_ptr;
+	uint16_t val;
+
+	val  = (uint16_t)p[0] << 8;
+	val |= (uint16_t)p[1];
+
+	return val;
+}
+
+uint32_t get_u32_be(const void *val_ptr)
+{
+	const uint8_t *p = (const uint8_t *)val_ptr;
+	uint32_t val;
+
+	val  = (uint32_t)p[0] << 24;
+	val |= (uint32_t)p[1] << 16;
+	val |= (uint32_t)p[2] << 8;
+	val |= (uint32_t)p[3];
+
+	return val;
+}
+
+uint64_t get_u64_be(const void *val_ptr)
+{
+	const uint8_t *p = (const uint8_t *)val_ptr;
+	uint64_t val;
+
+	val  = (uint64_t)p[0] << 56;
+	val |= (uint64_t)p[1] << 48;
+	val |= (uint64_t)p[2] << 40;
+	val |= (uint64_t)p[3] << 32;
+	val |= (uint64_t)p[4] << 24;
+	val |= (uint64_t)p[5] << 16;
+	val |= (uint64_t)p[6] << 8;
+	val |= (uint64_t)p[7];
+
+	return val;
+}
+
+/* Functions to convert uint16, uint32 and uint64
+ * to Little Endian
+ */
+void put_u16_le(void *val_ptr, const uint16_t val)
+{
+	uint8_t *p = (uint8_t *)val_ptr;
+
+	p[0] = (uint8_t)val & 0xff;
+	p[1] = (uint8_t)(val >> 8) & 0xff;
+}
+
+void put_u32_le(void *val_ptr, const uint32_t val)
+{
+	uint8_t *p = (uint8_t *)val_ptr;
+
+	p[0] = (uint8_t)val & 0xff;
+	p[1] = (uint8_t)(val >> 8) & 0xff;
+	p[2] = (uint8_t)(val >> 16) & 0xff;
+	p[3] = (uint8_t)(val >> 24) & 0xff;
+}
+
+void put_u64_le(void *val_ptr, const uint64_t val)
+{
+	uint8_t *p = (uint8_t *)val_ptr;
+
+	p[0] = (uint8_t)val & 0xff;
+	p[1] = (uint8_t)(val >> 8) & 0xff;
+	p[2] = (uint8_t)(val >> 16) & 0xff;
+	p[3] = (uint8_t)(val >> 24) & 0xff;
+	p[4] = (uint8_t)(val >> 32) & 0xff;
+	p[5] = (uint8_t)(val >> 40) & 0xff;
+	p[6] = (uint8_t)(val >> 48) & 0xff;
+	p[7] = (uint8_t)(val >> 56) & 0xff;
+}
+
+/* Functions to convert uint16, uint32 and uint64
+ * to Big Endian
+ */
+void put_u16_be(void *val_ptr, const uint16_t val)
+{
+	uint8_t *p = (uint8_t *)val_ptr;
+
+	p[0] = (uint8_t)(val >> 8) & 0xff;
+	p[1] = (uint8_t)val & 0xff;
+}
+
+void put_u32_be(void *val_ptr, const uint32_t val)
+{
+	uint8_t *p = (uint8_t *)val_ptr;
+
+	p[0] = (uint8_t)((val >> 24) & 0xff);
+	p[1] = (uint8_t)((val >> 16) & 0xff);
+	p[2] = (uint8_t)((val >> 8) & 0xff);
+	p[3] = (uint8_t)(val & 0xff);
+}
+
+void put_u64_be(void *val_ptr, const uint64_t val)
+{
+	uint8_t *p = (uint8_t *)val_ptr;
+
+	p[0] = (uint8_t)(val >> 56) & 0xff;
+	p[1] = (uint8_t)(val >> 48) & 0xff;
+	p[2] = (uint8_t)(val >> 40) & 0xff;
+	p[3] = (uint8_t)(val >> 32) & 0xff;
+	p[4] = (uint8_t)(val >> 24) & 0xff;
+	p[5] = (uint8_t)(val >> 16) & 0xff;
+	p[6] = (uint8_t)(val >> 8) & 0xff;
+	p[7] = (uint8_t)val & 0xff;
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_acc.c b/components/homekit/esp_hap_core/src/esp_hap_acc.c
new file mode 100644
index 0000000..b42314a
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_acc.c
@@ -0,0 +1,491 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <esp_wifi.h>
+#include <hap_platform_memory.h>
+#include <esp_hap_acc.h>
+#include <esp_mfi_debug.h>
+#include <esp_mfi_debug.h>
+
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+#include <esp_hap_database.h>
+#include <esp_hap_keystore.h>
+#include <esp_hap_main.h>
+
+/* Primary Accessory Pointer */
+static __hap_acc_t *primary_acc;
+
+/*****************************************************************************************************/
+
+hap_acc_t *hap_get_first_acc()
+{
+    return (hap_acc_t *)primary_acc;
+}
+
+hap_acc_t *hap_acc_get_next(hap_acc_t *ha)
+{
+    if (!ha)
+        return NULL;
+
+    __hap_acc_t *_ha = (__hap_acc_t *)ha;
+    return (hap_acc_t *)_ha->next;
+}
+/* Service write callback to handle "Identify"  */
+static int hap_acc_info_write(hap_write_data_t write_data[], int count,
+        void *serv_priv, void *write_priv)
+{
+	int i;
+    __hap_char_t *_hc;
+	for (i = 0; i < count; i++) {
+        _hc = (__hap_char_t *)write_data[i].hc;
+		if (!strcmp(_hc->type_uuid, HAP_CHAR_UUID_IDENTIFY)) {
+            __hap_acc_t *_ha = (__hap_acc_t *)serv_priv;
+            if (_ha) {
+                _ha->identify_routine((hap_acc_t *)_ha);
+                *(write_data->status) = HAP_STATUS_SUCCESS;
+                continue;
+            }
+        }
+        *(write_data->status) = HAP_STATUS_VAL_INVALID;
+	}
+	return HAP_SUCCESS;
+}
+
+/**
+ * @brief HAP create an accessory
+ */
+hap_acc_t *hap_acc_create(hap_acc_cfg_t *acc_cfg)
+{
+    static bool first = true;
+    int ret = 0;
+    __hap_acc_t *_ha = hap_platform_memory_calloc(1, sizeof(__hap_acc_t));
+    if (!_ha) {
+        return NULL;
+    }
+
+    _ha->identify_routine = acc_cfg->identify_routine;
+    _ha->next_iid = 1;
+
+    /* Add the Accessory Information Service internally */
+    hap_serv_t *hs = hap_serv_create("3E");
+    if (!hs) {
+        goto acc_create_fail;
+    }
+    ret = hap_serv_add_char(hs, hap_char_bool_create(HAP_CHAR_UUID_IDENTIFY, HAP_CHAR_PERM_PW, false));
+    ret |= hap_serv_add_char(hs, hap_char_string_create(HAP_CHAR_UUID_MANUFACTURER, HAP_CHAR_PERM_PR, acc_cfg->manufacturer));
+    ret |= hap_serv_add_char(hs, hap_char_string_create(HAP_CHAR_UUID_MODEL, HAP_CHAR_PERM_PR, acc_cfg->model));
+    ret |= hap_serv_add_char(hs, hap_char_string_create(HAP_CHAR_UUID_NAME, HAP_CHAR_PERM_PR, acc_cfg->name));
+    ret |= hap_serv_add_char(hs, hap_char_string_create(HAP_CHAR_UUID_SERIAL_NUMBER, HAP_CHAR_PERM_PR, acc_cfg->serial_num));
+    ret |= hap_serv_add_char(hs, hap_char_string_create(HAP_CHAR_UUID_FIRMWARE_REVISION, HAP_CHAR_PERM_PR, acc_cfg->fw_rev));
+    if (acc_cfg->hw_rev) {
+        ret |= hap_serv_add_char(hs, hap_char_string_create(HAP_CHAR_UUID_HARDWARE_REVISION, HAP_CHAR_PERM_PR, acc_cfg->hw_rev));
+    }
+    
+    if (ret) {
+        goto acc_create_fail;
+    }
+
+    hap_serv_set_write_cb(hs, hap_acc_info_write);
+    hap_serv_set_priv(hs,(void *)_ha);
+    hap_acc_add_serv((hap_acc_t *)_ha, hs);
+
+    if (first) {
+        /* Add the Procol Information Service Internally */
+        hs = hap_serv_create("A2");
+        if (!hs) {
+            goto acc_create_fail;
+        }
+        ret = hap_serv_add_char(hs, hap_char_string_create("37", HAP_CHAR_PERM_PR, "1.1.0"));
+
+        if (ret) {
+            goto acc_create_fail;
+        }
+        hap_acc_add_serv((hap_acc_t *)_ha, hs);
+        hap_priv.cid = acc_cfg->cid;
+        first = false;
+    }
+
+    return (hap_acc_t *)_ha;
+
+acc_create_fail:
+    hap_acc_delete((hap_acc_t *)_ha);
+    return NULL;
+}
+
+int hap_acc_add_accessory_flags(hap_acc_t *ha, uint32_t flags)
+{
+    if (!ha) {
+        return HAP_FAIL;
+    }
+    hap_serv_t *hs = hap_acc_get_serv_by_uuid(ha, HAP_SERV_UUID_ACCESSORY_INFORMATION);
+    if (!hs) {
+        return HAP_FAIL;
+    }
+    return hap_serv_add_char(hs, hap_char_accessory_flags_create(flags));
+
+}
+
+int hap_acc_update_accessory_flags(hap_acc_t *ha, uint32_t flags)
+{
+    if (!ha) {
+        return HAP_FAIL;
+    }
+    hap_serv_t *hs = hap_acc_get_serv_by_uuid(ha, HAP_SERV_UUID_ACCESSORY_INFORMATION);
+    if (!hs) {
+        return HAP_FAIL;
+    }
+    hap_char_t *hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_ACCESSORY_FLAGS);
+    if (!hc) {
+        return HAP_FAIL;
+    }
+    hap_val_t val = {
+        .u = flags,
+    };
+    return hap_char_update_val(hc, &val);
+}
+
+int hap_acc_add_product_data(hap_acc_t *ha, uint8_t *product_data, size_t data_size)
+{
+    if (!ha) {
+        return HAP_FAIL;
+    }
+    hap_serv_t *hs = hap_acc_get_serv_by_uuid(ha, HAP_SERV_UUID_ACCESSORY_INFORMATION);
+    if (!hs) {
+        return HAP_FAIL;
+    }
+    if (data_size != 8) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Product data size is not 8");
+    }
+    uint8_t *buf = calloc(1, data_size);
+    if (!buf) {
+        return HAP_FAIL;
+    }
+    memcpy(buf, product_data, data_size);
+    hap_data_val_t data_val = {
+        .buf = buf,
+        .buflen = data_size
+    };
+    return hap_serv_add_char(hs, hap_char_product_data_create(&data_val));
+}
+
+const hap_val_t *hap_get_product_data()
+{
+    hap_char_t *acc_info = hap_acc_get_serv_by_uuid(hap_get_first_acc(), HAP_SERV_UUID_ACCESSORY_INFORMATION);
+    if (acc_info) {
+        hap_char_t *product_data = hap_serv_get_char_by_uuid(acc_info, HAP_CHAR_UUID_PRODUCT_DATA);
+        if (product_data) {
+            return hap_char_get_val(product_data);
+        }
+    }
+    return NULL;
+}
+/**
+ * @brief check if accessory's AID matches the target AID
+ */
+bool hap_check_aid(__hap_acc_t *accessory, int32_t aid)
+{
+    return accessory->aid == aid ? true : false;
+}
+
+hap_serv_t *hap_acc_get_first_serv(hap_acc_t *ha)
+{
+    return ((__hap_acc_t *)ha)->servs;
+}
+/**
+ * @brief get target service by it's type description string
+ */
+hap_serv_t *hap_acc_get_serv_by_iid(hap_acc_t *ha, int32_t iid)
+{
+    if (!ha)
+        return NULL;
+
+    hap_serv_t *hs;
+    for (hs = hap_acc_get_first_serv(ha); hs; hs = hap_serv_get_next(hs)) {
+        if (((__hap_serv_t *)hs)->iid == iid)
+            return hs;
+    }
+    return NULL;
+}
+
+hap_serv_t *hap_acc_get_serv_by_uuid(hap_acc_t *ha, const char *uuid)
+{
+    if (!ha)
+        return NULL;
+
+    hap_serv_t *hs;
+    for (hs = hap_acc_get_first_serv(ha); hs; hs = hap_serv_get_next(hs)) {
+        if (!strcmp(((__hap_serv_t *)hs)->type_uuid, uuid))
+            return hs;
+    }
+    return NULL;
+}
+
+/**
+ * @brief get target characteristics by it's IID
+ */
+hap_char_t *hap_acc_get_char_by_iid(hap_acc_t *ha, int32_t iid)
+{
+    if (!ha)
+        return NULL;
+    hap_serv_t *hs;
+    hap_char_t *hc;
+    for (hs = hap_acc_get_first_serv(ha); hs; hs = hap_serv_get_next(hs)) {
+        hc = hap_serv_get_char_by_iid(hs, iid);
+        if (hc)
+            return hc;
+    }
+    return NULL;
+}
+
+int hap_acc_get_info(hap_acc_cfg_t *acc_cfg)
+{
+    ESP_MFI_ASSERT(acc_cfg);
+    hap_acc_t *ha = hap_get_first_acc();
+
+    ESP_MFI_ASSERT(ha);
+
+    hap_serv_t *hs = hap_acc_get_serv_by_uuid(ha, HAP_SERV_UUID_ACCESSORY_INFORMATION);
+
+    hap_char_t *hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_NAME);
+    acc_cfg->name = ((__hap_char_t *)hc)->val.s;
+    
+    hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_MODEL);
+    acc_cfg->model = ((__hap_char_t *)hc)->val.s;
+    
+    hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_MANUFACTURER);
+    acc_cfg->manufacturer = ((__hap_char_t *)hc)->val.s;
+
+    hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_SERIAL_NUMBER);
+    acc_cfg->serial_num = ((__hap_char_t *)hc)->val.s;
+    
+    hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_FIRMWARE_REVISION);
+    acc_cfg->fw_rev = ((__hap_char_t *)hc)->val.s;
+
+    hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_HARDWARE_REVISION);
+    if (hc) {
+        acc_cfg->hw_rev = ((__hap_char_t *)hc)->val.s;
+    } else {
+        acc_cfg->hw_rev = NULL;
+    }
+
+    hs = hap_acc_get_serv_by_uuid(ha, HAP_SERV_UUID_PROTOCOL_INFORMATION);
+
+    hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_VERSION);
+    acc_cfg->pv = ((__hap_char_t *)hc)->val.s;
+
+    return 0;
+}
+
+/**
+ * @brief add a characteristics to a service
+ */
+int hap_acc_add_serv(hap_acc_t *ha, hap_serv_t *hs)
+{
+    ESP_MFI_ASSERT(ha);
+    ESP_MFI_ASSERT(hs);
+    __hap_acc_t *_ha = (__hap_acc_t *)ha;
+    __hap_serv_t *_hs = (__hap_serv_t *)hs;
+
+    if (_hs->parent) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Service already added");
+        return HAP_FAIL;
+    }
+
+    /* If the accessory has no services, add this as the first */
+    if (!_ha->servs) {
+        _ha->servs = hs;
+    } else {
+        /* Else loop through the services to get to the last one,
+         * and add this at the end
+         */
+        __hap_serv_t *temp = (__hap_serv_t *)_ha->servs;
+        while (temp->next_serv)
+            temp = (__hap_serv_t *)temp->next_serv;
+        temp->next_serv = hs;
+    }
+	_hs->iid = _ha->next_iid++;
+	__hap_char_t *_hc = (__hap_char_t *)_hs->chars;
+	while(_hc) {
+		_hc->iid = _ha->next_iid++;
+		_hc = (__hap_char_t *)_hc->next_char;
+	}
+    _hs->parent = ha;
+    return 0;
+}
+
+static void hap_add_acc_to_list(__hap_acc_t *primary, __hap_acc_t *new)
+{
+    __hap_acc_t *cur = primary;
+    while (cur->next) {
+        cur = cur->next;
+    }
+    cur->next = new;
+}
+
+static void hap_remove_acc_from_list(__hap_acc_t *primary, __hap_acc_t *old)
+{
+    __hap_acc_t *cur = primary;
+    while (cur->next != old) {
+        cur = cur->next;
+    }
+    cur->next = cur->next->next;
+}
+
+#define HAP_BRIDGE_KEYSTORE     "hap_bridge"
+
+int hap_get_unique_aid(const char *id)
+{
+    if (!id) {
+        return -1;
+    }
+    int aid = 0;
+    size_t aid_size = sizeof(aid);
+    if (hap_keystore_get(HAP_KEYSTORE_NAMESPACE_HAPMAIN, id, (uint8_t *)&aid, &aid_size) != HAP_SUCCESS) {
+        aid = hap_get_next_aid();
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Assigning aid = %d for Bridged accessory %s", aid, id);
+        hap_keystore_set(HAP_KEYSTORE_NAMESPACE_HAPMAIN, id, (uint8_t *)&aid, sizeof(aid));
+    } else {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Using aid = %d for Bridged accessory %s", aid, id);
+    }
+    return aid;
+}
+
+/**
+ * @brief HAP add accessory to HAP kernel
+ */
+void hap_add_accessory(hap_acc_t *ha)
+{
+    if (!ha) {
+        return;
+    }
+    if (primary_acc) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Primary Accessory already added. Use hap_add_bridged_accessory() instead");
+        return;
+    }
+    __hap_acc_t *_ha = (__hap_acc_t *)ha;
+    _ha->aid = 1;
+    primary_acc = _ha;
+    if (hap_priv.cfg.unique_param >= UNIQUE_NAME) {
+        char name[74];
+        uint8_t eth_mac[6];
+        esp_wifi_get_mac(WIFI_IF_STA, eth_mac);
+        hap_serv_t *hs = hap_acc_get_serv_by_uuid(ha, HAP_SERV_UUID_ACCESSORY_INFORMATION);
+        hap_char_t *hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_NAME);
+        snprintf(name, sizeof(name), "%s-%02X%02X%02X", ((__hap_char_t *)hc)->val.s,
+                eth_mac[3], eth_mac[4], eth_mac[5]);
+        hap_platform_memory_free(((__hap_char_t *)hc)->val.s);
+        ((__hap_char_t *)hc)->val.s = strdup(name);
+    }
+    hap_acc_get_info(&hap_priv.primary_acc);
+}
+
+void hap_add_bridged_accessory(hap_acc_t *ha, int aid)
+{
+    if (!ha) {
+        return;
+    }
+    __hap_acc_t *_ha = (__hap_acc_t *)ha;
+    if (aid) {
+        _ha->aid = aid;
+    } else {
+        _ha->aid = hap_get_next_aid();
+    }
+
+    hap_add_acc_to_list(primary_acc, _ha);
+    if (!hap_priv.cfg.disable_config_num_update) {
+        hap_update_config_number();
+    }
+}
+
+void hap_remove_bridged_accessory(hap_acc_t *ha)
+{
+    if ((__hap_acc_t *)ha == primary_acc) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Cannot remove primary accessory");
+    } else {
+        if (ha) {
+            hap_remove_acc_from_list(primary_acc, (__hap_acc_t *)ha);
+            if (!hap_priv.cfg.disable_config_num_update) {
+                hap_update_config_number();
+            }
+        }
+
+    }
+}
+/**
+ * @brief HAP delete target accessory
+ */
+void hap_acc_delete(hap_acc_t *ha)
+{
+	/* Returning success even if pointer is NULL, because it means
+	 * that the accessory is absent and as good as deleted
+	 */
+	if (!ha)
+		return;
+	__hap_acc_t *_ha = (__hap_acc_t *)ha;
+	__hap_serv_t *_hs = (__hap_serv_t *)_ha->servs;
+	while (_hs) {
+		_ha->servs = _hs->next_serv;
+		hap_serv_delete((hap_serv_t *)_hs);
+		_hs = (__hap_serv_t *)_ha->servs;
+	}
+    hap_platform_memory_free(_ha);
+}
+
+/**
+ * @brief HAP get target accessory AID
+ */
+uint32_t hap_acc_get_aid(hap_acc_t *ha)
+{
+    ESP_MFI_ASSERT(ha);
+    __hap_acc_t *_ha = (__hap_acc_t *)ha;
+
+    return _ha->aid;
+}
+
+/**
+ * @brief delete all accessories
+ */
+void hap_delete_all_accessories(void)
+{
+    __hap_acc_t *next, *ha = primary_acc;
+    while (ha) {
+        next = ha->next;
+        hap_acc_delete((hap_acc_t *)ha);
+        ha = next;
+    }
+}
+/**
+ * @brief get target accessory by AID
+ */
+hap_acc_t *hap_acc_get_by_aid(int32_t aid)
+{
+	hap_acc_t *ha;
+	for (ha = hap_get_first_acc(); ha; ha = hap_acc_get_next(ha)) {
+        if (((__hap_acc_t *)ha)->aid == aid) {
+            return ha;
+        }
+    }
+    return NULL;
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_bct.c b/components/homekit/esp_hap_core/src/esp_hap_bct.c
new file mode 100644
index 0000000..ff9083a
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_bct.c
@@ -0,0 +1,71 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <esp_wifi.h>
+#include <hap_platform_memory.h>
+#include <esp_hap_main.h>
+#include <esp_hap_mdns.h>
+#include <esp_hap_wifi.h>
+#include <esp_hap_database.h>
+#include <esp_mfi_debug.h>
+
+static char *new_name;
+
+void hap_bct_change_name(const char *name)
+{
+    if (new_name) {
+        hap_platform_memory_free(new_name);
+    }
+    new_name = strdup(name);
+    hap_send_event(HAP_INTERNAL_EVENT_BCT_CHANGE_NAME);
+}
+
+void hap_bct_hot_plug()
+{
+    hap_send_event(HAP_INTERNAL_EVENT_BCT_HOT_PLUG);
+}
+
+void hap_handle_bct_change_name()
+{
+    if (!new_name) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "No BCT name specified");
+        return;
+    } else {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Changing BCT Name to %s", new_name);
+    }
+    if (hap_mdns_serv_name_change(&hap_priv.hap_mdns_handle, new_name) != HAP_SUCCESS) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Failed to change BCT name");
+    }
+    hap_platform_memory_free(new_name);
+    new_name = NULL;
+}
+
+void hap_handle_hot_plug()
+{
+    esp_wifi_stop();
+    vTaskDelay((10 * 1000) / portTICK_PERIOD_MS); /* Wait for 10 seconds */
+    esp_wifi_start();
+    esp_wifi_connect();
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_char.c b/components/homekit/esp_hap_core/src/esp_hap_char.c
new file mode 100644
index 0000000..9b712e3
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_char.c
@@ -0,0 +1,601 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <hap_platform_memory.h>
+#include <math.h>
+#include <string.h>
+#include "esp_mfi_debug.h"
+
+#include <esp_hap_main.h>
+#include <esp_hap_acc.h>
+#include <esp_hap_char.h>
+#include <esp_hap_ip_services.h>
+#include <esp_hap_database.h>
+
+static QueueHandle_t hap_event_queue;
+
+/**
+ * @brief get characteristics's value
+ */
+hap_val_t *esp_mfi_characteristics_get_value(__hap_char_t *_hc)
+{
+    return &_hc->val;
+}
+
+/**
+ * @brief check if characteristics has the specific permission
+ */
+bool hap_char_has_permission(__hap_char_t *_hc, uint16_t permission)
+{
+    return _hc->permission & permission ? true : false;
+}
+
+/**
+ * @brief compute the mod of a and b: a % b
+ */
+static double esp_mfi_fmod(double a, double b)
+{
+    if (a < 1e-06 || b < 1e-06)
+        return 0;
+
+    while (!((long long)a) || !((long long)b)) {
+        a *= 10.0;
+        b *= 10.0;
+    }
+
+    return fmod(a, b);
+}
+
+int hap_event_queue_init()
+{
+    hap_event_queue = xQueueCreate( hap_priv.cfg.max_event_notif_chars,
+                    sizeof(hap_char_t *) );
+    if (hap_event_queue) {
+        return HAP_SUCCESS;
+    } else {
+        return HAP_FAIL;
+    }
+}
+
+hap_char_t * hap_get_pending_notif_char()
+{
+    hap_char_t *hc;
+    if (xQueueReceive(hap_event_queue, &hc, 0) != pdTRUE) {
+        return NULL;
+    }
+    return hc;
+}
+
+static int hap_queue_event(hap_char_t *hc)
+{
+    int ret;
+    if (!hap_event_queue) {
+        return HAP_FAIL;
+    }
+    if (xPortInIsrContext() == pdTRUE) {
+        ret = xQueueSendFromISR(hap_event_queue, &hc, NULL);
+    } else {
+        ret = xQueueSend(hap_event_queue, &hc, 0);
+    }
+    if (ret == pdTRUE) {
+        hap_send_event(HAP_INTERNAL_EVENT_TRIGGER_NOTIF);
+        return HAP_SUCCESS;
+    }
+    return HAP_FAIL;
+}
+
+
+/**
+ * @brief check if characteristics value is at the range
+ */
+int hap_char_check_val_constraints(__hap_char_t *_hc, hap_val_t *val)
+{
+    if (!_hc->constraint_flags)
+        return HAP_SUCCESS;
+
+    if (_hc->format == HAP_CHAR_FORMAT_INT) {
+        int value = val->i;
+        int remainder;
+
+        if (value > _hc->max.i
+            || value < _hc->min.i)
+            return HAP_FAIL;
+
+        if (!_hc->step.i)
+            return HAP_SUCCESS;
+
+        remainder = (value - _hc->min.i) % _hc->step.i;
+        if (remainder)
+            return HAP_FAIL;
+    } else if (_hc->format == HAP_CHAR_FORMAT_FLOAT) {
+        float value = val->f;
+
+        if (value > _hc->max.f
+            || value < _hc->min.f)
+            return HAP_FAIL;
+# if 0
+        /* Check for step value for floats has a high chance of failure,
+         * because of precision issues. Hence, better to skip it.
+         */
+        double remainder;
+        if (_hc->step.f == 0.0)
+            return HAP_SUCCESS;
+
+        remainder = esp_mfi_fmod(value - _hc->min.f, _hc->step.f);
+        if (remainder != 0.0)
+            return HAP_FAIL;
+#endif
+    } else if (_hc->format == HAP_CHAR_FORMAT_UINT8
+               || _hc->format == HAP_CHAR_FORMAT_UINT16
+               || _hc->format == HAP_CHAR_FORMAT_UINT32) {
+        uint32_t value = val->u;
+        uint32_t remainder;
+
+
+        if (value > _hc->max.u
+            || value < _hc->min.u)
+            return HAP_FAIL;
+
+        if (!_hc->step.u)
+            return HAP_SUCCESS;
+
+        remainder = (value - _hc->min.u) % _hc->step.u;
+        if (remainder)
+            return HAP_FAIL;
+    } else if (_hc->format == HAP_CHAR_FORMAT_UINT64) {
+        /* TODO: Add support. Currently, there is no particular 64-bit characteristic */
+    }
+
+    return HAP_SUCCESS;
+}
+
+/**
+ * @brief user update characteristics value, preparing for notification
+ */
+int hap_char_update_val(hap_char_t *hc, hap_val_t *val)
+{
+    if (!hc || !val) {
+        return HAP_FAIL;
+    }
+    __hap_char_t *_hc = (__hap_char_t *)hc;
+    _hc->update_called = true;
+    if (hap_char_check_val_constraints(_hc, val) != HAP_SUCCESS)
+        return HAP_FAIL;
+	/* Boolean to track if the value has changed.
+	 * This will be later used to decide if an event notification
+	 * is required or not. If the new and old values are same,
+	 * there is no need of a notification
+	 */
+	bool value_changed = false;
+
+	switch (_hc->format) {
+		case HAP_CHAR_FORMAT_BOOL:
+			if (_hc->val.b != val->b) {
+				_hc->val.b = val->b;
+				value_changed = true;
+			}
+			break;
+		case HAP_CHAR_FORMAT_INT:
+		case HAP_CHAR_FORMAT_UINT8:
+		case HAP_CHAR_FORMAT_UINT16:
+		case HAP_CHAR_FORMAT_UINT32:
+			if (_hc->val.i != val->i) {
+				_hc->val.i = val->i;
+				value_changed = true;
+			}
+			break;
+		case HAP_CHAR_FORMAT_FLOAT:
+			if (_hc->val.f != val->f) {
+				_hc->val.f = val->f;
+				value_changed = true;
+			}
+			break;
+		case HAP_CHAR_FORMAT_STRING:
+			/* Not checking all combinations to find if value has changed,
+			 * since generally we do not expect dynamic string values
+			 *
+			 * Eg.
+			 * Both (old and new) values being NULL
+			 * Old value NULL, New non-NULL
+			 * Old value non-NULL, new NULL
+			 */
+			if (_hc->val.s && val->s && !strcmp(_hc->val.s, val->s))
+				value_changed = false;
+			else
+				value_changed = true;
+
+			if (_hc->val.s) {
+				hap_platform_memory_free(_hc->val.s);
+                _hc->val.s = NULL;
+            }
+
+			if (val->s) {
+				_hc->val.s = strdup(val->s);
+				if (!_hc->val.s)
+					return HAP_FAIL;
+			}
+			break;
+        case HAP_CHAR_FORMAT_DATA:
+        case HAP_CHAR_FORMAT_TLV8: {
+            _hc->val.d.buf = val->d.buf;
+            _hc->val.d.buflen = val->d.buflen;
+            value_changed = true;
+            }
+            break;
+		default:
+			break;
+	}
+	if (value_changed || (_hc->permission & HAP_CHAR_PERM_SPECIAL_READ)) {
+		ESP_MFI_DEBUG_INTR(ESP_MFI_DEBUG_INFO, "Value Changed");
+        hap_queue_event(hc);
+	} else {
+        /* If there is no value change, reset the owner flag here itself, as no notification
+         * is being sent anyways. In the absence of this, if there is a GET /characteristics
+         * followed by some value change from hardware, the owner_ctrl stays assigned to a
+         * stale value, and so the controller misses a notification.
+         */
+        _hc->owner_ctrl = 0;
+    }
+	return HAP_SUCCESS;
+}
+
+const hap_val_t *hap_char_get_val(hap_char_t *hc)
+{
+    if (!hc)
+        return NULL;
+    return &((__hap_char_t *)hc)->val;
+}
+
+/**
+ * @brief Get the minimum value of characteristic
+ */
+const hap_val_t *hap_char_get_min_val(hap_char_t *hc)
+{
+    if (hc) {
+        if(((__hap_char_t *)hc)->constraint_flags & HAP_CHAR_MIN_FLAG) {
+            return &((__hap_char_t *)hc)->min;
+        }
+    }
+    return NULL;
+}
+
+/**
+ * @brief Get the maximum value of characteristic
+ */
+const hap_val_t *hap_char_get_max_val(hap_char_t *hc)
+{
+    if (hc) {
+        if(((__hap_char_t *)hc)->constraint_flags & HAP_CHAR_MAX_FLAG || ((__hap_char_t *)hc)->constraint_flags & HAP_CHAR_MAXLEN_FLAG) {
+            return &((__hap_char_t *)hc)->max;
+        }
+    }
+    return NULL;
+}
+
+/**
+ * @brief Get the step value of characteristic
+ */
+const hap_val_t *hap_char_get_step_val(hap_char_t *hc)
+{
+    if (hc) {
+        if (((__hap_char_t *)hc)->constraint_flags & HAP_CHAR_STEP_FLAG) {
+            return &((__hap_char_t *)hc)->step;
+        }
+    }
+    return NULL;
+}
+
+/**
+ * @brief HAP create a characteristics
+ */
+static hap_char_t *hap_char_create(char *type_uuid, uint32_t permission, hap_char_format_t format, hap_val_t val)
+{
+    __hap_char_t *new_ch;
+
+    ESP_MFI_ASSERT(type_uuid);
+
+    if (HAP_CHAR_FORMAT_STRING == format && val.s) {
+        if (strlen(val.s) > HAP_CHAR_STRING_MAX_LEN)
+            return NULL;
+    }
+
+    new_ch = hap_platform_memory_calloc(1, sizeof(__hap_char_t));
+    if (!new_ch) {
+        return NULL;
+    }
+
+    new_ch->val = val;
+    new_ch->type_uuid = type_uuid;
+    new_ch->format = format;
+    new_ch->permission = permission;
+
+    return (hap_char_t *) new_ch;
+}
+
+hap_char_t *hap_char_bool_create(char *type_uuid, uint16_t perms, bool b)
+{
+    hap_val_t val = {.b = b};
+    return hap_char_create(type_uuid, perms, HAP_CHAR_FORMAT_BOOL, val);
+}
+hap_char_t *hap_char_uint8_create(char *type_uuid, uint16_t perms, uint8_t u8)
+{
+    hap_val_t val = {.u = u8};
+    return hap_char_create(type_uuid, perms, HAP_CHAR_FORMAT_UINT8, val);
+}
+hap_char_t *hap_char_uint16_create(char *type_uuid, uint16_t perms, uint16_t u16)
+{
+    hap_val_t val = {.u = u16};
+    return hap_char_create(type_uuid, perms, HAP_CHAR_FORMAT_UINT16, val);
+}
+hap_char_t *hap_char_uint32_create(char *type_uuid, uint16_t perms, uint32_t u32)
+{
+    hap_val_t val = {.u = u32};
+    return hap_char_create(type_uuid, perms, HAP_CHAR_FORMAT_UINT32, val);
+}
+hap_char_t *hap_char_uint64_create(char *type_uuid, uint16_t perms, uint64_t u64)
+{
+    hap_val_t val = {.i64 = u64};
+    return hap_char_create(type_uuid, perms, HAP_CHAR_FORMAT_UINT64, val);
+}
+hap_char_t *hap_char_int_create(char *type_uuid, uint16_t perms, int i32)
+{
+    hap_val_t val = {.i = i32};
+    return hap_char_create(type_uuid, perms, HAP_CHAR_FORMAT_INT, val);
+}
+hap_char_t *hap_char_float_create(char *type_uuid, uint16_t perms, float f)
+{
+    hap_val_t val = {.f = f};
+    return hap_char_create(type_uuid, perms, HAP_CHAR_FORMAT_FLOAT, val);
+}
+hap_char_t *hap_char_string_create(char *type_uuid, uint16_t perms, char *s)
+{
+    hap_val_t val;
+    if (s)
+        val.s = strdup(s);
+    else
+        val.s = NULL;
+    return hap_char_create(type_uuid, perms, HAP_CHAR_FORMAT_STRING, val);
+}
+
+hap_char_t *hap_char_data_create(char *type_uuid, uint16_t perms, hap_data_val_t *d)
+{
+    hap_val_t val = {0};
+    if (d) {
+        val.d = *d;
+    }
+    return hap_char_create(type_uuid, perms, HAP_CHAR_FORMAT_DATA, val);
+}
+
+hap_char_t *hap_char_tlv8_create(char *type_uuid, uint16_t perms, hap_tlv8_val_t *t)
+{
+    hap_val_t val = {0};
+    if (t) {
+        val.t = *t;
+    }
+    return hap_char_create(type_uuid, perms, HAP_CHAR_FORMAT_TLV8, val);
+}
+
+/**
+ * @brief HAP get target characteristics IID
+ */
+uint32_t hap_char_get_iid(hap_char_t *hc)
+{
+    ESP_MFI_ASSERT(hc);
+    __hap_char_t *tmp = (__hap_char_t *)hc;
+
+    return tmp->iid;
+}
+
+/**
+ * @brief HAP get target characteristics type UUID
+ */
+const char * hap_char_get_type_uuid(hap_char_t *hc)
+{
+    ESP_MFI_ASSERT(hc);
+    __hap_char_t *tmp = (__hap_char_t *)hc;
+
+    return tmp->type_uuid;
+}
+
+uint16_t hap_char_get_perm(hap_char_t *hc)
+{
+    if (!hc)
+        return 0;
+
+    __hap_char_t *tmp = (__hap_char_t *)hc;
+    return tmp->permission;
+}
+
+hap_char_format_t hap_char_get_format(hap_char_t *hc)
+{
+    if (!hc)
+        return 0;
+
+    __hap_char_t *tmp = (__hap_char_t *)hc;
+    return tmp->format;
+}
+
+/**
+ * @brief HAP delete target characteristics
+ */
+void hap_char_delete(hap_char_t *hc)
+{
+    ESP_MFI_ASSERT(hc);
+    __hap_char_t *_hc = (__hap_char_t *)hc;
+    if (_hc->format == HAP_CHAR_FORMAT_STRING) {
+        if (_hc->val.s) {
+            hap_platform_memory_free(_hc->val.s);
+        }
+    }
+    if (_hc->valid_vals) {
+        hap_platform_memory_free(_hc->valid_vals);
+    }
+    if (_hc->valid_vals_range) {
+        hap_platform_memory_free(_hc->valid_vals_range);
+    }
+    hap_platform_memory_free(_hc);
+}
+
+/**
+ * @brief HAP configure the characteristics's value description
+ */
+void hap_char_int_set_constraints(hap_char_t *hc, int min, int max, int step)
+{
+    ESP_MFI_ASSERT(hc);
+    __hap_char_t *tmp = (__hap_char_t *)hc;
+    tmp->min.i = min;
+    tmp->max.i = max;
+    tmp->step.i = step;
+    if (step) {
+        tmp->constraint_flags |= (HAP_CHAR_MIN_FLAG | HAP_CHAR_MAX_FLAG | HAP_CHAR_STEP_FLAG);
+    } else {
+        tmp->constraint_flags |= (HAP_CHAR_MIN_FLAG | HAP_CHAR_MAX_FLAG);
+    }
+}
+void hap_char_float_set_constraints(hap_char_t *hc, float min, float max, float step)
+{
+    ESP_MFI_ASSERT(hc);
+    __hap_char_t *tmp = (__hap_char_t *)hc;
+    tmp->min.f = min;
+    tmp->max.f = max;
+    tmp->step.f = step;
+    if (step) {
+        tmp->constraint_flags |= (HAP_CHAR_MIN_FLAG | HAP_CHAR_MAX_FLAG | HAP_CHAR_STEP_FLAG);
+    } else {
+        tmp->constraint_flags |= (HAP_CHAR_MIN_FLAG | HAP_CHAR_MAX_FLAG);
+    }
+}
+
+void hap_char_string_set_maxlen(hap_char_t *hc, int maxlen)
+{
+    ESP_MFI_ASSERT(hc);
+    __hap_char_t *tmp = (__hap_char_t *)hc;
+    if (maxlen > HAP_CHAR_STRING_MAX_LEN) {
+        maxlen = HAP_CHAR_STRING_MAX_LEN;
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_WARN, "Characteristic string length larger than maximum value(%d), falling back to the maximum value.", HAP_CHAR_STRING_MAX_LEN);
+    }
+    tmp->max.i = maxlen;
+    tmp->constraint_flags |= HAP_CHAR_MAXLEN_FLAG;
+}
+
+void hap_char_add_description(hap_char_t *hc, const char *description)
+{
+    ESP_MFI_ASSERT(hc);
+    __hap_char_t *tmp = (__hap_char_t *)hc;
+    tmp->description = (char *)description;
+}
+void hap_char_add_unit(hap_char_t *hc, const char *unit)
+{
+    ESP_MFI_ASSERT(hc);
+    __hap_char_t *tmp = (__hap_char_t *)hc;
+    tmp->unit = (char *)unit;
+}
+hap_char_t *hap_char_get_next(hap_char_t *hc)
+{
+    return ((__hap_char_t *)hc)->next_char;
+}
+
+hap_serv_t *hap_char_get_parent(hap_char_t *hc)
+{
+    return ((__hap_char_t *)hc)->parent;
+
+}
+
+#define set_bit(val, index)	((val) |= (1 << index))
+#define reset_bit(val, index)	((val) &= ~(1 << index))
+void hap_char_manage_notification(hap_char_t *hc, int index, bool ev)
+{
+	__hap_char_t *_hc = (__hap_char_t *)hc;
+	if (ev)
+		set_bit(_hc->ev_ctrls, index);
+	else
+		reset_bit(_hc->ev_ctrls, index);
+}
+
+bool hap_char_is_ctrl_subscribed(hap_char_t *hc, int index)
+{
+	__hap_char_t *_hc = (__hap_char_t *)hc;
+	return (_hc->ev_ctrls & (1 << index)) ? true : false;
+}
+
+void hap_char_set_owner_ctrl(hap_char_t *hc, int index)
+{
+	__hap_char_t *_hc = (__hap_char_t *)hc;
+    _hc->owner_ctrl = 0;
+    set_bit(_hc->owner_ctrl, index);
+}
+
+bool hap_char_is_ctrl_owner(hap_char_t *hc, int index)
+{
+	__hap_char_t *_hc = (__hap_char_t *)hc;
+	return (_hc->owner_ctrl & (1 << index)) ? true : false;
+}
+
+void hap_char_set_iid(hap_char_t *hc, int32_t iid)
+{
+    if (hc) {
+        ((__hap_char_t *)hc)->iid = iid;
+    }
+}
+
+void hap_disable_all_char_notif(int index)
+{
+    /* Just loop through all characteristic objects and reset the
+     * bit indicating event notifications. This is the simplest way
+     */
+    hap_acc_t *ha;
+    hap_serv_t *hs;
+    hap_char_t *hc;
+    for (ha = hap_get_first_acc(); ha; ha = hap_acc_get_next(ha)) {
+        for (hs = hap_acc_get_first_serv(ha); hs; hs = hap_serv_get_next(hs)) {
+            for (hc = hap_serv_get_first_char(hs); hc; hc = hap_char_get_next(hc)) {
+                reset_bit(((__hap_char_t *)hc)->ev_ctrls, index);
+            }
+        }
+    }
+}
+
+void hap_char_add_valid_vals(hap_char_t *hc, const uint8_t *valid_vals, size_t valid_val_cnt)
+{
+    if (!hc)
+        return;
+    __hap_char_t *_hc = (__hap_char_t *)hc;
+    _hc->valid_vals = hap_platform_memory_malloc(valid_val_cnt);
+    if (_hc->valid_vals) {
+        memcpy(_hc->valid_vals, valid_vals, valid_val_cnt);
+        _hc->valid_vals_cnt = valid_val_cnt;
+    }
+}
+
+void hap_char_add_valid_vals_range(hap_char_t *hc, uint8_t start_val, uint8_t end_val)
+{
+    if (!hc)
+        return;
+    __hap_char_t *_hc = (__hap_char_t *)hc;
+    _hc->valid_vals_range = hap_platform_memory_malloc(sizeof(uint8_t));
+    if (_hc->valid_vals_range) {
+        _hc->valid_vals_range[0] = start_val;
+        _hc->valid_vals_range[1] = end_val;
+    }
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_controllers.c b/components/homekit/esp_hap_core/src/esp_hap_controllers.c
new file mode 100644
index 0000000..4b2b16e
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_controllers.c
@@ -0,0 +1,149 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <hap.h>
+#include <esp_mfi_debug.h>
+
+#include <esp_hap_main.h>
+#include <esp_hap_database.h>
+#include <esp_hap_controllers.h>
+#include <esp_hap_keystore.h>
+
+#define HAP_KEYSTORE_NAMESPACE_CTRL "hap_ctrl"
+
+int hap_controllers_init()
+{
+	memset(hap_priv.controllers, 0, sizeof(hap_priv.controllers));
+    char index_str[4];
+    uint8_t i;
+    size_t info_size;
+    bool acc_paired = false;
+	for (i = 0; i < HAP_MAX_CONTROLLERS; i++) {
+        snprintf(index_str, sizeof(index_str), "%d", i);
+        info_size = sizeof(hap_ctrl_info_t);
+        if (hap_keystore_get(HAP_KEYSTORE_NAMESPACE_CTRL, index_str,
+                    (uint8_t *)&hap_priv.controllers[i].info, &info_size) == HAP_SUCCESS) {
+            if (info_size == sizeof(hap_ctrl_info_t)) {
+                hap_priv.controllers[i].index = i;
+                hap_priv.controllers[i].valid = true;
+                acc_paired = true;
+            }
+        }
+    }
+    if (acc_paired) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Accessory is Paired with atleast one controller");
+    } else {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Accessory is not Paired with any controller");
+    }
+	return HAP_SUCCESS;
+}
+
+hap_ctrl_data_t *hap_controller_get_empty_loc()
+{
+	int i;
+	for (i = 0; i < HAP_MAX_CONTROLLERS; i++) {
+		if (!hap_priv.controllers[i].valid) {
+            hap_priv.controllers[i].index = i;
+			return &hap_priv.controllers[i];
+        }
+	}
+	return NULL;
+}
+
+int hap_get_paired_controller_count()
+{
+	int i, cnt = 0;
+	for (i = 0; i < HAP_MAX_CONTROLLERS; i++) {
+		if (hap_priv.controllers[i].valid) {
+            cnt++;
+        }
+	}
+	return cnt;
+}
+
+bool is_accessory_paired()
+{
+	int i;
+	for (i = 0; i < HAP_MAX_CONTROLLERS; i++) {
+		if (hap_priv.controllers[i].valid)
+			return true;
+	}
+	return false;
+}
+
+bool is_admin_paired()
+{
+	int i;
+	for (i = 0; i < HAP_MAX_CONTROLLERS; i++) {
+		if (hap_priv.controllers[i].valid && hap_priv.controllers[i].info.perms)
+			return true;
+	}
+	return false;
+}
+
+int hap_controller_save(hap_ctrl_data_t *ctrl_data)
+{
+	ctrl_data->valid = true;
+    char index_str[4];
+    snprintf(index_str, sizeof(index_str), "%d", ctrl_data->index);
+    int ret = hap_keystore_set(HAP_KEYSTORE_NAMESPACE_CTRL, index_str,
+            (const uint8_t *)&ctrl_data->info, (size_t)sizeof(hap_ctrl_info_t));
+
+    if (ret != HAP_SUCCESS) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Failed to store controller %d", ctrl_data->index);
+        return HAP_FAIL;
+    }
+    hap_report_event(HAP_EVENT_CTRL_PAIRED, ctrl_data->info.id, sizeof(ctrl_data->info.id));
+    return HAP_SUCCESS;
+}
+
+void hap_controller_remove(hap_ctrl_data_t *ctrl_data)
+{
+	if (!ctrl_data)
+        return;
+    char index_str[4];
+    snprintf(index_str, sizeof(index_str), "%d", ctrl_data->index);
+    char id[HAP_CTRL_ID_LEN];
+    strncpy(id, ctrl_data->info.id, sizeof(id));
+    hap_keystore_delete(HAP_KEYSTORE_NAMESPACE_CTRL, index_str);
+    memset(ctrl_data, 0, sizeof(hap_ctrl_data_t));
+    hap_report_event(HAP_EVENT_CTRL_UNPAIRED, id, sizeof(id));
+}
+
+hap_ctrl_data_t *hap_get_controller(char *ctrl_id)
+{
+	int i;
+	for (i = 0; i < HAP_MAX_CONTROLLERS; i++) {
+		if (hap_priv.controllers[i].valid
+				&& (!strcmp(hap_priv.controllers[i].info.id, ctrl_id)))
+			return &hap_priv.controllers[i];
+	}
+	return NULL;
+}
+
+void hap_erase_controller_info()
+{
+    hap_keystore_delete_namespace(HAP_KEYSTORE_NAMESPACE_CTRL);
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_database.c b/components/homekit/esp_hap_core/src/esp_hap_database.c
new file mode 100644
index 0000000..dec7e80
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_database.c
@@ -0,0 +1,334 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <sodium/crypto_sign_ed25519.h>
+#include <string.h>
+#include <hap_platform_memory.h>
+
+#include <esp_mfi_rand.h>
+#include <esp_mfi_sha.h>
+#include <esp_mfi_debug.h>
+
+#include <esp_hap_main.h>
+#include <esp_hap_keystore.h>
+#include <esp_hap_database.h>
+#include <esp_hap_controllers.h>
+
+#include <esp_mfi_base64.h>
+
+#define HAP_KEY_ACC_ID                  "acc_id"
+#define HAP_KEY_LTSKA                   "ltska"
+#define HAP_KEY_LTPKA                   "ltpka"
+#define HAP_KEY_CONFIG_NUM              "config_num"
+#define HAP_KEY_FW_REV                  "fw_rev"
+#define HAP_KEY_CUR_AID                 "cur_aid"
+#define HAP_KEY_STATE_NUM              "state_num"
+
+#define HAP_KEY_SETUP_ID                "setup_id"
+#define HAP_KEY_SETUP_SALT              "setup_salt"
+#define HAP_KEY_SETUP_VERIFIER          "setup_verifier"
+
+#define HAP_LOOP_STACK              (4 * 1024)
+#define HAP_MAIN_THREAD_PRIORITY    7
+#define HAP_MAX_NOTIF_CHARS         8
+#define HAP_SOCK_RECV_TIMEOUT       10
+#define HAP_SOCK_SEND_TIMEOUT       10
+
+hap_priv_t hap_priv = {
+    .cfg = {
+        .task_stack_size = HAP_LOOP_STACK,
+        .task_priority = HAP_MAIN_THREAD_PRIORITY,
+        .max_event_notif_chars = HAP_MAX_NOTIF_CHARS,
+        .unique_param = UNIQUE_SSID,
+        .recv_timeout = HAP_SOCK_RECV_TIMEOUT,
+        .send_timeout = HAP_SOCK_SEND_TIMEOUT,
+        .sw_token_max_len = HAP_SW_TOKEN_MAX_LEN,
+    }
+};
+
+static void hap_save_config_number()
+{
+
+    hap_keystore_set(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_CONFIG_NUM,
+            (uint8_t *)&hap_priv.config_num, sizeof(hap_priv.config_num));
+}
+
+static void hap_get_config_number()
+{
+    size_t config_num_len = sizeof(hap_priv.config_num);
+    if (hap_keystore_get(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_CONFIG_NUM,
+                (uint8_t *)&hap_priv.config_num, &config_num_len) != HAP_SUCCESS) {
+        hap_priv.config_num = 1;
+        hap_save_config_number();
+    }
+    if (hap_priv.config_num > 65535) {
+        hap_priv.config_num = 1;
+        hap_save_config_number();
+    }
+}
+
+void hap_increment_and_save_config_num()
+{
+    hap_priv.config_num++;
+    if (hap_priv.config_num > 65535) {
+        hap_priv.config_num = 1;
+    }
+    hap_save_config_number();
+}
+
+
+static void hap_save_state_number()
+{
+    hap_keystore_set(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_STATE_NUM,
+            (uint8_t *)&hap_priv.state_num, sizeof(hap_priv.state_num));
+}
+
+void hap_increment_and_save_state_num()
+{
+    if (is_accessory_paired()) {
+        hap_priv.state_num++;
+        /* If value becomes 0 after incrementing, it means that it has wrapped around.
+         * So, reset to 1
+         */
+        if (hap_priv.state_num == 0) {
+            hap_priv.state_num = 1;
+        }
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Updated state number to %d", hap_priv.state_num);
+        hap_save_state_number();
+    }
+}
+
+static void hap_init_state_number()
+{
+    size_t state_num_len = sizeof(hap_priv.state_num);
+    if (hap_keystore_get(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_STATE_NUM,
+                (uint8_t *)&hap_priv.state_num, &state_num_len) != HAP_SUCCESS) {
+        /* If state number is not found, initialise with 1 and store.
+         */
+        hap_priv.state_num = 1;
+        hap_save_state_number();
+    } else {
+        hap_increment_and_save_state_num();
+    }
+}
+
+static void hap_save_cur_aid()
+{
+    hap_keystore_set(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_CUR_AID,
+            (uint8_t *)&hap_priv.cur_aid, sizeof(hap_priv.cur_aid));
+}
+
+static void hap_get_cur_aid()
+{
+    size_t aid_len = sizeof(hap_priv.cur_aid);
+    if (hap_keystore_get(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_CUR_AID,
+                (uint8_t *)&hap_priv.cur_aid, &aid_len) != HAP_SUCCESS) {
+        /* AID = 1 is reserved for Primary Accessory. So, we set the initial
+         * value to 1, so that the bridged accessories get assigned aid from
+         * 2 onwards
+         */
+        hap_priv.cur_aid = 1;
+        hap_save_cur_aid();
+    }
+}
+
+static int hap_get_setup_id()
+{
+    /* Read setup id from NVS, only if it is not already set from the accessory code */
+    if (!strlen(hap_priv.setup_id)) {
+        size_t setup_id_len = sizeof(hap_priv.setup_id);
+        if (hap_factory_keystore_get(HAP_FACTORY_NAMESPACE_HAP_SETUP, HAP_KEY_SETUP_ID,
+                (uint8_t *)hap_priv.setup_id, &setup_id_len) != HAP_SUCCESS) {
+            return HAP_FAIL;
+        }
+    }
+    return HAP_SUCCESS;
+}
+
+static int hap_get_setup_info()
+{
+    /* If the setup code has been set directly, no need to check for setup info */
+    if (hap_priv.setup_code) {
+        return HAP_SUCCESS;
+    }
+    /* If the setup info has been set externally, directly from the accessory code,
+     * no need to check in the NVS
+     */
+    if (!hap_priv.setup_info) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Getting setup info from factory NVS");
+        hap_priv.setup_info = hap_platform_memory_calloc(1, sizeof(hap_setup_info_t));
+        if (!hap_priv.setup_info)
+            return HAP_FAIL;
+        size_t salt_len = sizeof(hap_priv.setup_info->salt);
+        size_t verifier_len = sizeof(hap_priv.setup_info->verifier);
+        int ret = hap_factory_keystore_get(HAP_FACTORY_NAMESPACE_HAP_SETUP, HAP_KEY_SETUP_SALT,
+                hap_priv.setup_info->salt, &salt_len);
+        ret |= hap_factory_keystore_get(HAP_FACTORY_NAMESPACE_HAP_SETUP, HAP_KEY_SETUP_VERIFIER,
+                hap_priv.setup_info->verifier, &verifier_len);
+        if (ret != HAP_SUCCESS) {
+            hap_platform_memory_free(hap_priv.setup_info);
+            hap_priv.setup_info = NULL;
+            return HAP_FAIL;
+        }
+    }
+    return HAP_SUCCESS;
+}
+
+static void hap_check_fw_version()
+{
+    char fw_rev[64] = {0};
+    size_t fw_rev_len = sizeof(fw_rev);
+    /* Check if the firmware revision is stored in NVS */
+    if (hap_keystore_get(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_FW_REV,
+                (uint8_t *)fw_rev, &fw_rev_len) == HAP_SUCCESS) {
+        /* If the firmware revision is found, compare with the current revision.
+         * If it is the same, no need to do anything. So, just return
+         */
+        if (strncmp(fw_rev, hap_priv.primary_acc.fw_rev, sizeof(fw_rev)) == 0) {
+            return;
+        } else {
+            /* If there is a version mismatch, it means that the firmware was upgraded.
+             * Update config number in that case
+             */
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "FW Update detected. Incrementing config number");
+            hap_increment_and_save_config_num();
+        }
+    }
+    /* Save the new firmare revision to NVS */
+    hap_keystore_set(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_FW_REV,
+            (uint8_t *)hap_priv.primary_acc.fw_rev,
+            strlen(hap_priv.primary_acc.fw_rev));
+}
+
+int hap_acc_setup_init()
+{
+    if (hap_get_setup_id() != HAP_SUCCESS) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Setup ID absent");
+        return HAP_FAIL;
+    } else {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Setup ID: %s", hap_priv.setup_id);
+    }
+
+    if (hap_get_setup_info() != HAP_SUCCESS) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Setup Info absent");
+        return HAP_FAIL;
+    }
+
+    uint8_t digest[MFI_SHA512_SIZE] = {0};
+    esp_mfi_sha_ctx_t ctx = 0;
+    ctx = esp_mfi_sha512_new();
+    if (!ctx) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Out of Memory");
+        return HAP_FAIL;
+    }
+    /* Compute setup hash by taking a SHA512 hash of the setup id and device id */
+    esp_mfi_sha512_init(ctx);
+    esp_mfi_sha512_update(ctx, (const uint8_t *)hap_priv.setup_id, strlen(hap_priv.setup_id));
+    esp_mfi_sha512_update(ctx, (const uint8_t *)hap_priv.acc_id, strlen(hap_priv.acc_id));
+    esp_mfi_sha512_final(ctx, digest);
+    /* Copy only the first 4 bytes as the setup hash */
+    memcpy(hap_priv.setup_hash, digest, SETUP_HASH_LEN);
+    esp_mfi_sha512_free(ctx);
+
+    int hash_size = sizeof(hap_priv.setup_hash_str);
+    esp_mfi_base64_encode((const char *)hap_priv.setup_hash, SETUP_HASH_LEN,
+            hap_priv.setup_hash_str, hash_size, &hash_size);
+
+    hap_check_fw_version();
+
+    return HAP_SUCCESS;
+}
+
+int hap_database_init(void)
+{
+    uint8_t id[6];
+    size_t val_size = sizeof(id);
+    if (hap_keystore_get(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_ACC_ID, id, &val_size) == HAP_SUCCESS) {
+        val_size = sizeof(hap_priv.ltska);
+        hap_keystore_get(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_LTSKA, hap_priv.ltska, &val_size);
+        val_size = sizeof(hap_priv.ltpka);
+        hap_keystore_get(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_LTPKA, hap_priv.ltpka, &val_size);
+    } else {
+        /* If the accessory ID is not found in keystore, create and store a new random ID */
+	    esp_mfi_get_random(id, sizeof(id));
+        hap_keystore_set(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_ACC_ID, id, sizeof(id));
+        /* Also create a new ED25519 key pair */
+	    esp_mfi_get_random(hap_priv.ltska, sizeof(hap_priv.ltska));
+        crypto_sign_ed25519_keypair(hap_priv.ltpka, hap_priv.ltska);
+        hap_keystore_set(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_LTSKA, hap_priv.ltska, sizeof(hap_priv.ltska));
+        hap_keystore_set(HAP_KEYSTORE_NAMESPACE_HAPMAIN, HAP_KEY_LTPKA, hap_priv.ltpka, sizeof(hap_priv.ltpka));
+    }
+
+    memcpy(hap_priv.raw_acc_id, id, sizeof(hap_priv.raw_acc_id));
+	snprintf(hap_priv.acc_id, sizeof(hap_priv.acc_id), "%02X:%02X:%02X:%02X:%02X:%02X",
+			id[0], id[1], id[2], id[3], id[4], id[5]);
+
+	hap_controllers_init();
+    hap_get_config_number();
+    hap_get_cur_aid();
+    hap_init_state_number();
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Database initialised. Accessory Device ID: %s", hap_priv.acc_id);
+	return HAP_SUCCESS;
+}
+
+char *hap_get_acc_id()
+{
+	return hap_priv.acc_id;
+}
+
+int hap_get_next_aid(char *id)
+{
+    hap_priv.cur_aid++;
+    hap_save_cur_aid();
+    return hap_priv.cur_aid;
+}
+
+void hap_erase_accessory_info()
+{
+    hap_keystore_delete_namespace(HAP_KEYSTORE_NAMESPACE_HAPMAIN);
+}
+
+void hap_configure_unique_param(hap_unique_param_t param)
+{
+    hap_priv.cfg.unique_param = param;
+}
+
+int hap_get_config(hap_cfg_t *cfg)
+{
+    if (!cfg) {
+        return HAP_FAIL;
+    }
+    *cfg = hap_priv.cfg;
+    return HAP_SUCCESS;
+}
+
+int hap_set_config(const hap_cfg_t *cfg)
+{
+    if (!cfg) {
+        return HAP_FAIL;
+    }
+    hap_priv.cfg = *cfg;
+    return HAP_SUCCESS;
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_ip_services.c b/components/homekit/esp_hap_core/src/esp_hap_ip_services.c
new file mode 100644
index 0000000..de74472
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_ip_services.c
@@ -0,0 +1,1582 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <json_generator.h>
+#include <json_parser.h>
+#include <hap_platform_memory.h>
+#include <esp_mfi_debug.h>
+#include <esp_hap_main.h>
+#include <esp_hap_pair_setup.h>
+#include <esp_hap_pair_verify.h>
+#include <esp_hap_pairings.h>
+#include <esp_hap_network_io.h>
+#include <esp_hap_secure_message.h>
+#include <esp_hap_acc.h>
+#include <esp_hap_serv.h>
+#include <esp_hap_char.h>
+#include <esp_hap_mdns.h>
+#include <esp_hap_wac.h>
+#include <esp_hap_wifi.h>
+#include <esp_hap_database.h>
+#include <esp_mfi_base64.h>
+#include <esp_timer.h>
+#include <hexdump.h>
+#include <lwip/sockets.h>
+#include <esp_http_server.h>
+#include <hap_platform_httpd.h>
+#include <hap_platform_os.h>
+#include <esp_hap_ip_services.h>
+
+#ifdef ESP_MFI_DEBUG_ENABLE
+#define ESP_MFI_DEBUG_PLAIN(fmt, ...)   \
+    if (http_debug) {                   \
+        printf("\e[1;35m" fmt "\e[0m", ##__VA_ARGS__); \
+    }
+#else /* ESP_MFI_DEBUG_ENABLE */
+#define ESP_MFI_DEBUG_PLAIN(fmt, ...)
+#endif /* ESP_MFI_DEBUG_ENABLE */
+
+static bool http_debug;
+
+int hap_http_session_not_authorized(httpd_req_t *req)
+{
+    char buf[50];
+    httpd_resp_set_status(req, "470 Connection Authorization Required");
+    httpd_resp_set_type(req, "application/hap+json");
+    snprintf(buf, sizeof(buf),"{\"status\":-70401}");
+    httpd_resp_send(req, buf, strlen(buf));
+    return HAP_SUCCESS;
+
+}
+
+int hap_httpd_get_data(httpd_req_t *req, char *buffer, int len)
+{
+    int read_len = 0;
+    while (read_len < len) {
+        int tmp_len = httpd_req_recv(req, buffer + read_len, len - read_len);
+        if (tmp_len <= 0) {
+            return read_len;
+        }
+        read_len += tmp_len;
+    }
+    return read_len;
+}
+
+static int hap_http_pair_setup_handler(httpd_req_t *req)
+{
+	uint8_t buf[1200];
+	int ret, ret1, outlen;
+	void *ctx = (hap_secure_session_t *)hap_platform_httpd_get_sess_ctx(req);
+    int fd = httpd_req_to_sockfd(req);
+    ESP_MFI_DEBUG_PLAIN("Socket fd: %d; HTTP Request %s %s\n", httpd_req_to_sockfd(req), hap_platform_httpd_get_req_method(req), hap_platform_httpd_get_req_uri(req));
+	if (!ctx) {
+		if (hap_pair_setup_context_init(fd, &ctx, buf, sizeof(buf), &outlen) == HAP_SUCCESS) {
+            hap_platform_httpd_set_sess_ctx(req, ctx, hap_pair_setup_ctx_clean, true);
+		} else {
+			httpd_resp_set_type(req, "application/pairing+tlv8");
+			httpd_resp_send(req, (char *)buf, outlen);
+			return HAP_SUCCESS;
+		}
+	}
+	int data_len = httpd_req_recv(req, (char *)buf, sizeof(buf));
+	ret = hap_pair_setup_process(&ctx, buf, data_len, sizeof(buf), &outlen);
+	httpd_resp_set_type(req, "application/pairing+tlv8");
+	ret1 = httpd_resp_send(req, (char *)buf, outlen);
+	if (ret != HAP_SUCCESS) {
+		hap_pair_setup_ctx_clean(ctx);
+		ctx = NULL;
+	} else {
+        /* A pair verify function is called here, because for Software Token Authentication,
+         * secure session keys are generated at the step M4 of Pair Setup, and there onwards,
+         * the behavior is like a pair verified session.
+         */
+		if (hap_pair_verify_get_state(ctx) == STATE_VERIFIED) {
+			/* Saving socket fd since it will later be required for
+			 * event notifications.
+			 */
+			((hap_secure_session_t *)ctx)->conn_identifier = fd;
+            hap_platform_httpd_set_sess_ctx(req, ctx, hap_free_session, true);
+            httpd_sess_set_send_override(hap_priv.server, fd, hap_httpd_send);
+            httpd_sess_set_recv_override(hap_priv.server, fd, hap_httpd_recv);
+		}
+    }
+	/* Context will be NULL, either if there was an error and a cleanup was required,
+	 * or if the pair_setup_process cleared it after successful pairing.
+	 * For both the cases, we will set the sess_ctx and free_ctx to NULL
+	 */
+	if (!ctx) {
+        hap_platform_httpd_set_sess_ctx(req, NULL, NULL, true);
+	}
+	return ret1;
+}
+static struct httpd_uri hap_pair_setup = {
+	.uri = "/pair-setup",
+    .method = HTTP_POST,
+    .handler = hap_http_pair_setup_handler,
+};
+
+static int hap_http_pair_verify_handler(httpd_req_t *req)
+{
+	uint8_t buf[512];
+	int ret, outlen;
+	void *ctx = hap_platform_httpd_get_sess_ctx(req);
+    ESP_MFI_DEBUG_PLAIN("Socket fd: %d; HTTP Request %s %s\n", httpd_req_to_sockfd(req), hap_platform_httpd_get_req_method(req), hap_platform_httpd_get_req_uri(req));
+	if (!ctx) {
+		if (hap_pair_verify_context_init(&ctx, buf, sizeof(buf), &outlen) == HAP_SUCCESS) {
+            hap_platform_httpd_set_sess_ctx(req, ctx, NULL, true);
+		}
+	}
+	int data_len = httpd_req_recv(req, (char *)buf, sizeof(buf));
+	ret = hap_pair_verify_process(&ctx, buf, data_len, sizeof(buf), &outlen);
+	httpd_resp_set_type(req, "application/pairing+tlv8");
+	int ret1 = httpd_resp_send(req, (char *)buf, outlen);
+	if (ret == HAP_SUCCESS) {
+		if (hap_pair_verify_get_state(ctx) == STATE_VERIFIED) {
+			/* Saving socket fd since it will later be required for
+			 * event notifications.
+			 */
+            int fd = httpd_req_to_sockfd(req);
+			((hap_secure_session_t *)ctx)->conn_identifier = fd;
+
+            struct timeval timeout;
+            timeout.tv_sec = hap_priv.cfg.recv_timeout;
+            timeout.tv_usec = 0;
+            if (setsockopt (fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout,
+                        sizeof(timeout)) < 0) {
+                 ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "setsockopt on pair verified socket failed for SO_RCVTIMEO");
+            }
+
+            timeout.tv_sec = hap_priv.cfg.send_timeout;
+            timeout.tv_usec = 0;
+            if (setsockopt (fd, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout,
+                        sizeof(timeout)) < 0) {
+                 ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "setsockopt on pair verified socket failed for SO_SNDTIMEO");
+            }
+            hap_platform_httpd_set_sess_ctx(req, ctx, hap_free_session, true);
+            httpd_sess_set_send_override(hap_priv.server, fd, hap_httpd_send);
+            httpd_sess_set_recv_override(hap_priv.server, fd, hap_httpd_recv);
+		}
+	}
+	return ret1;
+}
+
+static struct httpd_uri hap_pair_verify = {
+	.uri = "/pair-verify",
+    .method = HTTP_POST,
+    .handler = hap_http_pair_verify_handler,
+};
+
+static int hap_add_char_val_json(hap_char_format_t format, char *key,
+		hap_val_t *val, json_gen_str_t *jptr)
+{
+	switch (format) {
+		case HAP_CHAR_FORMAT_BOOL : {
+			json_gen_obj_set_bool(jptr, key, val->b);
+			break;
+		}
+		case HAP_CHAR_FORMAT_UINT8:
+		case HAP_CHAR_FORMAT_UINT16:
+		case HAP_CHAR_FORMAT_UINT32:
+		case HAP_CHAR_FORMAT_INT: {
+			json_gen_obj_set_int(jptr, key, val->i);
+			break;
+		}
+		case HAP_CHAR_FORMAT_FLOAT : {
+			json_gen_obj_set_float(jptr, key, val->f);
+			break;
+		}
+		case HAP_CHAR_FORMAT_STRING : {
+            if (val->s) {
+			    json_gen_obj_set_string(jptr, key, val->s);
+            } else {
+                json_gen_obj_set_null(jptr, key);
+            }
+			break;
+		}
+        case HAP_CHAR_FORMAT_DATA:
+        case HAP_CHAR_FORMAT_TLV8: {
+            if (val->d.buf) {
+                json_gen_obj_start_long_string(jptr, key, NULL);
+                uint8_t *buf = val->d.buf;
+                uint32_t buflen = val->d.buflen;
+                char tmp[100];
+                while (buflen) {
+                    int tmp_len = sizeof(tmp);
+                    if (buflen > 60) {
+                        esp_mfi_base64_encode((char *)buf, 60, tmp, tmp_len, &tmp_len);
+                        buflen -= 60;
+                        buf += 60;
+                    } else {
+                        esp_mfi_base64_encode((char *)buf, buflen, tmp, tmp_len, &tmp_len);
+                        buflen -= buflen;
+                    }
+                    tmp[tmp_len] = 0;
+                    json_gen_add_to_long_string(jptr, tmp);
+                }
+                json_gen_end_long_string(jptr);
+            } else {
+                json_gen_obj_set_null(jptr, key);
+            }
+            break;
+        }
+		default :
+			break;
+	}
+	return HAP_SUCCESS;
+}
+
+static int hap_add_char_format_json(__hap_char_t *hc, json_gen_str_t *jptr)
+{
+	switch (hc->format) {
+		case HAP_CHAR_FORMAT_UINT8:
+			return json_gen_obj_set_string(jptr, "format", "uint8");
+		case HAP_CHAR_FORMAT_UINT16:
+			return json_gen_obj_set_string(jptr, "format", "uint16");
+		case HAP_CHAR_FORMAT_UINT32:
+			return json_gen_obj_set_string(jptr, "format", "uint32");
+		case HAP_CHAR_FORMAT_INT:
+			return json_gen_obj_set_string(jptr, "format", "int");
+		case HAP_CHAR_FORMAT_BOOL:
+			return json_gen_obj_set_string(jptr, "format", "bool");
+		case HAP_CHAR_FORMAT_STRING:
+			return json_gen_obj_set_string(jptr, "format", "string");
+		case HAP_CHAR_FORMAT_FLOAT:
+			return json_gen_obj_set_string(jptr, "format", "float");
+		case HAP_CHAR_FORMAT_DATA:
+			return json_gen_obj_set_string(jptr, "format", "data");
+		case HAP_CHAR_FORMAT_TLV8:
+			return json_gen_obj_set_string(jptr, "format", "tlv8");
+		default:
+			break;
+	}
+	return HAP_SUCCESS;
+}
+
+static int hap_add_char_type(__hap_char_t *hc, json_gen_str_t *jptr)
+{
+	return json_gen_obj_set_string(jptr, "type", (char *)hc->type_uuid);
+}
+
+static int hap_add_char_meta(__hap_char_t *hc, json_gen_str_t *jptr)
+{
+	hap_add_char_format_json(hc, jptr);
+
+	if (hc->constraint_flags & HAP_CHAR_MIN_FLAG)
+		hap_add_char_val_json(hc->format, "minValue", &hc->min, jptr);
+	if (hc->constraint_flags & HAP_CHAR_MAX_FLAG)
+		hap_add_char_val_json(hc->format, "maxValue", &hc->max, jptr);
+	if (hc->constraint_flags & HAP_CHAR_STEP_FLAG)
+		hap_add_char_val_json(hc->format, "minStep", &hc->step, jptr);
+
+	/* maxLen and maxDataLen are constraints for "string" and "data" format
+	 * of characteristics, respectively. However, the constraints themselves
+	 * are integers. So, we pass the format as HAP_CHAR_FORMAT_INT
+	 */
+	if (hc->constraint_flags & HAP_CHAR_MAXLEN_FLAG)
+		hap_add_char_val_json(HAP_CHAR_FORMAT_INT, "maxLen", &hc->max, jptr);
+	if (hc->constraint_flags & HAP_CHAR_MAXDATALEN_FLAG)
+		hap_add_char_val_json(HAP_CHAR_FORMAT_INT, "maxDataLen", &hc->max, jptr);
+
+	if (hc->description)
+		json_gen_obj_set_string(jptr, "description", hc->description);
+	if (hc->unit)
+		json_gen_obj_set_string(jptr, "unit", hc->unit);
+
+	return HAP_SUCCESS;
+}
+
+static int hap_add_char_perms(__hap_char_t *hc, json_gen_str_t *jptr)
+{
+	json_gen_push_array(jptr, "perms");
+	if (hc->permission & HAP_CHAR_PERM_PR)
+		json_gen_arr_set_string(jptr, "pr");
+	if (hc->permission & HAP_CHAR_PERM_PW)
+		json_gen_arr_set_string(jptr, "pw");
+	if (hc->permission & HAP_CHAR_PERM_EV)
+		json_gen_arr_set_string(jptr, "ev");
+	if (hc->permission & HAP_CHAR_PERM_AA)
+		json_gen_arr_set_string(jptr, "aa");
+	if (hc->permission & HAP_CHAR_PERM_TW)
+		json_gen_arr_set_string(jptr, "tw");
+	if (hc->permission & HAP_CHAR_PERM_HD)
+		json_gen_arr_set_string(jptr, "hd");
+	json_gen_pop_array(jptr);
+	return HAP_SUCCESS;
+}
+
+static int hap_add_char_ev(__hap_char_t *hc, json_gen_str_t *jptr, uint8_t session_index)
+{
+    if (hap_char_is_ctrl_subscribed((hap_char_t *)hc, session_index)) {
+        return json_gen_obj_set_bool(jptr, "ev", true);
+    } else {
+	    return json_gen_obj_set_bool(jptr, "ev", false);
+    }
+}
+
+static int hap_add_char_valid_vals(__hap_char_t *hc, json_gen_str_t *jptr)
+{
+    if (hc->valid_vals) {
+        json_gen_push_array(jptr, "valid-values");
+        int i;
+        for (i = 0; i < hc->valid_vals_cnt; i++) {
+            json_gen_arr_set_int(jptr, hc->valid_vals[i]);
+        }
+        json_gen_pop_array(jptr);
+    }
+    if (hc->valid_vals_range) {
+        json_gen_push_array(jptr, "valid-values-range");
+        json_gen_arr_set_int(jptr, hc->valid_vals_range[0]);
+        json_gen_arr_set_int(jptr, hc->valid_vals_range[1]);
+        json_gen_pop_array(jptr);
+    }
+    return HAP_SUCCESS;
+}
+
+static int hap_prepare_char_db(__hap_char_t *hc, json_gen_str_t *jptr, int session_index)
+{
+	json_gen_start_object(jptr);
+
+	json_gen_obj_set_int(jptr, "iid", hc->iid);
+
+    /* If the Update API has not been called from the service read routine,
+     * reset the owner controller value.
+     * Else, the controller will  miss the next notification.
+     */
+    if (!hc->update_called)   {
+        hc->owner_ctrl = 0;
+    }
+    hc->update_called = false;
+
+	if (hc->permission & HAP_CHAR_PERM_PR) {
+        if (hc->permission & HAP_CHAR_PERM_SPECIAL_READ) {
+            json_gen_obj_set_null(jptr, "value");
+        } else {
+            hap_add_char_val_json(hc->format, "value", &hc->val, jptr);
+        }
+	}
+	hap_add_char_type(hc, jptr);
+	hap_add_char_perms(hc, jptr);
+	hap_add_char_ev(hc, jptr, session_index);
+	hap_add_char_meta(hc, jptr);
+    hap_add_char_valid_vals(hc, jptr);
+
+	json_gen_end_object(jptr);
+
+	return HAP_SUCCESS;
+}
+
+static int hap_prepare_serv_db(__hap_serv_t *hs, json_gen_str_t *jptr, int session_index)
+{
+	json_gen_start_object(jptr);
+	json_gen_obj_set_int(jptr, "iid", hs->iid);
+	json_gen_obj_set_string(jptr, "type", hs->type_uuid);
+	if (hs->hidden)
+		json_gen_obj_set_bool(jptr, "hidden", "true");
+	if (hs->primary)
+		json_gen_obj_set_bool(jptr, "primary", "true");
+    if (hs->linked_servs) {
+        hap_linked_serv_t *linked = hs->linked_servs;
+        json_gen_push_array(jptr, "linked");
+        while (linked) {
+            json_gen_arr_set_int(jptr, ((__hap_serv_t *)linked->hs)->iid);
+            linked = linked->next;
+        }
+        json_gen_pop_array(jptr);
+    }
+
+	json_gen_push_array(jptr, "characteristics");
+    int char_cnt = 0;
+	hap_char_t *hc;
+    for (hc = hap_serv_get_first_char((hap_serv_t *)hs); hc; hc = hap_char_get_next(hc)) {
+        if (((__hap_char_t *)hc)->permission & HAP_CHAR_PERM_PR) {
+            char_cnt++;
+        }
+    }
+    if (char_cnt) {
+        hap_read_data_t *read_arr = hap_platform_memory_calloc(char_cnt, sizeof(hap_read_data_t));
+        if (!read_arr) {
+            return HAP_FAIL;
+        }
+
+        hap_status_t *status_codes = hap_platform_memory_calloc(char_cnt, sizeof(hap_status_t));
+        if (!status_codes) {
+            hap_platform_memory_free(read_arr);
+            return HAP_FAIL;
+        }
+
+        /* Create an array of characteristics to read, and then read them in one go */
+        char_cnt = 0;
+        for (hc = hap_serv_get_first_char((hap_serv_t *)hs); hc; hc = hap_char_get_next(hc)) {
+            if (((__hap_char_t *)hc)->permission & HAP_CHAR_PERM_PR) {
+                hap_char_set_owner_ctrl(hc, session_index);
+                ((__hap_char_t *)hc)->update_called = false;
+                read_arr[char_cnt].hc = hc;
+                status_codes[char_cnt] = HAP_STATUS_SUCCESS;
+                read_arr[char_cnt].status = &status_codes[char_cnt];
+                char_cnt++;
+            }
+        }
+
+        hs->bulk_read(&read_arr[0], char_cnt, hs->priv, NULL);
+        hap_platform_memory_free(read_arr);
+        hap_platform_memory_free(status_codes);
+    }
+    for (hc = hap_serv_get_first_char((hap_serv_t *)hs); hc; hc = hap_char_get_next(hc)) {
+		hap_prepare_char_db((__hap_char_t *)hc, jptr, session_index);
+	}
+
+	json_gen_pop_array(jptr);
+	json_gen_end_object(jptr);
+	return HAP_SUCCESS;
+}
+
+static int hap_prepare_acc_db(__hap_acc_t *ha, json_gen_str_t *jptr, int session_index)
+{
+	json_gen_start_object(jptr);
+	json_gen_obj_set_int(jptr, "aid", ha->aid);
+	json_gen_push_array(jptr, "services");
+	hap_serv_t *hs;
+	for (hs = hap_acc_get_first_serv((hap_acc_t *)ha); hs; hs = hap_serv_get_next(hs)) {
+		hap_prepare_serv_db((__hap_serv_t *)hs, jptr, session_index);
+	}
+	json_gen_pop_array(jptr);
+	json_gen_end_object(jptr);
+	return HAP_SUCCESS;
+}
+
+static int hap_prepare_json_database(char *buf, int bufsize, json_gen_flush_cb_t flush_cb, httpd_req_t *req)
+{
+    if (!req) {
+        return HAP_FAIL;
+    }
+    hap_secure_session_t *session = (hap_secure_session_t *)hap_platform_httpd_get_sess_ctx(req);
+    if (!session) {
+        return HAP_FAIL;
+    }
+	json_gen_str_t jstr;
+	json_gen_str_start(&jstr, buf, bufsize, flush_cb, req);
+	json_gen_start_object(&jstr);
+	json_gen_push_array(&jstr, "accessories");
+	hap_acc_t *ha;
+	for (ha = hap_get_first_acc(); ha; ha = hap_acc_get_next(ha)) {
+		hap_prepare_acc_db((__hap_acc_t *)ha, &jstr, hap_get_ctrl_session_index(session));
+	}
+	json_gen_pop_array(&jstr);
+	json_gen_end_object(&jstr);
+	json_gen_str_end(&jstr);
+	return HAP_SUCCESS;
+}
+
+static void hap_http_json_flush_chunk(char *data, void *priv)
+{
+    ESP_MFI_DEBUG_PLAIN("%s", data);
+	httpd_resp_send_chunk((httpd_req_t *)priv, data, strlen(data));
+}
+
+static int hap_http_get_accessories(httpd_req_t *req)
+{
+	char buf[1000];
+    ESP_MFI_DEBUG_PLAIN("Socket fd: %d; HTTP Request %s %s\n", httpd_req_to_sockfd(req), hap_platform_httpd_get_req_method(req), hap_platform_httpd_get_req_uri(req));
+    hap_secure_session_t *session = (hap_secure_session_t *)hap_platform_httpd_get_sess_ctx(req);
+    if (!hap_is_req_secure(session)) {
+        return hap_http_session_not_authorized(req);
+    }
+	httpd_resp_set_type(req, "application/hap+json");
+    ESP_MFI_DEBUG_PLAIN("Generating HTTP Response\n");
+    /* Using chunked encoding since the response can be large, especially for bridges */
+	hap_prepare_json_database(buf, sizeof(buf), hap_http_json_flush_chunk, req);
+    /* This indicates the last chunk */
+    httpd_resp_send_chunk(req, NULL, 0);
+    ESP_MFI_DEBUG_PLAIN("\n");
+
+    hap_report_event(HAP_EVENT_GET_ACC_COMPLETED, NULL, 0);
+	return HAP_SUCCESS;
+}
+static struct httpd_uri hap_accessories = {
+	.uri = "/accessories",
+    .method = HTTP_GET,
+    .handler = hap_http_get_accessories,
+};
+
+static void hap_set_char_report_status(bool *include_status, json_gen_str_t *jstr,
+		int aid, int iid, int status)
+{
+	if (!*include_status) {
+		json_gen_start_object(jstr);
+		json_gen_push_array(jstr, "characteristics");
+		*include_status = true;
+	}
+	json_gen_start_object(jstr);
+	json_gen_obj_set_int(jstr, "aid", aid);
+	json_gen_obj_set_int(jstr, "iid", iid);
+	json_gen_obj_set_int(jstr, "status", status);
+	json_gen_end_object(jstr);
+}
+
+static int hap_http_handle_set_char(jparse_ctx_t *jctx, char *outbuf, int buf_size,
+		httpd_req_t *req)
+{
+	int cnt = 0, char_cnt = 0, i;
+	bool include_status = false;
+    uint64_t pid;
+    bool valid_tw = false;
+    bool req_tw = false;
+	hap_secure_session_t *session = (hap_secure_session_t *)hap_platform_httpd_get_sess_ctx(req);
+    if (!session)
+        return HAP_FAIL;
+
+    int64_t cur_time = esp_timer_get_time() / 1000;
+    int64_t prepare_time = session->prepare_time;
+    if (prepare_time) {
+        /* If prepare time is non zero, it means that a prepare was received
+         * before this request, and so this write needs to be timed write
+         */
+        req_tw = true;
+        /* Reset prepare_time to 0, since a prepare is valid only for the immediate
+         * following write
+         */
+        session->prepare_time = 0;
+    }
+    if (json_obj_get_int64(jctx, "pid", (int64_t *)&pid) == OS_SUCCESS) {
+        /* If the pid value is present, this must be a timed write.
+         * However, if there was no preceding prepare, the check below will
+         * fail (as ttl will be 0) and appropriate error will be reported subsequently
+         */
+        req_tw = true;
+        if ((pid == session->pid) && ((cur_time - prepare_time) <= session->ttl)) {
+            valid_tw = true;
+        }
+    }
+    /* Resetting the values so that the session is ready for next prepare or write */
+    session->pid = 0;
+    session->ttl = 0;
+
+	json_obj_get_array(jctx, "characteristics", &cnt);
+	if (cnt <= 0)
+		return HAP_FAIL;
+
+    hap_write_data_t *write_arr = hap_platform_memory_calloc(cnt, sizeof(hap_write_data_t));
+	hap_status_t *status_arr = hap_platform_memory_calloc(cnt, sizeof(hap_status_t));
+	if (!write_arr || !status_arr)
+		goto set_char_end;
+
+	json_gen_str_t jstr;
+	json_gen_str_start(&jstr, outbuf, buf_size, hap_http_json_flush_chunk, req);
+    /* Dummy get, so that the loop can start by leaving the previous
+     * object and getting newer one
+     */
+    json_arr_get_object(jctx, 0);
+	/* Loop through all characteristic objects {aid,iid,value}, handle
+	 * errors if any, and if there are no errors, put the characteristic
+	 * pointer and value in an array (with char_cnt)
+	 */
+	for (i = 0; i < cnt; i++) {
+        /* Leave the previous object and get a newer one from the array */
+        json_arr_leave_object(jctx);
+		int aid = 0, iid = 0;
+		json_arr_get_object(jctx, i);
+		json_obj_get_int(jctx, "aid", &aid);
+		json_obj_get_int(jctx, "iid", &iid);
+		hap_acc_t *ha = hap_acc_get_by_aid(aid);
+		__hap_char_t *hc = (__hap_char_t *)hap_acc_get_char_by_iid(ha, iid);
+		if (!ha || !hc) {
+			hap_set_char_report_status(&include_status, &jstr,
+					aid, iid, HAP_STATUS_RES_ABSENT);
+			continue;
+		}
+
+        /* If the previous request was a prepare, but the current
+         * one was not a valid timed write, report error.
+         */
+        if (req_tw == true && valid_tw == false) {
+            hap_set_char_report_status(&include_status, &jstr,
+                    aid, iid, HAP_STATUS_VAL_INVALID);
+            continue;
+        }
+
+        /* For characteristic that require a Mandatory Timed Write, return
+         * error if this write is not a valid timed write
+         */
+        if (hc->permission & HAP_CHAR_PERM_TW) {
+            if (valid_tw == false) {
+                hap_set_char_report_status(&include_status, &jstr,
+                        aid, iid, HAP_STATUS_VAL_INVALID);
+                continue;
+            }
+        }
+
+        /* Check if this write is just to enable/disable event notifications.
+         * This is valid even for read-only characteristics that support event
+         * notifications (like sensor readings), so we do not check the HAP_CHAR_PERM_PW
+         * here.
+         */
+		bool ev;
+		if (json_obj_get_bool(jctx, "ev", &ev) == HAP_SUCCESS) {
+            if (hc->permission & HAP_CHAR_PERM_EV) {
+                int index = hap_get_ctrl_session_index(session);
+                hap_char_manage_notification((hap_char_t *)hc, index, ev);
+                ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Events %s for aid=%d iid=%d",
+                        ev ? "Enabled" : "Disabled", aid, iid);
+            } else {
+				hap_set_char_report_status(&include_status, &jstr,
+						aid, iid, HAP_STATUS_NO_NOTIF);
+			}
+			continue;
+		}
+
+        /* Check if the characteristic has write permission */
+		if (!(hc->permission & HAP_CHAR_PERM_PW)) {
+			hap_set_char_report_status(&include_status, &jstr,
+					aid, iid, HAP_STATUS_WR_ON_RDONLY);
+			continue;
+		}
+
+        /* Check if the characteristic needs Authorization Data.
+         * Actual authData value will be read later.
+         */
+        if (hc->permission & HAP_CHAR_PERM_AA) {
+            int tmp_len;
+            if (json_obj_get_strlen(jctx, "authData", &tmp_len) != HAP_SUCCESS) {
+			hap_set_char_report_status(&include_status, &jstr,
+					aid, iid, HAP_STATUS_INSUFFICIENT_AUTH);
+			continue;
+            }
+        }
+        /* If there is no write routine registered, there is no point of having
+         * this write request. Return an error.
+         */
+		if (!((__hap_serv_t *)(hap_char_get_parent((hap_char_t *)hc)))->write_cb) {
+			hap_set_char_report_status(&include_status, &jstr,
+					aid, iid, HAP_STATUS_VAL_INVALID);
+			continue;
+		}
+
+        hap_auth_data_t auth_data = {
+            .data = NULL,
+            .len = 0,
+        };
+		hap_val_t val;
+		int json_ret = HAP_FAIL;
+		switch (hc->format) {
+			case HAP_CHAR_FORMAT_BOOL:
+				json_ret = json_obj_get_bool(jctx, "value", &val.b);
+				break;
+			case HAP_CHAR_FORMAT_UINT8:
+			case HAP_CHAR_FORMAT_UINT16:
+			case HAP_CHAR_FORMAT_UINT32:
+			case HAP_CHAR_FORMAT_INT:
+				json_ret = json_obj_get_int(jctx, "value", &val.i);
+				break;
+			case HAP_CHAR_FORMAT_FLOAT:
+				json_ret = json_obj_get_float(jctx, "value", &val.f);
+				break;
+			case HAP_CHAR_FORMAT_STRING: {
+				int str_len = 0;
+				json_ret = json_obj_get_strlen(jctx, "value", &str_len);
+				if (json_ret == HAP_SUCCESS) {
+                    /* Increment string length, for NULL termination byte */
+                    str_len++;
+                    val.s = hap_platform_memory_calloc(str_len, 1);
+                    if (!val.s) {
+                        hap_set_char_report_status(&include_status, &jstr,
+                                aid, iid, HAP_STATUS_OO_RES);
+                        continue;
+                    }
+                    json_obj_get_string(jctx, "value", val.s, str_len);
+				}
+				break;
+			}
+            case HAP_CHAR_FORMAT_DATA:
+            case HAP_CHAR_FORMAT_TLV8: {
+				int str_len = 0;
+				json_ret = json_obj_get_strlen(jctx, "value", &str_len);
+				if (json_ret == HAP_SUCCESS) {
+					val.d.buf = hap_platform_memory_calloc(1, str_len + 1);
+                    if (!val.d.buf) {
+                        hap_set_char_report_status(&include_status, &jstr,
+                                aid, iid, HAP_STATUS_OO_RES);
+                        continue;
+                    }
+                    val.d.buflen = str_len + 1;
+					json_obj_get_string(jctx, "value", (char *)val.d.buf, val.d.buflen);
+                    if (esp_mfi_base64_decode((const char *)val.d.buf, strlen((char *)val.d.buf),
+                                (char *)val.d.buf, val.d.buflen, (int *)&val.d.buflen) != 0) {
+                        hap_platform_memory_free(val.d.buf);
+                        hap_set_char_report_status(&include_status, &jstr,
+                                aid, iid, HAP_STATUS_VAL_INVALID);
+                        continue;
+                    }
+				}
+				break;
+			}
+			default:
+				json_ret = HAP_FAIL;
+		}
+		if (json_ret != HAP_SUCCESS) {
+			hap_set_char_report_status(&include_status, &jstr,
+					aid, iid, HAP_STATUS_VAL_INVALID);
+			continue;
+		}
+
+        /* Check if the value is within constraints */
+        if (hap_char_check_val_constraints(hc, &val) != HAP_SUCCESS) {
+			hap_set_char_report_status(&include_status, &jstr,
+					aid, iid, HAP_STATUS_VAL_INVALID);
+			continue;
+        }
+
+        if (json_obj_get_strlen(jctx, "authData", &auth_data.len) == HAP_SUCCESS) {
+            auth_data.data = hap_platform_memory_calloc(1, auth_data.len + 1);
+            json_obj_get_string(jctx, "authData", (char *)auth_data.data, auth_data.len + 1);
+            esp_mfi_base64_decode((const char *)auth_data.data, auth_data.len, (char *)auth_data.data, auth_data.len + 1, &auth_data.len);
+        }
+        bool remote = false;
+        json_obj_get_bool(jctx, "remote", &remote);
+
+        int index = hap_get_ctrl_session_index(session);
+        hap_char_set_owner_ctrl((hap_char_t *)hc, index);
+		/* No errors in the object data itself. Save the characteristic
+		 * pointer and value, to be used later
+		 */
+		write_arr[char_cnt].hc = (hap_char_t *)hc;
+		write_arr[char_cnt].val = val;
+        write_arr[char_cnt].auth_data = auth_data;
+        write_arr[char_cnt].remote = remote;
+        write_arr[char_cnt].status = &status_arr[char_cnt];
+		char_cnt++;
+	}
+	if (!char_cnt)
+		goto set_char_end;
+
+	/* The logic here is to loop through all the saved characteristic
+	 * pointers, and invoke a single write callback for all consecutive
+	 * characteristics of the same service.
+	 * The write callback will be invoked if the service changes or
+	 * if the last characteristic in the array is reached
+	 */
+	int hs_index = 0;
+	bool write_err = false;
+	__hap_serv_t *hs = (__hap_serv_t *)hap_char_get_parent(write_arr[0].hc);
+	/* The counter here will go till char_cnt instead of char_cnt - 1.
+	 * When i == char_cnt, it will mean that all elements in the array
+	 * have been looped through.
+	 * So, last iteration will invoke the write callback for the last
+	 * set of characteritics.
+	 */
+	for (i = 0; i <= char_cnt; i++) {
+		if ((i < char_cnt) && ((hap_serv_t *)hs == hap_char_get_parent(write_arr[i].hc)))
+			continue;
+		else {
+			/* Passing the pointers to the first elements of the array
+			 * for a given service (indicated by hs_index).
+			 * Number of elements of the array are indicated by
+			 * i - hs_index
+			 */
+			if (hs->write_cb(&write_arr[hs_index], i - hs_index,
+					hs->priv, hap_platform_httpd_get_sess_ctx(req)) != HAP_SUCCESS)
+				write_err = true;
+			if (i < char_cnt) {
+				hs = (__hap_serv_t *)hap_char_get_parent(write_arr[i].hc);
+				hs_index = i;
+			}
+		}
+	}
+	if (write_err || include_status) {
+		for (i = 0; i < char_cnt; i++) {
+            /* TODO: The code to get aid looks complex. Simplify */
+			hap_set_char_report_status(&include_status, &jstr,
+				((__hap_acc_t *)hap_serv_get_parent(hap_char_get_parent(write_arr[i].hc)))->aid,
+				((__hap_char_t *)(write_arr[i].hc))->iid, *write_arr[i].status);
+		}
+	}
+
+	int ret = HAP_SUCCESS;
+set_char_end:
+	if (include_status) {
+		json_gen_pop_array(&jstr);
+		json_gen_end_object(&jstr);
+		json_gen_str_end(&jstr);
+		ret = HAP_FAIL;
+	}
+
+	if (write_arr) {
+		for (i = 0; i < char_cnt; i++) {
+			if (((__hap_char_t *)write_arr[i].hc)->format == HAP_CHAR_FORMAT_STRING) {
+				if (write_arr[i].val.s) {
+                    hap_platform_memory_free(write_arr[i].val.s);
+                }
+			} else if ((((__hap_char_t *)write_arr[i].hc)->format == HAP_CHAR_FORMAT_DATA) ||
+                    (((__hap_char_t *)write_arr[i].hc)->format == HAP_CHAR_FORMAT_TLV8)) {
+                    hap_platform_memory_free(write_arr[i].val.d.buf);
+            }
+            if (write_arr[i].auth_data.data) {
+                hap_platform_memory_free(write_arr[i].auth_data.data);
+            }
+		}
+	}
+	if (write_arr)
+		hap_platform_memory_free(write_arr);
+	if (status_arr)
+		hap_platform_memory_free(status_arr);
+	return ret;
+}
+
+static int hap_http_put_characteristics(httpd_req_t *req)
+{
+    char stack_inbuf[512] = {0};
+    char outbuf[512] = {0};
+    char *heap_inbuf = NULL;
+    char *inbuf = stack_inbuf;
+
+    ESP_MFI_DEBUG_PLAIN("Socket fd: %d; HTTP Request %s %s\n", httpd_req_to_sockfd(req), hap_platform_httpd_get_req_method(req), hap_platform_httpd_get_req_uri(req));
+    hap_secure_session_t *session = (hap_secure_session_t *)hap_platform_httpd_get_sess_ctx(req);
+    if (!hap_is_req_secure(session)) {
+        return hap_http_session_not_authorized(req);
+    }
+
+    /* If received content is larger than the buffer on stack, allocate one from heap.
+     * This will mostly be required only in case of bridges, wherein there could be a request to
+     * control all/many accessories at once.
+     */
+    int content_len = hap_platform_httpd_get_content_len(req);
+    if (content_len > sizeof(stack_inbuf)) {
+        heap_inbuf = hap_platform_memory_calloc(content_len + 1, 1); /* Allocating an extra byte for NULL termination */
+        if (!heap_inbuf) {
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Failed to read HTTPD Data");
+            httpd_resp_set_status(req, HTTPD_500);
+            return httpd_resp_send(req, NULL, 0);
+        }
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Allocated buffer of size %d for the large PUT",
+                    content_len + 1)
+        inbuf = heap_inbuf;
+    }
+	int data_len = hap_httpd_get_data(req, inbuf, content_len);
+	if (data_len < 0) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Failed to read HTTPD Data");
+		httpd_resp_set_status(req, HTTPD_500);
+        if (heap_inbuf) {
+            hap_platform_memory_free(heap_inbuf);
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Freed allocated buffer for PUT");
+        }
+		return httpd_resp_send(req, NULL, 0);
+	}
+    ESP_MFI_DEBUG_PLAIN("Data Received: %s\n", inbuf);
+	jparse_ctx_t jctx;
+	if (json_parse_start(&jctx, inbuf, data_len) != HAP_SUCCESS) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Failed to parse HTTPD JSON Data");
+		httpd_resp_set_status(req, HTTPD_500);
+        if (heap_inbuf) {
+            hap_platform_memory_free(heap_inbuf);
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Freed allocated buffer for PUT");
+        }
+		return httpd_resp_send(req, NULL, 0);
+	}
+
+	httpd_resp_set_type(req, "application/hap+json");
+	/* Setting response type to indicate error.
+	 * This will be actually sent out only if there is some error
+	 * to be reported while handling the characteristic writes.
+	 * Else, the response type will be set to 204
+	 */
+	httpd_resp_set_status(req, HTTPD_207);
+	if (hap_http_handle_set_char(&jctx, outbuf, sizeof(outbuf), req) == HAP_SUCCESS)
+	{
+		snprintf(outbuf, sizeof(outbuf), "HTTP/1.1 %s\r\n\r\n", HTTPD_204);
+		httpd_send(req, outbuf, strlen(outbuf));
+	} else {
+        /* If a failure was encountered, it would mean that a response has been generated,
+         * which will be chunk encoded. So, sending the last chunk here and also printing
+         * a new line to end the prints of the error string.
+         */
+        httpd_resp_send_chunk(req, NULL, 0);
+        ESP_MFI_DEBUG_PLAIN("\n");
+    }
+    json_parse_end(&jctx);
+
+    if (heap_inbuf) {
+        hap_platform_memory_free(heap_inbuf);
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Freed allocated buffer for PUT");
+    }
+
+    hap_report_event(HAP_EVENT_SET_CHAR_COMPLETED, NULL, 0);
+    return HAP_SUCCESS;
+}
+
+static bool hap_get_bool_url_param(char *query_str, char *key)
+{
+	char val[6]; /* Max string will be "false" */
+	if (httpd_query_key_value(query_str, key, val, sizeof(val)) == HAP_SUCCESS) {
+		if (!strcmp(val, "true") || !strcmp(val, "1"))
+			return true;
+	}
+	return false;
+}
+
+static int hap_http_get_characteristics(httpd_req_t *req)
+{
+    char outbuf[512];
+    char stack_val_buf[512] = {0};
+    char *heap_val_buf = NULL;
+    char *val = stack_val_buf;
+
+    ESP_MFI_DEBUG_PLAIN("Socket fd: %d; HTTP Request %s %s\n", httpd_req_to_sockfd(req), hap_platform_httpd_get_req_method(req), hap_platform_httpd_get_req_uri(req));
+
+    hap_secure_session_t *session = (hap_secure_session_t *)hap_platform_httpd_get_sess_ctx(req);
+    if (!hap_is_req_secure(session)) {
+        return hap_http_session_not_authorized(req);
+    }
+    const char *uri = hap_platform_httpd_get_req_uri(req);
+    /* Allocate on heap, if URI is longer */
+    if (strlen(uri) > sizeof(stack_val_buf)) {
+        heap_val_buf = hap_platform_memory_calloc(strlen(uri) + 1, 1); /* Allocating an extra byte for NULL termination */
+        if (!heap_val_buf) {
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Failed to read URL");
+            httpd_resp_set_status(req, HTTPD_500);
+            return httpd_resp_send(req, NULL, 0);
+        }
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Allocated buffer of size %d for the large GET",
+                    strlen(uri) + 1)
+        val = heap_val_buf;
+    }
+    size_t url_query_str_len = httpd_req_get_url_query_len(req);
+    char * url_query_str = hap_platform_memory_calloc(1, url_query_str_len + 1);
+    if (!url_query_str) {
+		httpd_resp_set_status(req, HTTPD_400);
+		httpd_resp_set_type(req, "application/hap+json");
+		snprintf(outbuf, sizeof(outbuf),"{\"status\":-70409}");
+		httpd_resp_send(req, outbuf, strlen(outbuf));
+        goto get_char_return;
+    }
+    httpd_req_get_url_query_str(req, url_query_str, url_query_str_len + 1);
+	/* Check for all the optional URL query paramaters */
+	bool meta = hap_get_bool_url_param(url_query_str, "meta");
+	bool perms = hap_get_bool_url_param(url_query_str, "perms");
+	bool type = hap_get_bool_url_param(url_query_str, "type");
+	bool ev = hap_get_bool_url_param(url_query_str, "ev");
+
+	/* Check for the mandatory "id" URL query parameter.
+	 * If not found, return success
+	 */
+	if (httpd_query_key_value(url_query_str, "id", val, strlen(uri) + 1) != HAP_SUCCESS) {
+		httpd_resp_set_status(req, HTTPD_400);
+		httpd_resp_set_type(req, "application/hap+json");
+		snprintf(outbuf, sizeof(outbuf),"{\"status\":-70409}");
+		httpd_resp_send(req, outbuf, strlen(outbuf));
+        goto get_char_return;
+    }
+
+	/* Get the total count of characteristics in the request. This will be
+	 * required to decide the size of the characteristic pointers' array
+	 */
+	int char_cnt = 0;
+	char *val_ptr = val;
+	/* We do not do any error checking here and just assume that the id
+	 * tag has a characteristic list which is a comma separated list
+	 * of <aid>.<iid> elements
+	 */
+	char *p = strsep(&val_ptr, ",");
+	while (p) {
+		char_cnt++;
+		p = strsep(&val_ptr, ",");
+	}
+
+	/* Normally, it would have been fine to just go on parsing the
+	 * characteristics in the URL, fetch their values and prepare
+	 * the response. However, if there is error for any characteristic
+	 * a "status" field needs to be added for all characteristics.
+	 *
+	 * So, it is better to maintain a list of characteristics pointers,
+	 * read all the values, and only then create the response
+	 */
+	hap_read_data_t *read_arr = hap_platform_memory_calloc(char_cnt, sizeof(hap_read_data_t));
+    if (!read_arr) {
+		httpd_resp_set_status(req, HTTPD_500);
+		httpd_resp_set_type(req, "application/hap+json");
+		snprintf(outbuf, sizeof(outbuf),"{\"status\":-70407}");
+		httpd_resp_send(req, outbuf, strlen(outbuf));
+        goto get_char_return;
+    }
+    hap_status_t *status_codes = hap_platform_memory_calloc(char_cnt, sizeof(hap_status_t));
+    if (!status_codes) {
+        hap_platform_memory_free(read_arr);
+		httpd_resp_set_status(req, HTTPD_500);
+		httpd_resp_set_type(req, "application/hap+json");
+		snprintf(outbuf, sizeof(outbuf),"{\"status\":-70407}");
+		httpd_resp_send(req, outbuf, strlen(outbuf));
+        goto get_char_return;
+    }
+
+    ESP_MFI_DEBUG_PLAIN("Generating HTTP Response\n");
+	/* Generate the JSON response */
+	bool include_status = 0;
+	httpd_resp_set_status(req, HTTPD_207);
+	httpd_resp_set_type(req, "application/hap+json");
+	json_gen_str_t jstr;
+	json_gen_str_start(&jstr, outbuf, sizeof(outbuf), hap_http_json_flush_chunk, req);
+
+	/* Get the ids once again. Not checking for success since that
+	 * would be redundant
+	 */
+	httpd_query_key_value(url_query_str, "id", val, strlen(uri) + 1);
+    char_cnt = 0;
+	int aid, iid;
+	val_ptr = val;
+	/* Parse the AIDs and IIDs in the "id" field and fetch the
+	 * characteristic pointer for each
+	 */
+	p = strsep(&val_ptr, ".");
+	while (p) {
+		aid = atoi(p);
+		p = strsep(&val_ptr, ",");
+		iid = atoi(p);
+		p = strsep(&val_ptr, ".");
+		hap_char_t *hc = hap_acc_get_char_by_iid(hap_acc_get_by_aid(aid), iid);
+		if (!hc) {
+			hap_set_char_report_status(&include_status, &jstr,
+					aid, iid, HAP_STATUS_RES_ABSENT);
+			continue;
+		}
+		if (!(((__hap_char_t *)hc)->permission & HAP_CHAR_PERM_PR)) {
+			hap_set_char_report_status(&include_status, &jstr,
+					aid, iid, HAP_STATUS_RD_ON_WRONLY);
+			continue;
+		}
+        hap_char_set_owner_ctrl(hc, hap_get_ctrl_session_index(session));
+        ((__hap_char_t *)hc)->update_called = false;
+        /* Add the characteristic to the read array */
+		read_arr[char_cnt].hc = hc;
+        status_codes[char_cnt] = HAP_STATUS_SUCCESS;
+        read_arr[char_cnt].status = &status_codes[char_cnt];
+		char_cnt++;
+	}
+
+    if (!char_cnt) {
+        goto get_char_end;
+    }
+
+
+	int hs_index = 0;
+	bool read_err = false;
+	__hap_serv_t *hs = (__hap_serv_t *)hap_char_get_parent(read_arr[0].hc);
+    /* Read all the values first, before preparing the response, so that it
+     * would be known in advance, if any read error is encountered
+     */
+    int i;
+	/* The counter here will go till char_cnt instead of char_cnt - 1.
+	 * When i == char_cnt, it will mean that all elements in the array
+	 * have been looped through.
+	 * So, last iteration will invoke the read callback for the last
+	 * set of characteritics.
+	 */
+	for (i = 0; i <= char_cnt; i++) {
+		if ((i < char_cnt) && ((hap_serv_t *)hs == hap_char_get_parent(read_arr[i].hc)))
+			continue;
+		else {
+			/* Passing the pointers to the first elements of the array
+			 * for a given service (indicated by hs_index).
+			 * Number of elements of the array are indicated by
+			 * i - hs_index
+			 */
+			if (hs->bulk_read(&read_arr[hs_index], i - hs_index, hs->priv, hap_platform_httpd_get_sess_ctx(req)) != HAP_SUCCESS)
+				read_err = true;
+			if (i < char_cnt) {
+				hs = (__hap_serv_t *)hap_char_get_parent(read_arr[i].hc);
+				hs_index = i;
+			}
+		}
+	}
+    if (!include_status) {
+        if (!read_err) {
+            /* If "include_status" is false, it means there
+             * were no errors.
+             * So, set response type to 200 OK
+             */
+            httpd_resp_set_status(req, HTTPD_200);
+        }
+        json_gen_start_object(&jstr);
+        json_gen_push_array(&jstr, "characteristics");
+    }
+	/* Loop through the characteristics and include their data
+	 */
+	for (i = 0; i < char_cnt; i++) {
+		__hap_char_t *hc = (__hap_char_t *)read_arr[i].hc;
+        /* If the Update API has not been called from the service read routine,
+         * reset the owner controller value.
+         * Else, the controller will  miss the next notification.
+         */
+        if (!hc->update_called) {
+            hc->owner_ctrl = 0;
+        }
+        hc->update_called = false;
+
+		json_gen_start_object(&jstr);
+		__hap_acc_t *ha = (__hap_acc_t *)hap_serv_get_parent(hc->parent);
+		json_gen_obj_set_int(&jstr, "aid", ha->aid);
+		json_gen_obj_set_int(&jstr, "iid", hc->iid);
+
+        if (hc->permission & HAP_CHAR_PERM_SPECIAL_READ) {
+            json_gen_obj_set_null(&jstr, "value");
+        } else {
+            /* Include "value" only if status is SUCCESS */
+            if (*read_arr[i].status == HAP_STATUS_SUCCESS) {
+                hap_add_char_val_json(hc->format, "value", &hc->val, &jstr);
+            }
+        }
+		/* Include status only if it was already included because of
+		 * some parsing errors, or if an error was encountered while
+         * actually reading the characteristics.
+		 */
+		if (include_status || read_err) {
+			json_gen_obj_set_int(&jstr, "status", *read_arr[i].status);
+		}
+		if (type)
+			hap_add_char_type(hc, &jstr);
+		if (perms)
+			hap_add_char_perms(hc, &jstr);
+		if (ev) {
+			hap_add_char_ev(hc, &jstr, hap_get_ctrl_session_index(session));
+        }
+		if (meta)
+			hap_add_char_meta(hc, &jstr);
+		json_gen_end_object(&jstr);
+	}
+get_char_end:
+	json_gen_pop_array(&jstr);
+	json_gen_end_object(&jstr);
+	json_gen_str_end(&jstr);
+
+	hap_platform_memory_free(read_arr);
+    hap_platform_memory_free(status_codes);
+
+    /* This indicates the last chunk */
+    httpd_resp_send_chunk(req, NULL, 0);
+    ESP_MFI_DEBUG_PLAIN("\n");
+get_char_return:
+    if (heap_val_buf) {
+        hap_platform_memory_free(heap_val_buf);
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Freed allocated buffer for GET");
+    }
+
+    if (url_query_str) {
+        hap_platform_memory_free(url_query_str);
+    }
+
+    hap_report_event(HAP_EVENT_GET_CHAR_COMPLETED, NULL, 0);
+	return HAP_SUCCESS;
+}
+static struct httpd_uri hap_characteristics_get = {
+	.uri = "/characteristics",
+    .method = HTTP_GET,
+    .handler = hap_http_get_characteristics,
+};
+static struct httpd_uri hap_characteristics_put = {
+	.uri = "/characteristics",
+    .method = HTTP_PUT,
+    .handler = hap_http_put_characteristics,
+};
+
+static int hap_http_pairings_handler(httpd_req_t *req)
+{
+	uint8_t buf[2048]; /* Large buffer to accommodate 16 pairings list */
+	void *ctx = hap_platform_httpd_get_sess_ctx(req);
+    ESP_MFI_DEBUG_PLAIN("Socket fd: %d; HTTP Request %s %s\n", httpd_req_to_sockfd(req), hap_platform_httpd_get_req_method(req), hap_platform_httpd_get_req_uri(req));
+	int data_len = httpd_req_recv(req, (char *)buf, sizeof(buf));
+	int outlen;
+    hap_secure_session_t *session = (hap_secure_session_t *)ctx;
+    if (!hap_is_req_secure(session)) {
+        /* Only setting the HTTP status here. Actual error TLV will be added
+         * by the hap_pairings_process() call
+         */
+        httpd_resp_set_status(req, "470 Connection Authorization Required");
+    }
+	hap_pairings_process(ctx, buf, data_len, sizeof(buf), &outlen);
+	httpd_resp_set_type(req, "application/pairing+tlv8");
+	return httpd_resp_send(req, (char *)buf, outlen);
+}
+static struct httpd_uri hap_pairings = {
+	.uri = "/pairings",
+    .method = HTTP_POST,
+    .handler = hap_http_pairings_handler,
+};
+
+static int hap_http_post_identify(httpd_req_t *req)
+{
+	char buf[100];
+    ESP_MFI_DEBUG_PLAIN("Socket fd: %d\nHTTP Request %s %s\n", httpd_req_to_sockfd(req), hap_platform_httpd_get_req_method(req), hap_platform_httpd_get_req_uri(req));
+	if (is_accessory_paired()) {
+		httpd_resp_set_status(req, HTTPD_400);
+		httpd_resp_set_type(req, "application/hap+json");
+		snprintf(buf, sizeof(buf),"{\"status\":-70401}");
+		httpd_resp_send(req, buf, strlen(buf));
+	} else {
+		hap_acc_t *ha = hap_get_first_acc();
+        __hap_acc_t *_ha = (__hap_acc_t *)ha;
+		_ha->identify_routine(ha);
+		snprintf(buf, sizeof(buf), "HTTP/1.1 %s\r\n\r\n", HTTPD_204);
+		httpd_send(req, buf, strlen(buf));
+	}
+	return HAP_SUCCESS;
+}
+
+static struct httpd_uri hap_identify = {
+	.uri = "/identify",
+    .method = HTTP_POST,
+    .handler = hap_http_post_identify,
+};
+
+static int hap_http_put_prepare(httpd_req_t *req)
+{
+    char buf[512] = {0};
+
+    ESP_MFI_DEBUG_PLAIN("Socket fd: %d; HTTP Request %s %s\n", httpd_req_to_sockfd(req), hap_platform_httpd_get_req_method(req), hap_platform_httpd_get_req_uri(req));
+    hap_secure_session_t *session = (hap_secure_session_t *)hap_platform_httpd_get_sess_ctx(req);
+    if (!hap_is_req_secure(session)) {
+        return hap_http_session_not_authorized(req);
+    }
+	int data_len = httpd_req_recv(req, (char *)buf, sizeof(buf));
+	if (data_len < 0) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Failed to read HTTPD Data");
+		httpd_resp_set_status(req, HTTPD_500);
+		return httpd_resp_send(req, NULL, 0);
+	}
+    ESP_MFI_DEBUG_PLAIN("Data Received: %s\n", buf);
+	jparse_ctx_t jctx;
+	if (json_parse_start(&jctx, buf, data_len) != HAP_SUCCESS) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Failed to parse HTTPD JSON Data");
+		httpd_resp_set_status(req, HTTPD_500);
+		return httpd_resp_send(req, NULL, 0);
+	}
+
+	httpd_resp_set_type(req, "application/hap+json");
+    uint64_t pid;
+    int64_t ttl;
+    if ((json_obj_get_int64(&jctx, "pid", (int64_t *)&pid) != OS_SUCCESS) ||
+        (json_obj_get_int64(&jctx, "ttl", &ttl) != OS_SUCCESS)) {
+		snprintf(buf, sizeof(buf),"{\"status\":-70410}");
+    } else {
+        session->pid = pid;
+        session->ttl = ttl;
+        session->prepare_time = esp_timer_get_time() / 1000; /* Set current time in msec */
+        snprintf(buf, sizeof(buf),"{\"status\":0}");
+    }
+    json_parse_end(&jctx);
+    httpd_resp_send(req, buf, strlen(buf));
+    return HAP_SUCCESS;
+}
+
+static struct httpd_uri hap_prepare = {
+	.uri = "/prepare",
+    .method = HTTP_PUT,
+    .handler = hap_http_put_prepare,
+};
+
+static void hap_send_notification(void *arg)
+{
+    int num_char = hap_priv.cfg.max_event_notif_chars;
+    hap_char_t *hc;
+    hap_char_t **char_arr = hap_platform_memory_calloc(num_char, sizeof(hap_char_t *));
+
+    if (!char_arr) {
+        return;
+    }
+
+    int i, num_notif_chars;
+    for (i = 0; i < num_char; i++) {
+        hc = hap_get_pending_notif_char();
+        if (hc) {
+            char_arr[i] = hc;
+        } else {
+            break;
+        }
+    }
+    /* If no characteristic notifications are pending, just exit */
+    if (i == 0) {
+        return;
+    }
+    num_notif_chars = i;
+	hap_secure_session_t *session;
+    /* Flag to indicate if any controller was connected */
+    bool ctrl_connected = false;
+	char buf[250];
+	for (i = 0; i < HAP_MAX_SESSIONS; i++) {
+		session = hap_priv.sessions[i];
+		if (!session)
+			continue;
+        ctrl_connected = true;
+		int fd = session->conn_identifier;
+#define HTTPD_HDR_STR      "EVENT/1.0 200 OK\r\n"                   \
+		"Content-Type: application/hap+json\r\n"           \
+		"Content-Length: %d\r\n"
+		char notif_json[1024];
+		json_gen_str_t jstr;
+		json_gen_str_start(&jstr, notif_json, sizeof(notif_json), NULL, NULL);
+		json_gen_start_object(&jstr);
+		json_gen_push_array(&jstr, "characteristics");
+
+        int j;
+        bool notif_to_send = false;
+        for (j = 0; j < num_notif_chars; j++) {
+            hc = char_arr[j];
+            __hap_char_t *_hc = ( __hap_char_t *)hc;
+            /* If the controller is the owner, dont send notification to it */
+            if (hap_char_is_ctrl_owner(hc, i)) {
+                /* Since there can be only one owner, which we are anyways skipping,
+                 * we can reset owner value to 0
+                 */
+                _hc->owner_ctrl = 0;
+                continue;
+            }
+            if (!hap_char_is_ctrl_subscribed(hc, i))
+                continue;
+
+            json_gen_start_object(&jstr);
+            hap_acc_t *ha = hap_serv_get_parent(hap_char_get_parent(hc));
+            int aid = ((__hap_acc_t *)ha)->aid;
+            json_gen_obj_set_int(&jstr, "aid", aid);
+            json_gen_obj_set_int(&jstr, "iid", _hc->iid);
+            hap_add_char_val_json(_hc->format, "value", &_hc->val, &jstr);
+            json_gen_end_object(&jstr);
+            notif_to_send = true;
+        }
+        if (!notif_to_send) {
+            /* No notification required for this controller. Just continue */
+            continue;
+        }
+
+        json_gen_pop_array(&jstr);
+		json_gen_end_object(&jstr);
+		json_gen_str_end(&jstr);
+
+		snprintf(buf, sizeof(buf), HTTPD_HDR_STR,
+				strlen(notif_json));
+		hap_httpd_send(hap_priv.server, fd, buf, strlen(buf), 0);
+		/* Space for sending additional headers based on set_header */
+		hap_httpd_send(hap_priv.server, fd, "\r\n", strlen("\r\n"), 0);
+		hap_httpd_send(hap_priv.server, fd, notif_json, strlen(notif_json), 0);
+        httpd_sess_update_lru_counter(hap_priv.server, fd);
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Notification Sent");
+        ESP_MFI_DEBUG_PLAIN("Socket fd: %d; Event message: %s\n", fd, notif_json);
+	}
+    /* If no controller was connected and no disconnected event was sent,
+     * reannaounce mDNS. That will increment state number as required
+     * by HAP Spec R15.
+     */
+    if (!ctrl_connected && !hap_priv.disconnected_event_sent) {
+        hap_mdns_announce(false);
+        hap_priv.disconnected_event_sent = true;
+    }
+    hap_platform_memory_free(char_arr);
+}
+
+void hap_http_debug_enable()
+{
+    http_debug = true;
+}
+
+void hap_http_debug_disable()
+{
+    http_debug = false;
+}
+
+void hap_http_send_notif()
+{
+	httpd_queue_work(hap_priv.server, hap_send_notification, NULL);
+}
+
+static bool hap_http_registered;
+int hap_register_http_handlers()
+{
+    if (!hap_http_registered) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Registering HomeKit web handlers");
+        httpd_register_uri_handler(hap_priv.server, &hap_pair_setup);
+        httpd_register_uri_handler(hap_priv.server, &hap_pair_verify);
+        httpd_register_uri_handler(hap_priv.server, &hap_pairings);
+        httpd_register_uri_handler(hap_priv.server, &hap_accessories);
+        httpd_register_uri_handler(hap_priv.server, &hap_characteristics_get);
+        httpd_register_uri_handler(hap_priv.server, &hap_characteristics_put);
+        httpd_register_uri_handler(hap_priv.server, &hap_identify);
+        httpd_register_uri_handler(hap_priv.server, &hap_prepare);
+        if (hap_priv.features & HAP_FF_SW_TOKEN_AUTH) {
+            hap_register_secure_message_handler(hap_priv.server);
+        }
+    }
+    hap_http_registered = true;
+    return HAP_SUCCESS;
+}
+
+int hap_unregister_http_handlers()
+{
+    if (hap_http_registered) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Unegistering HomeKit web handlers");
+        httpd_unregister_uri_handler(hap_priv.server, "/pair-setup", HTTP_POST);
+        httpd_unregister_uri_handler(hap_priv.server, "/pair-verify", HTTP_POST);
+        httpd_unregister_uri_handler(hap_priv.server, "/pairings", HTTP_POST);
+        httpd_unregister_uri_handler(hap_priv.server, "/accessories", HTTP_GET);
+        httpd_unregister_uri_handler(hap_priv.server, "/characteristics", HTTP_GET);
+        httpd_unregister_uri_handler(hap_priv.server, "/characteristics", HTTP_PUT);
+        httpd_unregister_uri_handler(hap_priv.server, "/identify", HTTP_POST);
+        httpd_unregister_uri_handler(hap_priv.server, "/prepare", HTTP_PUT);
+        if (hap_priv.features & HAP_FF_SW_TOKEN_AUTH) {
+            hap_unregister_secure_message_handler(hap_priv.server);
+        }
+    }
+    hap_http_registered = false;
+    return HAP_SUCCESS;
+}
+
+int hap_httpd_start(void)
+{
+    if (hap_platform_httpd_start(&hap_priv.server) == ESP_OK) {
+        return HAP_SUCCESS;
+    }
+    return HAP_FAIL;
+}
+
+httpd_handle_t * hap_httpd_get_handle()
+{
+    return &hap_priv.server;
+}
+static bool first_announce_done;
+
+int hap_mdns_deannounce(void)
+{
+    int ret = HAP_SUCCESS;
+    if (first_announce_done) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Deannouncing _hap._tcp mDNS service");
+        ret = hap_mdns_serv_stop(&hap_priv.hap_mdns_handle);
+        if (ret == HAP_SUCCESS) {
+            /* Wait for some time for the packets to go out on network */
+            vTaskDelay(2000 / hap_platform_os_get_msec_per_tick());
+            first_announce_done = false;
+        }
+    }
+    return ret;
+}
+
+int hap_mdns_announce(bool first)
+{
+    /* If the API is called with the "first" argument as true, Force announce the service,
+     * rather than just sending a re-announce packet
+     */
+    if (first) {
+        first_announce_done = false;
+    }
+    static char config_num[6]; /* Max value can be 65535 */
+    static char state_num[6]; /* Max value can be 65535 */
+    static char ff[4];
+    static char sf[4];
+    static char ci[4];
+
+    mdns_txt_item_t txt[9];
+    int i = 0;
+
+    snprintf(config_num, sizeof(config_num), "%d", hap_priv.config_num);
+    txt[i].key = "c#";
+    txt[i++].value = config_num;
+
+
+    uint8_t features = 0;
+    /* Either hardware authentication, or software authentication
+     * can be enabled at a time.
+     */
+    if (hap_priv.features & HAP_FF_HARDWARE_AUTH) {
+        features |= HAP_FF_HARDWARE_AUTH;
+    } else if (hap_priv.features & HAP_FF_SW_TOKEN_AUTH) {
+        features |= HAP_FF_SW_TOKEN_AUTH;
+    }
+    snprintf(ff, sizeof(ff), "%d", features);
+    txt[i].key = "ff";
+    txt[i++].value = ff;
+
+    txt[i].key = "id";
+    txt[i++].value = hap_priv.acc_id;
+
+    txt[i].key = "md";
+    txt[i++].value = hap_priv.primary_acc.model;
+
+    txt[i].key = "pv";
+    txt[i++].value = "1.1"; /* As per HAP Spec R10 */
+
+    if (first_announce_done) {
+        /* If first announcement was already done, this is a republish.
+         * Update the state number, since HAP Spec R15 requires that any Bonjour republish
+         * should update state number.
+         */
+        if (is_accessory_paired()) {
+            hap_increment_and_save_state_num();
+        }
+    }
+    snprintf(state_num, sizeof(state_num), "%u", hap_priv.state_num);
+    txt[i].key = "s#";
+    txt[i++].value = state_num;
+
+    uint8_t status_flags = is_accessory_paired() ? 0 : HAP_SF_ACC_UNPAIRED;
+    if (!hap_is_network_configured())
+        status_flags |= HAP_SF_ACC_UNCONFIGURED;
+    snprintf(sf, sizeof(sf), "%d", status_flags);
+    txt[i].key = "sf";
+    txt[i++].value = sf;
+
+    snprintf(ci, sizeof(ci), "%d", hap_priv.cid);
+    txt[i].key = "ci";
+    txt[i++].value = ci;
+
+    txt[i].key = "sh";
+    txt[i++].value = hap_priv.setup_hash_str;
+
+    int ret;
+    /* If first announce is not done, the service will be added instead of just updating.
+     * Else, first add the service, instead of just updating.
+     */
+    if (!first_announce_done) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Announcing _hap._tcp mDNS service");
+        ret = hap_mdns_serv_start(&hap_priv.hap_mdns_handle,
+            hap_priv.primary_acc.name, "_hap", "_tcp", hap_platform_httpd_get_port(), txt, i);
+        first_announce_done = true;
+    } else {
+        /* Else, just update TXT records. Not add new service.*/
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Re-announcing _hap._tcp mDNS service");
+        ret = hap_mdns_serv_update_txt(&hap_priv.hap_mdns_handle, txt, i);
+    }
+    if (ret != 0) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Failed to announce _hap mDNS service");
+        return HAP_FAIL;
+    }
+    return HAP_SUCCESS;
+}
+
+int hap_ip_services_start()
+{
+    static bool hap_ip_services_started;
+    if (hap_ip_services_started) {
+        return HAP_SUCCESS;
+    }
+    hap_register_http_handlers();
+    if (hap_mdns_announce(false) != HAP_SUCCESS) {
+        hap_unregister_http_handlers();
+        return HAP_FAIL;
+    }
+    hap_ip_services_started = true;
+    return HAP_SUCCESS;
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_keystore.c b/components/homekit/esp_hap_core/src/esp_hap_keystore.c
new file mode 100644
index 0000000..49ad893
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_keystore.c
@@ -0,0 +1,128 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <hap.h>
+#include <esp_mfi_debug.h>
+#include <hap_platform_keystore.h>
+
+static bool keystore_init_done;
+static char *hap_platform_nvs_partition;
+static char *hap_platform_factory_nvs_partition;
+
+int hap_keystore_init()
+{
+    if (keystore_init_done) {
+        return HAP_SUCCESS;
+    }
+
+    hap_platform_nvs_partition = hap_platform_keystore_get_nvs_partition_name();
+    int err = hap_platform_keystore_init_partition(hap_platform_nvs_partition, false);
+    if (err != 0) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Error (%d) NVS init failed", err);
+        return HAP_FAIL;
+    }
+    /* Not cheking the return value, as this partition may be absent */
+    hap_platform_factory_nvs_partition = hap_platform_keystore_get_factory_nvs_partition_name();
+    hap_platform_keystore_init_partition(hap_platform_factory_nvs_partition, true);
+
+    keystore_init_done = true;
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Keystore initialised");
+    return HAP_SUCCESS;
+}
+
+int __hap_keystore_get(const char *part_name, const char *name_space, const char *key, uint8_t *val, size_t *val_size)
+{
+    if (!keystore_init_done) {
+        return HAP_FAIL;
+    }
+
+    int err  = hap_platform_keystore_get(part_name, name_space, key, val, val_size);
+    if (err != 0) {
+        return HAP_FAIL;
+    }
+    return HAP_SUCCESS;
+}
+int hap_keystore_get(const char *name_space, const char *key, uint8_t *val, size_t *val_size)
+{
+
+    return __hap_keystore_get(hap_platform_nvs_partition, name_space, key, val, val_size);
+}
+int hap_factory_keystore_get(const char *name_space, const char *key, uint8_t *val, size_t *val_size)
+{
+    return __hap_keystore_get(hap_platform_factory_nvs_partition, name_space, key, val, val_size);
+}
+
+int __hap_keystore_set(const char *part_name, const char *name_space, const char *key, const uint8_t *val, const size_t val_len)
+
+{
+    if (!keystore_init_done) {
+        return HAP_FAIL;
+    }
+
+    int err  = hap_platform_keystore_set(part_name, name_space, key, val, val_len);
+    if (err != 0) {
+        return HAP_FAIL;
+    }
+    return HAP_SUCCESS;
+}
+
+int hap_keystore_set(const char *name_space, const char *key, const uint8_t *val, const size_t val_len)
+{
+    return __hap_keystore_set(hap_platform_nvs_partition, name_space, key, val, val_len);
+}
+
+int hap_factory_keystore_set(const char *name_space, const char *key, const uint8_t *val, const size_t val_len)
+{
+    return __hap_keystore_set(hap_platform_factory_nvs_partition, name_space, key, val, val_len);
+}
+
+int hap_keystore_delete(const char *name_space, const char *key)
+{
+    if (!keystore_init_done) {
+        return HAP_FAIL;
+    }
+
+    int err = hap_platform_keystore_delete(hap_platform_nvs_partition, name_space, key);
+    if (err != 0) {
+        return HAP_FAIL;
+    }
+    return HAP_SUCCESS;
+}
+
+int hap_keystore_delete_namespace(const char *name_space)
+{
+    if (!keystore_init_done) {
+        return HAP_FAIL;
+    }
+
+    int err = hap_platform_keystore_delete_namespace(hap_platform_nvs_partition, name_space);
+    if (err != 0) {
+        return HAP_FAIL;
+    }
+    return HAP_SUCCESS;
+}
+
+void hap_keystore_erase_all_data()
+{
+    hap_platfrom_keystore_erase_partition(hap_platform_nvs_partition);
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_main.c b/components/homekit/esp_hap_core/src/esp_hap_main.c
new file mode 100644
index 0000000..a540b4c
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_main.c
@@ -0,0 +1,372 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <errno.h>
+#include <unistd.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <freertos/queue.h>
+#include <esp_event.h>
+#include <esp_eth.h>
+#include <esp_wifi.h>
+
+#include <esp_mfi_debug.h>
+#include <esp_hap_acc.h>
+#include <esp_hap_char.h>
+#include <esp_hap_database.h>
+#include <esp_hap_ip_services.h>
+#include <esp_hap_wifi.h>
+#include <esp_hap_mdns.h>
+#include <esp_hap_keystore.h>
+#include <esp_hap_main.h>
+#include <esp_hap_wac.h>
+#include <esp_hap_bct_priv.h>
+#include <esp_hap_pair_verify.h>
+#include <hap_platform_os.h>
+
+static QueueHandle_t xQueue;
+ESP_EVENT_DEFINE_BASE(HAP_EVENT);
+
+const char * hap_get_version(void)
+{
+    return MFI_VER;
+}
+static void hap_nw_configured_sm(hap_internal_event_t event, hap_state_t *state)
+{
+    switch (event) {
+        case HAP_INTERNAL_EVENT_ACC_PAIRED:
+            hap_mdns_announce(false);
+            break;
+        case HAP_INTERNAL_EVENT_ACC_UNPAIRED:
+            hap_mdns_announce(false);
+            break;
+        case HAP_INTERNAL_EVENT_CONFIG_NUM_UPDATED:
+            hap_increment_and_save_config_num();
+            hap_mdns_announce(false);
+            break;
+        case HAP_INTERNAL_EVENT_BCT_CHANGE_NAME:
+            /* Waiting for sometime to allow the response to reach the host */
+            vTaskDelay(1000 / hap_platform_os_get_msec_per_tick());
+            hap_handle_bct_change_name();
+            break;
+        case HAP_INTERNAL_EVENT_BCT_HOT_PLUG:
+            /* Waiting for sometime to allow the response to reach the host */
+            vTaskDelay(1000 / hap_platform_os_get_msec_per_tick());
+            hap_handle_hot_plug();
+            break;
+        default:
+            break;
+    }
+}
+
+static void hap_common_sm(hap_internal_event_t event)
+{
+    char *reboot_reason = HAP_REBOOT_REASON_UNKNOWN;
+    switch (event) {
+        case HAP_INTERNAL_EVENT_RESET_PAIRINGS:
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Resetting all Pairing Information");
+            /* Wait for some time before erasing the information, so that the callee
+             * gets some time for any additional operations
+             */
+            vTaskDelay(1000 / hap_platform_os_get_msec_per_tick());
+            hap_close_all_sessions();
+            hap_mdns_deannounce();
+            hap_erase_controller_info();
+            hap_erase_accessory_info();
+            reboot_reason = HAP_REBOOT_REASON_RESET_PAIRINGS;
+            break;
+        case HAP_INTERNAL_EVENT_RESET_TO_FACTORY:
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Resetting to Factory Defaults");
+            /* Wait for some time before erasing the information, so that the callee
+             * gets some time for any additional operations
+             */
+            vTaskDelay(1000 / hap_platform_os_get_msec_per_tick());
+            hap_close_all_sessions();
+            hap_mdns_deannounce();
+            hap_keystore_erase_all_data();
+            reboot_reason = HAP_REBOOT_REASON_RESET_TO_FACTORY;
+            break;
+        case HAP_INTERNAL_EVENT_RESET_HOMEKIT_DATA:
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Resetting all HomeKit Data");
+            /* Wait for some time before erasing the information, so that the callee
+             * gets some time for any additional operations
+             */
+            vTaskDelay(1000 / hap_platform_os_get_msec_per_tick());
+            hap_close_all_sessions();
+            hap_mdns_deannounce();
+            hap_erase_controller_info();
+            hap_erase_network_info();
+            hap_erase_accessory_info();
+            reboot_reason = HAP_REBOOT_REASON_RESET_HOMEKIT_DATA;
+            break;
+        case HAP_INTERNAL_EVENT_REBOOT:
+            vTaskDelay(1000 / hap_platform_os_get_msec_per_tick());
+            /* Wait for some time and then close all the active sessions
+             */
+            hap_close_all_sessions();
+            hap_mdns_deannounce();
+            reboot_reason = HAP_REBOOT_REASON_REBOOT_ACC;
+            break;
+        case HAP_INTERNAL_EVENT_RESET_NETWORK:
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Resetting Network Credentials");
+            /* Wait for some time, close all the active sessions and then
+             * erase network info.
+             */
+            vTaskDelay(1000 / hap_platform_os_get_msec_per_tick());
+            hap_close_all_sessions();
+            hap_mdns_deannounce();
+            hap_erase_network_info();
+            reboot_reason = HAP_REBOOT_REASON_RESET_NETWORK;
+            break;
+        case HAP_INTERNAL_EVENT_TRIGGER_NOTIF:
+/* TODO: Avoid direct http function. Notification could be even for iCloud or BLE.
+ */
+            hap_http_send_notif();
+            return;
+        default:
+            return;
+        }
+
+    /* Wait for some time after peeforming the operations and then reboot */
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Rebooting...");
+    hap_report_event(HAP_EVENT_ACC_REBOOTING, reboot_reason, strlen(reboot_reason) + 1);
+    vTaskDelay(1000 / hap_platform_os_get_msec_per_tick());
+    esp_restart();
+}
+
+static void hap_loop_task(void *param)
+{
+    hap_state_t cur_state = HAP_STATE_NONE;
+    xQueue = xQueueCreate( 10, sizeof(hap_event_ctx_t) );
+    hap_event_ctx_t hap_event;
+    bool loop_continue = true;
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "HAP Main Loop Started");
+    while (loop_continue) {
+        if (xQueueReceive(xQueue, &hap_event, portMAX_DELAY) != pdTRUE) {
+            continue;
+        }
+        if (hap_event.event == HAP_INTERNAL_EVENT_LOOP_STOP) {
+            loop_continue = false;
+            continue;
+        }
+        hap_common_sm(hap_event.event);
+        hap_nw_configured_sm(hap_event.event, &cur_state);
+    }
+    vQueueDelete(xQueue);
+    xQueue = NULL;
+    vTaskDelete(NULL);
+}
+
+static bool loop_started;
+int hap_loop_start()
+{
+    if (!loop_started) {
+        loop_started = true;
+        xTaskCreate(hap_loop_task, "hap-loop", hap_priv.cfg.task_stack_size, NULL,
+                        hap_priv.cfg.task_priority, NULL);
+    }
+    return HAP_SUCCESS;
+}
+
+bool is_hap_loop_started()
+{
+    return loop_started;
+}
+int hap_send_event(hap_internal_event_t event)
+{
+    if (!is_hap_loop_started()) {
+        return HAP_FAIL;
+    }
+    if (!xQueue) {
+        return HAP_FAIL;
+    }
+    hap_event_ctx_t hap_event = {
+        .event = event,
+    };
+    BaseType_t ret;
+    if (xPortInIsrContext() == pdTRUE) {
+        ret = xQueueSendFromISR(xQueue, &hap_event, NULL);
+    } else {
+        ret = xQueueSend(xQueue, &hap_event, 0);
+    }
+    if (ret == pdTRUE) {
+        return HAP_SUCCESS;
+    }
+    return HAP_FAIL;
+}
+
+int hap_update_config_number()
+{
+    return hap_send_event(HAP_INTERNAL_EVENT_CONFIG_NUM_UPDATED);
+}
+
+int hap_loop_stop()
+{
+    return hap_send_event(HAP_INTERNAL_EVENT_LOOP_STOP);
+}
+
+#if 0
+static void hap_network_event_handler(void* arg, esp_event_base_t event_base,
+        int event_id, void* event_data)
+{
+    if (((event_base == WIFI_EVENT) && (event_id == WIFI_EVENT_STA_CONNECTED)) ||
+        ((event_base == ETH_EVENT) && (event_id == ETHERNET_EVENT_CONNECTED))){
+        hap_send_event(HAP_INTERNAL_EVENT_NETWORK_CONNECTED);
+    }
+}
+#endif
+int hap_init(hap_transport_t method)
+{
+    int ret = HAP_SUCCESS;
+    if (!(method & (HAP_TRANSPORT_WIFI | HAP_TRANSPORT_ETHERNET))) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Invalid Transport");
+        return HAP_FAIL;
+    }
+
+    hap_priv.transport = method;
+
+    ret = hap_keystore_init();
+    if (ret != 0 ) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "HAP Key Store Init failed");
+        return ret;
+    }
+
+    ret = hap_database_init();
+    if (ret != 0 ) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "HAP Database Init failed");
+        return ret;
+    }
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "HAP Initialization succeeded. Version : %s", hap_get_version());
+
+    return ret;
+}
+
+int hap_deinit(void)
+{
+    int ret = HAP_SUCCESS;
+    //todo
+    return ret;
+}
+
+int hap_reset_to_factory()
+{
+    return hap_send_event(HAP_INTERNAL_EVENT_RESET_TO_FACTORY);
+}
+
+int hap_reset_homekit_data()
+{
+    return hap_send_event(HAP_INTERNAL_EVENT_RESET_HOMEKIT_DATA);
+}
+
+int hap_reset_pairings()
+{
+    return hap_send_event(HAP_INTERNAL_EVENT_RESET_PAIRINGS);
+}
+
+int hap_reboot_accessory()
+{
+    return hap_send_event(HAP_INTERNAL_EVENT_REBOOT);
+}
+
+int hap_reset_network()
+{
+    return hap_send_event(HAP_INTERNAL_EVENT_RESET_NETWORK);
+}
+
+int hap_start(void)
+{
+    int ret = 0;
+#ifdef CONFIG_HAP_MFI_ENABLE
+    if (hap_priv.auth_type == HAP_MFI_AUTH_HW) {
+        ret = hap_enable_hw_auth();
+    } else if (hap_priv.auth_type == HAP_MFI_AUTH_SW) {
+        ret =  hap_enable_sw_auth();
+    }
+#endif /* CONFIG_HAP_MFI_ENABLE */
+    if (ret != 0) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Failed to enable MFi %s authentication",
+                hap_priv.auth_type == HAP_MFI_AUTH_HW ? "HW" : "SW");
+        return HAP_FAIL;
+    }
+
+    if (!hap_get_first_acc()) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Failed to start HAP. Please add an Accessory before hap_start()");
+        return HAP_FAIL;
+    }
+
+    ret = hap_acc_setup_init();
+    if (ret != HAP_SUCCESS) {
+         ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Accessory Setup init failed");
+         return ret;
+    }
+
+    ret = hap_httpd_start();
+    if (ret != HAP_SUCCESS) {
+         ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "HTTPD START Failed [%d]", ret);
+         return ret;
+    }
+
+    ret = hap_event_queue_init();
+    if (ret != HAP_SUCCESS) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Queue Initialisation for Event Notifications Failed");
+        return ret;
+    }
+
+    ret = hap_loop_start();
+    if (ret != 0) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "HAP Loop Failed: [%d]", ret);
+        return ret;
+    }
+    ret = hap_mdns_init();
+    if (ret != 0 ) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "HAP mDNS Init failed");
+        return ret;
+    }
+
+    ret = hap_ip_services_start();
+    if (ret != 0) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "HAP IP Services Start Failed [%d]", ret);
+        return ret;
+    }
+    return HAP_SUCCESS;
+}
+
+int hap_stop(void)
+{
+    int ret = HAP_SUCCESS;
+    //todo
+    return ret;
+}
+
+void hap_report_event(hap_event_t event, void *data, size_t data_size)
+{
+    if (hap_priv.hap_event_handler) {
+        hap_priv.hap_event_handler(event, data);
+    }
+    esp_event_post(HAP_EVENT, event, data, data_size, portMAX_DELAY);
+}
+
+void hap_register_event_handler(hap_event_handler_t handler)
+{
+    hap_priv.hap_event_handler = handler;
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_mdns.c b/components/homekit/esp_hap_core/src/esp_hap_mdns.c
new file mode 100644
index 0000000..2ccda56
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_mdns.c
@@ -0,0 +1,85 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <esp_hap_mdns.h>
+#include <esp_mfi_debug.h>
+
+static bool mdns_init_done;
+
+int hap_mdns_serv_start(hap_mdns_handle_t *handle, const char *name, const char *type,
+        const char *protocol, int port, mdns_txt_item_t *txt_records, size_t num_txt)
+{
+    strcpy(handle->type, type);
+    strcpy(handle->proto, protocol);
+    if (mdns_service_add(name, type, protocol, port, txt_records, num_txt) != 0) {
+        return HAP_FAIL;
+    }
+    return HAP_SUCCESS;
+}
+
+int hap_mdns_serv_update_txt(hap_mdns_handle_t *handle, mdns_txt_item_t *txt_records, size_t num_txt)
+{
+    if (mdns_service_txt_set(handle->type, handle->proto, txt_records, num_txt) != 0) {
+        return HAP_FAIL;
+    }
+    return HAP_SUCCESS;
+}
+
+int hap_mdns_serv_name_change(hap_mdns_handle_t *handle, const char * instance_name)
+{
+    if (mdns_service_instance_name_set(handle->type, handle->proto, instance_name) == ESP_OK) {
+        return HAP_SUCCESS;
+    }
+    return HAP_FAIL;
+}
+
+int hap_mdns_serv_stop(hap_mdns_handle_t *handle)
+{
+    if (mdns_service_remove(handle->type, handle->proto) == ESP_OK) {
+        return HAP_SUCCESS;
+    }
+    return HAP_FAIL;
+}
+
+int hap_mdns_init()
+{
+    int ret = HAP_SUCCESS;
+    if (!mdns_init_done) {
+        ret = mdns_init();
+        if (ret == ESP_OK) {
+            mdns_hostname_set("MyHost");
+            mdns_init_done = true;
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "mDNS initialised");
+            return HAP_SUCCESS;
+        }
+    }
+    return HAP_FAIL;
+}
+
+int hap_mdns_deinit()
+{
+    mdns_free();
+    mdns_init_done = false;
+    return HAP_SUCCESS;
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_network_io.c b/components/homekit/esp_hap_core/src/esp_hap_network_io.c
new file mode 100644
index 0000000..a2724ab
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_network_io.c
@@ -0,0 +1,199 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <stdint.h>
+#include <string.h>
+#include <sys/socket.h>
+
+#include <sodium/crypto_aead_chacha20poly1305.h>
+#include <byte_convert.h>
+
+#include <esp_mfi_debug.h>
+#include <hap.h>
+#include <esp_hap_database.h>
+#include <esp_hap_pair_common.h>
+#include <esp_hap_pair_verify.h>
+
+#define HAP_MAX_NW_FRAME_SIZE	1024 /* As per HAP Specifications */
+#define AUTH_TAG_LEN            16
+typedef struct {
+	uint8_t pkt_size[2];
+	uint8_t data[HAP_MAX_NW_FRAME_SIZE];
+	/* The Poly auth tag buffer will get used only if the data length is
+	 * greater than HAP_MAX_NW_FRAME_SIZE - 16.
+	 * Else, the auth tag would be included in the data buffer itself
+	 */
+	uint8_t poly_auth_tag[AUTH_TAG_LEN];
+} hap_encrypt_frame_t;
+
+typedef struct {
+	uint16_t pkt_size;
+	uint16_t bytes_read;
+	uint8_t data[HAP_MAX_NW_FRAME_SIZE + AUTH_TAG_LEN];
+	hap_secure_session_t *session;
+} hap_decrypt_frame_t;
+
+typedef int (*hap_decrypt_read_fn_t) (uint8_t *buf, int buf_size, void *context);
+static int min(int val1, int val2)
+{
+	if (val1 < val2)
+		return val1;
+	return val2;
+}
+static int hap_httpd_raw_recv(uint8_t *buf, int buf_size, void *context)
+{
+	int sock = *((int *)context);
+	return recv(sock, buf, buf_size, 0);
+}
+
+/* Frame format as per HAP Specifications:
+ * <2: AAD for Little Endian length of encrypted data (n) in bytes>
+ * <n: Encrypted data according to AEAD algorithm, upto 1024 bytes>
+ * <16: authTag according to AEAD algorithm>
+ */
+int hap_encrypt_data(hap_encrypt_frame_t *frame, hap_secure_session_t *session,
+		uint8_t *buf, int buflen)
+{
+	if (!session)
+		return HAP_FAIL;
+	put_u16_le(frame->pkt_size, buflen);
+	/* Encrypt the received data as per Chacha20-Poly1305 AEAD algorithm.
+	 * The authTag will be appended at the end of data. Hence, pointer given as
+	 * frame->data + nlen
+	 */
+    unsigned long long mlen = 16;
+    uint8_t newnonce[12];
+    memset(newnonce, 0, sizeof newnonce);
+    memcpy(newnonce+4, session->encrypt_nonce, 8);
+    crypto_aead_chacha20poly1305_ietf_encrypt_detached(frame->data, frame->data + buflen, &mlen,
+                buf, buflen, frame->pkt_size, 2, NULL, newnonce, session->encrypt_key);
+
+	/* Increment nonce after every frame */
+	uint64_t int_nonce = get_u64_le(session->encrypt_nonce);
+	int_nonce++;
+	put_u64_le(session->encrypt_nonce, int_nonce);
+	return 2 + buflen + 16; /* Total length of the encrypted data */
+}
+
+int hap_decrypt_error(hap_secure_session_t *session)
+{
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Decryption error/Connection lost. Marking session as invalid");
+	if (session) {
+		session->state = STATE_INVALID;
+        hap_close_ctrl_sessions(session->ctrl);
+	}
+	return HAP_FAIL;
+}
+
+int hap_decrypt_data(hap_decrypt_frame_t *frame, hap_secure_session_t *session,
+	void *buf, int buf_size, hap_decrypt_read_fn_t read_fn, void *context)
+{
+	if (!frame || !session)
+		return -1;
+	if (frame->session != session) {
+		memset(frame, 0, sizeof(hap_decrypt_frame_t));
+		frame->session = session;
+	}
+	if ((frame->pkt_size - frame->bytes_read) == 0) {
+		if (read_fn(frame->data, 2, context) < 2)
+			return hap_decrypt_error(session);
+
+		frame->pkt_size = get_u16_le(frame->data);
+		frame->bytes_read = 0;
+		uint16_t bytes_to_read = frame->pkt_size + AUTH_TAG_LEN; /* +AUTH_TAG_LEN as the receivedd packet will also have the auth Tag */
+		while (bytes_to_read) {
+			int num_bytes = read_fn(&frame->data[frame->bytes_read],
+					bytes_to_read, context);
+			if (num_bytes <= 0)
+				return hap_decrypt_error(session);
+			bytes_to_read -= num_bytes;
+			frame->bytes_read += num_bytes;
+		}
+		frame->bytes_read -= AUTH_TAG_LEN; /* -AUTH_TAG_LEN to get only the data length */
+		uint8_t aad[2];
+        int ret;
+		put_u16_le(aad, frame->pkt_size); /* Packet size is the AAD for AEAD */
+        uint8_t newnonce[12];
+        memset(newnonce, 0, sizeof newnonce);
+        memcpy(newnonce+4, session->decrypt_nonce, 8);
+        ret = crypto_aead_chacha20poly1305_ietf_decrypt_detached(frame->data, NULL, frame->data, frame->pkt_size,
+                    &frame->data[frame->bytes_read], aad, 2, newnonce, session->decrypt_key);
+        if (ret != 0) { 
+			ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "AEAD decryption failure");
+			return hap_decrypt_error(session);
+		}
+		frame->bytes_read = 0;
+		/* Increment nonce after every frame */
+		int64_t int_nonce = get_u64_le(session->decrypt_nonce);
+		int_nonce++;
+		put_u64_le(session->decrypt_nonce, int_nonce);
+	}
+	int bytes = min(frame->pkt_size - frame->bytes_read, buf_size);
+	memcpy(buf, &frame->data[frame->bytes_read], bytes);
+	frame->bytes_read += bytes;
+	return bytes;
+}
+
+int hap_httpd_send(httpd_handle_t hd, int sockfd, const char *buf, unsigned buf_len, int flags)
+{
+	hap_secure_session_t *session = httpd_sess_get_ctx(hap_priv.server, sockfd);
+	if (session && (session->state == STATE_VERIFIED)) {
+		uint8_t *buf_ptr = (uint8_t *)buf;
+		int tmp_buf_len = buf_len;
+		while (tmp_buf_len) {
+			hap_encrypt_frame_t encrypt_frame;
+			memset(&encrypt_frame, 0, sizeof(encrypt_frame));
+			int len = min(tmp_buf_len, HAP_MAX_NW_FRAME_SIZE);
+			int send_len = hap_encrypt_data(&encrypt_frame, session, buf_ptr, len);
+			if (send(sockfd, (uint8_t *)&encrypt_frame, send_len, flags) <= 0)
+				return HAP_FAIL;
+			tmp_buf_len -= len;
+			buf_ptr += len;
+		}
+		/* Return the total length at the end since this API expects so
+		 */
+		return buf_len;
+	}
+	return send(sockfd, buf, buf_len, flags);
+}
+
+int hap_httpd_recv(httpd_handle_t hd, int sockfd, char *buf, unsigned buf_len, int flags)
+{
+	static hap_decrypt_frame_t decrypt_frame;
+	hap_secure_session_t *session = httpd_sess_get_ctx(hap_priv.server, sockfd);
+	if (session) {
+		if (session->state == STATE_VERIFIED) {
+			return hap_decrypt_data(&decrypt_frame, session, buf, buf_len,
+					hap_httpd_raw_recv, &sockfd);
+		} else {
+			/* If the session state is invalid, we return an error.
+			 * The errno is set here explicitly, so that even if the higher layers
+			 * query for it, they do not get a stale value.
+			 * EACCES means permission denied, which indeed is the case here.
+			 */
+			errno = EACCES;
+			return HAP_FAIL;
+		}
+	}
+	return recv(sockfd, buf, buf_len, sockfd);
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_pair_common.c b/components/homekit/esp_hap_core/src/esp_hap_pair_common.c
new file mode 100644
index 0000000..9a003ab
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_pair_common.c
@@ -0,0 +1,127 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <esp_hap_pair_common.h>
+
+void hap_tlv_data_init(hap_tlv_data_t *tlv_data, uint8_t *buf, int buf_size)
+{
+	tlv_data->bufptr = buf;
+	tlv_data->bufsize = buf_size;
+	tlv_data->curlen = 0;
+}
+
+int get_tlv_length(uint8_t *buf, int buflen, uint8_t type)
+{
+	if (!buf )
+		return -1;
+	int curlen = 0;
+	int val_len = 0;
+	bool found = false;
+	while (buflen > 0) {
+		if (buf[curlen] == type) {
+			uint8_t len = buf[curlen + 1];
+			if ((buflen - len) < 2)
+				return -1;
+			val_len += len;
+			if (len < 255)
+				return val_len;
+			else
+				found = true;
+
+		} else if (found)
+			return val_len;
+
+		/* buf[curlen +1] will give the Length */
+		buflen -= (2 + buf[curlen + 1]);
+		curlen += (2 + buf[curlen + 1]);
+	}
+	return -1;
+}
+int get_value_from_tlv(uint8_t *buf, int buflen, uint8_t type, void *val, int val_size)
+{
+	if (!buf || !val)
+		return -1;
+	int curlen = 0;
+	int val_len = 0;
+	bool found = false;
+	while (buflen > 0) {
+		if (buf[curlen] == type) {
+			uint8_t len = buf[curlen + 1];
+			if ((val_size < len) || ((buflen - len) < 2))
+				return -1;
+			memcpy(val + val_len, &buf[curlen + 2], len);
+			val_len += len;
+			val_size -= len;
+			if (len < 255)
+				return val_len;
+			else
+				found = true;
+
+		} else if (found)
+			return val_len;
+
+		/* buf[curlen +1] will give the Length */
+		buflen -= (2 + buf[curlen + 1]);
+		curlen += (2 + buf[curlen + 1]);
+	}
+	return -1;
+}
+
+int add_tlv(hap_tlv_data_t *tlv_data, uint8_t type, int len, void *val)
+{
+	if(!tlv_data->bufptr || ((len + 2) > (tlv_data->bufsize - tlv_data->curlen)))
+		return -1;
+	uint8_t *buf_ptr = (uint8_t *)val;
+	int orig_len = tlv_data->curlen;
+	do {
+		tlv_data->bufptr[tlv_data->curlen++] = type;
+		int tmp_len;
+		if (len > 255)
+			tmp_len = 255;
+		else
+			tmp_len = len;
+		tlv_data->bufptr[tlv_data->curlen++] = tmp_len;
+		memcpy(&tlv_data->bufptr[tlv_data->curlen], buf_ptr, tmp_len);
+		tlv_data->curlen += tmp_len;
+		buf_ptr += tmp_len;
+		len -= tmp_len;
+	} while (len);
+	return tlv_data->curlen - orig_len;
+}
+void hap_prepare_error_tlv(uint8_t state, uint8_t error, void *buf, int bufsize, int *outlen)
+{
+	hap_tlv_data_t tlv_data;
+	tlv_data.bufptr = buf;
+	tlv_data.bufsize = bufsize;
+	tlv_data.curlen = 0;
+	/* Not doing any error handling because the size required for "state" and "error" will
+	 * be too small to cause any error, and we anyways dont have any specific action to
+	 * do in case if error in add_tlv()
+	 */
+	add_tlv(&tlv_data, kTLVType_State, sizeof(state), &state);
+	add_tlv(&tlv_data, kTLVType_Error, sizeof(error), &error);
+	*outlen = tlv_data.curlen;
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_pair_setup.c b/components/homekit/esp_hap_core/src/esp_hap_pair_setup.c
new file mode 100644
index 0000000..995158d
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_pair_setup.c
@@ -0,0 +1,563 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/timers.h>
+#include <mu_srp.h>
+#include <sodium/crypto_aead_chacha20poly1305.h>
+#include <hkdf-sha.h>
+#include <sodium/crypto_sign_ed25519.h>
+#include <hexdump.h>
+#include <hap_platform_memory.h>
+#include <hap_platform_os.h>
+
+#include <esp_hap_pair_common.h>
+#include <esp_hap_pair_setup.h>
+#include <esp_hap_database.h>
+#include <esp_hap_main.h>
+#include <esp_hap_acc.h>
+#include <esp_mfi_debug.h>
+
+/* Maximum attempts allowed for Pair Setup, as per HAP Specifications */
+#define HAP_PAIR_SETUP_MAX_ATTEMPTS	100
+
+#define PAIR_SETUP_ENCRYPT_SALT		"Pair-Setup-Encrypt-Salt"
+#define PAIR_SETUP_ENCRYPT_INFO		"Pair-Setup-Encrypt-Info"
+#define PAIR_SETUP_CTRL_SIGN_SALT	"Pair-Setup-Controller-Sign-Salt"
+#define PAIR_SETUP_CTRL_SIGN_INFO	"Pair-Setup-Controller-Sign-Info"
+#define PAIR_SETUP_ACC_SIGN_SALT	"Pair-Setup-Accessory-Sign-Salt"
+#define PAIR_SETUP_ACC_SIGN_INFO	"Pair-Setup-Accessory-Sign-Info"
+
+#define PS_CTX_INIT	1
+#define PS_CTX_DEINIT	2
+
+/* Timeout if pair setup not completed in 1 minute (60sec)*/
+#define HAP_SETUP_TIMEOUT_IN_TICKS  ((40 * 1000) / hap_platform_os_get_msec_per_tick())
+
+static int hap_pair_setup_process_srp_start(pair_setup_ctx_t *ps_ctx, uint8_t *buf, int inlen,
+		int bufsize, int *outlen)
+{
+	/* Pair setup is not allowed if the accessory is already paired */
+	if (is_accessory_paired()) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Accessory is already paired. "
+				"Please use \"Add Pairing\" to add more controllers");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unavailable, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+
+	/* Pair Setup is not allowed if the failed attempts have exceeded the
+	 * maximum allowed attempts.
+	 */
+	if (hap_priv.pair_attempts >= HAP_PAIR_SETUP_MAX_ATTEMPTS) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Too many attempts. Aborting");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_MaxTries, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+
+	ps_ctx->ctrl = hap_controller_get_empty_loc();
+	if (!ps_ctx->ctrl) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "No empty controller slot. Aborting");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+
+	uint8_t state;
+	if ((get_value_from_tlv(buf, inlen, kTLVType_State, &state, sizeof(state)) < 0) ||
+		(get_value_from_tlv(buf, inlen, kTLVType_Method,
+				    &ps_ctx->method, sizeof(ps_ctx->method)) < 0)) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Invalid TLVs received");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	if (state != STATE_M1) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Incorrect State received");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Pair Setup M1 Received");
+
+    int flags_len;
+    if ((flags_len = get_value_from_tlv(buf, inlen, kTLVType_Flags, &ps_ctx->pairing_flags, sizeof(ps_ctx->pairing_flags))) > 0) {
+        ps_ctx->pairing_flags_len = flags_len;
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Got pairing flags %x", ps_ctx->pairing_flags);
+
+        /* If the Split pairing flag is not set, it is an error */
+        if (!(ps_ctx->pairing_flags & PAIR_FLAG_SPLIT)) {
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Pairing Flags received, but the Split flag is not set");
+            hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+            return HAP_FAIL;
+        }
+
+        /* If either the current or the previous request didn't have transient flag set, return authentication error */
+        if (!((ps_ctx->pairing_flags | hap_priv.pairing_flags) & PAIR_FLAG_TRANSIENT)) {
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Split pairing received before preceding Transient Pairing");
+            hap_prepare_error_tlv(STATE_M2, kTLVError_Authentication, buf, bufsize, outlen);
+            return HAP_FAIL;
+        }
+    }
+    hap_priv.pairing_flags = ps_ctx->pairing_flags;
+
+	int len_B = 0;
+	char *bytes_B;
+
+	/* Create SRP Salt and Verifier for the provided pairing PIN */
+    mu_srp_init(&ps_ctx->srp_hd, MU_NG_3072);
+
+    /* If a setup code is explicitly set, use it */
+    if (hap_priv.setup_code) {
+        ps_ctx->len_s = 16;
+        mu_srp_srv_pubkey(&ps_ctx->srp_hd, "Pair-Setup", (const char*)hap_priv.setup_code, strlen(hap_priv.setup_code),
+                ps_ctx->len_s, &bytes_B, &len_B, &ps_ctx->bytes_s);
+    } else {
+        /* Else, use the salt and verifier for SRP. This should be the default production case
+         */
+        if (mu_srp_set_salt_verifier(&ps_ctx->srp_hd, (char *)hap_priv.setup_info->salt, sizeof(hap_priv.setup_info->salt),
+                    (char *)hap_priv.setup_info->verifier, sizeof(hap_priv.setup_info->verifier)) < 0) {
+            ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "SRP-6a Salt-Verifier Init Failed");
+            hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+            return HAP_FAIL;
+        }
+        ps_ctx->bytes_s = (char *)hap_priv.setup_info->salt;
+        ps_ctx->len_s = sizeof(hap_priv.setup_info->salt);
+        mu_srp_srv_pubkey_from_salt_verifier(&ps_ctx->srp_hd, &bytes_B, &len_B);
+    }
+	if (!ps_ctx->bytes_s || !bytes_B) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "SRP-6a Verifier Creation Failed");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+
+	hex_dbg_with_name("salt", (uint8_t *)ps_ctx->bytes_s, ps_ctx->len_s);
+	hex_dbg_with_name("acc_srp_public_key", (uint8_t *)bytes_B, len_B);
+
+	/* Construct the response M2 */
+	hap_tlv_data_t tlv_data;
+	tlv_data.bufptr = buf;
+	tlv_data.bufsize = bufsize;
+	tlv_data.curlen = 0;
+	state = STATE_M2;
+	if ((add_tlv(&tlv_data, kTLVType_State, 1, &state) < 0) ||
+			(add_tlv(&tlv_data, kTLVType_PublicKey, len_B, (void *)bytes_B) < 0) ||
+			(add_tlv(&tlv_data, kTLVType_Salt, ps_ctx->len_s, ps_ctx->bytes_s) < 0 )) {
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+    /* Not adding any error check here, because without the pairing flags, the pairing will
+     * anyways fail later.
+     */
+    if (ps_ctx->pairing_flags_len) {
+        add_tlv(&tlv_data, kTLVType_Flags, ps_ctx->pairing_flags_len, &ps_ctx->pairing_flags);
+    }
+	*outlen = tlv_data.curlen;
+	ps_ctx->state = state;
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Pair Setup M2 Successful");
+    hap_report_event(HAP_EVENT_PAIRING_STARTED, NULL, 0);
+	return HAP_SUCCESS;
+}
+
+
+static int hap_pair_setup_process_srp_verify(pair_setup_ctx_t *ps_ctx, uint8_t *buf, int inlen,
+		int bufsize, int *outlen)
+{
+	uint8_t state;
+	char ctrl_public_key[384];
+	int ctrl_public_key_len;
+	char ctrl_proof[64];
+	int ctrl_proof_len;
+
+	if ((get_value_from_tlv(buf, inlen, kTLVType_State, &state, sizeof(state)) < 0) ||
+		((ctrl_public_key_len = get_value_from_tlv(buf, inlen, kTLVType_PublicKey,
+				ctrl_public_key, sizeof(ctrl_public_key))) < 0) ||
+		((ctrl_proof_len = get_value_from_tlv(buf, inlen, kTLVType_Proof,
+				ctrl_proof, sizeof(ctrl_proof))) < 0)) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Invalid TLVs received");
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	if (state != STATE_M3) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Incorrect State received");
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Pair Setup M3 Received");
+
+	hex_dbg_with_name("ctrl_srp_public_key", (uint8_t *)ctrl_public_key, ctrl_public_key_len);
+	hex_dbg_with_name("ctrl_proof", (uint8_t *)ctrl_proof, ctrl_proof_len);
+    mu_srp_get_session_key(&ps_ctx->srp_hd, ctrl_public_key, ctrl_public_key_len, &ps_ctx->shared_secret, &ps_ctx->secret_len);
+    char host_proof[SHA512HashSize];
+    int ret = mu_srp_exchange_proofs(&ps_ctx->srp_hd, "Pair-Setup", ctrl_proof, host_proof);
+    if (ret != 1) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "SRP Verify: Controller Authentication failed");
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Authentication, buf, bufsize, outlen);
+        hap_report_event(HAP_EVENT_PAIRING_ABORTED, NULL, 0);
+		return HAP_FAIL;
+    }
+    int acc_proof_length = SHA512HashSize;
+
+	hkdf(SHA512, (uint8_t *) PAIR_SETUP_ENCRYPT_SALT, strlen(PAIR_SETUP_ENCRYPT_SALT),
+			(uint8_t *)ps_ctx->shared_secret, ps_ctx->secret_len,
+			(uint8_t *) PAIR_SETUP_ENCRYPT_INFO, strlen(PAIR_SETUP_ENCRYPT_INFO),
+			ps_ctx->session_key, sizeof(ps_ctx->session_key));
+
+	/* Construct the response M4 */
+	hap_tlv_data_t tlv_data;
+	tlv_data.bufptr = buf;
+	tlv_data.bufsize = bufsize;
+	tlv_data.curlen = 0;
+	state = STATE_M4;
+	if ((add_tlv(&tlv_data, kTLVType_State, 1, &state) < 0) ||
+			(add_tlv(&tlv_data, kTLVType_Proof, acc_proof_length,
+				 (void *)host_proof) < 0)) {
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Unknown, buf, bufsize, outlen);
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "TLV creation failed");
+		return HAP_FAIL;
+    }
+    hap_tlv_error_t tlv_error = 0;
+    if (hap_pair_setup_manage_mfi_auth(ps_ctx, &tlv_data, &tlv_error) != ESP_OK) {
+        hap_prepare_error_tlv(STATE_M4, tlv_error, buf, bufsize, outlen);
+        return HAP_FAIL;
+    }
+	*outlen = tlv_data.curlen;
+	ps_ctx->state = state;
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Pair Setup M4 Successful");
+	return HAP_SUCCESS;
+}
+static int hap_pair_setup_process_exchange(pair_setup_ctx_t *ps_ctx, uint8_t *buf, int inlen,
+		int bufsize, int *outlen)
+{
+	uint8_t state;
+	uint8_t edata[220];
+	int edata_len;
+    int ret;
+
+	if ((get_value_from_tlv(buf, inlen, kTLVType_State, &state, sizeof(state)) < 0) ||
+		((edata_len = get_value_from_tlv(buf, inlen, kTLVType_EncryptedData,
+				edata, sizeof(edata))) < 0))  {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Invalid TLVs received");
+		hap_prepare_error_tlv(STATE_M6, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	hex_dbg_with_name("recv_encrypted_data", edata, edata_len);
+	if (state != STATE_M5) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Incorrect State received");
+		hap_prepare_error_tlv(STATE_M6, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+    }
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Pair Setup M5 Received");
+    edata_len -= 16; /* 16 bytes for the authTag */
+    uint8_t newnonce[12];
+    memset(newnonce, 0, sizeof newnonce);
+    memcpy(newnonce+4, (uint8_t *)PS_NONCE2, 8);
+    ret = crypto_aead_chacha20poly1305_ietf_decrypt_detached(edata, NULL, edata, edata_len,
+            &edata[edata_len], NULL, 0, newnonce, ps_ctx->session_key);
+    if (ret != 0) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Decryption Failed");
+		hap_prepare_error_tlv(STATE_M6, kTLVError_Authentication, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	hex_dbg_with_name("subtlv", edata, edata_len);
+	int ctrl_id_len;
+	unsigned char ed_sign[64];
+    unsigned long long ed_sign_len;
+	if (((ctrl_id_len = get_value_from_tlv(edata, edata_len, kTLVType_Identifier,
+					ps_ctx->ctrl->info.id, sizeof(ps_ctx->ctrl->info.id))) < 0) ||
+			(get_value_from_tlv(edata, edata_len, kTLVType_PublicKey,
+					    ps_ctx->ctrl->info.ltpk, ED_KEY_LEN) != ED_KEY_LEN) ||
+			(get_value_from_tlv(edata, edata_len, kTLVType_Signature,
+					    ed_sign, sizeof(ed_sign)) != sizeof(ed_sign))) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Invalid subTLV received");
+		hap_prepare_error_tlv(STATE_M6, kTLVError_Authentication, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	ps_ctx->ctrl->info.id[ctrl_id_len] = 0; /* NULL termination */
+	hex_dbg_with_name("ctrl_id", (uint8_t *)ps_ctx->ctrl->info.id, ctrl_id_len);
+	hex_dbg_with_name("ltpkc", ps_ctx->ctrl->info.ltpk, ED_KEY_LEN);
+	hex_dbg_with_name("ctrl_sign", ed_sign, sizeof(ed_sign));
+
+	/* Derive iOSDeviceX from SRP shared secret using HKDF-SHA512 */
+	uint8_t ios_device_x[32];
+	hkdf(SHA512, (unsigned char *) PAIR_SETUP_CTRL_SIGN_SALT,
+			strlen(PAIR_SETUP_CTRL_SIGN_SALT), (uint8_t *)ps_ctx->shared_secret, ps_ctx->secret_len,
+			(unsigned char *) PAIR_SETUP_CTRL_SIGN_INFO,
+			strlen(PAIR_SETUP_CTRL_SIGN_INFO),
+			ios_device_x, sizeof(ios_device_x));
+	/* Construct iOSDeviceInfo by concatenating
+	 * iOSDeviceX
+	 * iOSDevicePairingID (ctrl_id)
+	 * iOSDeviceLTPK (ltpkc)
+	 */
+	uint8_t info_buf[HAP_CTRL_ID_LEN + 32 + ED_KEY_LEN];
+	uint8_t *ios_dev_info = info_buf;
+	int ios_dev_info_len = 0;
+	memcpy(ios_dev_info, ios_device_x, sizeof(ios_device_x));
+	ios_dev_info_len += sizeof(ios_device_x);
+	memcpy(&ios_dev_info[ios_dev_info_len], ps_ctx->ctrl->info.id, ctrl_id_len);
+	ios_dev_info_len += ctrl_id_len;
+	memcpy(&ios_dev_info[ios_dev_info_len], ps_ctx->ctrl->info.ltpk, ED_KEY_LEN);
+	ios_dev_info_len += ED_KEY_LEN;
+
+    ret = crypto_sign_ed25519_verify_detached(ed_sign, ios_dev_info, ios_dev_info_len, ps_ctx->ctrl->info.ltpk);
+	/* Verify Signature of constructed iOSDeviceInfo using the iOSDeviceLTPK */
+    if (ret != 0) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Invalid Signature");
+		hap_prepare_error_tlv(STATE_M6, kTLVError_Authentication, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+
+	hex_dbg_with_name("ltpka", hap_priv.ltpka, sizeof(hap_priv.ltpka));
+
+	/* Derive AccessoryX from the SRP shared secret using HKDF-SHA512 */
+	uint8_t acc_x[32];
+	hkdf(SHA512, (unsigned char *) PAIR_SETUP_ACC_SIGN_SALT,
+			strlen(PAIR_SETUP_ACC_SIGN_SALT), (uint8_t *)ps_ctx->shared_secret, ps_ctx->secret_len,
+			(unsigned char *) PAIR_SETUP_ACC_SIGN_INFO,
+			strlen(PAIR_SETUP_ACC_SIGN_INFO),
+			acc_x, sizeof(acc_x));
+	/* Construct AccessoryInfo by concatenating
+	 * AccessoryX
+	 * AccessoryPairingID (acc_id)
+	 * AccessoryLTPK (ltpka)
+	 */
+	uint8_t *acc_info = info_buf;
+	int acc_info_len = 0;
+	memcpy(acc_info, acc_x, sizeof(acc_x));
+	acc_info_len += sizeof(acc_x);
+	memcpy(&ios_dev_info[acc_info_len], hap_priv.acc_id, strlen(hap_priv.acc_id));
+	acc_info_len += strlen(hap_priv.acc_id);
+	memcpy(&ios_dev_info[acc_info_len], hap_priv.ltpka, sizeof(hap_priv.ltpka));
+	acc_info_len += sizeof(hap_priv.ltpka);
+
+	/* Generate AccessorySignature by signing AccessoryInfo with AccessoryLTSK
+	 */
+    crypto_sign_ed25519_detached(ed_sign, &ed_sign_len, acc_info, acc_info_len, hap_priv.ltska);
+	hex_dbg_with_name("acc_sign", ed_sign, sizeof(ed_sign));
+
+	/* Create subTLV with:
+	 * kTLVType_Identifier : Accessory ID (acc_id)
+	 * kTLVType_PublicKey : Accessory LTPK
+	 * kTLVType_Signature : AccessorySignature
+	 */
+
+	uint8_t subtlv[6 + HAP_ACC_ID_LEN + ED_KEY_LEN + ED_SIGN_LEN + POLY_AUTHTAG_LEN];
+
+	hap_tlv_data_t tlv_data;
+	tlv_data.bufptr = subtlv;
+	tlv_data.bufsize = sizeof(subtlv);
+	tlv_data.curlen = 0;
+	add_tlv(&tlv_data, kTLVType_Identifier, strlen(hap_priv.acc_id), hap_priv.acc_id);
+	add_tlv(&tlv_data, kTLVType_PublicKey, sizeof(hap_priv.ltpka), hap_priv.ltpka);
+	add_tlv(&tlv_data, kTLVType_Signature, sizeof(ed_sign), ed_sign);
+	int subtlv_len = tlv_data.curlen;
+	hex_dbg_with_name("subtlv", subtlv, subtlv_len);
+
+	/* Encrypt the subTLV using the session key */
+
+    unsigned long long mlen = 16;
+    memset(newnonce, 0, sizeof newnonce);
+    memcpy(newnonce+4, (uint8_t *) PS_NONCE3, 8);
+    crypto_aead_chacha20poly1305_ietf_encrypt_detached(subtlv, &subtlv[subtlv_len], &mlen, subtlv,
+                subtlv_len, NULL, 0, NULL, newnonce, ps_ctx->session_key); 
+	hex_dbg_with_name("send_encrypt_data", subtlv, subtlv_len + 16);
+
+	/* Construct the response M6 */
+	tlv_data.bufptr = buf;
+	tlv_data.bufsize = bufsize;
+	tlv_data.curlen = 0;
+	state = STATE_M6;
+	if ((add_tlv(&tlv_data, kTLVType_State, 1, &state) < 0) ||
+			(add_tlv(&tlv_data, kTLVType_EncryptedData, subtlv_len + 16,
+				 subtlv) < 0)) {
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	*outlen = tlv_data.curlen;
+	ps_ctx->state = state;
+	ps_ctx->ctrl->info.perms = 1; /* Controller added using pair setup is always an admin */
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Pair Setup Successful for %s", ps_ctx->ctrl->info.id);
+    /* Reset the Pairing Attempts count */
+	hap_priv.pair_attempts = 0;
+    hap_controller_save(ps_ctx->ctrl);
+    hap_send_event(HAP_INTERNAL_EVENT_ACC_PAIRED);
+	return HAP_SUCCESS;
+}
+static uint8_t hap_pair_setup_get_received_state(uint8_t *buf, int inlen)
+{
+	uint8_t state = 0;
+	get_value_from_tlv(buf, inlen, kTLVType_State, &state, sizeof(state));
+	return state;
+}
+
+static void hap_pair_setup_timeout(TimerHandle_t handle)
+{
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Clearing Pair Setup Context due to inactivity");
+    pair_setup_ctx_t *ps_ctx = pvTimerGetTimerID(handle);
+    if (ps_ctx) {
+        httpd_sess_trigger_close(hap_priv.server, ps_ctx->sock_fd);
+        hap_report_event(HAP_EVENT_PAIRING_ABORTED, NULL, 0);
+    }
+}
+
+/* Pair Setup can have only a single context at a time as the specification does not allow
+ * multiple controllers to perform Pair Setup Simultaneously.
+ *
+ * The purpose of this function is to manage allocation and resetting of the context by
+ * using a static variable rather than a global variable.
+ */
+static pair_setup_ctx_t *hap_pair_setup_ctx_action(int action)
+{
+	static pair_setup_ctx_t *ps_ctx;
+	/* If the call is to initialise the context, check if it is already
+	 * initialised.
+	 */
+	if (action == PS_CTX_INIT) {
+		/* If the context is already initialised, it means that pair setup
+		 * is already in progress. So, return NULL.
+		 * Else, allocate the context.
+		 */
+		if (ps_ctx)
+			return NULL;
+		else {
+			ps_ctx = hap_platform_memory_calloc(sizeof(pair_setup_ctx_t), 1);
+            if (ps_ctx) {
+                ps_ctx->timer = xTimerCreate("hap_setup_timer", HAP_SETUP_TIMEOUT_IN_TICKS,
+                            pdFALSE, (void *) ps_ctx, hap_pair_setup_timeout);
+                xTimerStart(ps_ctx->timer, 0);
+            }
+        }
+	} else if (action == PS_CTX_DEINIT) {
+		/* If the call is to de-initialise the context, clean it up
+		 * and set the pointer to NULL
+		 */
+		if (ps_ctx) {
+            if (ps_ctx->timer) {
+                xTimerStop(ps_ctx->timer, 0);
+                xTimerDelete(ps_ctx->timer, 100);
+            }
+            mu_srp_free(&ps_ctx->srp_hd);
+			hap_platform_memory_free(ps_ctx);
+		}
+		ps_ctx = NULL;
+	}
+	return ps_ctx;
+}
+
+
+void hap_pair_setup_ctx_clean(void *sess_ctx)
+{
+	if (sess_ctx) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Cleaning Pair Setup Context");
+		hap_pair_setup_ctx_action(PS_CTX_DEINIT);
+    }
+}
+
+int hap_pair_setup_context_init(int sock_fd, void **ctx, uint8_t *buf, int bufsize, int *outlen)
+{
+	pair_setup_ctx_t *ps_ctx = hap_pair_setup_ctx_action(PS_CTX_INIT);
+
+	if (!ps_ctx) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR,"######## Aborted! Pair Setup in Progress with another controller ########");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Busy, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+    ps_ctx->sock_fd = sock_fd;
+	*ctx = ps_ctx;
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "######## Starting Pair Setup ########");
+	return HAP_SUCCESS;
+
+}
+int hap_pair_setup_process(void **ctx, uint8_t *buf, int inlen, int bufsize, int *outlen)
+{
+	pair_setup_ctx_t *ps_ctx = (pair_setup_ctx_t *)(*ctx);
+
+	uint8_t recv_state = hap_pair_setup_get_received_state(buf, inlen);
+	if (!ps_ctx) {
+		hap_prepare_error_tlv(recv_state + 1, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	/* Receiving STATE_M1 in the message while the pair-setup was already in progress means
+	 * that pair setup was restarted. Handle it accordingly
+	 */
+	if ((recv_state == STATE_M1) && (ps_ctx->state != STATE_M0)) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Restarting Pair Setup");
+        int sock_fd = ps_ctx->sock_fd;
+		hap_pair_setup_ctx_clean(ps_ctx);
+		int ret = hap_pair_setup_context_init(sock_fd, ctx, buf, bufsize, outlen);
+		if (ret != HAP_SUCCESS)
+			return ret;
+		ps_ctx = (pair_setup_ctx_t *)(*ctx);
+	}
+	if (ps_ctx->state == STATE_M0) {
+		return hap_pair_setup_process_srp_start(ps_ctx, buf, inlen, bufsize, outlen);
+	} else if (ps_ctx->state == STATE_M2) {
+		hap_priv.pair_attempts++;
+		int ret = hap_pair_setup_process_srp_verify(ps_ctx, buf, inlen, bufsize, outlen);
+        if (ps_ctx->session) {
+            *ctx = ps_ctx->session;
+            hap_pair_setup_ctx_clean(ps_ctx);
+        }
+        return ret;
+	} else if (ps_ctx->state == STATE_M4) {
+		int ret = hap_pair_setup_process_exchange(ps_ctx, buf, inlen, bufsize, outlen);
+		/* If last step of pair setup is successful, it means that the context would
+		 * be no more required. Hence, clear it.
+		 */
+		if (ret == HAP_SUCCESS) {
+			hap_pair_setup_ctx_clean(ps_ctx);
+			*ctx = NULL;
+		}
+		return ret;
+	}
+	hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+	return HAP_FAIL;
+}
+
+void hap_set_setup_code(const char *setup_code)
+{
+    if (hap_priv.setup_code)
+        hap_platform_memory_free(hap_priv.setup_code);
+    hap_priv.setup_code = strdup(setup_code);
+}
+
+int hap_set_setup_info(const hap_setup_info_t *setup_info)
+{
+    if (!setup_info)
+        return HAP_FAIL;
+    if (hap_priv.setup_info)
+        hap_platform_memory_free(hap_priv.setup_info);
+    hap_priv.setup_info = hap_platform_memory_calloc(1, sizeof(hap_setup_info_t));
+    if (!hap_priv.setup_info)
+        return HAP_FAIL;
+    memcpy(hap_priv.setup_info, setup_info, sizeof(hap_setup_info_t));
+    return HAP_SUCCESS;
+}
+
+int hap_set_setup_id(const char *setup_id)
+{
+    if (setup_id == NULL || strlen(setup_id) != SETUP_ID_LEN)
+        return HAP_FAIL;
+    strcpy(hap_priv.setup_id, setup_id);
+    return HAP_SUCCESS;
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_pair_verify.c b/components/homekit/esp_hap_core/src/esp_hap_pair_verify.c
new file mode 100644
index 0000000..ddbf6b4
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_pair_verify.c
@@ -0,0 +1,457 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <sodium/crypto_scalarmult_curve25519.h>
+#include <sodium/crypto_sign_ed25519.h>
+#include <hkdf-sha.h>
+#include <sodium/crypto_aead_chacha20poly1305.h>
+#include <esp_http_server.h>
+#include <hap_platform_memory.h>
+
+#include <esp_hap_main.h>
+#include <esp_hap_pair_common.h>
+#include <esp_hap_database.h>
+#include <esp_hap_char.h>
+#include <hexdump.h>
+#include <esp_mfi_debug.h>
+#include <esp_mfi_rand.h>
+
+#define PAIR_VERIFY_ENCRYPT_SALT	"Pair-Verify-Encrypt-Salt"
+#define PAIR_VERIFY_ENCRYPT_INFO	"Pair-Verify-Encrypt-Info"
+#define PV_NONCE1 			"PV-Msg02"
+#define PV_NONCE2 			"PV-Msg03"
+#define CONTROL_SALT			"Control-Salt"
+#define CONTROL_READ_INFO		"Control-Read-Encryption-Key"
+#define CONTROL_WRITE_INFO		"Control-Write-Encryption-Key"
+
+typedef struct {
+	/* It is important that "state" should be the first element of the structure.
+	 * It will be the first element, even in hap_secure_session_t.
+	 * This will be useful while checking the state from the context, irrespective
+	 * of whether the context points to pair_verify_ctx_t or hap_secure_session_t.
+	 */
+	uint8_t state;
+	uint8_t ctrl_curve_pk[CURVE_KEY_LEN];
+	uint8_t acc_curve_pk[CURVE_KEY_LEN];
+	uint8_t hkdf_key[ENCRYPT_KEY_LEN];
+	uint8_t shared_secret[CURVE_KEY_LEN];
+	hap_secure_session_t *session;
+} pair_verify_ctx_t;
+
+void hap_close_ctrl_sessions(hap_ctrl_data_t *ctrl)
+{
+	if (!ctrl)
+		return;
+	int i;
+	for (i = 0; i < HAP_MAX_SESSIONS; i++) {
+        if (!hap_priv.sessions[i])
+            continue;
+		if (hap_priv.sessions[i]->ctrl == ctrl) {
+            hap_report_event(HAP_EVENT_CTRL_DISCONNECTED, (ctrl->info.id),
+                    sizeof((ctrl->info.id)));
+			/* TODO: Use some generic function and not a direct HTTPD function
+			 */
+            httpd_sess_trigger_close(hap_priv.server, hap_priv.sessions[i]->conn_identifier);
+		}
+	}
+}
+
+int hap_get_ctrl_session_index(hap_secure_session_t *session)
+{
+	int i;
+	for (i = 0; i < HAP_MAX_SESSIONS; i++) {
+		if (hap_priv.sessions[i] == session)
+			return i;
+	}
+	return -1;
+}
+
+void hap_close_all_sessions()
+{
+	int i;
+	for (i = 0; i < HAP_MAX_SESSIONS; i++) {
+		if (hap_priv.sessions[i]) {
+			ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Closing Session");
+            hap_close_ctrl_sessions(hap_priv.sessions[i]->ctrl);
+        }
+	}
+}
+
+static void hap_add_secure_session(hap_secure_session_t *session)
+{
+	int i;
+	for (i = 0; i < HAP_MAX_SESSIONS; i++) {
+		if (hap_priv.sessions[i] == NULL) {
+			hap_priv.sessions[i] = session;
+            hap_report_event(HAP_EVENT_CTRL_CONNECTED, session->ctrl->info.id,
+                            sizeof(session->ctrl->info.id));
+            /* Set the disconnected_event_sent flag here to false so that an
+             * event can be sent later for a state change, when no controller
+             * is connected.
+             * HAP Spec R15 say that the state number should change only once
+             * between accessory disconneted (from all controllers) to connected
+             * state.
+             */
+            hap_priv.disconnected_event_sent = false;
+			ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "HomeKit Session active");
+			break;
+		}
+	}
+}
+
+void hap_free_session(void *session)
+{
+	if (!session)
+		return;
+	int i;
+	for (i = 0; i < HAP_MAX_SESSIONS; i++) {
+		if (hap_priv.sessions[i] == session) {
+			/* Disable all characteristic notifications on this session */
+			hap_disable_all_char_notif(i);
+			hap_priv.sessions[i] = NULL;
+			ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "HomeKit Session terminated");
+			break;
+		}
+	}
+	hap_platform_memory_free(session);
+}
+
+static int hap_pair_verify_process_start(pair_verify_ctx_t *pv_ctx, uint8_t *buf, int inlen,
+		int bufsize, int *outlen)
+{
+	/* Parse the data received from the controller */
+	uint8_t state;
+	if (!pv_ctx) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "No context");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	if ((get_value_from_tlv(buf, inlen, kTLVType_State, &state, sizeof(state)) < 0) ||
+		(get_value_from_tlv(buf, inlen, kTLVType_PublicKey, pv_ctx->ctrl_curve_pk,
+				    CURVE_KEY_LEN) < 0)) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Invalid TLVs received");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	if (state != STATE_M1) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Incorrect State received");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Pair Verify M1 Received");
+	hex_dbg_with_name("ctrl curve pk", pv_ctx->ctrl_curve_pk, 32);
+
+	/* Generate a new Curve25519 Key Pair */
+	uint8_t acc_curve_sk[CURVE_KEY_LEN];
+	esp_mfi_get_random(acc_curve_sk, CURVE_KEY_LEN);
+	/* This particular value of basepoint is required to generate the public key
+	 * from secret key
+	 */
+	uint8_t basepoint[32] = {9};
+    if (crypto_scalarmult_curve25519(pv_ctx->acc_curve_pk, acc_curve_sk, basepoint) == -1) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Curve25519 Error");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+    }
+	hex_dbg_with_name("acc curve sk", acc_curve_sk, 32);
+	hex_dbg_with_name("acc curve pk", pv_ctx->acc_curve_pk, 32);
+    if (crypto_scalarmult_curve25519(pv_ctx->shared_secret, acc_curve_sk, pv_ctx->ctrl_curve_pk) == -1) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Curve25519 Error");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+    }
+
+	hex_dbg_with_name("shared secret", pv_ctx->shared_secret, 32);
+
+	/* Construct AccessoryInfo by concatenating
+	 * a. Accessory's Curve25519 Public Key
+	 * b. Accessory ID
+	 * c. Controller's Curve25519 Public Key received in M1
+	 */
+	uint8_t acc_info[2 * CURVE_KEY_LEN + HAP_ACC_ID_LEN];
+	int acc_info_len  = 0;
+	memcpy(acc_info, pv_ctx->acc_curve_pk, CURVE_KEY_LEN);
+	acc_info_len += CURVE_KEY_LEN;
+	memcpy(acc_info + acc_info_len, hap_priv.acc_id, strlen(hap_priv.acc_id));
+	acc_info_len += strlen(hap_priv.acc_id);
+	memcpy(acc_info + acc_info_len, pv_ctx->ctrl_curve_pk, CURVE_KEY_LEN);
+	acc_info_len += CURVE_KEY_LEN;
+
+	hex_dbg_with_name("acc_info", acc_info, acc_info_len);
+
+	/* Use Ed25519 to generate AccessorySignature by signing AccessoryInfo
+	 * with its Long Term Secret Key AccessoryLTSK
+	 */
+	unsigned char ed_sign[64];
+    unsigned long long ed_sign_len;
+    crypto_sign_ed25519_detached(ed_sign, &ed_sign_len, acc_info, acc_info_len, hap_priv.ltska);
+	hex_dbg_with_name("sign", ed_sign, 64);
+
+	/* Construct a subTLV with
+	 * kTLVType_Identifier : Accessory Identifier
+	 * kTLVType_Signature : AccessorySignature generated above
+	 */
+	uint8_t subtlv[4 + HAP_ACC_ID_LEN + ED_SIGN_LEN + POLY_AUTHTAG_LEN];
+	hap_tlv_data_t tlv_data;
+	tlv_data.bufptr = subtlv;
+	tlv_data.bufsize = sizeof(subtlv);
+	tlv_data.curlen = 0;
+	add_tlv(&tlv_data, kTLVType_Identifier, strlen(hap_priv.acc_id), hap_priv.acc_id);
+	add_tlv(&tlv_data, kTLVType_Signature, sizeof(ed_sign), ed_sign);
+	int subtlv_len = tlv_data.curlen;
+	hex_dbg_with_name("subtlv", subtlv, subtlv_len);
+
+	/* Derive Symmetric Session encryption key SessionKey from the curve
+	 * shared secret using HKDF-SHA-512
+	 */
+	hkdf(SHA512, (unsigned char *) PAIR_VERIFY_ENCRYPT_SALT,
+			strlen(PAIR_VERIFY_ENCRYPT_SALT),
+			pv_ctx->shared_secret, sizeof(pv_ctx->shared_secret),
+			(unsigned char *) PAIR_VERIFY_ENCRYPT_INFO,
+			strlen(PAIR_VERIFY_ENCRYPT_INFO),
+			pv_ctx->hkdf_key, sizeof(pv_ctx->hkdf_key));
+	/* Encrypt the sub TLV to get encryptedData and an authTag using
+	 * Chacha20-Poly1305 AEAD Algorithm
+	 */
+	uint8_t edata[4 + HAP_ACC_ID_LEN + ED_SIGN_LEN + POLY_AUTHTAG_LEN];
+    unsigned long long mlen = 16;
+    uint8_t newnonce[12];
+    memset(newnonce, 0, sizeof newnonce);
+    memcpy(newnonce+4, PV_NONCE1, 8);
+
+    crypto_aead_chacha20poly1305_ietf_encrypt_detached(edata, edata + subtlv_len, &mlen, subtlv, subtlv_len, NULL, 0, NULL, newnonce, pv_ctx->hkdf_key);
+
+	int edata_len = subtlv_len + POLY_AUTHTAG_LEN;
+
+	hex_dbg_with_name("encrypt_data", edata, edata_len);
+
+	/* Construct the response M2 */
+	tlv_data.bufptr = buf;
+	tlv_data.bufsize = bufsize;
+	tlv_data.curlen = 0;
+	state = STATE_M2;
+	if ((add_tlv(&tlv_data, kTLVType_State, 1, &state) < 0) ||
+			(add_tlv(&tlv_data, kTLVType_PublicKey, CURVE_KEY_LEN,
+				 pv_ctx->acc_curve_pk) < 0) ||
+			(add_tlv(&tlv_data, kTLVType_EncryptedData, edata_len, edata) < 0)) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "TLV creation failed");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	*outlen = tlv_data.curlen;
+	hex_dbg_with_name("M2", buf, *outlen);
+	pv_ctx->state = STATE_M2;
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Pair Verify M2 Successful");
+	return HAP_SUCCESS;
+}
+
+static int hap_pair_verify_process_finish(pair_verify_ctx_t *pv_ctx, uint8_t *buf, int inlen,
+		int bufsize, int *outlen)
+{
+	/* Parse the data received from the controller */
+	uint8_t state;
+	if (!pv_ctx) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "No context");
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	uint8_t edata[4 + HAP_CTRL_ID_LEN + ED_SIGN_LEN + POLY_AUTHTAG_LEN];
+	int edata_len;
+	if ((get_value_from_tlv(buf, inlen, kTLVType_State, &state, sizeof(state)) < 0) ||
+		((edata_len = get_value_from_tlv(buf, inlen, kTLVType_EncryptedData,
+					 edata, sizeof(edata))) < 0)) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Invalid TLVs received");
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	if (state != STATE_M3) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Incorrect State received");
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Pair Verify M3 Received");
+
+    /* Decrypt the received data to get the subTLV */
+    uint8_t newnonce[12];
+    memset(newnonce, 0, sizeof newnonce);
+    memcpy(newnonce+4, PV_NONCE2, 8);
+    int ret;
+    ret = crypto_aead_chacha20poly1305_ietf_decrypt_detached(edata, NULL, edata, edata_len - POLY_AUTHTAG_LEN, edata + edata_len - POLY_AUTHTAG_LEN, NULL, 0, newnonce, pv_ctx->hkdf_key); 
+    if (ret != 0) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Decryption error");
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Authentication, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+
+	/* Parse the subTLV to get the iOSDevicePairingID and iOSDeviceSignature
+	 */
+	edata_len = edata_len - POLY_AUTHTAG_LEN;
+    unsigned char ed_sign[64];
+	char ctrl_id[HAP_CTRL_ID_LEN];
+	memset(ctrl_id, 0, sizeof(ctrl_id));
+	if ((get_value_from_tlv(edata, edata_len, kTLVType_Identifier,
+					ctrl_id, sizeof(ctrl_id)) < 0) ||
+			(get_value_from_tlv(edata, edata_len, kTLVType_Signature,
+					ed_sign, sizeof(ed_sign)) < 0)) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Wrong subTLV received");
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+
+	/* Check if the controller is present in the database i.e. check
+	 * if the controller was paired with the accessory
+	 */
+	hap_ctrl_data_t *ctrl = hap_get_controller(ctrl_id);
+	if (!ctrl) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "No ctrl details found");
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Authentication, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+
+	/* Construct iOSDeviceInfo by concatenating
+	 * a. Controllers's Curve25519 Public Key (received in M1)
+	 * b. Controller ID
+	 * c. Accessory's Curve25519 Public Key (sent in M2)
+	 */
+	uint8_t ios_dev_info[2 * CURVE_KEY_LEN + HAP_CTRL_ID_LEN];
+	int ios_dev_info_len = 0;
+	memcpy(ios_dev_info, pv_ctx->ctrl_curve_pk, CURVE_KEY_LEN);
+	ios_dev_info_len += CURVE_KEY_LEN;
+	memcpy(ios_dev_info + ios_dev_info_len, ctrl_id, strlen(ctrl_id));
+	ios_dev_info_len += strlen(ctrl_id);
+	memcpy(ios_dev_info + ios_dev_info_len, pv_ctx->acc_curve_pk,
+			CURVE_KEY_LEN);
+	ios_dev_info_len += CURVE_KEY_LEN;
+
+	/* Validate the signature with the received iOSDeviceSignature */
+    if (crypto_sign_ed25519_verify_detached(ed_sign, ios_dev_info, ios_dev_info_len, ctrl->info.ltpk) != 0) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Signature mismatch");
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Authentication, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+
+	/* Allocate memory for the secure session information */
+	hap_secure_session_t *session = hap_platform_memory_calloc(sizeof(hap_secure_session_t), 1);
+	if (!session) {
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Unknown, buf, bufsize, outlen);
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Memory allocation failed");
+		return HAP_FAIL;
+	}
+	/* Construct the response M4 */
+	hap_tlv_data_t tlv_data;
+	tlv_data.bufptr = buf;
+	tlv_data.bufsize = bufsize;
+	tlv_data.curlen = 0;
+	state = STATE_M4;
+	if (add_tlv(&tlv_data, kTLVType_State, 1, &state) < 0) {
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Unknown, buf, bufsize, outlen);
+		hap_platform_memory_free(session);
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "TLV creation failed");
+		return HAP_FAIL;
+	}
+	*outlen = tlv_data.curlen;
+
+	/* Generate the Encryption and Decryption Keys.
+	 * Since, read and write are from the controller's point of view,
+	 * encryption key uses READ_INFO and decryption key uses WRITE_INFO
+	 *
+	 * Also, set the nonce to zero
+	 */
+	hkdf(SHA512, (unsigned char *) CONTROL_SALT, strlen(CONTROL_SALT),
+			pv_ctx->shared_secret, sizeof(pv_ctx->shared_secret),
+			(unsigned char *) CONTROL_READ_INFO, strlen(CONTROL_READ_INFO),
+			session->encrypt_key, sizeof(session->encrypt_key));
+
+	hkdf(SHA512, (unsigned char *) CONTROL_SALT, strlen(CONTROL_SALT),
+			pv_ctx->shared_secret, sizeof(pv_ctx->shared_secret),
+			(unsigned char *) CONTROL_WRITE_INFO, strlen(CONTROL_WRITE_INFO),
+			session->decrypt_key, sizeof(session->decrypt_key));
+
+	session->state = STATE_VERIFIED;
+	pv_ctx->state = STATE_VERIFIED;
+
+	memset(session->encrypt_nonce, 0, sizeof(session->encrypt_nonce));
+	memset(session->decrypt_nonce, 0, sizeof(session->decrypt_nonce));
+	session->ctrl = ctrl;
+
+	pv_ctx->session = session;
+
+	/* Add the session information to database */
+	hap_add_secure_session(session);
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Pair Verify Successful for %s", ctrl_id);
+	return HAP_SUCCESS;
+}
+
+int hap_pair_verify_process(void **ctx, uint8_t *buf, int inlen, int bufsize, int *outlen)
+{
+	pair_verify_ctx_t *pv_ctx = (pair_verify_ctx_t *)(*ctx);
+	if (pv_ctx) {
+		if (pv_ctx->state == STATE_M0)
+			return hap_pair_verify_process_start(pv_ctx, buf, inlen,
+					bufsize, outlen);
+		else if (pv_ctx->state == STATE_M2) {
+			int ret = hap_pair_verify_process_finish(pv_ctx, buf, inlen,
+					bufsize, outlen);
+			/* Successful finish means that the pair verify was successful.
+			 * So, we clear the old context and assign the secure_session
+			 * as the new context
+			 */
+			if (ret == HAP_SUCCESS) {
+				hap_secure_session_t *session = pv_ctx->session;
+				hap_platform_memory_free(pv_ctx);
+				*ctx = session;
+			}
+			return ret;
+		}
+	}
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Error processing Pair Verify Data");
+	hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+	return HAP_FAIL;
+}
+
+int hap_pair_verify_context_init(void **ctx, uint8_t *buf, int bufsize, int *outlen)
+{
+	pair_verify_ctx_t *pv_ctx;
+
+	pv_ctx = (pair_verify_ctx_t *) hap_platform_memory_calloc(sizeof(pair_verify_ctx_t), 1);
+	if (!pv_ctx) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Failed to create Pair Verify Context");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	*ctx = pv_ctx;
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "######## Starting Pair Verify ########");
+	return HAP_SUCCESS;
+}
+
+uint8_t hap_pair_verify_get_state(void *ctx)
+{
+	pair_verify_ctx_t *pv_ctx = (pair_verify_ctx_t *)ctx;
+	if (pv_ctx)
+		return pv_ctx->state;
+	return 0;
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_pairings.c b/components/homekit/esp_hap_core/src/esp_hap_pairings.c
new file mode 100644
index 0000000..cffe335
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_pairings.c
@@ -0,0 +1,255 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include <esp_hap_database.h>
+#include <esp_hap_controllers.h>
+#include <esp_hap_pair_common.h>
+#include <esp_hap_pair_verify.h>
+#include <esp_hap_main.h>
+#include <esp_mfi_debug.h>
+
+bool hap_is_req_admin(void *__session)
+{
+    hap_secure_session_t *session = (hap_secure_session_t *)__session;
+    if (!session) {
+        return false;
+    }
+	if ((session->state == STATE_VERIFIED) && (session->ctrl->info.perms == 1)) {
+		return true;
+    }
+    return false;
+}
+
+char *hap_req_get_ctrl_id(void *__session)
+{
+    hap_secure_session_t *session = (hap_secure_session_t *)__session;
+    if (!session)
+        return NULL;
+
+    if (session->state == STATE_VERIFIED) {
+        return session->ctrl->info.id;
+    }
+    return NULL;
+}
+
+bool hap_is_req_secure(hap_secure_session_t *session)
+{
+    if (!session) {
+        return false;
+    }
+    if (session->state == STATE_VERIFIED) {
+        return true;
+    }
+    return false;
+}
+
+void hap_remove_all_controllers()
+{
+	int i;
+	for (i = 0; i < HAP_MAX_CONTROLLERS; i++) {
+		if (hap_priv.controllers[i].valid) {
+			hap_close_ctrl_sessions(&hap_priv.controllers[i]);
+			hap_controller_remove(&hap_priv.controllers[i]);
+		}
+	}
+}
+static int hap_process_pair_remove(uint8_t *buf, int inlen, int bufsize, int *outlen)
+{
+    bool acc_unpaired = false;
+	char ctrl_id[HAP_CTRL_ID_LEN];
+	memset(ctrl_id, 0, HAP_CTRL_ID_LEN);
+	if (get_value_from_tlv(buf, inlen, kTLVType_Identifier,
+					ctrl_id, sizeof(ctrl_id)) < 0) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Identifier not found");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+
+	ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Removing Controller %s", ctrl_id);
+	hap_ctrl_data_t *ctrl = hap_get_controller(ctrl_id);
+	hap_close_ctrl_sessions(ctrl);
+	hap_controller_remove(ctrl);
+
+	if (!is_admin_paired()) {
+        acc_unpaired = true;
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Last Admin controller removed. Removing all other controllers.");
+		hap_remove_all_controllers();
+    }
+
+	hap_tlv_data_t tlv_data = {
+		.bufptr = buf,
+		.bufsize = bufsize,
+		.curlen = 0,
+	};
+	uint8_t state = STATE_M2;
+	if (add_tlv(&tlv_data, kTLVType_State, sizeof(state), &state) < 0) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "TLV creation failed");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	*outlen = tlv_data.curlen;
+    if (acc_unpaired) {
+        hap_send_event(HAP_INTERNAL_EVENT_ACC_UNPAIRED);
+    }
+	return HAP_SUCCESS;
+}
+
+static int hap_process_pair_add(uint8_t *buf, int inlen, int bufsize, int *outlen)
+{
+	char ctrl_id[HAP_CTRL_ID_LEN];
+	uint8_t ltpkc[ED_KEY_LEN];
+	uint8_t perms;
+	memset(ctrl_id, 0, HAP_CTRL_ID_LEN);
+	if ((get_value_from_tlv(buf, inlen, kTLVType_Identifier,
+						ctrl_id, sizeof(ctrl_id)) < 0) ||
+		(get_value_from_tlv(buf, inlen, kTLVType_PublicKey,
+				    ltpkc, sizeof(ltpkc)) < 0) ||
+		 (get_value_from_tlv(buf, inlen, kTLVType_Permissions,
+				     &perms, sizeof(perms)) < 0)) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Invalid TLVs received");
+		hap_prepare_error_tlv(STATE_M4, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+
+	hap_ctrl_data_t *ctrl = hap_get_controller(ctrl_id);
+	if (ctrl) {
+		/* If controller already exists, but the key does not match, return error */
+		if (memcmp(ltpkc, ctrl->info.ltpk, ED_KEY_LEN)) {
+			hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+			return HAP_FAIL;
+		} else {
+			/* Else, just change the permissions */
+			ctrl->info.perms = perms;
+	        ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Modifying Existing Controller %s", ctrl_id);
+			hap_controller_save(ctrl);
+		}
+	} else {
+		/* Check if there is space available for a new controller */
+		ctrl = 	hap_controller_get_empty_loc();
+		if (!ctrl) {
+			hap_prepare_error_tlv(STATE_M2, kTLVError_MaxPeers, buf, bufsize, outlen);
+			return HAP_FAIL;
+		}
+		strcpy(ctrl->info.id, ctrl_id);
+		memcpy(ctrl->info.ltpk, ltpkc, ED_KEY_LEN);
+		ctrl->info.perms = perms;
+		hap_controller_save(ctrl);
+	    ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Added Controller %s", ctrl_id);
+	}
+	hap_tlv_data_t tlv_data = {
+		.bufptr = buf,
+		.bufsize = bufsize,
+		.curlen = 0,
+	};
+	uint8_t state = STATE_M2;
+	if (add_tlv(&tlv_data, kTLVType_State, sizeof(state), &state) < 0) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "TLV creation failed");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	*outlen = tlv_data.curlen;
+	return HAP_SUCCESS;
+
+}
+static int hap_process_pair_list(uint8_t *buf, int inlen, int bufsize, int *outlen)
+{
+	hap_tlv_data_t tlv_data = {
+		.bufptr = buf,
+		.bufsize = bufsize,
+		.curlen = 0,
+	};
+	int i;
+	hap_ctrl_data_t *ctrl;
+    hap_ctrl_info_t *ctrl_info;
+	bool entry_added = false;
+	for (i = 0; i < HAP_MAX_CONTROLLERS; i++) {
+		ctrl = &hap_priv.controllers[i];
+		if (!ctrl->valid)
+			continue;
+        /* If an entry is already added, include a separator */
+        if (entry_added) {
+            if (add_tlv(&tlv_data, kTLVType_Separator, 0, NULL) < 0) {
+                ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "TLV creation failed");
+                hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown,
+                        buf, bufsize, outlen);
+                return HAP_FAIL;
+            }
+        } else {
+            /* Else, since this is the first entry, add the state */
+	        uint8_t state = STATE_M2;
+            if (add_tlv(&tlv_data, kTLVType_State, sizeof(state), &state) < 0) {
+                ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "TLV creation failed");
+                hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown,
+                        buf, bufsize, outlen);
+                return HAP_FAIL;
+            }
+        }
+        ctrl_info = &ctrl->info;
+		if ((add_tlv(&tlv_data, kTLVType_Identifier,
+						strlen(ctrl_info->id), ctrl_info->id) < 0) ||
+				(add_tlv(&tlv_data, kTLVType_PublicKey,
+					 ED_KEY_LEN, ctrl_info->ltpk) < 0) ||
+				(add_tlv(&tlv_data, kTLVType_Permissions,
+					 1, &ctrl_info->perms) < 0)) {
+			ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "TLV creation failed");
+			hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+			return HAP_FAIL;
+		}
+		entry_added = true;
+	}
+	*outlen = tlv_data.curlen;
+	return HAP_SUCCESS;
+}
+
+int hap_pairings_process(void *ctx, uint8_t *buf, int inlen, int bufsize, int *outlen)
+{
+	if (!hap_is_req_admin(ctx)) {
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Authentication, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	uint8_t state, method;
+	if ((get_value_from_tlv(buf, inlen, kTLVType_State, &state, sizeof(state)) < 0) ||
+			(get_value_from_tlv(buf, inlen, kTLVType_Method,
+					    &method, sizeof(method)) < 0) ||
+			(state != STATE_M1)) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Invalid TLVs received");
+		hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+		return HAP_FAIL;
+	}
+	if (method == HAP_METHOD_ADD_PAIRING) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Add Pairing received");
+		return hap_process_pair_add(buf, inlen, bufsize, outlen);
+	} else if (method == HAP_METHOD_REMOVE_PAIRING) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Remove Pairing received");
+		return hap_process_pair_remove(buf, inlen, bufsize, outlen);
+	} else if (method == HAP_METHOD_LIST_PAIRINGS) {
+		ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "List Pairings received");
+		return hap_process_pair_list(buf, inlen, bufsize, outlen);
+	}
+	hap_prepare_error_tlv(STATE_M2, kTLVError_Unknown, buf, bufsize, outlen);
+	return HAP_FAIL;
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_serv.c b/components/homekit/esp_hap_core/src/esp_hap_serv.c
new file mode 100644
index 0000000..8c8bd9f
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_serv.c
@@ -0,0 +1,329 @@
+ /*
+  * ESPRESSIF MIT License
+  *
+  * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+  *
+  * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+  * it is 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 <hap_platform_memory.h>
+
+#include <esp_hap_serv.h>
+#include <esp_mfi_debug.h>
+
+void hap_serv_mark_primary(hap_serv_t *hs)
+{
+    if (hs) {
+        ((__hap_serv_t *)hs)->primary = true;
+    }
+}
+
+void hap_serv_mark_hidden(hap_serv_t *hs)
+{
+    if (hs) {
+        ((__hap_serv_t *)hs)->hidden = true;
+    }
+}
+
+/**
+ * @brief get service hidden attribute
+ */
+bool hap_serv_get_hidden(hap_serv_t *hs)
+{
+    if (hs) {
+        return ((__hap_serv_t *)hs)->hidden;
+    }
+    return false;
+}
+
+
+void hap_serv_set_iid(hap_serv_t *hs, int32_t iid)
+{
+    if (hs) {
+        ((__hap_serv_t *)hs)->iid = iid;
+    }
+}
+
+/**
+ * @brief get service "primary" attribute
+ */
+bool hap_serv_get_primary(hap_serv_t *hs)
+{
+    if (hs) {
+        return ((__hap_serv_t *)hs)->primary;
+    }
+    return false;
+}
+
+hap_char_t *hap_serv_get_first_char(hap_serv_t *hs)
+{
+    return ((__hap_serv_t *)hs)->chars;
+}
+/**
+ * @brief get target characteristics by it's IID
+ */
+hap_char_t *hap_serv_get_char_by_iid(hap_serv_t *hs, int32_t iid)
+{
+    if (!hs)
+        return NULL;
+
+    hap_char_t *hc;
+    for (hc = hap_serv_get_first_char(hs); hc; hc = hap_char_get_next(hc)) {
+        if (((__hap_char_t *)hc)->iid == iid)
+            return hc;
+    }
+    return NULL;
+}
+
+/**
+ * @brief get target characteristics by it's UUID
+ */
+hap_char_t *hap_serv_get_char_by_uuid(hap_serv_t *hs, const char *uuid)
+{
+    if (!hs | !uuid)
+        return NULL;
+
+    hap_char_t *hc;
+    for (hc = hap_serv_get_first_char(hs); hc; hc = hap_char_get_next(hc)) {
+        if (!strcmp(((__hap_char_t *)hc)->type_uuid, uuid))
+            return hc;
+    }
+    return NULL;
+}
+
+/**
+ * @brief get characteristics UUID prefix number
+ */
+ char *hap_serv_get_uuid(hap_serv_t *hs)
+ {
+     return ((__hap_serv_t *)hs)->type_uuid;
+ }
+
+/**
+ * Default service bulk read callback, which will be registered while creating a service.
+ * It will internally call the actual read routines
+ */
+static int hap_serv_def_bulk_read_cb(hap_read_data_t read_data[], int count,
+        void *serv_priv, void *read_priv)
+{
+    int i;
+    if (!count) {
+        return HAP_FAIL;
+    }
+    __hap_serv_t *hs = (__hap_serv_t *)hap_char_get_parent(read_data[0].hc);
+    /* If no read routine is registered, just return success so that the cached values
+     * will be used
+     */
+    if (!hs->read_cb) {
+        return HAP_SUCCESS;
+    }
+
+    int ret = HAP_SUCCESS;
+    for (i = 0; i < count; i++) {
+       if (hs->read_cb(read_data[i].hc, read_data[i].status, serv_priv, read_priv) != HAP_SUCCESS) {
+           ret = HAP_FAIL;
+       }
+    }
+    return ret;
+}
+/**
+ * @brief HAP create a service
+ */
+hap_serv_t *hap_serv_create(char *type_uuid)
+{
+    ESP_MFI_ASSERT(type_uuid);
+    __hap_serv_t *_hs = hap_platform_memory_calloc(1, sizeof(__hap_serv_t));
+    if (!_hs) {
+        return NULL;
+    }
+
+    _hs->type_uuid = type_uuid;
+    _hs->bulk_read = hap_serv_def_bulk_read_cb;
+
+    return (hap_serv_t *)_hs;
+}
+
+int hap_serv_link_serv(hap_serv_t *hs, hap_serv_t *linked_serv)
+{
+    if (!hs || !linked_serv)
+        return HAP_FAIL;
+
+    hap_linked_serv_t *cur = hap_platform_memory_calloc(1, sizeof(hap_linked_serv_t));
+    if (!cur)
+        return HAP_FAIL;
+    cur->hs = linked_serv;
+
+    __hap_serv_t *_hs = (__hap_serv_t *)hs;
+    hap_linked_serv_t *linked = _hs->linked_servs;
+
+    if (!linked) {
+        _hs->linked_servs = cur;
+        return HAP_SUCCESS;
+    } else {
+        while(linked->next) {
+            linked = linked->next;
+        }
+        linked->next = cur;
+        return HAP_SUCCESS;
+    }
+    return HAP_FAIL;
+}
+
+/**
+ * @brief HAP get target service IID
+ */
+uint32_t hap_serv_get_iid(hap_serv_t *hs)
+{
+    if (!hs)
+       return 0;
+
+    __hap_serv_t *tmp = (__hap_serv_t *)hs;
+
+    return tmp->iid;
+}
+
+char *hap_serv_get_type_uuid(hap_serv_t *hs)
+{
+    if (!hs)
+       return 0;
+
+    __hap_serv_t *tmp = (__hap_serv_t *)hs;
+
+    return tmp->type_uuid;
+}
+
+/**
+ * @brief HAP delete target service
+ */
+void hap_serv_delete(hap_serv_t *hs)
+{
+	/* Returning success even if pointer is NULL, because it means
+	 * that the service is absent and as good as deleted
+	 */
+	if (!hs)
+		return;
+	__hap_serv_t *_hs = (__hap_serv_t *)hs;
+	__hap_char_t *_hc = (__hap_char_t *)_hs->chars;
+	while (_hc) {
+		_hs->chars = _hc->next_char;
+		hap_char_delete((hap_char_t *)_hc);
+		_hc = (__hap_char_t *)_hs->chars;
+	}
+    if (_hs->linked_servs) {
+        hap_linked_serv_t *cur = _hs->linked_servs;
+        hap_linked_serv_t *next = cur->next;
+        while (next) {
+            hap_platform_memory_free(cur);
+            cur = next;
+            next = cur->next;
+        }
+        hap_platform_memory_free(cur);
+    }
+    hap_platform_memory_free(hs);
+}
+
+/**
+ * @brief add a characteristics to a service
+ */
+int hap_serv_add_char(hap_serv_t *hs, hap_char_t *hc)
+{
+    if (!hs || !hc)
+        return -1;
+    __hap_serv_t *_hs = (__hap_serv_t *)hs;
+    __hap_char_t *_hc = (__hap_char_t *)hc;
+
+    if (_hc->parent) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Characteristic already added");
+        return HAP_FAIL;
+    }
+
+    /* If the service has no characteristics, add this as the first */
+    if (!_hs->chars) {
+        _hs->chars = hc;
+    } else {
+        /* Else loop through the characteristics to get to the last one,
+         * and add this at the end
+         */
+        __hap_char_t *temp = (__hap_char_t *)_hs->chars;
+        while (temp->next_char)
+            temp = (__hap_char_t *)temp->next_char;
+        temp->next_char = hc;
+    }
+    if (_hs->parent) {
+        _hc->iid = ((__hap_acc_t *)(_hs->parent))->next_iid++;
+    }
+    _hc->parent = hs;
+    return 0;
+}
+
+void hap_serv_set_write_cb(hap_serv_t *hs, hap_serv_write_t write)
+{
+    if (hs) {
+        ((__hap_serv_t *)hs)->write_cb = write;
+    }
+}
+
+void hap_serv_set_read_cb(hap_serv_t *hs, hap_serv_read_t read)
+{
+    if (hs) {
+        ((__hap_serv_t *)hs)->read_cb = read;
+    }
+}
+
+void hap_serv_set_bulk_read_cb(hap_serv_t *hs, hap_serv_bulk_read_t read)
+{
+    if (hs) {
+        ((__hap_serv_t *)hs)->bulk_read = read;
+    }
+}
+
+
+hap_serv_t *hap_serv_get_next(hap_serv_t *hs)
+{
+    if (hs) {
+        return ((__hap_serv_t *)hs)->next_serv;
+    } else {
+        return NULL;
+    }
+}
+
+hap_acc_t *hap_serv_get_parent(hap_serv_t *hs)
+{
+    if (hs) {
+        return ((__hap_serv_t *)hs)->parent;
+    } else {
+        return NULL;
+    }
+}
+
+void hap_serv_set_priv(hap_serv_t *hs, void *priv)
+{
+    if (hs) {
+        ((__hap_serv_t *)hs)->priv = priv;
+    }
+}
+
+void *hap_serv_get_priv(hap_serv_t *hs)
+{
+    if (hs) {
+        return ((__hap_serv_t *)hs)->priv;
+    } else {
+        return NULL;
+    }
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_setup_payload.c b/components/homekit/esp_hap_core/src/esp_hap_setup_payload.c
new file mode 100644
index 0000000..52cc793
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_setup_payload.c
@@ -0,0 +1,81 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <stdlib.h>
+#include <string.h>
+#include <esp_err.h>
+#include <esp_log.h>
+#include <hap.h>
+
+#include <base36.h>
+
+static const char *TAG = "esp_hap_setup_payload";
+
+#define SETUP_CODE_MASK     0x0000000007ffffff
+#define HAP_OVER_IP_MASK    0x0000000010000000
+#define WAC_MASK            0x0000000040000000
+#define SETUP_PAYLOAD_PREFIX              "X-HM://00"
+
+static void remove_chars(char *str, char c)
+{
+    int i = 0, j = 0;
+    while(str[i]) {
+        if (str[i] != c) {
+            str[j] = str[i];
+            j++;
+        }
+        i++;
+    }
+    str[j] = 0;
+}
+
+char *esp_hap_get_setup_payload(char *setup_code, char *setup_id, bool wac_support, hap_cid_t cid)
+{
+    if (!setup_code || !setup_id) {
+        ESP_LOGE(TAG, "Setup code or Setup ID cannot be NULL");
+        return NULL;
+    }
+    uint64_t payload = 0;
+    if (strlen(setup_code) != 10 || strlen(setup_id) != 4) {
+        ESP_LOGE(TAG, "Setup code or Setup ID not correct. Eg. 111-22-333, ES32");
+        return NULL;
+    }
+    char setup_code_copy[11];
+    strcpy(setup_code_copy, setup_code);
+    remove_chars(setup_code_copy, '-');
+    int64_t code = atoi(setup_code_copy);
+    int64_t category = cid;
+    category <<= 31;
+
+    payload |= code;
+    payload |= category;
+    payload |= HAP_OVER_IP_MASK;
+    if (wac_support) {
+        payload |= WAC_MASK;
+    }
+    char *base36_str = base36_to_str(payload);
+    char setup_payload[24];
+    snprintf(setup_payload, sizeof(setup_payload), "%s%s%s", SETUP_PAYLOAD_PREFIX, base36_str, setup_id);
+    free(base36_str);
+    return strdup(setup_payload);
+}
diff --git a/components/homekit/esp_hap_core/src/esp_hap_wifi.c b/components/homekit/esp_hap_core/src/esp_hap_wifi.c
new file mode 100644
index 0000000..b46adbc
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_hap_wifi.c
@@ -0,0 +1,121 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <esp_log.h>
+#include <esp_mfi_debug.h>
+#include <string.h>
+#include <esp_wifi.h>
+#include <esp_hap_database.h>
+
+esp_err_t hap_wifi_is_provisioned(bool *provisioned)
+{
+    if (!provisioned) {
+        return ESP_ERR_INVALID_ARG;
+    }
+
+    *provisioned = false;
+
+    /* Get Wi-Fi Station configuration */
+    wifi_config_t wifi_cfg;
+    if (esp_wifi_get_config(ESP_IF_WIFI_STA, &wifi_cfg) != ESP_OK) {
+        return ESP_FAIL;
+    }
+
+    if (strlen((const char *) wifi_cfg.sta.ssid)) {
+        *provisioned = true;
+    }
+    return ESP_OK;
+}
+bool hap_is_network_configured(void)
+{
+    /* If only the Ethernet is enabled, return true */
+    if (hap_priv.transport == HAP_TRANSPORT_ETHERNET) {
+        return true;
+    }
+
+    bool provisioned = false;
+    hap_wifi_is_provisioned(&provisioned);
+    return provisioned;
+}
+
+void hap_erase_network_info(void)
+{
+    esp_wifi_restore();
+}
+
+esp_err_t hap_wifi_softap_start(char *ssid)
+{
+    if (!ssid) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "SSID cannot be NULL");
+    }
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Starting SoftAP with SSID: %s", ssid);
+    wifi_config_t wifi_config = {
+        .ap = {
+            .ssid = "",
+            .ssid_len = 0,
+            .max_connection = 4,
+            .password = "",
+            .authmode = WIFI_AUTH_OPEN
+        },
+    };
+    size_t ssid_len = strnlen(ssid, sizeof(wifi_config.ap.ssid));
+    memcpy(wifi_config.ap.ssid, ssid, ssid_len);
+    wifi_mode_t mode;
+    esp_wifi_get_mode(&mode);
+    if (mode == WIFI_MODE_STA) {
+        esp_wifi_set_mode(WIFI_MODE_APSTA);
+    } else {
+        esp_wifi_set_mode(WIFI_MODE_AP);
+    }
+    esp_wifi_set_config(ESP_IF_WIFI_AP, &wifi_config);
+    esp_wifi_start();
+    return ESP_OK;
+}
+
+esp_err_t hap_wifi_softap_stop(void)
+{
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Stopping SoftAP.");
+    wifi_mode_t mode;
+    esp_wifi_get_mode(&mode);
+    if (mode == WIFI_MODE_AP) {
+        esp_wifi_stop();
+    }
+    esp_wifi_set_mode(WIFI_MODE_STA);
+    return ESP_OK;
+}
+
+esp_err_t hap_wifi_sta_connect(wifi_config_t *config)
+{
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_INFO, "Connecting to Wi-Fi.");
+    wifi_mode_t mode;
+    esp_wifi_get_mode(&mode);
+    if (mode == WIFI_MODE_AP || mode == WIFI_MODE_APSTA) {
+        esp_wifi_set_mode(WIFI_MODE_APSTA);
+    } else {
+        esp_wifi_set_mode(WIFI_MODE_STA);
+    }
+    esp_wifi_set_config(ESP_IF_WIFI_STA, config);
+    esp_wifi_start();
+    esp_wifi_connect();
+    return ESP_OK;
+}
diff --git a/components/homekit/esp_hap_core/src/esp_mfi_debug.c b/components/homekit/esp_hap_core/src/esp_mfi_debug.c
new file mode 100644
index 0000000..ca8917a
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_mfi_debug.c
@@ -0,0 +1,80 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <hap.h>
+#include <esp_mfi_debug.h>
+
+#define RED_CHAR    31
+#define GREEN_CHAR  32
+#define YELLOW_CHAR 33
+#define BLUE_CHAR   34
+#define CYAN_CHAR   36
+#define WHITE_CHAR  37
+
+#ifdef CONFIG_MFI_DEBUG_LEVEL_INIT
+#define MFI_DEBUG_LEVEL_INIT CONFIG_MFI_DEBUG_LEVEL_INIT
+#else /* CONFIG_MFI_DEBUG_LEVEL_INIT */
+#define MFI_DEBUG_LEVEL_INIT 0
+#endif /* CONFIG_MFI_DEBUG_LEVEL_INIT */
+
+static uint32_t mfi_debug_level = MFI_DEBUG_LEVEL_INIT;
+
+/**
+ * @bref set the MFI debugging level
+ */
+int esp_mfi_set_debug_level(uint32_t level)
+{
+    mfi_debug_level = level;
+    return 0;
+}
+
+/**
+ * @bref get the MFI debugging level and output data color
+ */
+uint32_t esp_mfi_get_debug_level(uint32_t level, uint32_t *color)
+{
+    const uint32_t prospect_table[] = {
+        0,              /* no                                   */
+        WHITE_CHAR,     /* information: 1, color(37: white)     */
+        GREEN_CHAR,     /* warn       : 3, color(32: green)     */
+        RED_CHAR,       /* error      : 3, color(31: red)       */
+        YELLOW_CHAR,    /* assert     : 4, color(33: yellow)    */
+        CYAN_CHAR       /* block      : 5, color(36: cyan)      */
+                        /* others     : n, color(34: blue)      */
+    };
+    const uint32_t prospect_table_size = sizeof(prospect_table) / sizeof(prospect_table[0]);
+
+    if (level < prospect_table_size)
+        *color = prospect_table[level];
+    else
+        *color = BLUE_CHAR;
+
+    return mfi_debug_level;
+}
+
+void hap_set_debug_level(hap_debug_level_t level)
+{
+    esp_mfi_set_debug_level(level);
+}
diff --git a/components/homekit/esp_hap_core/src/esp_mfi_dummy.c b/components/homekit/esp_hap_core/src/esp_mfi_dummy.c
new file mode 100644
index 0000000..9ddcd1f
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/esp_mfi_dummy.c
@@ -0,0 +1,84 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <stdint.h>
+#include <esp_http_server.h>
+#include <esp_mfi_debug.h>
+#include <esp_hap_pair_common.h>
+#include <esp_hap_pair_setup.h>
+#include <esp_hap_database.h>
+#include <hap.h>
+
+ESP_EVENT_DEFINE_BASE(HAP_WAC_EVENT);
+
+int hap_pair_setup_manage_mfi_auth(pair_setup_ctx_t *ps_ctx, hap_tlv_data_t *tlv_data, hap_tlv_error_t *tlv_error)
+{
+
+    if (ps_ctx->method == HAP_METHOD_PAIR_SETUP) {
+        ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "Secure pair setup not supported. Please use MFi variant of the SDK.");
+        *tlv_error = kTLVError_Unknown;
+        return HAP_FAIL;
+    }
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_WARN, "Using pair-setup without MFi.");
+    return ESP_OK;
+}
+
+int hap_enable_mfi_auth(hap_mfi_auth_type_t auth_type)
+{
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_WARN, "MFi auth not supported. Falling back to HAP_MFI_AUTH_NONE");
+    hap_priv.auth_type = HAP_MFI_AUTH_NONE;
+    return 0;
+}
+
+int hap_wac_start(void)
+{
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "WAC not supported. Please use MFi variant of the SDK.");
+    return ESP_FAIL;
+}
+
+int hap_wac_stop(void)
+{
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "WAC not supported. Please use MFi variant of the SDK.");
+    return ESP_FAIL;
+}
+int hap_enable_hw_auth(void)
+{
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "MFi HW Auth not supported. Please use MFi variant of the SDK.");
+    return ESP_FAIL;
+
+}
+int hap_enable_sw_auth(void)
+{
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "MFi SW Auth not supported. Please use MFi variant of the SDK.");
+    return ESP_FAIL;
+}
+int hap_register_secure_message_handler(httpd_handle_t handle)
+{
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "MFi SW Auth not supported. Please use MFi variant of the SDK.");
+    return ESP_FAIL;
+}
+int hap_unregister_secure_message_handler(httpd_handle_t handle)
+{
+    ESP_MFI_DEBUG(ESP_MFI_DEBUG_ERR, "MFi SW Auth not supported. Please use MFi variant of the SDK.");
+    return ESP_FAIL;
+}
diff --git a/components/homekit/esp_hap_core/src/hexbin.c b/components/homekit/esp_hap_core/src/hexbin.c
new file mode 100644
index 0000000..7451525
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/hexbin.c
@@ -0,0 +1,51 @@
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// 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.
+#include <hexbin.h>
+static int hex2bin_byte(uint8_t *byte)
+{
+    if (*byte >= '0' && *byte <= '9')
+        *byte -= '0';
+    else if (*byte >= 'a' && *byte <= 'f')
+        *byte -= ('a' - 0x0a);
+    else if (*byte >= 'A' && *byte <= 'F')
+        *byte -= ('A' - 0x0a);
+    else
+        return -1;
+    return 0;
+}
+
+int hex2bin(const char *ihex, size_t ilen, uint8_t *obin, size_t *olen)
+{
+    if (ilen > (2 * (*olen))) {
+        return -1;
+    } else if (ilen % 2) {
+        return -1;
+    }
+    int i, j;
+    uint8_t byte;
+    for (i = 0, j = 0; i < ilen / 2; i++) {
+       byte = ihex[j++];
+       if (hex2bin_byte(&byte) < 0) {
+           return -1;
+       }
+       obin[i] = (byte << 4);
+       byte = ihex[j++];
+       if (hex2bin_byte(&byte) < 0) {
+           return -1;
+       }
+       obin[i] |= byte;
+    }
+    *olen = i;
+    return 0;
+}
diff --git a/components/homekit/esp_hap_core/src/hexdump.c b/components/homekit/esp_hap_core/src/hexdump.c
new file mode 100644
index 0000000..f6e7e0a
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/hexdump.c
@@ -0,0 +1,34 @@
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// 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.
+#include <stdio.h>
+
+//#define HEX_DBG_ENABLE
+
+#ifdef HEX_DBG_ENABLE
+void hex_dbg_with_name(char *name, unsigned char *buf, int buf_len)
+{
+	int i;
+	printf("%s: ", name);
+	for (i = 0; i < buf_len; i++) {
+		if (i % 16 == 0)
+			printf("\r\n");
+		printf("%02x ", buf[i]);
+	}
+	printf("\r\n");
+}
+#else
+void hex_dbg_with_name(char *name, unsigned char *buf, int buf_len)
+{
+}
+#endif /* HEX_DBG_ENABLED */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/base36.h b/components/homekit/esp_hap_core/src/priv_includes/base36.h
new file mode 100644
index 0000000..332e387
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/base36.h
@@ -0,0 +1,60 @@
+/*
+ * Base36 PostgreSQL input/output function for bigint
+ *
+ * Author: Dimitri Fontaine <dimitri@2ndQuadrant.fr>
+ *
+ * Taken from https://github.com/dimitri/base36/blob/master/base36.c
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define BASE36_LENGTH      13
+
+typedef long long int base36;
+
+static int base36_digits[36] =
+  {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+   'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+   'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+   'U', 'V', 'W', 'X', 'Y', 'Z'
+  };
+
+static base36 base36_powers[BASE36_LENGTH] =
+  {
+1ULL,
+    36ULL,
+    1296ULL,
+    46656ULL,
+    1679616ULL,
+    60466176ULL,
+    2176782336ULL,
+	78364164096ULL,
+	2821109907456ULL,
+	101559956668416ULL,
+	3656158440062976ULL,
+	131621703842267136ULL,
+	4738381338321616896ULL
+  };
+
+static inline
+char *base36_to_str(base36 c)
+{
+  int i, d, p = 0;
+  base36 m = c;
+  bool discard = true;
+  char *str = calloc((BASE36_LENGTH + 1),  sizeof(char));
+
+  for(i=BASE36_LENGTH-1; i>=0; i--)
+  {
+    d = m / base36_powers[i];
+    m = m - base36_powers[i] * d;
+
+    discard = discard && (d == 0 && i >0);
+
+    if( !discard )
+       str[p++] = base36_digits[d];
+  }
+
+  return str;
+}
diff --git a/components/homekit/esp_hap_core/src/priv_includes/byte_convert.h b/components/homekit/esp_hap_core/src/priv_includes/byte_convert.h
new file mode 100644
index 0000000..0c91ed8
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/byte_convert.h
@@ -0,0 +1,139 @@
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// 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.
+/**
+ * \file byte_convert.h
+ * \brief Conversion between integers and byte streams
+ *
+ * This module offers APIs to convert 16bit, 32bit and 64 bit unsigned integers
+ * into Little/Big Endian byte streams
+ */
+#ifndef _BYTE_CONVERT_H
+#define _BYTE_CONVERT_H
+
+#include <stdint.h>
+
+/** Little Endian to uint16 Conversion
+ * Get a uint16 integer from a little Endian byte stream
+ *
+ * \param[in] val_ptr Pointer to the 2 byte stream
+ *
+ * \return The converted uint16 integer
+ */
+uint16_t get_u16_le(const void *val_ptr);
+
+/** Little Endian to uint32 Conversion
+ * Get a uint32 integer from a little Endian byte stream
+ *
+ * \param[in] val_ptr Pointer to the 4 byte stream
+ *
+ * \return The converted uint32 integer
+ */
+uint32_t get_u32_le(const void *val_ptr);
+
+/** Little Endian to uint64 Conversion
+ * Get a uint64 integer from a little Endian byte stream
+ *
+ * \param[in] val_ptr Pointer to the 8 byte stream
+ *
+ * \return The converted uint32 integer
+ */
+uint64_t get_u64_le(const void *val_ptr);
+
+/** Big Endian to uint16 Conversion
+ * Get a uint16 integer from a Big Endian byte stream
+ *
+ * \param[in] val_ptr Pointer to the 2 byte stream
+ *
+ * \return The converted uint16 integer
+ */
+uint16_t get_u16_be(const void *val_ptr);
+
+/** Big Endian to uint32 Conversion
+ * Get a uint32 integer from a Big Endian byte stream
+ *
+ * \param[in] val_ptr Pointer to the 4 byte stream
+ *
+ * \return The converted uint32 integer
+ */
+uint32_t get_u32_be(const void *val_ptr);
+
+/** Big Endian to uint64 Conversion
+ * Get a uint64 integer from a Big Endian byte stream
+ *
+ * \param[in] val_ptr Pointer to the 8 byte stream
+ *
+ * \return The converted uint16 integer
+ */
+uint64_t get_u64_be(const void *val_ptr);
+
+/** Uint16 to Little Endian Conversion
+ *
+ * Put a uint16 integer into a Little Endian byte stream
+ *
+ * \param[out] Pointer to a 2 byte stream that will be filled with the value
+ *
+ * \param[in] The uint16 integer
+ */
+void put_u16_le(void *val_ptr, const uint16_t val);
+
+/** Uint32 to Little Endian Conversion
+ *
+ * Put a uint32 integer into a Little Endian byte stream
+ *
+ * \param[out] Pointer to a 4 byte stream that will be filled with the value
+ *
+ * \param[in] The uint32 integer
+ */
+void put_u32_le(void *val_ptr, const uint32_t val);
+
+/** Uint64 to Little Endian Conversion
+ *
+ * Put a uint64 integer into a Little Endian byte stream
+ *
+ * \param[out] Pointer to a 8 byte stream that will be filled with the value
+ *
+ * \param[in] The uint64 integer
+ */
+void put_u64_le(void *val_ptr, const uint64_t val);
+
+/** Uint16 to Big Endian Conversion
+ *
+ * Put a uint16 integer into a Big Endian byte stream
+ *
+ * \param[out] Pointer to a 2 byte stream that will be filled with the value
+ *
+ * \param[in] The uint16 integer
+ */
+void put_u16_be(void *val_ptr, const uint16_t val);
+
+/** Uint32 to Big Endian Conversion
+ *
+ * Put a uint32 integer into a Big Endian byte stream
+ *
+ * \param[out] Pointer to a 4 byte stream that will be filled with the value
+ *
+ * \param[in] The uint32 integer
+ */
+void put_u32_be(void *val_ptr, const uint32_t val);
+
+/** Uint64 to Big Endian Conversion
+ *
+ * Put a uint64 integer into a Big Endian byte stream
+ *
+ * \param[out] Pointer to a 8 byte stream that will be filled with the value
+ *
+ * \param[in] The uint64 integer
+ */
+void put_u64_be(void *val_ptr, const uint64_t val);
+#endif /* _BYTE_CONVERT_H */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_acc.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_acc.h
new file mode 100644
index 0000000..2783f9c
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_acc.h
@@ -0,0 +1,51 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_ACC_H_
+#define _HAP_ACC_H_
+
+#include <hap.h>
+#include <esp_hap_serv.h>
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+typedef struct esp_mfi_accessory {
+    struct esp_mfi_accessory *next;
+    uint32_t             aid;            /* accessory AID */
+    hap_serv_t      *servs;   /* service list */
+    bool                power_off;
+    uint32_t next_iid;
+    hap_identify_routine_t identify_routine;
+} __hap_acc_t;
+hap_char_t *hap_acc_get_char_by_iid(hap_acc_t *ha, int32_t iid);
+hap_acc_t *hap_acc_get_by_aid(int32_t aid);
+int hap_acc_get_info(hap_acc_cfg_t *acc_cfg);
+const hap_val_t *hap_get_product_data();
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _HAP_ACC_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_bct_priv.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_bct_priv.h
new file mode 100644
index 0000000..70df56c
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_bct_priv.h
@@ -0,0 +1,28 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_BCT_PRIV_H_
+#define _HAP_BCT_PRIV_H_
+void hap_handle_bct_change_name();
+void hap_handle_hot_plug();
+#endif /* _HAP_BCT_PRIV_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_char.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_char.h
new file mode 100644
index 0000000..d24fcf8
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_char.h
@@ -0,0 +1,98 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_CHAR_H_
+#define _HAP_CHAR_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <sys/errno.h>
+
+#include <hap.h>
+#include <esp_hap_serv.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define HAP_CHAR_MIN_FLAG		(1 << 0)
+#define HAP_CHAR_MAX_FLAG		(1 << 1)
+#define HAP_CHAR_STEP_FLAG		(1 << 2)
+#define HAP_CHAR_MAXLEN_FLAG		(1 << 3)
+#define HAP_CHAR_MAXDATALEN_FLAG	(1 << 4)
+
+/**
+ * @brief characteristics object information
+ */
+typedef struct  {
+    uint32_t iid;        /* Characteristic instance ID */
+    const char *type_uuid;       /* Apple's characteristic UUID */
+    uint16_t permission; /* Characteristic permission */
+    hap_char_format_t      format;   /* data type of the value */
+    hap_val_t       val;
+    bool ev;         /* check if characteristics supports event */
+    char *description;      /* characteristics's description */
+    char *unit;
+
+    /* Characteristics's father subsystem */
+    hap_serv_t                *parent;
+
+    uint8_t constraint_flags;
+
+    hap_val_t       max;       /* maximum value, maxlen, max data len*/
+    hap_val_t       min;       /* minimum value */
+    hap_val_t       step;      /* step value */
+
+    hap_char_t *next_char;
+    /* Bitmap to indicate which controllers have enabled notifications
+     */
+	uint16_t ev_ctrls;
+
+    /* Bitmap indicating the last controller that modified the value.
+     * No notification should be sent to the owner
+     */
+    uint16_t owner_ctrl;
+
+    /* Pointer to a valid values range. It will be a 2 byte array, if set from application */
+    uint8_t *valid_vals_range;
+    /* Since a list of valid values can have any length, using a pointer here,
+     * which will be allocated if valid values are set for a characteristic
+     */
+    uint8_t *valid_vals;
+    size_t valid_vals_cnt;
+    bool update_called;
+} __hap_char_t;
+
+void hap_char_manage_notification(hap_char_t *hc, int index, bool ev);
+bool hap_char_is_ctrl_subscribed(hap_char_t *hc, int index);
+void hap_char_set_owner_ctrl(hap_char_t *hc, int index);
+bool hap_char_is_ctrl_owner(hap_char_t *hc, int index);
+void hap_disable_all_char_notif(int index);
+int hap_char_check_val_constraints(__hap_char_t *_hc, hap_val_t *val);
+int hap_event_queue_init();
+hap_char_t * hap_get_pending_notif_char();
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _HAP_CHAR_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_controllers.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_controllers.h
new file mode 100644
index 0000000..1a341dd
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_controllers.h
@@ -0,0 +1,61 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_CONTROLLERS_H_
+#define _HAP_CONTROLLERS_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#define HAP_MAX_CONTROLLERS 16
+#define HAP_CTRL_ID_LEN		64
+#define ED_KEY_LEN		32
+
+
+typedef struct {
+	char id[HAP_CTRL_ID_LEN];
+	uint8_t ltpk[ED_KEY_LEN];
+	uint8_t perms;
+} __attribute__((packed)) hap_ctrl_info_t;
+
+typedef struct {
+    hap_ctrl_info_t info;
+	/* If "valid" is false, it means that the entry is invalid,
+	 * irrespective of the values of other members, and can be
+	 * used to store new controller info
+	 */
+	bool valid;
+    /* Index is used just for better managing the keystore data */
+    uint8_t index;
+} hap_ctrl_data_t;
+
+int hap_controllers_init();
+bool is_accessory_paired();
+bool is_admin_paired();
+hap_ctrl_data_t *hap_controller_get_empty_loc();
+int hap_controller_save(hap_ctrl_data_t *ctrl_data);
+void hap_controller_remove(hap_ctrl_data_t *ctrl_data);
+hap_ctrl_data_t *hap_get_controller(char *ctrl_id);
+void hap_erase_controller_info();
+
+#endif /* _HAP_CONTROLLERS_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_database.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_database.h
new file mode 100644
index 0000000..22da74c
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_database.h
@@ -0,0 +1,92 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_DATABASE_H_
+#define _HAP_DATABASE_H_
+
+#include <hap.h>
+#include <esp_hap_controllers.h>
+#include <esp_hap_pair_common.h>
+#include <esp_hap_mdns.h>
+#include <esp_hap_secure_message.h>
+#include <esp_http_server.h>
+
+#define HAP_KEYSTORE_NAMESPACE_HAPMAIN  "hap_main"
+#define HAP_FACTORY_NAMESPACE_HAP_SETUP "hap_setup"
+
+#define HAP_MAX_SESSIONS	8
+#define SETUP_ID_LEN        4
+#define SETUP_HASH_LEN      4
+
+#define HAP_ACC_ID_LEN		18 /* AA:BB:CC:XX:YY:ZZ\0 */
+#define ED_KEY_LEN		32
+#define HAP_SW_TOKEN_MAX_LEN        1200
+
+
+typedef struct {
+    hap_acc_cfg_t primary_acc;
+    uint32_t config_num;
+    uint32_t cur_aid;
+    uint8_t raw_acc_id[6];
+	char acc_id[HAP_ACC_ID_LEN];
+    char setup_id[SETUP_ID_LEN + 1];
+    uint8_t setup_hash[SETUP_HASH_LEN];
+    char setup_hash_str[SETUP_HASH_LEN * 2 + 1];
+	uint8_t ltska[ED_KEY_LEN];
+	uint8_t ltpka[ED_KEY_LEN];
+	hap_cid_t cid;
+	hap_ctrl_data_t controllers[HAP_MAX_CONTROLLERS];
+	hap_secure_session_t *sessions[HAP_MAX_SESSIONS];
+	uint8_t pair_attempts;
+    hap_mdns_handle_t wac_mdns_handle;
+    hap_mdns_handle_t hap_mdns_handle;
+    hap_setup_info_t *setup_info;
+    char *setup_code;
+    char *ssid;
+    char *password;
+    hap_software_token_info_t *token_info;
+    uint8_t features;
+    hap_event_handler_t hap_event_handler;
+    char *softap_ssid;
+    void (*ext_nw_prov_start)(void *data, const char *name);
+    void (*ext_nw_prov_stop)(void *data);
+    void *ext_nw_prov_data;
+    hap_cfg_t cfg;
+    hap_transport_t transport;
+    uint32_t pairing_flags;
+    httpd_handle_t server;
+    uint8_t *product_data;
+    uint16_t state_num;
+    bool disconnected_event_sent;
+    hap_mfi_auth_type_t auth_type;
+} hap_priv_t;
+
+extern hap_priv_t hap_priv;
+int hap_database_init(void);
+char *hap_get_acc_id();
+int hap_get_next_aid();
+int hap_acc_setup_init();
+void hap_erase_accessory_info();
+void hap_increment_and_save_config_num();
+void hap_increment_and_save_state_num();
+#endif /* _HAP_DATABASE_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_ip_services.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_ip_services.h
new file mode 100644
index 0000000..fa65bfa
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_ip_services.h
@@ -0,0 +1,35 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_IP_SERVICES_H_
+#define _HAP_IP_SERVICES_H_
+#include <stdbool.h>
+#include <esp_http_server.h>
+int hap_http_session_not_authorized(httpd_req_t *req);
+int hap_httpd_get_data(httpd_req_t *req, char *buffer, int len);
+int hap_httpd_start();
+int hap_ip_services_start();
+int hap_mdns_announce(bool first);
+int hap_mdns_deannounce();
+void hap_http_send_notif();
+#endif /* _HAP_IP_SERVICES_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_keystore.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_keystore.h
new file mode 100644
index 0000000..26587e8
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_keystore.h
@@ -0,0 +1,34 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_KEYSTORE_H_
+#define _HAP_KEYSTORE_H_
+#include <hap.h>
+int hap_keystore_init();
+int hap_keystore_get(const char *name_space, const char *key, uint8_t *val, size_t *val_size);
+int hap_keystore_set(const char *name_space, const char *key, const uint8_t *val, const size_t val_len);
+int hap_keystore_delete(const char *name_space, const char *key);
+int hap_keystore_delete_namespace(const char *name_space);
+int hap_factory_keystore_set(const char *name_space, const char *key, const uint8_t *val, const size_t val_len);
+void hap_keystore_erase_all_data();
+#endif /* _HAP_KEYSTORE_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_main.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_main.h
new file mode 100644
index 0000000..508c856
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_main.h
@@ -0,0 +1,72 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_MAIN_LOOP_H_
+#define _HAP_MAIN_LOOP_H_
+#include <stdbool.h>
+#include <hap.h>
+
+#define HAP_FF_HARDWARE_AUTH    0x01
+#define HAP_FF_SW_TOKEN_AUTH    0x02
+
+
+#define HAP_SF_ACC_UNPAIRED         0x01
+#define HAP_SF_ACC_UNCONFIGURED     0x02
+#define HAP_SF_PROBLEM_DETECTED     0x04
+
+typedef enum {
+    HAP_INTERNAL_EVENT_LOOP_STOP = 1,
+    HAP_INTERNAL_EVENT_ACC_PAIRED,
+    HAP_INTERNAL_EVENT_ACC_UNPAIRED,
+    HAP_INTERNAL_EVENT_CONFIG_NUM_UPDATED,
+    HAP_INTERNAL_EVENT_BCT_CHANGE_NAME,
+    HAP_INTERNAL_EVENT_BCT_HOT_PLUG,
+    HAP_INTERNAL_EVENT_RESET_PAIRINGS,
+    HAP_INTERNAL_EVENT_RESET_TO_FACTORY,
+    HAP_INTERNAL_EVENT_REBOOT,
+    HAP_INTERNAL_EVENT_RESET_NETWORK,
+    HAP_INTERNAL_EVENT_TRIGGER_NOTIF,
+    HAP_INTERNAL_EVENT_RESET_HOMEKIT_DATA,
+} hap_internal_event_t;
+
+typedef struct {
+    hap_internal_event_t event;
+} hap_event_ctx_t;
+
+typedef enum {
+    HAP_STATE_NONE = 0,
+    HAP_STATE_NW_UNCONFIGURED,
+    HAP_STATE_NW_CONFIGURED,
+} hap_state_t;
+
+int hap_loop_start();
+int hap_loop_stop();
+int hap_send_event(hap_internal_event_t event);
+int hap_update_config_number();
+bool is_hap_loop_started();
+void hap_report_event(hap_event_t event, void *data, size_t data_size);
+int hap_enable_hw_auth(void);
+int hap_enable_sw_auth(void);
+
+#endif /* _HAP_MAIN_LOOP_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_mdns.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_mdns.h
new file mode 100644
index 0000000..c206161
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_mdns.h
@@ -0,0 +1,43 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_MDNS_H_
+#define _HAP_MDNS_H_
+
+#include <mdns.h>
+#include <hap.h>
+
+typedef struct {
+    char type[32];
+    char proto[32];
+} hap_mdns_handle_t;
+
+int hap_mdns_serv_start(hap_mdns_handle_t *handle, const char *name, const char *type,
+        const char *protocol, int port, mdns_txt_item_t *txt_records, size_t num_txt);
+int hap_mdns_serv_update_txt(hap_mdns_handle_t *handle, mdns_txt_item_t *txt_records, size_t num_txt);
+int hap_mdns_serv_name_change(hap_mdns_handle_t *handle, const char * instance_name);
+int hap_mdns_serv_stop(hap_mdns_handle_t *handle);
+int hap_mdns_init();
+int hap_mdns_deinit();
+
+#endif /* _HAP_MDNS_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_network_io.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_network_io.h
new file mode 100644
index 0000000..7c8b3ef
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_network_io.h
@@ -0,0 +1,31 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_NETWORK_IO_H_
+#define _HAP_NETWORK_IO_H_
+#include <stdint.h>
+#include <hap_platform_httpd.h>
+int hap_httpd_send(httpd_handle_t hd, int sockfd, const char *buf, unsigned buf_len, int flags);
+int hap_httpd_recv(httpd_handle_t hd, int sockfd, char *buf, unsigned buf_len, int flags);
+
+#endif /* _HAP_NETWORK_IO_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_pair_common.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_pair_common.h
new file mode 100644
index 0000000..a795d58
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_pair_common.h
@@ -0,0 +1,114 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_PAIR_COMMON_H_
+#define _HAP_PAIR_COMMON_H_
+
+#include <stdint.h>
+#include <esp_hap_controllers.h>
+#define ENCRYPT_KEY_LEN		32
+#define POLY_AUTHTAG_LEN	16
+#define CURVE_KEY_LEN		32
+#define ED_SIGN_LEN		64
+#define NONCE_LEN		8
+
+#define STATE_M0		0
+#define STATE_M1		1
+#define STATE_M2		2
+#define STATE_M3		3
+#define STATE_M4		4
+#define STATE_M5		5
+#define STATE_M6		6
+#define STATE_VERIFIED		0x55
+#define STATE_INVALID		0xaa
+
+typedef enum {
+	HAP_METHOD_RESERVED = 0,
+	HAP_METHOD_PAIR_SETUP = 1,
+	HAP_METHOD_PAIR_VERIFY = 2,
+	HAP_METHOD_ADD_PAIRING = 3,
+	HAP_METHOD_REMOVE_PAIRING = 4,
+	HAP_METHOD_LIST_PAIRINGS = 5,
+} hap_pairing_methods_t;
+
+
+typedef enum {
+	kTLVError_Unknown = 0x01,
+	kTLVError_Authentication = 0x02,
+	kTLVError_Backoff = 0x03,
+	kTLVError_MaxPeers = 0x04,
+	kTLVError_MaxTries = 0x05,
+	kTLVError_Unavailable = 0x06,
+	kTLVError_Busy = 0x07,
+} hap_tlv_error_t;
+
+typedef enum {
+	kTLVType_Method = 0x00,
+	kTLVType_Identifier = 0x01,
+	kTLVType_Salt = 0x02,
+	kTLVType_PublicKey = 0x03,
+	kTLVType_Proof = 0x04,
+	kTLVType_EncryptedData = 0x05,
+	kTLVType_State = 0x06,
+	kTLVType_Error = 0x07,
+	kTLVType_RetryDelay = 0x08,
+	kTLVType_Certificate = 0x09,
+	kTLVType_Signature = 0x0a,
+	kTLVType_Permissions = 0x0b,
+	kTLVType_FragmentedData = 0x0c,
+	kTLVType_FragmentLast = 0x0d,
+    kTLVType_Flags = 0x13,
+    kTLVType_OwnershipProofToken = 0x1A,
+    kTLVType_ProductData = 0x1C,
+	kTLVType_Separator = 0xff,
+} hap_tlv_type_t;
+
+typedef struct {
+	uint8_t *bufptr;
+	int bufsize;
+	int curlen;
+} hap_tlv_data_t;
+
+typedef struct {
+	uint8_t state;
+	uint8_t encrypt_key[ENCRYPT_KEY_LEN];
+	uint8_t decrypt_key[ENCRYPT_KEY_LEN];
+	uint8_t encrypt_nonce[NONCE_LEN];
+	uint8_t decrypt_nonce[NONCE_LEN];
+	hap_ctrl_data_t *ctrl;
+    uint64_t pid;
+    int64_t ttl;
+    int64_t prepare_time;
+	/* TODO: As of now, this identifier will be the socket
+	 * number, since only http is supported.
+	 * Need to make this generic later.
+	 */
+	int conn_identifier;
+} hap_secure_session_t;
+
+void hap_tlv_data_init(hap_tlv_data_t *tlv_data, uint8_t *buf, int buf_size);
+int get_value_from_tlv(uint8_t *buf, int buf_len, uint8_t type, void *val, int val_size);
+int get_tlv_length(uint8_t *buf, int buflen, uint8_t type);
+int add_tlv(hap_tlv_data_t *tlv_data, uint8_t type, int len, void *val);
+void hap_prepare_error_tlv(uint8_t state, uint8_t error, void *buf, int buf_size, int *out_len);
+#endif /* _HAP_PAIR_COMMON_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_pair_setup.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_pair_setup.h
new file mode 100644
index 0000000..a79e27a
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_pair_setup.h
@@ -0,0 +1,60 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_PAIR_SETUP_H_
+#define _HAP_PAIR_SETUP_H_
+#include <stdint.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/timers.h>
+#include <mu_srp.h>
+#include <esp_hap_pair_common.h>
+
+#define PS_NONCE1	"PS-Msg04"
+#define PS_NONCE2	"PS-Msg05"
+#define PS_NONCE3	"PS-Msg06"
+
+#define PAIR_FLAG_TRANSIENT     0x00000010
+#define PAIR_FLAG_SPLIT         0x01000000
+
+
+typedef struct {
+	uint8_t state;
+	uint8_t method;
+    uint32_t pairing_flags;
+    int8_t pairing_flags_len;
+	int len_s;
+	char *bytes_s;
+    int secret_len;
+    char *shared_secret;
+    mu_srp_handle_t srp_hd;
+	hap_ctrl_data_t *ctrl;
+	uint8_t session_key[32];
+    TimerHandle_t timer;
+    hap_secure_session_t *session;
+    int sock_fd;
+} pair_setup_ctx_t;
+int hap_pair_setup_context_init(int sock_fd, void **ctx, uint8_t *buf, int bufsize, int *outlen);
+int hap_pair_setup_process(void **ctx, uint8_t *buf, int inlen, int bufsize, int *outlen);
+void hap_pair_setup_ctx_clean(void *sess_ctx);
+int hap_pair_setup_manage_mfi_auth(pair_setup_ctx_t *ps_ctx, hap_tlv_data_t *tlv_data, hap_tlv_error_t *tlv_error);
+#endif /* _HAP_PAIR_SETUP_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_pair_verify.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_pair_verify.h
new file mode 100644
index 0000000..f40a990
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_pair_verify.h
@@ -0,0 +1,35 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_PAIR_VERIFY_H_
+#define _HAP_PAIR_VERIFY_H_
+#include <esp_hap_pair_common.h>
+#include <esp_hap_controllers.h>
+int hap_pair_verify_context_init(void **ctx, uint8_t *buf, int bufsize, int *outlen);
+int hap_pair_verify_process(void **ctx, uint8_t *buf, int inlen, int bufsize, int *outlen);
+uint8_t hap_pair_verify_get_state(void *ctx);
+void hap_free_session(void *session);
+int hap_get_ctrl_session_index(hap_secure_session_t *session);
+void hap_close_ctrl_sessions(hap_ctrl_data_t *ctrl);
+void hap_close_all_sessions();
+#endif /* _HAP_PAIR_VERIFY_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_pairings.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_pairings.h
new file mode 100644
index 0000000..7b7eaab
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_pairings.h
@@ -0,0 +1,29 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_PAIRINGS_H_
+#define _HAP_PAIRINGS_H_
+#include <esp_hap_pair_common.h>
+int hap_pairings_process(void *ctx, uint8_t *buf, int inlen, int bufsize, int *outlen);
+bool hap_is_req_secure(hap_secure_session_t *session);
+#endif /* _HAP_PAIRINGS_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_secure_message.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_secure_message.h
new file mode 100644
index 0000000..dbeb4b1
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_secure_message.h
@@ -0,0 +1,42 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_SECURE_MESSAGE_H_
+#define _HAP_SECURE_MESSAGE_H_
+#include <stdint.h>
+#include <esp_http_server.h>
+/** Information for Software Token based authentication.
+ * To be used only if MFi chip is not present on the accessory
+ */
+typedef struct {
+    /** UUID for the accessory */
+    uint8_t uuid[16];
+    /** Token associated with the UUID */
+    uint8_t *token;
+    /* Length of the above token */
+    size_t token_len;
+} hap_software_token_info_t;
+
+int hap_register_secure_message_handler(httpd_handle_t handle);
+int hap_unregister_secure_message_handler(httpd_handle_t handle);
+#endif /* _HAP_SECURE_MESSAGE_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_serv.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_serv.h
new file mode 100644
index 0000000..8d041d8
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_serv.h
@@ -0,0 +1,80 @@
+ /*
+  * ESPRESSIF MIT License
+  *
+  * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+  *
+  * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+  * it is 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 _HAP_SERV_H_
+#define _HAP_SERV_H_
+
+#include <hap.h>
+#include <esp_hap_char.h>
+#include <esp_hap_acc.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct hap_linked_serv {
+    hap_serv_t *hs;
+    struct hap_linked_serv *next;
+} hap_linked_serv_t;
+
+typedef struct hap_linked_serv hap_linked_serv_t;
+
+/**
+ * HAP service information
+ */
+typedef struct {
+    char                *type_uuid;      /* String that defines the type of the service. */
+
+    uint32_t             iid;        /* service instance ID */
+
+    bool                hidden;     /* If set it to be True, the service is not visible to user. */
+    bool                primary;    /* If set it to be True, this is the primary service of the accessory. */
+
+    /**
+     * List of Characteristic objects. Must not be empty. The maximum number of characteristics
+     * allowed is 100, and each characteristic in the array must have a unique type.
+     */
+    hap_char_t *chars;
+    hap_acc_t  *parent;
+    hap_serv_t *next_serv;
+    
+    hap_serv_write_t write_cb;
+    hap_serv_read_t read_cb;
+    hap_serv_bulk_read_t bulk_read;
+    hap_linked_serv_t *linked_servs;
+    void *priv;
+} __hap_serv_t;
+
+bool hap_serv_get_hidden(hap_serv_t *hs);
+bool hap_serv_get_primary(hap_serv_t *hs);
+hap_char_t *hap_serv_get_char_by_iid(hap_serv_t *hs, int32_t iid);
+ char *hap_serv_get_uuid(hap_serv_t *hs);
+hap_serv_t *hap_serv_create(char *type_uuid);
+void hap_serv_delete(hap_serv_t *hs);
+int hap_serv_add_char(hap_serv_t *hs, hap_char_t *hc);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _HAP_SERV_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_wac.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_wac.h
new file mode 100644
index 0000000..8ea04f3
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_wac.h
@@ -0,0 +1,32 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_WAC_H_
+#define _HAP_WAC_H_
+int hap_wac_start(void);
+int hap_wac2_network_switch(void);
+int hap_wac2_finish(void);
+int hap_wac2_stop(void);
+bool hap_is_mfi_auth_enabled();
+#endif /* _HAP_WAC_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_hap_wifi.h b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_wifi.h
new file mode 100644
index 0000000..7b7f958
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_hap_wifi.h
@@ -0,0 +1,30 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_WIFI_H_
+#define _HAP_WIFI_H_
+#include <hap.h>
+bool hap_is_network_configured();
+void hap_wifi_restart();
+void hap_erase_network_info();
+#endif /* _HAP_WIFI_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/esp_mfi_debug.h b/components/homekit/esp_hap_core/src/priv_includes/esp_mfi_debug.h
new file mode 100644
index 0000000..98664a8
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/esp_mfi_debug.h
@@ -0,0 +1,158 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 ESP_MFI_DEBUG_H_
+#define ESP_MFI_DEBUG_H_
+
+#include <stdint.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+#define ESP_MFI_DEBUG_FL "\n"
+#define CONFIG_ESP_MFI_DEBUG_ENABLE
+#ifdef CONFIG_ESP_MFI_DEBUG_ENABLE
+#define ESP_MFI_DEBUG_ENABLE
+#endif /* CONFIG_ESP_MFI_DEBUG_ENABLE */
+
+#define CONFIG_ESP_MFI_ASSERT
+#ifdef CONFIG_ESP_MFI_ASSERT
+#define ESP_MFI_ASSERT_ENABLE
+#endif /* CONFIG_ESP_MFI_ASSERT */
+
+#define CONFIG_MFI_DEBUG_LEVEL_INIT 0
+#define CONFIG_ESP_MFI_ASSERT_BLOCK
+#ifdef CONFIG_ESP_MFI_ASSERT_BLOCK
+#define ESP_MFI_ASSERT_BLOCK()  while (1)
+#else /* CONFIG_ESP_MFI_ASSERT_BLOCK */
+#define ESP_MFI_ASSERT_BLOCK()
+#endif /* CONFIG_ESP_MFI_ASSERT_BLOCK */
+
+/* debug level with different color */
+#define ESP_MFI_DEBUG_INFO      1
+#define ESP_MFI_DEBUG_WARN      2
+#define ESP_MFI_DEBUG_ERR       3
+#define ESP_MFI_DEBUG_ASSERT    4
+#define ESP_MFI_DEBUG_BLOCK     5
+
+/**
+ * @bref set the MFI debugging level
+ *
+ * @param level debugging level
+ *
+ * @return the result
+ *     = 0 : OK
+ *     others : failed
+ */
+int esp_mfi_set_debug_level(uint32_t level);
+
+/**
+ * @bref get the MFI debugging level and output data color
+ *
+ * @param level input debug level
+ * @param color data color
+ *
+ * @return MFI debugging level
+ */
+uint32_t esp_mfi_get_debug_level(uint32_t level, uint32_t *color);
+
+/**
+ * @bref format the string and data, then output it
+ *
+ * @param level if level > MFI_DEBUG_LEVEL then output it
+ * @param fmt format string
+ * @param ... parameters of format string
+ *
+ * @return none
+ *
+ * void ESP_MFI_DEBUG(unsigned int level, const char *fmt, ...);
+ */
+#ifdef ESP_MFI_DEBUG_ENABLE
+#define ESP_MFI_DEBUG(l, fmt, ...)                                                          \
+    {                                                                                       \
+        uint32_t __color_LINE;                                                              \
+        if (l > esp_mfi_get_debug_level(l, &__color_LINE)) {                                \
+            printf("\e[1;%dm" fmt "\e[0m" ESP_MFI_DEBUG_FL,                         \
+                                __color_LINE,  ##__VA_ARGS__);                              \
+        }                                                                                   \
+    }
+#define ESP_MFI_DEBUG_INTR(l, fmt, ...)                                                          \
+    {                                                                                       \
+        uint32_t __color_LINE;                                                              \
+        if (l > esp_mfi_get_debug_level(l, &__color_LINE)) {                                \
+            ets_printf("\e[1;%dm" fmt "\e[0m" ESP_MFI_DEBUG_FL,                         \
+                                __color_LINE,  ##__VA_ARGS__);                              \
+        }                                                                                   \
+    }
+#else /* ESP_MFI_DEBUG_ENABLE */
+#define ESP_MFI_DEBUG(l, fmt, ...)
+#define ESP_MFI_DEBUG_INTR(l, fmt, ...)
+#endif /* ESP_MFI_DEBUG_ENABLE */
+
+/**
+ * @bref if the signal is false(0) do something depended on configuration
+ *
+ * @param conditions checking conditions
+ *
+ * @return none
+ *
+ * void ESP_MFI_ASSERT(int conditions);
+ */
+#ifdef ESP_MFI_ASSERT_ENABLE
+#define ESP_MFI_ASSERT(cond)                                                                \
+{                                                                                           \
+    if (!(cond)) {                                                                          \
+        printf("\e[1;33m" "ESP_MFI assert file %s line %d" ESP_MFI_DEBUG_FL,        \
+                                __FILE__, __LINE__);                                        \
+        ESP_MFI_ASSERT_BLOCK();                                                             \
+    }                                                                                       \
+}
+#else
+#define ESP_MFI_ASSERT(cond)
+#endif
+
+/**
+ * @bref check if data length matches given length
+ *
+ * @param optlen data length
+ * @param opttype data
+ *
+ * @return none
+ *
+ * void ESP_MFI_CHECK_OPTLEN(int conditions, (all type) data);
+ */
+#define ESP_MFI_CHECK_OPTLEN(optlen, opttype)                                               \
+    do {                                                                                    \
+        if ((optlen) > sizeof(opttype)) {                                                   \
+            return -1;                                                                      \
+        }                                                                                   \
+    } while(0)                                                                              \
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ESP_MFI_DEBUG_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/hexbin.h b/components/homekit/esp_hap_core/src/priv_includes/hexbin.h
new file mode 100644
index 0000000..ced744b
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/hexbin.h
@@ -0,0 +1,19 @@
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// 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.
+#ifndef _HEXBIN_H_
+#define _HEXBIN_H_
+#include <stdint.h>
+#include <stddef.h>
+int hex2bin(const char *ihex, size_t ilen, uint8_t *obin, size_t *olen);
+#endif /* _HEXBIN_H_ */
diff --git a/components/homekit/esp_hap_core/src/priv_includes/hexdump.h b/components/homekit/esp_hap_core/src/priv_includes/hexdump.h
new file mode 100644
index 0000000..a64bc7c
--- /dev/null
+++ b/components/homekit/esp_hap_core/src/priv_includes/hexdump.h
@@ -0,0 +1,18 @@
+// Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+//
+// 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.
+#ifndef _HEXDUMP_H_
+#define _HEXDUMP_H_
+void hex_dbg_with_name(char *name, unsigned char *buf, int buf_len);
+
+#endif /* _HEXDUMP_H_ */
diff --git a/components/homekit/esp_hap_extras/CMakeLists.txt b/components/homekit/esp_hap_extras/CMakeLists.txt
new file mode 100644
index 0000000..5d791ff
--- /dev/null
+++ b/components/homekit/esp_hap_extras/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(COMPONENT_ADD_INCLUDEDIRS include)
+
+# Edit following two lines to set component requirements (see docs)
+set(COMPONENT_REQUIRES esp_hap_core)
+set(COMPONENT_PRIV_REQUIRES esp_http_server esp_https_ota protocomm wifi_provisioning bt esp_hap_platform app_update)
+
+set(COMPONENT_SRCS src/hap_bct_http_handlers.c src/hap_fw_upgrade.c)
+
+register_component()
+component_compile_options(-Wno-unused-function)
diff --git a/components/homekit/esp_hap_extras/component.mk b/components/homekit/esp_hap_extras/component.mk
new file mode 100644
index 0000000..bc14fc5
--- /dev/null
+++ b/components/homekit/esp_hap_extras/component.mk
@@ -0,0 +1,6 @@
+#
+# Component Makefile
+#
+CFLAGS += -Wno-unused-function
+COMPONENT_SRCDIRS := src
+COMPONENT_ADD_INCLUDEDIRS := include
diff --git a/components/homekit/esp_hap_extras/include/hap_bct_http_handlers.h b/components/homekit/esp_hap_extras/include/hap_bct_http_handlers.h
new file mode 100644
index 0000000..efcb6d2
--- /dev/null
+++ b/components/homekit/esp_hap_extras/include/hap_bct_http_handlers.h
@@ -0,0 +1,61 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+
+/* BCT HTTP Handlers
+*/
+#ifndef _HAP_BCT_HTTP_HANDLERS_H_
+#define _HAP_BCT_HTTP_HANDLERS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Register web handlers for tester interaction steps of Bonjour Conformance Tests (BCT)
+ *
+ * Two web handlers will be registered, which can be used during BCT to trigger
+ * varions "Tester Interaction" steps.
+ *
+ * /bct/hotplug: A GET or POST on this can be used for "Cable Change Handling" or "Hot Plugging"
+ * steps.
+ * /bct/name-change: A GET or POST on this can be used for "Manual Name Change".
+ *
+ * Eg. curl 169.254.1.9/bct/hotplug
+ *     curl -d {} 169.254.1.9/bct/name-change
+ *
+ * This should be used only for Certification accessories. Irrespective of when this API is called,
+ * the handlers will get enabled only after hap_start().
+ */
+void hap_bct_register_http_handlers();
+
+/**
+ * @brief De-register the handlers registered using hap_bct_register_http_handlers()
+ */
+void hap_bct_unregister_http_handlers();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _HAP_BCT_HTTP_HANDLERS_H_ */
diff --git a/components/homekit/esp_hap_extras/include/hap_fw_upgrade.h b/components/homekit/esp_hap_extras/include/hap_fw_upgrade.h
new file mode 100644
index 0000000..9497f24
--- /dev/null
+++ b/components/homekit/esp_hap_extras/include/hap_fw_upgrade.h
@@ -0,0 +1,87 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+
+/* Firmware Upgrade HomeKit Custom Service
+ */
+#ifndef _HAP_FW_UPGRADE_H_
+#define _HAP_FW_UPGRADE_H_
+#include <hap.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Custom UUID for Firmware Upgrade Service */
+#define HAP_SERV_CUSTOM_UUID_FW_UPG         "d57034d8-3736-11e8-b467-0ed5f89f718b"
+
+/** Custom UUID for the Write-Only Firmware Upgrade  URL */
+#define HAP_CHAR_CUSTOM_UUID_FW_UPG_URL     "d57039e2-3736-11e8-b467-0ed5f89f718b"
+
+/** Custom UUID for the Read-Only Firmware Upgrade Status */
+#define HAP_CHAR_CUSTOM_UUID_FW_UPG_STATUS  "d5703b5e-3736-11e8-b467-0ed5f89f718b"
+
+typedef struct {
+    char * server_cert_pem; /*!< Server verification, PEM format as string */
+} hap_fw_upgrade_config_t;
+
+/** Firmware Upgrade Status
+ *
+ * These are the valid values for HAP_CHAR_CUSTOM_UUID_FW_UPG_STATUS
+ */
+typedef enum {
+    /** FW Upgrade Failed */
+    FW_UPG_STATUS_FAIL = -1,
+    /** FW Upgrade Idle */
+    FW_UPG_STATUS_IDLE = 0,
+    /** FW Upgrade in Progress */
+    FW_UPG_STATUS_UPGRADING = 1,
+    /** FW Upgrade Successful */
+    FW_UPG_STATUS_SUCCESS = 2,
+} hap_fw_upgrade_status_t;
+
+/** Create Firmware Upgrade Service
+ *
+ * This creates the custom Firmware Upgrade HomeKit Service with appropriate characteristics.
+ * Add this service to the accessory, to enable the HTTP Client based Firmware Upgrade.
+ * Host the FW image binary on a webserver and provide the URL as write value for
+ * \ref HAP_CHAR_CUSTOM_UUID_FW_UPG_URL. The status will be reported on
+ * \ref HAP_CHAR_CUSTOM_UUID_FW_UPG_STATUS
+ *
+ * Please refer the top level README.md for more details.
+ * ESP32 OTA details: https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/system/ota.html
+ * ESP32 API Reference: https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/system/esp_https_ota.html
+ * @param[in] ota_config Pointer to a \ref hap_fw_upgrade_config_t structure, for using Secure HTTP (HTTPS).
+ *
+ * @return Service Object pointer on success
+ * @return NULL on failure
+ */
+hap_serv_t * hap_serv_fw_upgrade_create(hap_fw_upgrade_config_t *ota_config);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _HAP_FW_UPGRADE_H_ */
diff --git a/components/homekit/esp_hap_extras/src/hap_bct_http_handlers.c b/components/homekit/esp_hap_extras/src/hap_bct_http_handlers.c
new file mode 100644
index 0000000..b5e643d
--- /dev/null
+++ b/components/homekit/esp_hap_extras/src/hap_bct_http_handlers.c
@@ -0,0 +1,90 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+
+/* BCT HTTP Handlers
+*/
+#include <sdkconfig.h>
+#include <esp_http_server.h>
+#include <hap_platform_httpd.h>
+#include <hap.h>
+#include <hap_bct.h>
+
+#define SUCCESS_RESP    "{\"status\":0}"
+
+#ifdef CONFIG_LEGACY_BCT /* BCT 1.4 and earlier */
+#define NEW_BCT_NAME    "New - Bonjour Service Name"
+#else
+#define NEW_BCT_NAME    "New-BCT"
+#endif /* CONFIG_LEGACY_BCT */
+
+static int hap_bct_name_change_handler(httpd_req_t *req)
+{
+    hap_bct_change_name(NEW_BCT_NAME);
+    return httpd_resp_send(req, SUCCESS_RESP, strlen(SUCCESS_RESP));
+}
+static struct httpd_uri bct_name_change_get = {
+	.uri = "/bct/name-change",
+    .method = HTTP_GET,
+    .handler = hap_bct_name_change_handler,
+};
+static struct httpd_uri bct_name_change_post = {
+	.uri = "/bct/name-change",
+    .method = HTTP_POST,
+    .handler = hap_bct_name_change_handler,
+};
+
+static int hap_bct_hot_plug_handler(httpd_req_t *req)
+{
+    hap_bct_hot_plug();
+    return httpd_resp_send(req, SUCCESS_RESP, strlen(SUCCESS_RESP));
+}
+static struct httpd_uri bct_hotplug_get = {
+	.uri = "/bct/hotplug",
+    .method = HTTP_GET,
+    .handler = hap_bct_hot_plug_handler,
+};
+
+static struct httpd_uri bct_hotplug_post = {
+	.uri = "/bct/hotplug",
+    .method = HTTP_POST,
+    .handler = hap_bct_hot_plug_handler,
+};
+
+void hap_bct_register_http_handlers()
+{
+    httpd_handle_t *httpd_handle = hap_platform_httpd_get_handle();
+    httpd_register_uri_handler(*httpd_handle, &bct_name_change_get);
+    httpd_register_uri_handler(*httpd_handle, &bct_name_change_post);
+    httpd_register_uri_handler(*httpd_handle, &bct_hotplug_get);
+    httpd_register_uri_handler(*httpd_handle, &bct_hotplug_post);
+}
+
+void hap_bct_unregister_http_handlers()
+{
+    httpd_handle_t *httpd_handle = hap_platform_httpd_get_handle();
+    httpd_unregister_uri_handler(*httpd_handle, "/bct/name-change", HTTP_GET);
+    httpd_unregister_uri_handler(*httpd_handle, "/bct/name-change", HTTP_POST);
+    httpd_unregister_uri_handler(*httpd_handle, "/bct/hotplug", HTTP_GET);
+    httpd_unregister_uri_handler(*httpd_handle, "/bct/hotplug", HTTP_POST);
+}
diff --git a/components/homekit/esp_hap_extras/src/hap_fw_upgrade.c b/components/homekit/esp_hap_extras/src/hap_fw_upgrade.c
new file mode 100644
index 0000000..5a30c63
--- /dev/null
+++ b/components/homekit/esp_hap_extras/src/hap_fw_upgrade.c
@@ -0,0 +1,168 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+
+/* Firmware Upgrade HomeKit Custom Service
+ */
+#include <string.h>
+#include <esp_log.h>
+#include <hap.h>
+#include <hap_fw_upgrade.h>
+#include <esp_https_ota.h>
+
+#define FW_UPG_TASK_PRIORITY    1
+#define FW_UPG_STACKSIZE        6 * 1024
+#define FW_UPG_TASK_NAME        "hap_fw_upgrade"
+
+static const char *TAG = "HAP FW Upgrade";
+
+static hap_fw_upgrade_status_t fw_upgrade_status = FW_UPG_STATUS_IDLE;
+static hap_char_t *fw_upgrade_status_char;
+
+static void remove_escape_char(char *url)
+{
+    char *target_url = url;
+    while (*url) {
+        if (*url == '\\') {
+            url++;
+        }
+        *target_url++ = *url++;
+    }
+    *target_url = '\0';
+}
+
+static void fw_upgrade_thread_entry(void *data)
+{
+    esp_http_client_config_t *client_config = (esp_http_client_config_t *)data;
+    remove_escape_char((char *)client_config->url);
+    ESP_LOGI(TAG, "Fetching FW image from %s", client_config->url);
+    fw_upgrade_status = FW_UPG_STATUS_UPGRADING;
+    hap_val_t val = {.i = fw_upgrade_status};
+    hap_char_update_val(fw_upgrade_status_char, &val);
+    int ret = esp_https_ota(client_config);
+    if (ret == ESP_OK) {
+        ESP_LOGI(TAG, "FW Upgrade Successful");
+        fw_upgrade_status = FW_UPG_STATUS_SUCCESS;
+    } else {
+        ESP_LOGE(TAG, "FW Upgrade Failed");
+        fw_upgrade_status = FW_UPG_STATUS_FAIL;
+    }
+    free((char *)client_config->url);
+    val.i = fw_upgrade_status;
+    hap_char_update_val(fw_upgrade_status_char, &val);
+    if (fw_upgrade_status == FW_UPG_STATUS_SUCCESS) {
+        ESP_LOGI(TAG, "Rebooting into new firmware");
+        /* Wait for 5 seconds, so that there is enough time for the status
+         * to reflect on the controller
+         */
+        vTaskDelay((5 * 1000) / portTICK_PERIOD_MS);
+        /* Restart and boot into the new firmware */
+        hap_reboot_accessory();
+    }
+    /* Updating the value of the variable here, so that the next upgrade attempt (if any) can start.
+     * However, no need to update the value, as we want to retain the lates status for 
+     * controllers to read.
+     */
+    fw_upgrade_status = FW_UPG_STATUS_IDLE;
+    vTaskDelete(NULL);
+}
+
+static int hap_fw_upgrade_write(hap_write_data_t write_data[], int count,
+        void *serv_priv, void *write_priv)
+{
+    int i, ret = HAP_SUCCESS;
+    hap_write_data_t *write;
+    for (i = 0; i < count; i++) {
+        write = &write_data[i];
+        if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_CUSTOM_UUID_FW_UPG_URL)) {
+            /* If the Upgrade Status is not idle, it means that a FW Upgrade attempt
+             * is already in progress. Report appropriate status in such a case and do
+             * not proceed
+             */
+            if (fw_upgrade_status != FW_UPG_STATUS_IDLE) {
+                *(write->status) = HAP_STATUS_RES_BUSY;
+                ret = HAP_FAIL;
+            } else {
+                if (!serv_priv) {
+                    *(write->status) = HAP_STATUS_OO_RES;
+                    ret = HAP_FAIL;
+                    continue;
+                }
+                esp_http_client_config_t *client_config = (esp_http_client_config_t *)serv_priv;
+                client_config->url = strndup(write->val.s, strlen(write->val.s)+1);
+                if (xTaskCreate(fw_upgrade_thread_entry, FW_UPG_TASK_NAME, FW_UPG_STACKSIZE,
+                    client_config, FW_UPG_TASK_PRIORITY, NULL) == pdTRUE) {
+                    *(write->status) = HAP_STATUS_SUCCESS;
+                } else {
+                    *(write->status) = HAP_STATUS_OO_RES;
+                    ret = HAP_FAIL;
+                }
+            }
+        } else {
+            *(write->status) = HAP_STATUS_RES_ABSENT;
+            ret = HAP_FAIL;
+        }
+    }
+    return ret;
+}
+
+hap_serv_t * hap_serv_fw_upgrade_create(hap_fw_upgrade_config_t *ota_config)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_CUSTOM_UUID_FW_UPG);
+    if (!hs) {
+        return NULL;
+    }
+    hap_char_t *hc = hap_char_string_create(HAP_CHAR_CUSTOM_UUID_FW_UPG_URL, HAP_CHAR_PERM_PW, NULL);
+    int ret = hap_serv_add_char(hs, hc);
+    fw_upgrade_status_char = hap_char_int_create(HAP_CHAR_CUSTOM_UUID_FW_UPG_STATUS, HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, 0);
+    ret = hap_serv_add_char(hs, fw_upgrade_status_char);
+    if (ret != HAP_SUCCESS) {
+        hap_serv_delete(hs);
+        return NULL;
+    }
+    hap_char_add_description(hc, "FW Upgrade URL");
+    hap_char_add_description(fw_upgrade_status_char, "FW Upgrade Status");
+    hap_serv_set_write_cb(hs, hap_fw_upgrade_write);
+    esp_http_client_config_t *client_config = calloc(1, sizeof(esp_http_client_config_t));
+    if (!client_config) {
+        hap_serv_delete(hs);
+        return NULL;
+    }
+    if(ota_config->server_cert_pem) {
+        client_config->cert_pem = strdup(ota_config->server_cert_pem);
+        if(!client_config->cert_pem) {
+            free(client_config);
+            hap_serv_delete(hs);
+            return NULL;
+        }
+    } else {
+        ESP_LOGW(TAG, "Server certificate not provided in OTA config.");
+    }
+    hap_serv_set_priv(hs, client_config);
+
+    /* Mark the service as hidden as it need not be controlled directly by users */
+    hap_serv_mark_hidden(hs);
+    return hs;
+}
+
+
diff --git a/components/homekit/esp_hap_platform/CMakeLists.txt b/components/homekit/esp_hap_platform/CMakeLists.txt
new file mode 100644
index 0000000..759d9c4
--- /dev/null
+++ b/components/homekit/esp_hap_platform/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(COMPONENT_ADD_INCLUDEDIRS include)
+
+# Edit following two lines to set component requirements (see docs)
+set(COMPONENT_REQUIRES esp_http_server)
+set(COMPONENT_PRIV_REQUIRES mbedtls nvs_flash mdns esp_eth esp_hap_core)
+
+set(COMPONENT_SRCS src/esp32/esp_mfi_aes.c src/esp32/esp_mfi_base64.c src/esp32/esp_mfi_i2c.c src/esp32/esp_mfi_rand.c src/esp32/esp_mfi_sha.c src/esp32/hap_platform_httpd.c src/esp32/hap_platform_keystore.c src/esp32/hap_platform_memory.c src/esp32/hap_platform_os.c)
+
+register_component()
+component_compile_options(-Wno-unused-function)
diff --git a/components/homekit/esp_hap_platform/Kconfig b/components/homekit/esp_hap_platform/Kconfig
new file mode 100644
index 0000000..1d644fc
--- /dev/null
+++ b/components/homekit/esp_hap_platform/Kconfig
@@ -0,0 +1,85 @@
+menu "MFi I2C Setup"
+
+    choice
+        prompt "Choose Data Rate"
+        default DR_400 if IDF_TARGET_ESP32
+        default DR_100 if IDF_TARGET_ESP32S2
+        config DR_400
+            bool "400 kbit/s"
+        config DR_100
+            bool "100 kbit/s"
+    endchoice
+
+    config IC2_SPEED
+        int
+        default 400000 if DR_400
+        default 100000 if DR_100
+        help
+            Set the i2c datarate
+
+    config SDA_GPIO
+        int "SDA GPIO"
+        default 26 if IDF_TARGET_ESP32
+        default 4 if IDF_TARGET_ESP32S2
+        help
+            GPIO for SDA - please check schematic carefully
+
+    config SCL_GPIO
+        int "SCL GPIO"
+        default 27 if IDF_TARGET_ESP32
+        default 5 if IDF_TARGET_ESP32S2
+        help
+            GPIO for SCL - please check schematic carefully
+
+    config I2C_MAX_READ_COUNT
+        int "Max read count"
+        range 50 300
+        default 150
+        help
+            Set the max read count
+
+    config I2C_RETRY_COUNT
+        int "Retry Count"
+        default 200
+        help
+            Set the number of retries for an I2C interface
+
+endmenu
+
+menu "HAP HTTP Server"
+
+    config HAP_HTTP_STACK_SIZE
+        int "Server Stack Size"
+        default 12288
+        range 8192 32768
+        help
+            Set the stack size for the HomeKit HTTP Server thread.
+
+    config HAP_HTTP_SERVER_PORT
+        int "Server Port"
+        default 80
+        help
+            Set the HomeKit HTTP Server Port number.
+
+    config HAP_HTTP_CONTROL_PORT
+        int "Server Control Port"
+        default 32859
+        help
+            Set the HomeKit HTTP Server UDP Control Port which is used for internl communication.
+
+    config HAP_HTTP_MAX_OPEN_SOCKETS
+        int "Max Open Sockets"
+        default 8
+        range 2 24
+        help
+            Set the Maximum simultaneous Open Sockets that the HTTP Server should allow.
+            A minimum of 8 is required for HomeKit Certification.
+
+    config HAP_HTTP_MAX_URI_HANDLERS
+        int "Max URI Handlers"
+        default 16
+        range 12 32
+        help
+            Set the Maximum number of URI handlers that the HTTP Server should allow.
+
+endmenu
diff --git a/components/homekit/esp_hap_platform/component.mk b/components/homekit/esp_hap_platform/component.mk
new file mode 100644
index 0000000..877da27
--- /dev/null
+++ b/components/homekit/esp_hap_platform/component.mk
@@ -0,0 +1,6 @@
+#
+# Component Makefile
+#
+CFLAGS += -Wno-unused-function
+COMPONENT_SRCDIRS := src/esp32
+COMPONENT_ADD_INCLUDEDIRS := include
diff --git a/components/homekit/esp_hap_platform/include/esp_mfi_aes.h b/components/homekit/esp_hap_platform/include/esp_mfi_aes.h
new file mode 100644
index 0000000..c563ea1
--- /dev/null
+++ b/components/homekit/esp_hap_platform/include/esp_mfi_aes.h
@@ -0,0 +1,82 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 ESP_MFI_AES_H_
+#define ESP_MFI_AES_H_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MFI_AES_CTR_SIZE 16
+
+typedef void* esp_mfi_aes_ctr_t;
+
+/**
+ * @brief Create AES context
+ *
+ * @return pointer of the AES context
+ */
+esp_mfi_aes_ctr_t esp_mfi_aes_ctr_new(void);
+
+/**
+ * @brief Initialize AES context, including the key and nonce
+ *
+ * @param incontext pointer of the AES context
+ * @param inkey AES key
+ * @param innonce AES nonce
+ *
+ * @return
+ *     - 0 : succeed
+ *     - others : fail
+ */
+int esp_mfi_aes_ctr_init(esp_mfi_aes_ctr_t incontext, const uint8_t inkey[MFI_AES_CTR_SIZE], const uint8_t innonce[MFI_AES_CTR_SIZE]);
+
+/**
+ * @brief Update AES context
+ *
+ * @param incontext  AES context point
+ * @param insrc  pointer of the source data to be updated
+ * @param insrclen  source data length
+ * @param indst  pointer of the updated data
+ *
+ * @return
+ *     - 0 : succeed
+ *     - others : fail
+ */
+int esp_mfi_aes_ctr_update(esp_mfi_aes_ctr_t incontext, const void *insrc, uint16_t insrclen, void *indst);
+
+/**
+ * @brief Destroy AES context pointer
+ *
+ * @param incontext  pointer of the AES context
+ */
+void esp_mfi_aes_ctr_final(esp_mfi_aes_ctr_t incontext);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ESP_MFI_AES_H_ */
diff --git a/components/homekit/esp_hap_platform/include/esp_mfi_base64.h b/components/homekit/esp_hap_platform/include/esp_mfi_base64.h
new file mode 100644
index 0000000..28e87e7
--- /dev/null
+++ b/components/homekit/esp_hap_platform/include/esp_mfi_base64.h
@@ -0,0 +1,67 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 ESP_MFI_BASE64_H_
+#define ESP_MFI_BASE64_H_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief transform bin data to base64 data
+ *
+ * @param src input data point
+ * @param len input data length
+ * @param dest output data point
+ * @param dest_len output data buffer length
+ * @param out_len output data length
+ *
+ * @return
+ *     - 0 : succeed
+ *     - others : fail
+ */
+int esp_mfi_base64_encode(const char *src, int len, char *dest, int dest_len, int *out_len);
+
+/**
+ * @brief transform base64 data to bin data
+ *
+ * @param src input data point
+ * @param len input data length
+ * @param dest output data point
+ * @param dest_len output data buffer length
+ * @param out_len output data length
+ *
+ * @return
+ *     - 0 : succeed
+ *     - others : fail
+ */
+int esp_mfi_base64_decode(const char *src, int len, char *dest, int dest_len, int *out_len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ESP_MFI_BASE64_H_ */
diff --git a/components/homekit/esp_hap_platform/include/esp_mfi_i2c.h b/components/homekit/esp_hap_platform/include/esp_mfi_i2c.h
new file mode 100644
index 0000000..4813bc0
--- /dev/null
+++ b/components/homekit/esp_hap_platform/include/esp_mfi_i2c.h
@@ -0,0 +1,84 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 ESP_MFI_I2C_H_
+#define ESP_MFI_I2C_H_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Initialize I2C
+ *
+ * @return
+ *     - 0 : succeed
+ *     - others : fail
+ */
+int esp_mfi_i2c_init(void);
+
+/**
+ * @brief I2C operation end
+ *
+ * @return
+ *     - 0 : succeed
+ *     - others : fail
+ */
+int esp_mfi_i2c_end(void);
+
+/**
+ * @brief Write data to I2C slave
+ *
+ * @param slvaddr  address of slave
+ * @param regaddr  address of register
+ * @param buff     pointer of data to write
+ * @param len      the data length
+ *
+ * @return
+ *     - 0 : succeed
+ *     - others : fail
+ */
+int esp_mfi_i2c_write(uint8_t slvaddr, uint8_t regaddr, uint8_t *buff, uint32_t len);
+
+/**
+ * @brief Read data from I2C slave
+ *
+ * @param slvaddr  address of slave
+ * @param regaddr  address of register
+ * @param buff     pointer of data read
+ * @param len      the data length
+ *
+ * @return
+ *     - 0 : succeed
+ *     - others : fail
+ */
+int esp_mfi_i2c_read(uint8_t slvaddr, uint8_t regaddr, uint8_t *buff, uint32_t len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ESP_MFI_I2C_H_ */
diff --git a/components/homekit/esp_hap_platform/include/esp_mfi_rand.h b/components/homekit/esp_hap_platform/include/esp_mfi_rand.h
new file mode 100644
index 0000000..ad2808a
--- /dev/null
+++ b/components/homekit/esp_hap_platform/include/esp_mfi_rand.h
@@ -0,0 +1,50 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 ESP_MFI_RAND_H_
+#define ESP_MFI_RAND_H_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Get a random number of bytes specified.
+ *
+ * @param buf pointer of the random number it gets
+ * @param len specified bytes of the random number
+ *
+ * @return
+ *      - > 0 : the actual length(bytes) of the random number
+ *      - others : failure
+ */
+int esp_mfi_get_random(uint8_t *buf, uint16_t len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ESP_MFI_RAND_H_ */
diff --git a/components/homekit/esp_hap_platform/include/esp_mfi_sha.h b/components/homekit/esp_hap_platform/include/esp_mfi_sha.h
new file mode 100644
index 0000000..87d4058
--- /dev/null
+++ b/components/homekit/esp_hap_platform/include/esp_mfi_sha.h
@@ -0,0 +1,172 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 ESP_MFI_SHA_H_
+#define ESP_MFI_SHA_H_
+
+#include <stdint.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+typedef void* esp_mfi_sha_ctx_t;
+
+/*
+ * SHA1 declarations
+ */
+
+#define MFI_SHA1_SIZE   20
+
+/**
+ * @brief Create SHA1 context
+ *
+ * @return pointer of the SHA1 context
+ */
+esp_mfi_sha_ctx_t esp_mfi_sha1_new(void);
+
+/**
+ * @brief Init SHA1 context
+ *
+ * @param ctx pointer of the SHA1 context
+ */
+void esp_mfi_sha1_init(esp_mfi_sha_ctx_t ctx);
+
+/**
+ * @brief Update SHA1 context
+ *
+ * @param ctx pointer of the SHA1 context
+ * @param msg pointer of the input data
+ * @param len input data length
+ */
+void esp_mfi_sha1_update(esp_mfi_sha_ctx_t ctx, const uint8_t *msg, int len);
+
+/**
+ * @brief Final SHA1 context
+ *
+ * @param digest pointer of output data
+ * @param ctx pointer of the SHA1 context
+ */
+void esp_mfi_sha1_final(esp_mfi_sha_ctx_t ctx, uint8_t *digest);
+
+/**
+ * @brief Free SHA1 context
+ *
+ * @param ctx pointer of the SHA1 context
+ */
+void esp_mfi_sha1_free(esp_mfi_sha_ctx_t ctx);
+
+/*
+ * SHA256 declarations
+ */
+
+#define MFI_SHA256_SIZE 32
+
+/**
+ * @brief Create SHA256 context
+ *
+ * @return pointer of the SHA256 context
+ */
+esp_mfi_sha_ctx_t esp_mfi_sha256_new(void);
+
+/**
+ * @brief Init SHA256 context
+ *
+ * @param ctx pointer of the SHA256 context
+ */
+void esp_mfi_sha256_init(esp_mfi_sha_ctx_t ctx);
+
+/**
+ * @brief Update SHA256 context
+ *
+ * @param ctx pointer of the SHA256 context
+ * @param msg pointer of input data
+ * @param len input data length
+ */
+void esp_mfi_sha256_update(esp_mfi_sha_ctx_t ctx, const uint8_t *input, int len);
+
+/**
+ * @brief Final SHA256 context
+ *
+ * @param digest pointer of output data
+ * @param ctx pointer of the SHA256 context
+ */
+void esp_mfi_sha256_final(esp_mfi_sha_ctx_t ctx, uint8_t *digest);
+
+/**
+ * @brief Free SHA256 context
+ *
+ * @param ctx pointer of the SHA256 context
+ */
+void esp_mfi_sha256_free(esp_mfi_sha_ctx_t ctx);
+
+/*
+ * SHA512 declarations
+ */
+
+#define MFI_SHA512_SIZE 64
+
+/**
+ * @brief Create SHA512 context
+ *
+ * @return pointer of the SHA512 context
+ */
+esp_mfi_sha_ctx_t esp_mfi_sha512_new(void);
+
+/**
+ * @brief Init SHA512 context
+ *
+ * @param ctx pointer of the SHA512 context
+ */
+void esp_mfi_sha512_init(esp_mfi_sha_ctx_t ctx);
+
+/**
+ * @brief Update SHA512 context
+ *
+ * @param ctx pointer of the SHA512 context
+ * @param msg pointer of input data
+ * @param len input data length
+ */
+void esp_mfi_sha512_update(esp_mfi_sha_ctx_t ctx, const uint8_t *input, int len);
+
+/**
+ * @brief Final SHA512 context
+ *
+ * @param digest pointer of output data
+ * @param ctx pointer of the SHA512 context
+ */
+void esp_mfi_sha512_final(esp_mfi_sha_ctx_t ctx, uint8_t *digest);
+
+/**
+ * @brief Free SHA512 context
+ *
+ * @param ctx pointer of the SHA512 context
+ */
+void esp_mfi_sha512_free(esp_mfi_sha_ctx_t ctx);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ESP_MFI_SHA_H_ */
diff --git a/components/homekit/esp_hap_platform/include/hap_platform_httpd.h b/components/homekit/esp_hap_platform/include/hap_platform_httpd.h
new file mode 100644
index 0000000..ce5b0dc
--- /dev/null
+++ b/components/homekit/esp_hap_platform/include/hap_platform_httpd.h
@@ -0,0 +1,136 @@
+
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2019 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_PLATFORM_HTTPD_H_
+#define _HAP_PLATFORM_HTTPD_H_
+#include <esp_http_server.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Start the webserver
+ *
+ * This API will be called by the HAP Core to start the webserver.
+ *
+ * @param[out] handle Pointer to the handle that should be populated by this
+ * function on a success.
+ *
+ * @return ESP_OK on success
+ * @return error code otherwise
+ */
+int hap_platform_httpd_start(httpd_handle_t *handle);
+
+/** Stop the webserver
+ *
+ * This API will be called by the HAP Core to stop the webserver.
+ *
+ * @param[in] handle Pointer to the handle created in hap_platform_httpd_start
+ *
+ * @return ESP_OK on success
+ * @return error code otherwise
+ */
+int hap_platform_httpd_stop(httpd_handle_t *handle);
+
+/** Get the current HTTP Port
+ *
+ * This API will be called by the HAP Core to get the HTTP Port being used. This will
+ * be used for the mDNS announcement
+ *
+ * @return Configured HTTP Port
+ */
+int hap_platform_httpd_get_port();
+
+/** Get the HTTPD session context
+ *
+ * This API will be called by the HAP Core to get the context associated with a given
+ * session. It is generally used to maintain pairing information.
+ *
+ * @param[in] req HTTPD Request structure.
+ *
+ * @return pointer to the session context.
+ */
+void * hap_platform_httpd_get_sess_ctx(httpd_req_t *req);
+
+/** Set the HTTPD session context
+ *
+ * This API will be called by the HAP Core to set the context associated with a given
+ * session. It is generally used to maintain pairing information.
+ *
+ * @param[in] req HTTPD Request structure.
+ * @param[in] ctx The context to be set for the given session.
+ * @param[in] free_fn Pointer to a function that will be used by the HTTP Server to clear the context when the session closes
+ * @param[in] ignore_ctx_changes Flag to indicate if the HTTP Server should ignore changes to the context across different requests.
+ * If set to false, the server will try clearing the old context, if it detects any change.
+ *
+ * @return ESP_OK in success
+ * @return ESP_FAIL if req is nULL
+ */
+esp_err_t hap_platform_httpd_set_sess_ctx(httpd_req_t *req, void *ctx, httpd_free_ctx_fn_t free_ctx, bool ignore_ctx_changes);
+
+/** Get the HTTP request method
+ *
+ * This API will be called by the HAP Core to get the HTTP request method
+ * in string format (Eg. GET, POST, etc.)
+ *
+ * @param[in] HTTPD Request structure.
+ *
+ * @return Pointer to a string indicating the HTTP method.
+ */
+const char *hap_platform_httpd_get_req_method(httpd_req_t *req);
+
+/** Get the HTTP request URI
+ *
+ * This API will be called by the HAP Core to get the request URI string.
+ *
+ * @param[in] HTTPD Request structure.
+ *
+ * @return Pointer to the URI string.
+ */
+const char *hap_platform_httpd_get_req_uri(httpd_req_t *req);
+
+/** Get the HTTP request content length
+ *
+ * This API will be called by the HAP Core to get the content length of the request.
+ *
+ * @param[in] HTTPD Request structure.
+ *
+ * @return Content length.
+ */
+int hap_platform_httpd_get_content_len(httpd_req_t *req);
+
+/**
+ * Get the HAP HTTPD Handle
+ *
+ * If an application wants to register additional HTTPD endpoints on the same server
+ * instance being used by HomeKit, this API can be used to get the handle. This
+ * should be used only after hap_start().
+ *
+ * @return HomeKit HTTPD Handle
+ */
+httpd_handle_t *hap_platform_httpd_get_handle();
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _HAP_PLATFORM_HTTPD_H_ */
diff --git a/components/homekit/esp_hap_platform/include/hap_platform_keystore.h b/components/homekit/esp_hap_platform/include/hap_platform_keystore.h
new file mode 100644
index 0000000..6be1c47
--- /dev/null
+++ b/components/homekit/esp_hap_platform/include/hap_platform_keystore.h
@@ -0,0 +1,115 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_PLATFORM_KEYSTORE_H_
+#define _HAP_PLATFORM_KEYSTORE_H_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Get NVS Partition Name
+ *
+ * @return pointer to an allocated string indicating NVS partition Name
+ */
+char * hap_platform_keystore_get_nvs_partition_name();
+
+
+/** Get Factory NVS Partition Name
+ *
+ * @return pointer to an allocated string indicating Factory NVS partition Name
+ */
+char * hap_platform_keystore_get_factory_nvs_partition_name();
+
+/** Initialise Key Store Partition
+ *
+ * @param[in] part_name Name of Partition
+ * @param[in] read_only True for Read-Only, False for Read-Write
+ *
+ * @return 0 on success
+ * @return -1 on error
+ */
+int hap_platform_keystore_init_partition(const char *part_name, bool read_only);
+
+/** Get Value from Key Store
+ *
+ * @param[in] part_name Name of Partition
+ * @param[in] name_space Name space for the key
+ * @param[in] key Name of the key
+ * @param[out] val Allocated buffer into which the value will be read
+ * @param[in,out] val_size Size of the allocated value buffer. Will hold the size of value read on success
+ *
+ * @return 0 on success
+ * @return -1 on error
+ */
+int hap_platform_keystore_get(const char *part_name, const char *name_space, const char *key, uint8_t *val, size_t *val_size);
+
+/** Set Value in Key Store
+ *
+ * @param[in] part_name Name of Partition
+ * @param[in] name_space Name space for the key
+ * @param[in] key Name of the key
+ * @param[in] val Pointer to the value buffer
+ * @param[in] val_len Length of the value buffer
+ *
+ * @return 0 on success
+ * @return -1 on error
+ */
+int hap_platform_keystore_set(const char *part_name, const char *name_space, const char *key, const uint8_t *val, const size_t val_len);
+
+/** Delete Entry from Key Store
+ *
+ * @param[in] part_name Name of Partition
+ * @param[in] name_space Name space for the key
+ * @param[in] key Name of the key
+ *
+ * @return 0 on success
+ * @return -1 on error
+ */
+int hap_platform_keystore_delete(const char *part_name, const char *name_space, const char *key);
+
+/** Delete Name space from Key Store
+ *
+ * @param[in] part_name Name of Partition
+ * @param[in] name_space Name space for the key
+ *
+ * @return 0 on success
+ * @return -1 on error
+ */
+int hap_platform_keystore_delete_namespace(const char *part_name, const char *name_space);
+
+/** Erase a Key Store partition
+ *
+ * @param[in] part_name Name of Partition
+ *
+ * @return 0 on success
+ * @return -1 on error
+ */
+int hap_platfrom_keystore_erase_partition(const char *part_name);
+#ifdef __cplusplus
+}
+#endif
+#endif /* _HAP_PLATFORM_KEYSTORE_H_ */
diff --git a/components/homekit/esp_hap_platform/include/hap_platform_memory.h b/components/homekit/esp_hap_platform/include/hap_platform_memory.h
new file mode 100644
index 0000000..ce8f39e
--- /dev/null
+++ b/components/homekit/esp_hap_platform/include/hap_platform_memory.h
@@ -0,0 +1,67 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2019 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_PLATFORM_MEMORY_H_
+#define _HAP_PLATFORM_MEMORY_H_
+#include <stdlib.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/** Allocate memory
+ *
+ * This API allocates "size" bytes of memory and returns a pointer to the allocated memory.
+ *
+ * @param[in] size Number of bytes to be allocated
+ *
+ * @return pointer to the allocated memory
+ * @return NULL on failure
+ */
+void * hap_platform_memory_malloc(size_t size);
+
+/** Allocate contiguous memory for items
+ *
+ * This API contiguously allocates enough space for "count" objects that are "size" bytes of memory each
+ * and returns a pointer to the allocated memory.  The allocated memory is filled with bytes of value zero.
+ *
+ * @param[in] count Number of items
+ * @param[in] size Size of each item
+ *
+ * @return pointer to the allocated memory
+ * @return NULL on failure
+ */
+void * hap_platform_memory_calloc(size_t count, size_t size);
+
+/** Free allocate memory
+ *
+ * This API frees the memory allocated by hap_platform_memory_malloc() or hap_platform_memory_calloc()
+ *
+ * @param[in] ptr Pointer to the allocated memory
+ */
+void hap_platform_memory_free(void *ptr);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _HAP_PLATFORM_MEMORY_H_ */
diff --git a/components/homekit/esp_hap_platform/include/hap_platform_os.h b/components/homekit/esp_hap_platform/include/hap_platform_os.h
new file mode 100644
index 0000000..1270ba7
--- /dev/null
+++ b/components/homekit/esp_hap_platform/include/hap_platform_os.h
@@ -0,0 +1,41 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2019 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 _HAP_PLATFORM_OS_H_
+#define _HAP_PLATFORM_OS_H_
+#include <stdint.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/** Return the OS tick period in milliseconds
+ *
+ * @return the milliseconds per tick as configured for the OS
+ */
+uint16_t hap_platform_os_get_msec_per_tick();
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _HAP_PLATFORM_OS_H_ */
diff --git a/components/homekit/esp_hap_platform/src/esp32/esp_mfi_aes.c b/components/homekit/esp_hap_platform/src/esp32/esp_mfi_aes.c
new file mode 100644
index 0000000..a81b34d
--- /dev/null
+++ b/components/homekit/esp_hap_platform/src/esp32/esp_mfi_aes.c
@@ -0,0 +1,145 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <stdlib.h>
+#include <string.h>
+#include <sys/errno.h>
+
+#include "mbedtls/aes.h"
+#include "esp_log.h"
+
+#include "esp_mfi_aes.h"
+
+static const char* TAG = "mfi_aes_adapter";
+
+/*!
+ * @group AES 128-bit Counter Mode API
+
+ * @abstract API to encrypt or decrypt using AES-128 in counter mode.
+ *
+ * Call esp_mfi_aes_ctr_init to initialize the context. Don't use the context until it has been initialized.
+ * Call esp_mfi_aes_ctr_update to encrypt or decrypt N bytes of input and generate N bytes of output.
+ * Call esp_mfi_aes_ctr_final to finalize the context. After finalizing, you must call AES_CTR_Init to use it again.
+*/
+
+typedef struct {
+    uint8_t key[MFI_AES_CTR_SIZE];
+    uint8_t nonce[MFI_AES_CTR_SIZE];
+} aes_ctr_context_t;
+
+/**
+ * @bref Create AES context
+ *
+ * @param none
+ *
+ * @return the AES context point
+ */
+esp_mfi_aes_ctr_t esp_mfi_aes_ctr_new(void)
+{
+    aes_ctr_context_t *context = NULL;
+    context = (aes_ctr_context_t *) malloc(sizeof(aes_ctr_context_t));
+    return context;
+}
+
+/**
+ * @bref Initialize AES context, include initialize the key and nonce
+ *
+ * @param incontext AES context point
+ *        inkey AES key
+ *        innonce AES nonce
+ *
+ * @return the result
+ *      0 : sucessful
+ *      others : failed
+ */
+int esp_mfi_aes_ctr_init(esp_mfi_aes_ctr_t incontext, const uint8_t inkey[MFI_AES_CTR_SIZE], const uint8_t innonce[MFI_AES_CTR_SIZE])
+{
+    int ret = 0;
+
+    if (incontext == NULL)
+        return -EINVAL;
+
+    aes_ctr_context_t *context = incontext;
+
+    memcpy(context->key, inkey, MFI_AES_CTR_SIZE);
+    memcpy(context->nonce, innonce, MFI_AES_CTR_SIZE);
+
+    return ret;
+}
+
+/**
+ * @bref Update AES context
+ *
+ * @param incontext AES context point
+ *        insrc the data point of update
+ *        insrclen the data length
+ *        indst the data pint of output
+ *
+ * @return the result
+ *      0 : sucessful
+ *      others : failed
+ */
+int esp_mfi_aes_ctr_update(esp_mfi_aes_ctr_t incontext, const void *insrc, uint16_t insrclen, void *indst)
+{
+    int ret = 0;
+
+    if (incontext == NULL)
+        return -EINVAL;
+
+    aes_ctr_context_t *context = incontext;
+    size_t offset = 0;
+    uint8_t stream_block[MFI_AES_CTR_SIZE];
+    mbedtls_aes_context ctx;
+    mbedtls_aes_init(&ctx);
+
+    ret = mbedtls_aes_setkey_enc( &ctx, context->key, 128);
+
+    if (ret != 0) {
+        ESP_LOGE(TAG, "mfi aes setkey[%d]", ret);
+        ret = -EINVAL;
+    } else {
+        ret = mbedtls_aes_crypt_ctr(&ctx, insrclen, &offset, context->nonce, stream_block, (uint8_t *) insrc, indst);
+        if (ret != 0) {
+            ESP_LOGE(TAG, "mfi aes crypt[%d]", ret);
+            ret = -EINVAL;
+        }
+    }
+
+    return ret;
+}
+
+/**
+ * @bref Destory AES context point
+ *
+ * @param incontext AES context point
+ *
+ * @return none
+ */
+void esp_mfi_aes_ctr_final(esp_mfi_aes_ctr_t incontext)
+{
+    if (incontext) {
+        memset((aes_ctr_context_t *) incontext, 0, sizeof(aes_ctr_context_t));
+        free(incontext);
+    }
+}
diff --git a/components/homekit/esp_hap_platform/src/esp32/esp_mfi_base64.c b/components/homekit/esp_hap_platform/src/esp32/esp_mfi_base64.c
new file mode 100644
index 0000000..6d1cb6f
--- /dev/null
+++ b/components/homekit/esp_hap_platform/src/esp32/esp_mfi_base64.c
@@ -0,0 +1,54 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <sys/errno.h>
+
+#include "mbedtls/base64.h"
+
+/**
+ * @brief transform bin data to base64 data
+ */
+int esp_mfi_base64_encode(const char *src, int len, char *dest, int dest_len, int *out_len)
+{
+    int ret = mbedtls_base64_encode((unsigned char *)dest, dest_len, (size_t *)out_len, (unsigned char *)src, len);
+    if (ret != 0){
+        return -EINVAL;
+    } else{
+        return 0;
+    }
+}
+
+/**
+ * @brief transform base64 data to bin data
+ */
+int esp_mfi_base64_decode(const char *src, int len, char *dest, int dest_len, int *out_len)
+{
+    int ret = 0;
+    ret = mbedtls_base64_decode((unsigned char *)dest, dest_len, (size_t *)out_len, (unsigned char *)src, len);
+    if (ret != 0) {
+        return -EINVAL;
+    } else {
+        return 0;
+    }
+}
diff --git a/components/homekit/esp_hap_platform/src/esp32/esp_mfi_i2c.c b/components/homekit/esp_hap_platform/src/esp32/esp_mfi_i2c.c
new file mode 100644
index 0000000..c75e8b6
--- /dev/null
+++ b/components/homekit/esp_hap_platform/src/esp32/esp_mfi_i2c.c
@@ -0,0 +1,689 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <sys/errno.h>
+#include <sdkconfig.h>
+#ifdef CONFIG_IDF_TARGET_ESP32S2
+#include "esp32s2/rom/ets_sys.h"
+#else
+#include "esp32/rom/ets_sys.h"
+#endif
+
+#ifdef CONFIG_I2C_SOFTWARE
+#include "driver/gpio.h"
+#else
+#include "driver/i2c.h"
+#endif
+
+#include "esp_log.h"
+#include "esp_mfi_i2c.h"
+
+static const char *TAG = "mfi_i2c";
+
+#ifndef CONFIG_I2C_SOFTWARE
+
+#define I2C_MASTER_NUM              I2C_NUM_0
+#define I2C_MASTER_FREQ_HZ          CONFIG_IC2_SPEED
+#define I2C_MASTER_RX_BUF_DISABLE   0
+#define I2C_MASTER_TX_BUF_DISABLE   0
+#define ACK_CHECK_EN                1
+#define ACK_VAL                     0
+#define NACK_VAL                    1
+
+/* To use GPIOs 17/18 for the Hardware I2C, replace the numbers 26/27 below
+ */
+#define I2C_MASTER_SDA_GPIO         CONFIG_SDA_GPIO
+#define I2C_MASTER_SCL_GPIO         CONFIG_SCL_GPIO
+
+#define I2C_MASTER_MAX_READ         CONFIG_I2C_MAX_READ_COUNT
+#define I2C_MASTER_RETRY_TIMES      500
+#define I2C_MASTER_TICKS_TIMES      2 * I2C_MASTER_RETRY_TIMES
+#define I2C_MASTER_MAX_RETRY        10
+#define I2C_MASTER_INTERNAL_TIMES   8 * I2C_MASTER_RETRY_TIMES
+/**
+ * @brief Initialize I2C information
+ */
+int esp_mfi_i2c_init(void)
+{
+    int ret = 0;
+    i2c_config_t conf;
+    int i2c_master_port = I2C_MASTER_NUM;
+
+    conf.mode = I2C_MODE_MASTER;
+    conf.sda_io_num = I2C_MASTER_SDA_GPIO;
+    conf.sda_pullup_en = GPIO_PULLUP_ENABLE;
+    conf.scl_io_num = I2C_MASTER_SCL_GPIO;
+    conf.scl_pullup_en = GPIO_PULLUP_ENABLE;
+    conf.master.clk_speed = I2C_MASTER_FREQ_HZ;
+
+    ret = i2c_param_config(i2c_master_port, &conf);
+    if (ret != ESP_OK) {
+        ESP_LOGE(TAG, "I2C parameter initial fail %d", ret);
+        return -EINVAL;
+    }
+
+    ret = i2c_driver_install(i2c_master_port, conf.mode, I2C_MASTER_RX_BUF_DISABLE, I2C_MASTER_TX_BUF_DISABLE, 0);
+    if (ret != ESP_OK) {
+        ESP_LOGE(TAG, "I2C driver initial fail %d", ret);
+        return -EINVAL;
+    }
+
+    return 0;
+}
+/**
+ * @brief write data buffer to slave
+ */
+int esp_mfi_i2c_write(uint8_t slvaddr, uint8_t regaddr, uint8_t *buff, uint32_t len)
+{
+    uint16_t i;
+
+    if (!buff)
+        return -EINVAL;
+
+    ESP_LOGI(TAG, "Writing to HW I2C");
+
+    int ret = 0;
+    i2c_cmd_handle_t cmd = NULL;
+    i = 0;
+
+    do {
+        cmd = i2c_cmd_link_create();
+        i2c_master_start(cmd);
+
+        // Send write address of the CP
+        i2c_master_write_byte(cmd, slvaddr, ACK_CHECK_EN);
+        // Send register address to slave.
+        i2c_master_write_byte(cmd, regaddr, ACK_CHECK_EN);
+        // Send data out.
+        i2c_master_write(cmd, buff, len, ACK_CHECK_EN);
+
+        i2c_master_stop(cmd);
+        ret = i2c_master_cmd_begin(I2C_MASTER_NUM, cmd, I2C_MASTER_TICKS_TIMES / portTICK_RATE_MS);
+        i ++;
+        i2c_cmd_link_delete(cmd);
+        ets_delay_us(I2C_MASTER_RETRY_TIMES);
+    } while(ret != ESP_OK && i < I2C_MASTER_MAX_RETRY);
+
+    if (ret != ESP_OK) {
+        ESP_LOGE(TAG, "Write data to slave fail %d.", ret);
+    }
+    return ret;
+}
+
+/**
+ * @brief read data form slave
+ */
+int esp_mfi_i2c_read(uint8_t slvaddr, uint8_t regaddr, uint8_t *buff, uint32_t len)
+{
+    uint16_t i, j = 0;
+
+    if (!buff)
+        return -EINVAL;
+
+    ESP_LOGI(TAG, "Reading from HW I2C");
+
+    int ret = 0;
+    i2c_cmd_handle_t cmd = NULL;
+    i = 0;
+
+    do {
+        for (j = 0; j < I2C_MASTER_MAX_READ; j++) {
+            cmd = i2c_cmd_link_create();
+            i2c_master_start(cmd);
+
+            // Send write address of the CP
+            i2c_master_write_byte(cmd, slvaddr, ACK_CHECK_EN);
+            // Send register address to slave.
+            i2c_master_write_byte(cmd, regaddr, ACK_CHECK_EN);
+
+            i2c_master_stop(cmd);
+            ret = i2c_master_cmd_begin(I2C_MASTER_NUM, cmd, I2C_MASTER_TICKS_TIMES / portTICK_RATE_MS);
+            i2c_cmd_link_delete(cmd);
+            if (ret == ESP_OK) {
+                break;
+            } else {
+                ets_delay_us(I2C_MASTER_INTERNAL_TIMES);
+            }
+        }
+
+        ets_delay_us(I2C_MASTER_INTERNAL_TIMES);
+
+        cmd = i2c_cmd_link_create();
+        i2c_master_start(cmd);
+
+        i2c_master_write_byte(cmd, slvaddr + 1, ACK_CHECK_EN);
+        if (len == 1)
+            i2c_master_read_byte(cmd, buff, NACK_VAL);
+        else {
+            i2c_master_read(cmd, buff, len - 1, ACK_VAL);
+            i2c_master_read_byte(cmd, buff + len - 1, NACK_VAL);
+        }
+
+        i2c_master_stop(cmd);
+        ret = i2c_master_cmd_begin(I2C_MASTER_NUM, cmd, I2C_MASTER_TICKS_TIMES / portTICK_RATE_MS);
+        i ++;
+        i2c_cmd_link_delete(cmd);
+    } while (ret != ESP_OK && i < I2C_MASTER_MAX_RETRY);
+
+    if (ret != ESP_OK) {
+        ESP_LOGE(TAG, "Read data from slave fail %d.", ret);
+    }
+
+    return ret;
+}
+
+#else
+
+#define MFI_CP_BUSY_RETRY_TIMES CONFIG_I2C_RETRY_COUNT
+
+#define GPIO_Pin_26 GPIO_SEL_26
+#define GPIO_Pin_27 GPIO_SEL_27
+
+#define gpio_set_output_level(a, b)                 gpio_set_level(a, b)
+#define gpio_get_input_level(a)                     gpio_get_level(a)
+
+#define GPIO_Mode_Input_OutOD                       GPIO_MODE_INPUT_OUTPUT_OD
+#define GPIO_PullDown_DIS                           GPIO_PULLDOWN_DISABLE
+#define GPIO_PullUp_EN                              GPIO_PULLUP_ENABLE
+#define GPIO_Mode_Out_OD                            GPIO_MODE_OUTPUT_OD
+
+#define I2C_MASTER_SDA_MUX                          PERIPHS_IO_MUX_GPIO26_U
+#define I2C_MASTER_SCL_MUX                          PERIPHS_IO_MUX_GPIO27_U
+#define I2C_MASTER_SDA_GPIO                         26
+#define I2C_MASTER_SDA_PIN                          GPIO_Pin_26
+#define I2C_MASTER_SDA_FUNC                         FUNC_GPIO26_GPIO26
+#define I2C_MASTER_SCL_GPIO                         27
+#define I2C_MASTER_SCL_PIN                          GPIO_Pin_27
+#define I2C_MASTER_SCL_FUNC                         FUNC_GPIO27_GPIO27
+
+#define I2C_MASTER_SDA_HIGH_SCL_HIGH()              \
+    gpio_set_output_level(I2C_MASTER_SDA_GPIO,1);   \
+    gpio_set_output_level(I2C_MASTER_SCL_GPIO,1);
+
+#define I2C_MASTER_SDA_HIGH_SCL_LOW()               \
+    gpio_set_output_level(I2C_MASTER_SDA_GPIO,1);   \
+    gpio_set_output_level(I2C_MASTER_SCL_GPIO,0);
+
+#define I2C_MASTER_SDA_LOW_SCL_HIGH()               \
+    gpio_set_output_level(I2C_MASTER_SDA_GPIO,0);   \
+    gpio_set_output_level(I2C_MASTER_SCL_GPIO,1);
+
+#define I2C_MASTER_SDA_LOW_SCL_LOW()                \
+  gpio_set_output_level(I2C_MASTER_SDA_GPIO,0);     \
+  gpio_set_output_level(I2C_MASTER_SCL_GPIO,0);
+
+#define i2c_master_wait ets_delay_us
+
+static void i2c_master_init(void);
+static void i2c_master_stop(void);
+
+static uint8_t s_last_sda;
+static uint8_t s_last_scl;
+
+/**
+ * @brief set I2C SDA and SCL bit value for half CLK cycle
+ */
+static void i2c_master_setDC(uint8_t SDA, uint8_t SCL)
+{
+    SDA &= 0x01;
+    SCL &= 0x01;
+    s_last_sda = SDA;
+    s_last_scl = SCL;
+
+    if ((0 == SDA) && (0 == SCL)) {
+        I2C_MASTER_SDA_LOW_SCL_LOW();
+    } else if ((0 == SDA) && (1 == SCL)) {
+        I2C_MASTER_SDA_LOW_SCL_HIGH();
+    } else if ((1 == SDA) && (0 == SCL)) {
+        I2C_MASTER_SDA_HIGH_SCL_LOW();
+    } else {
+        I2C_MASTER_SDA_HIGH_SCL_HIGH();
+    }
+}
+
+/**
+ * @brief get I2C SDA bit value
+ */
+static uint8_t i2c_master_getDC(void)
+{
+    uint8_t sda_out;
+
+    sda_out = gpio_get_input_level(GPIO_ID_PIN(I2C_MASTER_SDA_GPIO));
+
+    return sda_out;
+}
+
+/**
+ * @brief initialize I2C bus to enable i2c operations
+ */
+static void i2c_master_init(void)
+{
+    uint8_t i;
+
+    i2c_master_setDC(1, 0);
+    i2c_master_wait(5);
+
+    // when SCL = 0, toggle SDA to clear up
+    i2c_master_setDC(0, 0) ;
+    i2c_master_wait(5);
+    i2c_master_setDC(1, 0) ;
+    i2c_master_wait(5);
+
+    // set data_cnt to max value
+    for (i = 0; i < 28; i++) {
+        i2c_master_setDC(1, 0);
+        i2c_master_wait(5); // sda 1, scl 0
+        i2c_master_setDC(1, 1);
+        i2c_master_wait(5); // sda 1, scl 1
+    }
+
+    // reset all
+    i2c_master_stop();
+}
+
+/**
+ * @brief configure SDA and SCL GPIO to open-drain output mode
+ */
+static void i2c_master_gpio_init(void)
+{
+
+    gpio_config_t io_config;
+    io_config.intr_type = GPIO_PIN_INTR_DISABLE;
+    io_config.mode = GPIO_MODE_INPUT_OUTPUT_OD;
+    io_config.pin_bit_mask = I2C_MASTER_SDA_PIN;
+    io_config.pull_down_en = GPIO_PULLDOWN_DISABLE;
+    io_config.pull_up_en  = GPIO_PULLUP_ENABLE;
+
+    gpio_config(&io_config);
+
+    io_config.intr_type = GPIO_PIN_INTR_DISABLE;
+    io_config.mode = GPIO_MODE_OUTPUT_OD;
+    io_config.pin_bit_mask = I2C_MASTER_SCL_PIN;
+    io_config.pull_down_en = GPIO_PULLDOWN_DISABLE;
+    io_config.pull_up_en  = GPIO_PULLUP_ENABLE;
+
+
+    gpio_config(&io_config);
+
+    gpio_pullup_en(I2C_MASTER_SDA_GPIO);
+    gpio_pullup_en(I2C_MASTER_SCL_GPIO);
+    gpio_pulldown_dis(I2C_MASTER_SDA_GPIO);
+    gpio_pulldown_dis(I2C_MASTER_SCL_GPIO);
+
+    i2c_master_init();
+}
+
+/**
+ * @brief set I2C to start operation
+ */
+static void i2c_master_start(void)
+{
+    i2c_master_setDC(1, s_last_scl);
+    i2c_master_wait(5);
+    i2c_master_setDC(1, 1);
+    i2c_master_wait(5); // sda 1, scl 1
+    i2c_master_setDC(0, 1);
+    i2c_master_wait(5); // sda 0, scl 1
+}
+
+/**
+ * @brief set i2c to stop sending state
+ */
+static void i2c_master_stop(void)
+{
+    i2c_master_wait(5);
+
+    i2c_master_setDC(0, s_last_scl);
+    i2c_master_wait(5); // sda 0
+    i2c_master_setDC(0, 1);
+    i2c_master_wait(5); // sda 0, scl 1
+    i2c_master_setDC(1, 1);
+    i2c_master_wait(5); // sda 1, scl 1
+}
+
+/**
+ * @brief set ack to i2c bus as level value
+ */
+static void i2c_master_setAck(uint8_t level)
+{
+    i2c_master_setDC(s_last_sda, 0);
+    i2c_master_wait(5);
+    i2c_master_setDC(level, 0);
+    i2c_master_wait(5); // sda level, scl 0
+    i2c_master_setDC(level, 1);
+    i2c_master_wait(8); // sda level, scl 1
+    i2c_master_setDC(level, 0);
+    i2c_master_wait(5); // sda level, scl 0
+    i2c_master_setDC(1, 0);
+    i2c_master_wait(5);
+}
+
+/**
+ * @brief confirm if peer send ack
+ */
+static uint8_t i2c_master_getAck(void)
+{
+    uint8_t retVal;
+
+    i2c_master_setDC(s_last_sda, 0);
+    i2c_master_wait(5);
+    i2c_master_setDC(1, 0);
+    i2c_master_wait(5);
+    i2c_master_setDC(1, 1);
+    i2c_master_wait(5);
+
+    retVal = i2c_master_getDC();
+    i2c_master_wait(5);
+    i2c_master_setDC(1, 0);
+    i2c_master_wait(5);
+
+    return retVal;
+}
+
+/**
+ * @brief get I2C response
+ */
+static bool i2c_master_checkAck(void)
+{
+    if (i2c_master_getAck()) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+/**
+ * @brief send I2C ack signal
+ */
+static void i2c_master_send_ack(void)
+{
+    i2c_master_setAck(0x0);
+}
+
+/**
+ * @brief send I2C not ack signal
+ */
+static void i2c_master_send_nack(void)
+{
+    i2c_master_setAck(0x1);
+}
+
+/**
+ * @brief read byte from i2c bus
+ */
+static uint8_t i2c_master_readByte(void)
+{
+    uint8_t retVal = 0;
+    uint8_t k, i;
+
+    i2c_master_wait(5);
+    i2c_master_setDC(s_last_sda, 0);
+    i2c_master_wait(5); // sda 1, scl 0
+
+    for (i = 0; i < 8; i++) {
+        i2c_master_wait(5);
+        i2c_master_setDC(1, 0);
+        i2c_master_wait(5); // sda 1, scl 0
+        i2c_master_setDC(1, 1);
+        i2c_master_wait(5); // sda 1, scl 1
+
+        k = i2c_master_getDC();
+        i2c_master_wait(5);
+
+        if (i == 7) {
+            i2c_master_wait(3);
+        }
+
+        k <<= (7 - i);
+        retVal |= k;
+    }
+
+    i2c_master_setDC(1, 0);
+    i2c_master_wait(5); // sda 1, scl 0
+
+    return retVal;
+}
+
+/**
+ * @brief write byte to i2c
+ */
+static void i2c_master_writeByte(uint8_t wrdata)
+{
+    uint8_t dat;
+    int8_t i;
+
+    i2c_master_wait(5);
+    i2c_master_setDC(s_last_sda, 0);
+    i2c_master_wait(5);
+
+    for (i = 7; i >= 0; i--) {
+        dat = wrdata >> i;
+        i2c_master_setDC(dat, 0);
+        i2c_master_wait(5);
+        i2c_master_setDC(dat, 1);
+        i2c_master_wait(5);
+
+        if (i == 0) {
+            i2c_master_wait(3);   ////
+        }
+
+        i2c_master_setDC(dat, 0);
+        i2c_master_wait(5);
+    }
+
+}
+
+/**
+ * @brief write byte to i2c and get check ack
+ */
+static bool i2c_write_byte(uint8_t data, uint8_t iter)
+{
+    if (iter == 0) {
+        iter = 1;
+    }
+
+    while (iter--) {
+        i2c_master_writeByte(data);
+
+        if (i2c_master_getAck()) {
+            i2c_master_stop();
+            ets_delay_us(500);  // Wait 500us and retry.
+            i2c_master_start();
+        } else {
+            return true;
+        }
+    }
+    i2c_master_stop();
+    return false;
+}
+
+/**
+ * @brief write byte to target register of target I2C slave
+ */
+static void i2c_write_reg(uint8_t slave_add, uint8_t reg_add, uint16_t data)
+{
+    i2c_master_start();
+    if (false == i2c_write_byte(slave_add, 30)) {
+        ESP_LOGE(TAG, "1Slave is busy, [%02x]TIME OUT\n", slave_add);
+    }
+    if (false == i2c_write_byte(reg_add, 30)) {
+        ESP_LOGE(TAG, "2Slave is busy, [%02x]TIME OUT\n", reg_add);
+    }
+    if (false == i2c_write_byte((data >> 8), 30)) {
+        ESP_LOGE(TAG, "3Slave is busy, [%02x]TIME OUT\n", data);
+    }
+    if (false == i2c_write_byte((data & 0xFF), 30)) {
+        ESP_LOGE(TAG, "3Slave is busy, [%02x]TIME OUT\n", data);
+    }
+    i2c_master_stop();
+}
+
+/**
+ * @brief a block of data to I2C
+ */
+static void i2s_write_arr(const uint8_t *data, size_t len)
+{
+    if (data == NULL || len <= 0) return;
+
+    i2c_master_start();
+
+    int i = 0;
+    for (i = 0; i < len; ++i) {
+        if (false == i2c_write_byte(data[i], 30)) {
+            ESP_LOGE(TAG, "Slave is busy, [%02x]TIME OUT\n", data[i]);
+        }
+    }
+    i2c_master_stop();
+}
+
+/**
+ * @brief Initialize I2C information
+ */
+int esp_mfi_i2c_init(void)
+{
+    i2c_master_gpio_init();
+    return 0;
+}
+
+/**
+ * @brief Finish I2C information
+ */
+int esp_mfi_i2c_end(void)
+{
+    return 0;
+}
+
+/**
+ * @brief write one byte data to slave
+ */
+static int esp_mfi_i2c_write_byte(uint8_t data, uint16_t retrytimes)
+{
+    uint16_t times = retrytimes;
+    if (0 == times) {
+        times = 1;
+    }
+
+    while (times--) {
+        i2c_master_writeByte(data);
+        if (i2c_master_getAck()) {
+            i2c_master_wait(500);  /**< Wait 500us and retry */
+            i2c_master_stop();
+            i2c_master_wait(500);  /**< Wait 500us and retry */
+            i2c_master_start();
+        } else {
+            return 0;
+        }
+    }
+
+    i2c_master_stop();
+
+    return -ETIME;
+}
+
+/**
+ * @brief write data buffer to slave
+ */
+int esp_mfi_i2c_write(uint8_t slvaddr, uint8_t regaddr, uint8_t *buff, uint32_t len)
+{
+    uint16_t i;
+
+    if (!buff)
+        return -EINVAL;
+
+    ESP_LOGI(TAG, "Writing to SW I2C");
+
+    i2c_master_start();
+
+    /**< Send write address of the CP */
+    if (esp_mfi_i2c_write_byte(slvaddr, MFI_CP_BUSY_RETRY_TIMES) != 0) {
+        ESP_LOGE(TAG, "Slave is busy, time out.");
+        return -ETIME;
+    }
+
+    /**< Send register address to slave */
+    if (esp_mfi_i2c_write_byte(regaddr, 0) != 0) {
+        ESP_LOGE(TAG, "Write register address[0x%02x] to slave.", regaddr);
+        return -ENODATA;
+    }
+
+    /**< Send data out */
+    for (i = 0; i < len; ++i) {
+        if (esp_mfi_i2c_write_byte(*buff++, 0) != 0) {
+            ESP_LOGE(TAG, "Write data[0x%02x] to slave.", *buff);
+            return -ENODATA;
+        }
+    }
+
+    i2c_master_stop();
+
+    return 0;
+}
+
+/**
+ * @brief read data form slave
+ */
+int esp_mfi_i2c_read(uint8_t slvaddr, uint8_t regaddr, uint8_t *buff, uint32_t len)
+{
+    uint16_t i;
+
+    if (!buff)
+        return -EINVAL;
+
+    ESP_LOGI(TAG, "Reading from SW I2C");
+
+    i2c_master_start();
+
+    /**< Send write address of the CP */
+    if (esp_mfi_i2c_write_byte(slvaddr, MFI_CP_BUSY_RETRY_TIMES) != 0) {
+        ESP_LOGE(TAG, "Slave is busy, time out.");
+        return -ETIME;
+    }
+
+    /**< Send register address to slave */
+    if (esp_mfi_i2c_write_byte(regaddr, 0) != 0) {
+        ESP_LOGE(TAG, "Write register address[0x%02x] to slave.", regaddr);
+        return -ENODATA;
+    }
+    i2c_master_stop();
+
+    i2c_master_wait(4000);
+
+    /**< Send read address of the CP */
+    if (esp_mfi_i2c_write_byte((slvaddr + 1), MFI_CP_BUSY_RETRY_TIMES) != 0) {
+        ESP_LOGE(TAG, "Slave is busy, time out.");
+        return -ETIME;
+    }
+
+    for (i = 0; i < len; ++i) {
+        buff[i] = i2c_master_readByte();
+
+        i2c_master_setAck((i == (len - 1)) ? 1 : 0);
+    }
+
+    i2c_master_stop();
+
+    return 0;
+}
+#endif
diff --git a/components/homekit/esp_hap_platform/src/esp32/esp_mfi_rand.c b/components/homekit/esp_hap_platform/src/esp32/esp_mfi_rand.c
new file mode 100644
index 0000000..437da0f
--- /dev/null
+++ b/components/homekit/esp_hap_platform/src/esp32/esp_mfi_rand.c
@@ -0,0 +1,56 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <stdint.h>
+#include <esp_system.h>
+
+/**
+ * @bref Obtain a series of random bytes
+ *
+ * @param buf the random bytes were copied point
+ *        len the number of bytes requested
+ *
+ * @return the result
+ *      > 0 : the number of bytes that were copied to the buffer
+ *      others : failed
+ */
+int esp_mfi_get_random(uint8_t *buf, uint16_t len)
+{
+    int i, j;
+    unsigned long tmp;
+
+    for (i = 0; i < ((len + 3) & ~3) / 4; i++) {
+        tmp = esp_random();
+
+        for (j = 0; j < 4; j++) {
+            if ((i * 4 + j) < len) {
+                buf[i * 4 + j] = (uint8_t) (tmp >> (j * 8));
+            } else {
+                break;
+            }
+        }
+    }
+
+    return len;
+}
diff --git a/components/homekit/esp_hap_platform/src/esp32/esp_mfi_sha.c b/components/homekit/esp_hap_platform/src/esp32/esp_mfi_sha.c
new file mode 100644
index 0000000..4ff8c00
--- /dev/null
+++ b/components/homekit/esp_hap_platform/src/esp32/esp_mfi_sha.c
@@ -0,0 +1,273 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <stdlib.h>
+
+#include "mbedtls/sha1.h"
+#include "mbedtls/sha256.h"
+#include "mbedtls/sha512.h"
+
+#include "esp_mfi_sha.h"
+
+/**
+ * @bref Create SHA1 context
+ *
+ * @param none
+ *
+ * @return the SHA1 context point
+ */
+esp_mfi_sha_ctx_t esp_mfi_sha1_new(void)
+{
+    mbedtls_sha1_context *context = NULL;
+    context = (mbedtls_sha1_context *) malloc(sizeof(mbedtls_sha1_context));
+    mbedtls_sha1_init(context);
+    return context;
+}
+
+/**
+ * @bref Free SHA1 context
+ *
+ * @param ctx the SHA1 context point
+ *
+ * @return none
+ */
+void esp_mfi_sha1_free(esp_mfi_sha_ctx_t ctx)
+{
+    if (ctx) {
+        mbedtls_sha1_free( (mbedtls_sha1_context *)ctx);
+        free(ctx);
+    }
+}
+
+/**
+ * @bref Init SHA1 context
+ *
+ * @param ctx the SHA1 context point
+ *
+ * @return none
+ */
+void esp_mfi_sha1_init(esp_mfi_sha_ctx_t ctx)
+{
+    if (ctx == NULL)
+        return;
+
+    mbedtls_sha1_starts((mbedtls_sha1_context *) ctx);
+}
+
+/**
+ * @bref Update SHA1 context
+ *
+ * @param ctx the SHA1 context point
+ *        msg input data point
+ *        len input data length
+ *
+ * @return none
+ */
+void esp_mfi_sha1_update(esp_mfi_sha_ctx_t ctx, const uint8_t * msg, int len)
+{
+    if (ctx == NULL || msg == NULL)
+        return;
+
+    mbedtls_sha1_update((mbedtls_sha1_context *) ctx, msg, len);
+}
+
+/**
+ * @bref Final SHA1 context
+ *
+ * @param digest output data point
+ *        ctx the SHA1 context point
+ *
+ * @return none
+ */
+void esp_mfi_sha1_final(esp_mfi_sha_ctx_t ctx, uint8_t *digest)
+{
+    if (ctx == NULL || digest == NULL)
+        return;
+
+    mbedtls_sha1_finish((mbedtls_sha1_context *) ctx, digest);
+}
+
+/*
+ * SHA256 declarations
+ */
+
+/**
+ * @bref Create SHA256 context
+ *
+ * @param none
+ *
+ * @return the SHA256 context point
+ */
+esp_mfi_sha_ctx_t esp_mfi_sha256_new(void)
+{
+    mbedtls_sha256_context *context = NULL;
+    context = (mbedtls_sha256_context *) malloc(sizeof(mbedtls_sha256_context));
+    mbedtls_sha256_init(context);
+    return context;
+}
+
+/**
+ * @bref Free SHA256 context
+ *
+ * @param ctx the SHA256 context point
+ *
+ * @return none
+ */
+void esp_mfi_sha256_free(esp_mfi_sha_ctx_t ctx)
+{
+    if (ctx) {
+        mbedtls_sha256_free((mbedtls_sha256_context *)ctx);
+        free(ctx);
+    }
+}
+
+/**
+ * @bref Init SHA256 context
+ *
+ * @param ctx the SHA256 context point
+ *
+ * @return none
+ */
+void esp_mfi_sha256_init(esp_mfi_sha_ctx_t ctx)
+{
+    if (ctx == NULL)
+        return;
+
+    mbedtls_sha256_starts((mbedtls_sha256_context *) ctx, 0);
+}
+
+/**
+ * @bref Update SHA256 context
+ *
+ * @param ctx the SHA256 context point
+ *        msg input data point
+ *        len input data length
+ *
+ * @return none
+ */
+void esp_mfi_sha256_update(esp_mfi_sha_ctx_t ctx, const uint8_t *input, int len)
+{
+    if (ctx == NULL || input == NULL)
+        return;
+
+    mbedtls_sha256_update((mbedtls_sha256_context *) ctx, input, len);
+}
+
+/**
+ * @bref Final SHA256 context
+ *
+ * @param digest output data point
+ *        ctx the SHA256 context point
+ *
+ * @return none
+ */
+void esp_mfi_sha256_final(esp_mfi_sha_ctx_t ctx, uint8_t *digest)
+{
+    if (ctx == NULL || digest == NULL)
+        return;
+
+    mbedtls_sha256_finish((mbedtls_sha256_context *) ctx, digest);
+}
+
+/*
+ * SHA512 declarations
+ */
+
+/**
+ * @bref Create SHA512 context
+ *
+ * @param none
+ *
+ * @return the SHA512 context point
+ */
+esp_mfi_sha_ctx_t esp_mfi_sha512_new(void)
+{
+    mbedtls_sha512_context *context = NULL;
+    context = (mbedtls_sha512_context *) malloc(sizeof(mbedtls_sha512_context));
+    mbedtls_sha512_init(context);
+    return context;
+}
+
+/**
+ * @bref Free SHA512 context
+ *
+ * @param ctx the SHA512 context point
+ *
+ * @return none
+ */
+void esp_mfi_sha512_free(esp_mfi_sha_ctx_t ctx)
+{
+    if (ctx) {
+        mbedtls_sha512_free((mbedtls_sha512_context *)ctx);
+        free(ctx);
+    }
+}
+
+/**
+ * @bref Init SHA512 context
+ *
+ * @param ctx the SHA512 context point
+ *
+ * @return none
+ */
+void esp_mfi_sha512_init(esp_mfi_sha_ctx_t ctx)
+{
+    if (ctx == NULL)
+        return;
+
+    mbedtls_sha512_starts((mbedtls_sha512_context *) ctx, 0);
+}
+
+/**
+ * @bref Update SHA512 context
+ *
+ * @param ctx the SHA512 context point
+ *        msg input data point
+ *        len input data length
+ *
+ * @return none
+ */
+void esp_mfi_sha512_update(esp_mfi_sha_ctx_t ctx, const uint8_t *input, int len)
+{
+    if (ctx == NULL || input == NULL)
+        return;
+
+    mbedtls_sha512_update((mbedtls_sha512_context *) ctx, input, len);
+}
+
+/**
+ * @bref Final SHA512 context
+ *
+ * @param digest output data point
+ *        ctx the SHA512 context point
+ *
+ * @return none
+ */
+void esp_mfi_sha512_final(esp_mfi_sha_ctx_t ctx, uint8_t *digest)
+{
+    if (ctx == NULL || digest == NULL)
+        return;
+
+    mbedtls_sha512_finish((mbedtls_sha512_context *) ctx, digest);
+}
diff --git a/components/homekit/esp_hap_platform/src/esp32/hap_platform_httpd.c b/components/homekit/esp_hap_platform/src/esp32/hap_platform_httpd.c
new file mode 100644
index 0000000..f280f4b
--- /dev/null
+++ b/components/homekit/esp_hap_platform/src/esp32/hap_platform_httpd.c
@@ -0,0 +1,123 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2019 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <esp_http_server.h>
+
+httpd_handle_t *int_handle;
+int hap_platform_httpd_start(httpd_handle_t *handle)
+{
+    httpd_config_t config = {
+        .task_priority  = tskIDLE_PRIORITY+5,
+        .stack_size         = CONFIG_HAP_HTTP_STACK_SIZE,
+        .server_port        = CONFIG_HAP_HTTP_SERVER_PORT,
+        .ctrl_port          = CONFIG_HAP_HTTP_CONTROL_PORT,
+        .max_open_sockets   = CONFIG_HAP_HTTP_MAX_OPEN_SOCKETS,
+        .max_uri_handlers   = CONFIG_HAP_HTTP_MAX_URI_HANDLERS,
+        .max_resp_headers   = 8,
+        .backlog_conn       = 5,
+        .lru_purge_enable   = true,
+        .recv_wait_timeout  = 5,
+        .send_wait_timeout  = 5,
+    };
+    esp_err_t err =  httpd_start(handle, &config);
+    if (err == ESP_OK) {
+        int_handle = handle;
+    }
+    return err;
+}
+
+int hap_platform_httpd_stop(httpd_handle_t *handle)
+{
+    esp_err_t err = httpd_stop(*handle);
+    if (err == ESP_OK) {
+        int_handle = NULL;
+    }
+    return err;
+}
+
+int hap_platform_httpd_get_port()
+{
+    return CONFIG_HAP_HTTP_SERVER_PORT;
+}
+
+void * hap_platform_httpd_get_sess_ctx(httpd_req_t *req)
+{
+    if (req) {
+        return req->sess_ctx;
+    }
+    return NULL;
+}
+
+esp_err_t hap_platform_httpd_set_sess_ctx(httpd_req_t *req, void *ctx, httpd_free_ctx_fn_t free_ctx, bool ignore_ctx_changes)
+{
+    if (req) {
+        req->sess_ctx = ctx;
+        req->free_ctx =  free_ctx;
+        req->ignore_sess_ctx_changes = ignore_ctx_changes;
+        return ESP_OK;
+    }
+    return ESP_FAIL;
+}
+
+static char * hap_platform_httpd_rqtype_to_string(int method)
+{
+    switch (method) {
+        case HTTP_GET:
+            return "GET";
+        case HTTP_POST:
+            return "POST";
+        case HTTP_PUT:
+            return "PUT";
+        default:
+            return "INVALID";
+    }
+}
+
+const char *hap_platform_httpd_get_req_method(httpd_req_t *req)
+{
+    if (req) {
+        return hap_platform_httpd_rqtype_to_string(req->method);
+    }
+    return NULL;
+}
+
+const char *hap_platform_httpd_get_req_uri(httpd_req_t *req)
+{
+    if (req) {
+        return req->uri;
+    }
+    return NULL;
+}
+
+int hap_platform_httpd_get_content_len(httpd_req_t *req)
+{
+    if (req) {
+        return req->content_len;
+    }
+    return -1;
+}
+
+httpd_handle_t *hap_platform_httpd_get_handle()
+{
+    return int_handle;
+}
diff --git a/components/homekit/esp_hap_platform/src/esp32/hap_platform_keystore.c b/components/homekit/esp_hap_platform/src/esp32/hap_platform_keystore.c
new file mode 100644
index 0000000..b82457c
--- /dev/null
+++ b/components/homekit/esp_hap_platform/src/esp32/hap_platform_keystore.c
@@ -0,0 +1,187 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2020 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <esp_log.h>
+#include <nvs_flash.h>
+#include <string.h>
+
+#define HAP_PLATFORM_DEF_NVS_PARTITION          "nvs"
+#define HAP_PLATFORM_DEF_FACTORY_NVS_PARTITION  "factory_nvs"
+
+static const char *TAG = "hap_platform_keystore";
+
+char * hap_platform_keystore_get_nvs_partition_name()
+{
+    return HAP_PLATFORM_DEF_NVS_PARTITION;
+}
+
+char * hap_platform_keystore_get_factory_nvs_partition_name()
+{
+    return HAP_PLATFORM_DEF_FACTORY_NVS_PARTITION;
+}
+
+#ifdef CONFIG_NVS_ENCRYPTION
+int hap_platform_keystore_init_partition(const char *part_name, bool read_only)
+{
+    esp_err_t err;
+    nvs_sec_cfg_t *cfg = NULL;
+    nvs_sec_cfg_t sec_cfg;
+    esp_partition_iterator_t iterator = esp_partition_find(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_NVS_KEYS, NULL);
+    if (iterator) {
+        const esp_partition_t *partition = esp_partition_get(iterator);
+        err = nvs_flash_read_security_cfg(partition, &sec_cfg);
+        if (err == ESP_OK) {
+            cfg = &sec_cfg;
+        } else {
+            ESP_LOGE(TAG, "No NVS keys found");
+        }
+    } else {
+        ESP_LOGE(TAG, "No NVS keys partition found");
+    }
+    if (!cfg) {
+        ESP_LOGE(TAG, "NVS partition '%s' not encrypted", part_name);
+    } else {
+        ESP_LOGI(TAG, "NVS partition '%s' is encrypted", part_name);
+    }
+    if (read_only) {
+        err = nvs_flash_secure_init_partition(part_name, cfg);
+    } else {
+        err = nvs_flash_secure_init_partition(part_name, cfg);
+        if (err == ESP_ERR_NVS_NO_FREE_PAGES) {
+            ESP_ERROR_CHECK(nvs_flash_erase_partition(part_name));
+            err = nvs_flash_secure_init_partition(part_name, cfg);
+        }
+    }
+    if (err == ESP_OK) {
+        return 0;
+    }
+    return -1;
+}
+#else
+int hap_platform_keystore_init_partition(const char *part_name, bool read_only)
+{
+    esp_err_t err;
+    if (read_only) {
+        err = nvs_flash_init_partition(part_name);
+    } else {
+        err = nvs_flash_init_partition(part_name);
+        if (err == ESP_ERR_NVS_NO_FREE_PAGES) {
+            ESP_ERROR_CHECK(nvs_flash_erase_partition(part_name));
+            err = nvs_flash_init_partition(part_name);
+        }
+    }
+    if (err == ESP_OK) {
+        return 0;
+    }
+    return -1;
+}
+#endif /* CONFIG_NVS_ENCRYPTION */
+
+int hap_platform_keystore_get(const char *part_name, const char *name_space, const char *key, uint8_t *val, size_t *val_size)
+{
+    nvs_handle handle;
+    esp_err_t err = nvs_open_from_partition(part_name, name_space, NVS_READONLY, &handle);
+    if (err != ESP_OK) {
+        return -1;
+    } else {
+        err = nvs_get_blob(handle, key, val, val_size);
+        nvs_close(handle);
+    }
+    if (err == ESP_OK) {
+        return 0;
+    }
+    return -1;
+}
+
+int hap_platform_keystore_set(const char *part_name, const char *name_space, const char *key, const uint8_t *val, const size_t val_len)
+
+{
+    nvs_handle handle;
+    esp_err_t err = nvs_open_from_partition(part_name, name_space, NVS_READWRITE, &handle);
+    if (err != ESP_OK) {
+        ESP_LOGE(TAG, "Error (%d) opening NVS handle!", err);
+    } else {
+        err = nvs_set_blob(handle, key, val, val_len);
+        if (err != ESP_OK) {
+            ESP_LOGE(TAG, "Failed to write %s", key);
+        } else {
+            nvs_commit(handle);
+        }
+        nvs_close(handle);
+    }
+    if (err == ESP_OK) {
+        return 0;
+    }
+    return -1;
+}
+
+int hap_platform_keystore_delete(const char *part_name, const char *name_space, const char *key)
+{
+    nvs_handle handle;
+    esp_err_t err = nvs_open_from_partition(part_name, name_space, NVS_READWRITE, &handle);
+    if (err != ESP_OK) {
+        ESP_LOGE(TAG, "Error (%d) opening NVS handle!", err);
+    } else {
+        err = nvs_erase_key(handle, key);
+        if (err != ESP_OK) {
+            ESP_LOGE(TAG, "Failed to delete %s", key);
+        } else {
+            nvs_commit(handle);
+        }
+        nvs_close(handle);
+    }
+    if (err == ESP_OK) {
+        return 0;
+    }
+    return -1;
+}
+
+int hap_platform_keystore_delete_namespace(const char *part_name, const char *name_space)
+{
+    nvs_handle handle;
+    esp_err_t err = nvs_open_from_partition(part_name, name_space, NVS_READWRITE, &handle);
+    if (err != ESP_OK) {
+        ESP_LOGE(TAG, "Error (%d) opening NVS handle!", err);
+    } else {
+        err = nvs_erase_all(handle);
+        if (err != ESP_OK) {
+            ESP_LOGE(TAG, "Failed to delete %s", name_space);
+        } else {
+            nvs_commit(handle);
+        }
+        nvs_close(handle);
+    }
+    if (err == ESP_OK) {
+        return 0;
+    }
+    return -1;
+}
+
+int hap_platfrom_keystore_erase_partition(const char *part_name)
+{
+    esp_err_t err = nvs_flash_erase_partition(part_name);
+    if (err == ESP_OK) {
+        return 0;
+    }
+    return -1;
+}
diff --git a/components/homekit/esp_hap_platform/src/esp32/hap_platform_memory.c b/components/homekit/esp_hap_platform/src/esp32/hap_platform_memory.c
new file mode 100644
index 0000000..361cd3e
--- /dev/null
+++ b/components/homekit/esp_hap_platform/src/esp32/hap_platform_memory.c
@@ -0,0 +1,39 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2019 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <stdlib.h>
+
+void * hap_platform_memory_malloc(size_t size)
+{
+    return malloc(size);
+}
+
+void * hap_platform_memory_calloc(size_t count, size_t size)
+{
+    return calloc(count, size);
+}
+
+void hap_platform_memory_free(void *ptr)
+{
+    free(ptr);
+}
diff --git a/components/homekit/esp_hap_platform/src/esp32/hap_platform_os.c b/components/homekit/esp_hap_platform/src/esp32/hap_platform_os.c
new file mode 100644
index 0000000..1403d27
--- /dev/null
+++ b/components/homekit/esp_hap_platform/src/esp32/hap_platform_os.c
@@ -0,0 +1,31 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2019 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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 <stdint.h>
+#include <freertos/FreeRTOSConfig.h>
+#include <freertos/portmacro.h>
+
+uint16_t hap_platform_os_get_msec_per_tick()
+{
+    return portTICK_PERIOD_MS;
+}
diff --git a/components/homekit/hkdf-sha/CMakeLists.txt b/components/homekit/hkdf-sha/CMakeLists.txt
new file mode 100644
index 0000000..f9e6ae2
--- /dev/null
+++ b/components/homekit/hkdf-sha/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(COMPONENT_ADD_INCLUDEDIRS ./include)
+
+# Edit following two lines to set component requirements (see docs)
+set(COMPONENT_REQUIRES )
+set(COMPONENT_PRIV_REQUIRES )
+
+set(COMPONENT_SRCS ./upstream/hkdf.c ./upstream/hmac.c ./upstream/sha1.c ./upstream/sha224-256.c ./upstream/sha384-512.c ./upstream/shatest.c ./upstream/usha.c)
+
+register_component()
diff --git a/components/homekit/hkdf-sha/component.mk b/components/homekit/hkdf-sha/component.mk
new file mode 100644
index 0000000..ccb4691
--- /dev/null
+++ b/components/homekit/hkdf-sha/component.mk
@@ -0,0 +1,3 @@
+# Empty
+COMPONENT_SRCDIRS := ./upstream
+COMPONENT_ADD_INCLUDEDIRS := ./include
diff --git a/components/homekit/hkdf-sha/include/hkdf-sha.h b/components/homekit/hkdf-sha/include/hkdf-sha.h
new file mode 100644
index 0000000..276c368
--- /dev/null
+++ b/components/homekit/hkdf-sha/include/hkdf-sha.h
@@ -0,0 +1,358 @@
+/**************************** sha.h ****************************/
+/***************** See RFC 6234 for details. *******************/
+/*
+   Copyright (c) 2011 IETF Trust and the persons identified as
+   authors of the code.  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or
+   without modification, are permitted provided that the following
+   conditions are met:
+
+   - Redistributions of source code must retain the above
+     copyright notice, this list of conditions and
+     the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following
+     disclaimer in the documentation and/or other materials provided
+     with the distribution.
+
+   - Neither the name of Internet Society, IETF or IETF Trust, nor
+     the names of specific contributors, may be used to endorse or
+     promote products derived from this software without specific
+     prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+   CONTRIBUTORS "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 COPYRIGHT OWNER 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 _SHA_H_
+#define _SHA_H_
+
+/*
+ *  Description:
+ *      This file implements the Secure Hash Algorithms
+ *      as defined in the U.S. National Institute of Standards
+ *      and Technology Federal Information Processing Standards
+ *      Publication (FIPS PUB) 180-3 published in October 2008
+ *      and formerly defined in its predecessors, FIPS PUB 180-1
+ *      and FIP PUB 180-2.
+ *
+ *      A combined document showing all algorithms is available at
+ *              http://csrc.nist.gov/publications/fips/
+ *                     fips180-3/fips180-3_final.pdf
+ *
+ *      The five hashes are defined in these sizes:
+ *              SHA-1           20 byte / 160 bit
+ *              SHA-224         28 byte / 224 bit
+ *              SHA-256         32 byte / 256 bit
+ *              SHA-384         48 byte / 384 bit
+ *              SHA-512         64 byte / 512 bit
+ *
+ *  Compilation Note:
+ *    These files may be compiled with two options:
+ *        USE_32BIT_ONLY - use 32-bit arithmetic only, for systems
+ *                         without 64-bit integers
+ *
+ *        USE_MODIFIED_MACROS - use alternate form of the SHA_Ch()
+ *                         and SHA_Maj() macros that are equivalent
+ *                         and potentially faster on many systems
+ *
+ */
+
+#include <stdint.h>
+/*
+ * If you do not have the ISO standard stdint.h header file, then you
+ * must typedef the following:
+ *    name              meaning
+ *  uint64_t         unsigned 64-bit integer
+ *  uint32_t         unsigned 32-bit integer
+ *  uint8_t          unsigned 8-bit integer (i.e., unsigned char)
+ *  int_least16_t    integer of >= 16 bits
+ *
+ * See stdint-example.h
+ */
+
+#ifndef _SHA_enum_
+#define _SHA_enum_
+/*
+ *  All SHA functions return one of these values.
+ */
+enum {
+    shaSuccess = 0,
+    shaNull,            /* Null pointer parameter */
+    shaInputTooLong,    /* input data too long */
+    shaStateError,      /* called Input after FinalBits or Result */
+    shaBadParam         /* passed a bad parameter */
+};
+#endif /* _SHA_enum_ */
+
+/*
+ *  These constants hold size information for each of the SHA
+ *  hashing operations
+ */
+enum {
+    SHA1_Message_Block_Size = 64, SHA224_Message_Block_Size = 64,
+    SHA256_Message_Block_Size = 64, SHA384_Message_Block_Size = 128,
+    SHA512_Message_Block_Size = 128,
+    USHA_Max_Message_Block_Size = SHA512_Message_Block_Size,
+
+    SHA1HashSize = 20, SHA224HashSize = 28, SHA256HashSize = 32,
+    SHA384HashSize = 48, SHA512HashSize = 64,
+    USHAMaxHashSize = SHA512HashSize,
+
+    SHA1HashSizeBits = 160, SHA224HashSizeBits = 224,
+    SHA256HashSizeBits = 256, SHA384HashSizeBits = 384,
+    SHA512HashSizeBits = 512, USHAMaxHashSizeBits = SHA512HashSizeBits
+};
+
+/*
+ *  These constants are used in the USHA (Unified SHA) functions.
+ */
+typedef enum SHAversion {
+    SHA1, SHA224, SHA256, SHA384, SHA512
+} SHAversion;
+
+/*
+ *  This structure will hold context information for the SHA-1
+ *  hashing operation.
+ */
+typedef struct SHA1Context {
+    uint32_t Intermediate_Hash[SHA1HashSize/4]; /* Message Digest */
+
+    uint32_t Length_High;               /* Message length in bits */
+    uint32_t Length_Low;                /* Message length in bits */
+
+    int_least16_t Message_Block_Index;  /* Message_Block array index */
+                                        /* 512-bit message blocks */
+    uint8_t Message_Block[SHA1_Message_Block_Size];
+
+    int Computed;                   /* Is the hash computed? */
+    int Corrupted;                  /* Cumulative corruption code */
+} SHA1Context;
+
+/*
+ *  This structure will hold context information for the SHA-256
+ *  hashing operation.
+ */
+typedef struct SHA256Context {
+    uint32_t Intermediate_Hash[SHA256HashSize/4]; /* Message Digest */
+
+    uint32_t Length_High;               /* Message length in bits */
+    uint32_t Length_Low;                /* Message length in bits */
+
+    int_least16_t Message_Block_Index;  /* Message_Block array index */
+                                        /* 512-bit message blocks */
+    uint8_t Message_Block[SHA256_Message_Block_Size];
+
+    int Computed;                   /* Is the hash computed? */
+    int Corrupted;                  /* Cumulative corruption code */
+} SHA256Context;
+
+/*
+ *  This structure will hold context information for the SHA-512
+ *  hashing operation.
+ */
+typedef struct SHA512Context {
+#ifdef USE_32BIT_ONLY
+    uint32_t Intermediate_Hash[SHA512HashSize/4]; /* Message Digest  */
+    uint32_t Length[4];                 /* Message length in bits */
+#else /* !USE_32BIT_ONLY */
+    uint64_t Intermediate_Hash[SHA512HashSize/8]; /* Message Digest */
+    uint64_t Length_High, Length_Low;   /* Message length in bits */
+#endif /* USE_32BIT_ONLY */
+
+    int_least16_t Message_Block_Index;  /* Message_Block array index */
+                                        /* 1024-bit message blocks */
+    uint8_t Message_Block[SHA512_Message_Block_Size];
+
+    int Computed;                   /* Is the hash computed?*/
+    int Corrupted;                  /* Cumulative corruption code */
+} SHA512Context;
+
+/*
+ *  This structure will hold context information for the SHA-224
+ *  hashing operation.  It uses the SHA-256 structure for computation.
+ */
+typedef struct SHA256Context SHA224Context;
+
+/*
+ *  This structure will hold context information for the SHA-384
+ *  hashing operation.  It uses the SHA-512 structure for computation.
+ */
+typedef struct SHA512Context SHA384Context;
+
+/*
+ *  This structure holds context information for all SHA
+ *  hashing operations.
+ */
+typedef struct USHAContext {
+    int whichSha;               /* which SHA is being used */
+    union {
+      SHA1Context sha1Context;
+      SHA224Context sha224Context; SHA256Context sha256Context;
+      SHA384Context sha384Context; SHA512Context sha512Context;
+    } ctx;
+
+} USHAContext;
+
+/*
+ *  This structure will hold context information for the HMAC
+ *  keyed-hashing operation.
+ */
+typedef struct HMACContext {
+    int whichSha;               /* which SHA is being used */
+    int hashSize;               /* hash size of SHA being used */
+    int blockSize;              /* block size of SHA being used */
+    USHAContext shaContext;     /* SHA context */
+    unsigned char k_opad[USHA_Max_Message_Block_Size];
+                        /* outer padding - key XORd with opad */
+    int Computed;               /* Is the MAC computed? */
+    int Corrupted;              /* Cumulative corruption code */
+
+} HMACContext;
+
+/*
+ *  This structure will hold context information for the HKDF
+ *  extract-and-expand Key Derivation Functions.
+ */
+typedef struct HKDFContext {
+    int whichSha;               /* which SHA is being used */
+    HMACContext hmacContext;
+    int hashSize;               /* hash size of SHA being used */
+    unsigned char prk[USHAMaxHashSize];
+                        /* pseudo-random key - output of hkdfInput */
+    int Computed;               /* Is the key material computed? */
+    int Corrupted;              /* Cumulative corruption code */
+} HKDFContext;
+
+/*
+ *  Function Prototypes
+ */
+
+/* SHA-1 */
+extern int SHA1Reset(SHA1Context *);
+extern int SHA1Input(SHA1Context *, const uint8_t *bytes,
+                     unsigned int bytecount);
+extern int SHA1FinalBits(SHA1Context *, uint8_t bits,
+                         unsigned int bit_count);
+extern int SHA1Result(SHA1Context *,
+                      uint8_t Message_Digest[SHA1HashSize]);
+
+/* SHA-224 */
+extern int SHA224Reset(SHA224Context *);
+extern int SHA224Input(SHA224Context *, const uint8_t *bytes,
+                       unsigned int bytecount);
+extern int SHA224FinalBits(SHA224Context *, uint8_t bits,
+                           unsigned int bit_count);
+extern int SHA224Result(SHA224Context *,
+                        uint8_t Message_Digest[SHA224HashSize]);
+
+/* SHA-256 */
+extern int SHA256Reset(SHA256Context *);
+extern int SHA256Input(SHA256Context *, const uint8_t *bytes,
+                       unsigned int bytecount);
+extern int SHA256FinalBits(SHA256Context *, uint8_t bits,
+                           unsigned int bit_count);
+extern int SHA256Result(SHA256Context *,
+                        uint8_t Message_Digest[SHA256HashSize]);
+
+/* SHA-384 */
+extern int SHA384Reset(SHA384Context *);
+extern int SHA384Input(SHA384Context *, const uint8_t *bytes,
+                       unsigned int bytecount);
+extern int SHA384FinalBits(SHA384Context *, uint8_t bits,
+                           unsigned int bit_count);
+extern int SHA384Result(SHA384Context *,
+                        uint8_t Message_Digest[SHA384HashSize]);
+
+/* SHA-512 */
+extern int SHA512Reset(SHA512Context *);
+extern int SHA512Input(SHA512Context *, const uint8_t *bytes,
+                       unsigned int bytecount);
+extern int SHA512FinalBits(SHA512Context *, uint8_t bits,
+                           unsigned int bit_count);
+extern int SHA512Result(SHA512Context *,
+                        uint8_t Message_Digest[SHA512HashSize]);
+
+/* Unified SHA functions, chosen by whichSha */
+extern int USHAReset(USHAContext *context, SHAversion whichSha);
+extern int USHAInput(USHAContext *context,
+                     const uint8_t *bytes, unsigned int bytecount);
+extern int USHAFinalBits(USHAContext *context,
+                         uint8_t bits, unsigned int bit_count);
+extern int USHAResult(USHAContext *context,
+                      uint8_t Message_Digest[USHAMaxHashSize]);
+extern int USHABlockSize(enum SHAversion whichSha);
+extern int USHAHashSize(enum SHAversion whichSha);
+extern int USHAHashSizeBits(enum SHAversion whichSha);
+extern const char *USHAHashName(enum SHAversion whichSha);
+
+/*
+ * HMAC Keyed-Hashing for Message Authentication, RFC 2104,
+ * for all SHAs.
+ * This interface allows a fixed-length text input to be used.
+ */
+extern int hmac(SHAversion whichSha, /* which SHA algorithm to use */
+    const unsigned char *text,     /* pointer to data stream */
+    int text_len,                  /* length of data stream */
+    const unsigned char *key,      /* pointer to authentication key */
+    int key_len,                   /* length of authentication key */
+    uint8_t digest[USHAMaxHashSize]); /* caller digest to fill in */
+
+/*
+ * HMAC Keyed-Hashing for Message Authentication, RFC 2104,
+ * for all SHAs.
+ * This interface allows any length of text input to be used.
+ */
+extern int hmacReset(HMACContext *context, enum SHAversion whichSha,
+                     const unsigned char *key, int key_len);
+extern int hmacInput(HMACContext *context, const unsigned char *text,
+                     int text_len);
+extern int hmacFinalBits(HMACContext *context, uint8_t bits,
+                         unsigned int bit_count);
+extern int hmacResult(HMACContext *context,
+                      uint8_t digest[USHAMaxHashSize]);
+
+/*
+ * HKDF HMAC-based Extract-and-Expand Key Derivation Function,
+ * RFC 5869, for all SHAs.
+ */
+extern int hkdf(SHAversion whichSha, const unsigned char *salt,
+                int salt_len, const unsigned char *ikm, int ikm_len,
+                const unsigned char *info, int info_len,
+                uint8_t okm[ ], int okm_len);
+extern int hkdfExtract(SHAversion whichSha, const unsigned char *salt,
+                       int salt_len, const unsigned char *ikm,
+                       int ikm_len, uint8_t prk[USHAMaxHashSize]);
+extern int hkdfExpand(SHAversion whichSha, const uint8_t prk[ ],
+                      int prk_len, const unsigned char *info,
+                      int info_len, uint8_t okm[ ], int okm_len);
+
+/*
+ * HKDF HMAC-based Extract-and-Expand Key Derivation Function,
+ * RFC 5869, for all SHAs.
+ * This interface allows any length of text input to be used.
+ */
+extern int hkdfReset(HKDFContext *context, enum SHAversion whichSha,
+                     const unsigned char *salt, int salt_len);
+extern int hkdfInput(HKDFContext *context, const unsigned char *ikm,
+                     int ikm_len);
+extern int hkdfFinalBits(HKDFContext *context, uint8_t ikm_bits,
+                         unsigned int ikm_bit_count);
+extern int hkdfResult(HKDFContext *context,
+                      uint8_t prk[USHAMaxHashSize],
+                      const unsigned char *info, int info_len,
+                      uint8_t okm[USHAMaxHashSize], int okm_len);
+#endif /* _SHA_H_ */
+
diff --git a/components/homekit/hkdf-sha/upstream/.gitignore b/components/homekit/hkdf-sha/upstream/.gitignore
new file mode 100644
index 0000000..88c98a8
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/.gitignore
@@ -0,0 +1,22 @@
+# Object files
+*.o
+
+# Libraries
+*.lib
+*.a
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+
+shatest
+
+# Dependencies
+*.d
diff --git a/components/homekit/hkdf-sha/upstream/Makefile b/components/homekit/hkdf-sha/upstream/Makefile
new file mode 100644
index 0000000..357d7fa
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/Makefile
@@ -0,0 +1,36 @@
+# Makefile for rfc6234 code examples
+
+BINS += shatest
+DEPS = Makefile
+
+# Prettifiers
+LINK    = @echo "* Linking $@"; $(CC) $(CFLAGS) $(LDFLAGS)
+
+all: ${BINS}
+	@echo "* All Done"
+
+OBJS := $(shell ls *.c | sed 's/\.c/.o/' | sed 's/ /\n/g' | sort | uniq | tr '\n' ' ')
+
+-include $(OBJS:.o=.d)
+
+depend: clean
+	@echo "* Making dependencies for $(OBJS)"
+	@$(MAKE) -s $(OBJS)
+	@echo "* Making dependencies - done"
+
+clean:
+	@echo "* Cleansing"
+	@rm -rf $(BINS) *.o *.so *.lo *.la *.slo *.loT *.d
+
+shatest: $(DEPS) $(OBJS)
+	$(LINK) -o $@ $(OBJS)
+
+%.o: %.c $(DEPS)
+	@echo "* Compiling $@";
+	@$(CC) -c $(CFLAGS) $*.c -o $*.o
+	@$(CC) -MM $(CFLAGS) $*.c > $*.d
+	@cp -f $*.d $*.d.tmp
+	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
+	  sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
+	@rm -f $*.d.tmp
+
diff --git a/components/homekit/hkdf-sha/upstream/README.md b/components/homekit/hkdf-sha/upstream/README.md
new file mode 100644
index 0000000..141aede
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/README.md
@@ -0,0 +1,6 @@
+rfc6234 RFC6234 US Secure Hash Algorithms - Example Code Extract
+================================================================
+
+These are the code examples given in the IETF RFC6234:
+  http://tools.ietf.org/html/rfc6234
+
diff --git a/components/homekit/hkdf-sha/upstream/hkdf.c b/components/homekit/hkdf-sha/upstream/hkdf.c
new file mode 100644
index 0000000..bd12ef2
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/hkdf.c
@@ -0,0 +1,335 @@
+/**************************** hkdf.c ***************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ *  Description:
+ *      This file implements the HKDF algorithm (HMAC-based
+ *      Extract-and-Expand Key Derivation Function, RFC 5869),
+ *      expressed in terms of the various SHA algorithms.
+ */
+
+#include "sha.h"
+#include <string.h>
+#include <stdlib.h>
+
+/*
+ *  hkdf
+ *
+ *  Description:
+ *      This function will generate keying material using HKDF.
+ *
+ *  Parameters:
+ *      whichSha: [in]
+ *          One of SHA1, SHA224, SHA256, SHA384, SHA512
+ *      salt[ ]: [in]
+ *          The optional salt value (a non-secret random value);
+ *          if not provided (salt == NULL), it is set internally
+ *          to a string of HashLen(whichSha) zeros.
+ *      salt_len: [in]
+ *          The length of the salt value.  (Ignored if salt == NULL.)
+ *      ikm[ ]: [in]
+ *          Input keying material.
+ *      ikm_len: [in]
+ *          The length of the input keying material.
+ *      info[ ]: [in]
+ *          The optional context and application specific information.
+ *          If info == NULL or a zero-length string, it is ignored.
+ *      info_len: [in]
+ *          The length of the optional context and application specific
+ *          information.  (Ignored if info == NULL.)
+ *      okm[ ]: [out]
+ *          Where the HKDF is to be stored.
+ *      okm_len: [in]
+ *          The length of the buffer to hold okm.
+ *          okm_len must be <= 255 * USHABlockSize(whichSha)
+ *
+ *  Notes:
+ *      Calls hkdfExtract() and hkdfExpand().
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hkdf(SHAversion whichSha,
+    const unsigned char *salt, int salt_len,
+    const unsigned char *ikm, int ikm_len,
+    const unsigned char *info, int info_len,
+    uint8_t okm[ ], int okm_len)
+{
+  uint8_t prk[USHAMaxHashSize];
+  return hkdfExtract(whichSha, salt, salt_len, ikm, ikm_len, prk) ||
+         hkdfExpand(whichSha, prk, USHAHashSize(whichSha), info,
+                    info_len, okm, okm_len);
+}
+
+/*
+ *  hkdfExtract
+ *
+ *  Description:
+ *      This function will perform HKDF extraction.
+ *
+ *  Parameters:
+ *      whichSha: [in]
+ *          One of SHA1, SHA224, SHA256, SHA384, SHA512
+ *      salt[ ]: [in]
+ *          The optional salt value (a non-secret random value);
+ *          if not provided (salt == NULL), it is set internally
+ *          to a string of HashLen(whichSha) zeros.
+ *      salt_len: [in]
+ *          The length of the salt value.  (Ignored if salt == NULL.)
+ *      ikm[ ]: [in]
+ *          Input keying material.
+ *      ikm_len: [in]
+ *          The length of the input keying material.
+ *      prk[ ]: [out]
+ *          Array where the HKDF extraction is to be stored.
+ *          Must be larger than USHAHashSize(whichSha);
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hkdfExtract(SHAversion whichSha,
+    const unsigned char *salt, int salt_len,
+    const unsigned char *ikm, int ikm_len,
+    uint8_t prk[USHAMaxHashSize])
+{
+  unsigned char nullSalt[USHAMaxHashSize];
+  if (salt == 0) {
+    salt = nullSalt;
+    salt_len = USHAHashSize(whichSha);
+    memset(nullSalt, '\0', salt_len);
+  } else if (salt_len < 0) {
+    return shaBadParam;
+  }
+  return hmac(whichSha, ikm, ikm_len, salt, salt_len, prk);
+}
+
+/*
+ *  hkdfExpand
+ *
+ *  Description:
+ *      This function will perform HKDF expansion.
+ *
+ *  Parameters:
+ *      whichSha: [in]
+ *          One of SHA1, SHA224, SHA256, SHA384, SHA512
+ *      prk[ ]: [in]
+ *          The pseudo-random key to be expanded; either obtained
+ *          directly from a cryptographically strong, uniformly
+ *          distributed pseudo-random number generator, or as the
+ *          output from hkdfExtract().
+ *      prk_len: [in]
+ *          The length of the pseudo-random key in prk;
+ *          should at least be equal to USHAHashSize(whichSHA).
+ *      info[ ]: [in]
+ *          The optional context and application specific information.
+ *          If info == NULL or a zero-length string, it is ignored.
+ *      info_len: [in]
+ *          The length of the optional context and application specific
+ *          information.  (Ignored if info == NULL.)
+ *      okm[ ]: [out]
+ *          Where the HKDF is to be stored.
+ *      okm_len: [in]
+ *          The length of the buffer to hold okm.
+ *          okm_len must be <= 255 * USHABlockSize(whichSha)
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hkdfExpand(SHAversion whichSha, const uint8_t prk[ ], int prk_len,
+    const unsigned char *info, int info_len,
+    uint8_t okm[ ], int okm_len)
+{
+  int hash_len, N;
+  unsigned char T[USHAMaxHashSize];
+  int Tlen, where, i;
+
+  if (info == 0) {
+    info = (const unsigned char *)"";
+    info_len = 0;
+  } else if (info_len < 0) {
+    return shaBadParam;
+  }
+  if (okm_len <= 0) return shaBadParam;
+  if (!okm) return shaBadParam;
+
+  hash_len = USHAHashSize(whichSha);
+  if (prk_len < hash_len) return shaBadParam;
+  N = okm_len / hash_len;
+  if ((okm_len % hash_len) != 0) N++;
+  if (N > 255) return shaBadParam;
+
+  Tlen = 0;
+  where = 0;
+  for (i = 1; i <= N; i++) {
+    HMACContext context;
+    unsigned char c = i;
+    int ret = hmacReset(&context, whichSha, prk, prk_len) ||
+              hmacInput(&context, T, Tlen) ||
+              hmacInput(&context, info, info_len) ||
+              hmacInput(&context, &c, 1) ||
+              hmacResult(&context, T);
+    if (ret != shaSuccess) return ret;
+    memcpy(okm + where, T,
+           (i != N) ? hash_len : (okm_len - where));
+    where += hash_len;
+    Tlen = hash_len;
+  }
+  return shaSuccess;
+}
+
+/*
+ *  hkdfReset
+ *
+ *  Description:
+ *      This function will initialize the hkdfContext in preparation
+ *      for key derivation using the modular HKDF interface for
+ *      arbitrary length inputs.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The context to reset.
+ *      whichSha: [in]
+ *          One of SHA1, SHA224, SHA256, SHA384, SHA512
+ *      salt[ ]: [in]
+ *          The optional salt value (a non-secret random value);
+ *          if not provided (salt == NULL), it is set internally
+ *          to a string of HashLen(whichSha) zeros.
+ *      salt_len: [in]
+ *          The length of the salt value.  (Ignored if salt == NULL.)
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hkdfReset(HKDFContext *context, enum SHAversion whichSha,
+              const unsigned char *salt, int salt_len)
+{
+  unsigned char nullSalt[USHAMaxHashSize];
+  if (!context) return shaNull;
+
+  context->whichSha = whichSha;
+  context->hashSize = USHAHashSize(whichSha);
+  if (salt == 0) {
+    salt = nullSalt;
+    salt_len = context->hashSize;
+    memset(nullSalt, '\0', salt_len);
+  }
+
+  return hmacReset(&context->hmacContext, whichSha, salt, salt_len);
+}
+
+/*
+ *  hkdfInput
+ *
+ *  Description:
+ *      This function accepts an array of octets as the next portion
+ *      of the input keying material.  It may be called multiple times.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The HKDF context to update.
+ *      ikm[ ]: [in]
+ *          An array of octets representing the next portion of
+ *          the input keying material.
+ *      ikm_len: [in]
+ *          The length of ikm.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hkdfInput(HKDFContext *context, const unsigned char *ikm,
+              int ikm_len)
+{
+  if (!context) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  return hmacInput(&context->hmacContext, ikm, ikm_len);
+}
+
+/*
+ * hkdfFinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the
+ *   input keying material.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The HKDF context to update
+ *   ikm_bits: [in]
+ *     The final bits of the input keying material, in the upper
+ *     portion of the byte.  (Use 0b###00000 instead of 0b00000###
+ *     to input the three bits ###.)
+ *   ikm_bit_count: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int hkdfFinalBits(HKDFContext *context, uint8_t ikm_bits,
+                  unsigned int ikm_bit_count)
+{
+  if (!context) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  return hmacFinalBits(&context->hmacContext, ikm_bits, ikm_bit_count);
+}
+
+/*
+ * hkdfResult
+ *
+ * Description:
+ *   This function will finish the HKDF extraction and perform the
+ *   final HKDF expansion.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The HKDF context to use to calculate the HKDF hash.
+ *   prk[ ]: [out]
+ *     An optional location to store the HKDF extraction.
+ *     Either NULL, or pointer to a buffer that must be
+ *     larger than USHAHashSize(whichSha);
+ *   info[ ]: [in]
+ *     The optional context and application specific information.
+ *     If info == NULL or a zero-length string, it is ignored.
+ *   info_len: [in]
+ *     The length of the optional context and application specific
+ *     information.  (Ignored if info == NULL.)
+ *   okm[ ]: [out]
+ *     Where the HKDF is to be stored.
+ *   okm_len: [in]
+ *     The length of the buffer to hold okm.
+ *     okm_len must be <= 255 * USHABlockSize(whichSha)
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int hkdfResult(HKDFContext *context,
+               uint8_t prk[USHAMaxHashSize],
+               const unsigned char *info, int info_len,
+               uint8_t okm[ ], int okm_len)
+{
+  uint8_t prkbuf[USHAMaxHashSize];
+  int ret;
+
+  if (!context) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (!okm) return context->Corrupted = shaBadParam;
+  if (!prk) prk = prkbuf;
+
+  ret = hmacResult(&context->hmacContext, prk) ||
+        hkdfExpand(context->whichSha, prk, context->hashSize, info,
+                   info_len, okm, okm_len);
+  context->Computed = 1;
+  return context->Corrupted = ret;
+}
+
diff --git a/components/homekit/hkdf-sha/upstream/hmac.c b/components/homekit/hkdf-sha/upstream/hmac.c
new file mode 100644
index 0000000..b09c50e
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/hmac.c
@@ -0,0 +1,249 @@
+/**************************** hmac.c ***************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ *  Description:
+ *      This file implements the HMAC algorithm (Keyed-Hashing for
+ *      Message Authentication, [RFC 2104]), expressed in terms of
+ *      the various SHA algorithms.
+ */
+
+#include "sha.h"
+
+/*
+ *  hmac
+ *
+ *  Description:
+ *      This function will compute an HMAC message digest.
+ *
+ *  Parameters:
+ *      whichSha: [in]
+ *          One of SHA1, SHA224, SHA256, SHA384, SHA512
+ *      message_array[ ]: [in]
+ *          An array of octets representing the message.
+ *          Note: in RFC 2104, this parameter is known
+ *          as 'text'.
+ *      length: [in]
+ *          The length of the message in message_array.
+ *      key[ ]: [in]
+ *          The secret shared key.
+ *      key_len: [in]
+ *          The length of the secret shared key.
+ *      digest[ ]: [out]
+ *          Where the digest is to be returned.
+ *          NOTE: The length of the digest is determined by
+ *              the value of whichSha.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+
+int hmac(SHAversion whichSha,
+    const unsigned char *message_array, int length,
+    const unsigned char *key, int key_len,
+    uint8_t digest[USHAMaxHashSize])
+{
+  HMACContext context;
+  return hmacReset(&context, whichSha, key, key_len) ||
+         hmacInput(&context, message_array, length) ||
+         hmacResult(&context, digest);
+}
+
+/*
+ *  hmacReset
+ *
+ *  Description:
+ *      This function will initialize the hmacContext in preparation
+ *      for computing a new HMAC message digest.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The context to reset.
+ *      whichSha: [in]
+ *          One of SHA1, SHA224, SHA256, SHA384, SHA512
+ *      key[ ]: [in]
+ *          The secret shared key.
+ *      key_len: [in]
+ *          The length of the secret shared key.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hmacReset(HMACContext *context, enum SHAversion whichSha,
+    const unsigned char *key, int key_len)
+{
+  int i, blocksize, hashsize, ret;
+
+  /* inner padding - key XORd with ipad */
+  unsigned char k_ipad[USHA_Max_Message_Block_Size];
+
+  /* temporary buffer when keylen > blocksize */
+  unsigned char tempkey[USHAMaxHashSize];
+
+  if (!context) return shaNull;
+  context->Computed = 0;
+  context->Corrupted = shaSuccess;
+
+  blocksize = context->blockSize = USHABlockSize(whichSha);
+  hashsize = context->hashSize = USHAHashSize(whichSha);
+  context->whichSha = whichSha;
+
+  /*
+   * If key is longer than the hash blocksize,
+   * reset it to key = HASH(key).
+   */
+  if (key_len > blocksize) {
+    USHAContext tcontext;
+    int err = USHAReset(&tcontext, whichSha) ||
+              USHAInput(&tcontext, key, key_len) ||
+              USHAResult(&tcontext, tempkey);
+    if (err != shaSuccess) return err;
+
+    key = tempkey;
+    key_len = hashsize;
+  }
+
+  /*
+   * The HMAC transform looks like:
+   *
+   * SHA(K XOR opad, SHA(K XOR ipad, text))
+   *
+   * where K is an n byte key, 0-padded to a total of blocksize bytes,
+   * ipad is the byte 0x36 repeated blocksize times,
+   * opad is the byte 0x5c repeated blocksize times,
+   * and text is the data being protected.
+   */
+
+  /* store key into the pads, XOR'd with ipad and opad values */
+  for (i = 0; i < key_len; i++) {
+    k_ipad[i] = key[i] ^ 0x36;
+    context->k_opad[i] = key[i] ^ 0x5c;
+  }
+  /* remaining pad bytes are '\0' XOR'd with ipad and opad values */
+  for ( ; i < blocksize; i++) {
+    k_ipad[i] = 0x36;
+    context->k_opad[i] = 0x5c;
+  }
+
+  /* perform inner hash */
+  /* init context for 1st pass */
+  ret = USHAReset(&context->shaContext, whichSha) ||
+        /* and start with inner pad */
+        USHAInput(&context->shaContext, k_ipad, blocksize);
+  return context->Corrupted = ret;
+}
+
+/*
+ *  hmacInput
+ *
+ *  Description:
+ *      This function accepts an array of octets as the next portion
+ *      of the message.  It may be called multiple times.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The HMAC context to update.
+ *      text[ ]: [in]
+ *          An array of octets representing the next portion of
+ *          the message.
+ *      text_len: [in]
+ *          The length of the message in text.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hmacInput(HMACContext *context, const unsigned char *text,
+    int text_len)
+{
+  if (!context) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  /* then text of datagram */
+  return context->Corrupted =
+    USHAInput(&context->shaContext, text, text_len);
+}
+
+/*
+ * hmacFinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The HMAC context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int hmacFinalBits(HMACContext *context,
+    uint8_t bits, unsigned int bit_count)
+{
+  if (!context) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  /* then final bits of datagram */
+  return context->Corrupted =
+    USHAFinalBits(&context->shaContext, bits, bit_count);
+}
+
+/*
+ * hmacResult
+ *
+ * Description:
+ *   This function will return the N-byte message digest into the
+ *   Message_Digest array provided by the caller.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the HMAC hash.
+ *   digest[ ]: [out]
+ *     Where the digest is returned.
+ *     NOTE 2: The length of the hash is determined by the value of
+ *      whichSha that was passed to hmacReset().
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int hmacResult(HMACContext *context, uint8_t *digest)
+{
+  int ret;
+  if (!context) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+
+  /* finish up 1st pass */
+  /* (Use digest here as a temporary buffer.) */
+  ret =
+    USHAResult(&context->shaContext, digest) ||
+
+         /* perform outer SHA */
+         /* init context for 2nd pass */
+         USHAReset(&context->shaContext, context->whichSha) ||
+
+         /* start with outer pad */
+         USHAInput(&context->shaContext, context->k_opad,
+                   context->blockSize) ||
+
+         /* then results of 1st hash */
+         USHAInput(&context->shaContext, digest, context->hashSize) ||
+         /* finish up 2nd pass */
+         USHAResult(&context->shaContext, digest);
+
+  context->Computed = 1;
+  return context->Corrupted = ret;
+}
+
diff --git a/components/homekit/hkdf-sha/upstream/rfc6234.txt b/components/homekit/hkdf-sha/upstream/rfc6234.txt
new file mode 100644
index 0000000..814568a
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/rfc6234.txt
@@ -0,0 +1,7115 @@
+
+
+
+
+
+
+Internet Engineering Task Force (IETF)                   D. Eastlake 3rd
+Request for Comments: 6234                                        Huawei
+Obsoletes: 4634                                                T. Hansen
+Updates: 3174                                                  AT&T Labs
+Category: Informational                                         May 2011
+ISSN: 2070-1721
+
+
+                       US Secure Hash Algorithms
+                   (SHA and SHA-based HMAC and HKDF)
+
+Abstract
+
+   The United States of America has adopted a suite of Secure Hash
+   Algorithms (SHAs), including four beyond SHA-1, as part of a Federal
+   Information Processing Standard (FIPS), namely SHA-224, SHA-256,
+   SHA-384, and SHA-512.  This document makes open source code
+   performing these SHA hash functions conveniently available to the
+   Internet community.  The sample code supports input strings of
+   arbitrary bit length.  Much of the text herein was adapted by the
+   authors from FIPS 180-2.
+
+   This document replaces RFC 4634, fixing errata and adding code for an
+   HMAC-based extract-and-expand Key Derivation Function, HKDF (RFC
+   5869).  As with RFC 4634, code to perform SHA-based Hashed Message
+   Authentication Codes (HMACs) is also included.
+
+Status of This Memo
+
+   This document is not an Internet Standards Track specification; it is
+   published for informational purposes.
+
+   This document is a product of the Internet Engineering Task Force
+   (IETF).  It represents the consensus of the IETF community.  It has
+   received public review and has been approved for publication by the
+   Internet Engineering Steering Group (IESG).  Not all documents
+   approved by the IESG are a candidate for any level of Internet
+   Standard; see Section 2 of RFC 5741.
+
+   Information about the current status of this document, any errata,
+   and how to provide feedback on it may be obtained at
+   http://www.rfc-editor.org/info/rfc6234.
+
+
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                     [Page 1]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+Copyright Notice
+
+   Copyright (c) 2011 IETF Trust and the persons identified as the
+   document authors.  All rights reserved.
+
+   This document is subject to BCP 78 and the IETF Trust's Legal
+   Provisions Relating to IETF Documents
+   (http://trustee.ietf.org/license-info) in effect on the date of
+   publication of this document.  Please review these documents
+   carefully, as they describe your rights and restrictions with respect
+   to this document.  Code Components extracted from this document must
+   include Simplified BSD License text as described in Section 4.e of
+   the Trust Legal Provisions and are provided without warranty as
+   described in the Simplified BSD License.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                     [Page 2]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+Table of Contents
+
+   1. Overview of Contents ............................................4
+   2. Notation for Bit Strings and Integers ...........................5
+   3. Operations on Words .............................................6
+   4. Message Padding and Parsing .....................................8
+      4.1. SHA-224 and SHA-256 ........................................8
+      4.2. SHA-384 and SHA-512 ........................................9
+   5. Functions and Constants Used ...................................10
+      5.1. SHA-224 and SHA-256 .......................................10
+      5.2. SHA-384 and SHA-512 .......................................11
+   6. Computing the Message Digest ...................................12
+      6.1. SHA-224 and SHA-256 Initialization ........................12
+      6.2. SHA-224 and SHA-256 Processing ............................13
+      6.3. SHA-384 and SHA-512 Initialization ........................14
+      6.4. SHA-384 and SHA-512 Processing ............................15
+   7. HKDF- and SHA-Based HMACs ......................................17
+      7.1. SHA-Based HMACs ...........................................17
+      7.2. HKDF ......................................................17
+   8. C Code for SHAs, HMAC, and HKDF ................................17
+      8.1. The Header Files ..........................................21
+           8.1.1. The .h file ........................................21
+           8.1.2. stdint-example.h ...................................29
+           8.1.3. sha-private.h ......................................29
+      8.2. The SHA Code ..............................................30
+           8.2.1. sha1.c .............................................30
+           8.2.2. sha224-256.c .......................................39
+           8.2.3. sha384-512.c .......................................51
+           8.2.4. usha.c .............................................73
+      8.3. The HMAC Code .............................................79
+      8.4. The HKDF Code .............................................84
+      8.5. The Test Driver ...........................................91
+   9. Security Considerations .......................................123
+   10. Acknowledgements .............................................123
+   11. References ...................................................124
+      11.1. Normative References ....................................124
+      11.2. Informative References ..................................124
+   Appendix: Changes from RFC 4634...................................126
+
+
+
+
+
+
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                     [Page 3]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+1.  Overview of Contents
+
+   This document includes specifications for the United States of
+   America (USA) Federal Information Processing Standard (FIPS) Secure
+   Hash Algorithms (SHAs), code to implement the SHAs, code to implement
+   HMAC (Hashed Message Authentication Code, [RFC2104]) based on the
+   SHAs, and code to implement HKDF (HMAC-based Key Derivation Function,
+   [RFC5869]) based on HMAC.  Specifications for HMAC and HKDF are not
+   included as they appear elsewhere in the RFC series [RFC2104]
+   [RFC5869].
+
+   NOTE: Much of the text below is taken from [SHS], and the assertions
+   of the security of the hash algorithms described therein are made by
+   the US Government, the author of [SHS], not by the listed authors of
+   this document.  See also [RFC6194] concerning the security of SHA-1.
+
+   The text below specifies Secure Hash Algorithms, SHA-224 [RFC3874],
+   SHA-256, SHA-384, and SHA-512, for computing a condensed
+   representation of a message or a data file.  (SHA-1 is specified in
+   [RFC3174].) When a message of any length < 2^64 bits (for SHA-224 and
+   SHA-256) or < 2^128 bits (for SHA-384 and SHA-512) is input to one of
+   these algorithms, the result is an output called a message digest.
+   The message digests range in length from 224 to 512 bits, depending
+   on the algorithm.  Secure Hash Algorithms are typically used with
+   other cryptographic algorithms, such as digital signature algorithms
+   and keyed-hash authentication codes, the generation of random numbers
+   [RFC4086], or in key derivation functions.
+
+   The algorithms specified in this document are called secure because
+   it is computationally infeasible to (1) find a message that
+   corresponds to a given message digest, or (2) find two different
+   messages that produce the same message digest.  Any change to a
+   message in transit will, with very high probability, result in a
+   different message digest.  This will result in a verification failure
+   when the Secure Hash Algorithm is used with a digital signature
+   algorithm or a keyed-hash message authentication algorithm.
+
+   The code provided herein supports input strings of arbitrary bit
+   length.  SHA-1's sample code from [RFC3174] has also been updated to
+   handle input strings of arbitrary bit length.  Permission is granted
+   for all uses, commercial and non-commercial, of this code.
+
+   This document obsoletes [RFC4634], and the changes from that RFC are
+   summarized in the Appendix.
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                     [Page 4]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+   ASN.1 OIDs (Object Identifiers) for the SHA algorithms, taken from
+   [RFC4055], are as follows:
+
+   id-sha1  OBJECT IDENTIFIER  ::=  { iso(1)
+                         identified-organization(3) oiw(14)
+                         secsig(3) algorithms(2) 26 }
+    id-sha224  OBJECT IDENTIFIER  ::=  {{ joint-iso-itu-t(2)
+                         country(16) us(840) organization(1) gov(101)
+                         csor(3) nistalgorithm(4) hashalgs(2) 4 }
+    id-sha256  OBJECT IDENTIFIER  ::=  { joint-iso-itu-t(2)
+                         country(16) us(840) organization(1) gov(101)
+                         csor(3) nistalgorithm(4) hashalgs(2) 1 }
+    id-sha384  OBJECT IDENTIFIER  ::=  { joint-iso-itu-t(2)
+                         country(16) us(840) organization(1) gov(101)
+                         csor(3) nistalgorithm(4) hashalgs(2) 2 }
+    id-sha512  OBJECT IDENTIFIER  ::=  { joint-iso-itu-t(2)
+                         country(16) us(840) organization(1) gov(101)
+                         csor(3) nistalgorithm(4) hashalgs(2) 3 }
+
+   Section 2 below defines the terminology and functions used as
+   building blocks to form these algorithms.  Section 3 describes the
+   fundamental operations on words from which these algorithms are
+   built.  Section 4 describes how messages are padded up to an integral
+   multiple of the required block size and then parsed into blocks.
+   Section 5 defines the constants and the composite functions used to
+   specify the hash algorithms.  Section 6 gives the actual
+   specification for the SHA-224, SHA-256, SHA-384, and SHA-512
+   functions.  Section 7 provides pointers to the specification of HMAC
+   keyed message authentication codes and to the specification of an
+   extract-and-expand key derivation function based on HMAC.
+
+   Section 8 gives sample code for the SHA algorithms, for SHA-based
+   HMACs, and for HMAC-based extract-and-expand key derivation function.
+
+2.  Notation for Bit Strings and Integers
+
+   The following terminology related to bit strings and integers will be
+   used:
+
+   a. A hex digit is an element of the set {0, 1, ... , 9, A, ... , F}.
+      A hex digit is the representation of a 4-bit string.  Examples: 7
+      = 0111, A = 1010.
+
+      b. A word equals a 32-bit or 64-bit string that may be represented
+      as a sequence of 8 or 16 hex digits, respectively.  To convert a
+      word to hex digits, each 4-bit string is converted to its hex
+      equivalent as described in (a) above.  Example:
+
+
+
+
+Eastlake & Hansen             Informational                     [Page 5]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+         1010 0001 0000 0011 1111 1110 0010 0011 = A103FE23.
+
+      Throughout this document, the "big-endian" convention is used when
+      expressing both 32-bit and 64-bit words, so that within each word
+      the most significant bit is shown in the leftmost bit position.
+
+      c. An integer may be represented as a word or pair of words.
+
+      An integer between 0 and 2^32 - 1 inclusive may be represented as
+      a 32-bit word.  The least significant four bits of the integer are
+      represented by the rightmost hex digit of the word representation.
+      Example: the integer 291 = 2^8+2^5+2^1+2^0 = 256+32+2+1 is
+      represented by the hex word 00000123.
+
+      The same holds true for an integer between 0 and 2^64-1 inclusive,
+      which may be represented as a 64-bit word.
+
+      If Z is an integer, 0 <= z < 2^64, then z = (2^32)x + y where
+      0 <= x < 2^32 and 0 <= y < 2^32.  Since x and y can be represented
+      as words X and Y, respectively, z can be represented as the pair
+      of words (X,Y).
+
+      Again, the "big-endian" convention is used and the most
+      significant word is in the leftmost word position for values
+      represented by multiple-words.
+
+      d. block = 512-bit or 1024-bit string.  A block (e.g., B) may be
+      represented as a sequence of 32-bit or 64-bit words.
+
+3.  Operations on Words
+
+   The following logical operators will be applied to words in all four
+   hash operations specified herein.  SHA-224 and SHA-256 operate on
+   32-bit words while SHA-384 and SHA-512 operate on 64-bit words.
+
+   In the operations below, x<<n is obtained as follows: discard the
+   leftmost n bits of x and then pad the result with n zeroed bits on
+   the right (the result will still be the same number of bits).
+   Similarly, x>>n is obtained as follows: discard the rightmost n bits
+   of x and then prepend the result with n zeroed bits on the left (the
+   result will still be the same number of bits).
+
+   a. Bitwise logical word operations
+
+         X AND Y  =  bitwise logical "and" of  X and Y.
+
+         X OR Y   =  bitwise logical "inclusive-or" of X and Y.
+
+
+
+
+Eastlake & Hansen             Informational                     [Page 6]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+         X XOR Y  =  bitwise logical "exclusive-or" of X and Y.
+
+         NOT X    =  bitwise logical "complement" of X.
+
+         Example:
+                  01101100101110011101001001111011
+            XOR   01100101110000010110100110110111
+                  --------------------------------
+              =   00001001011110001011101111001100
+
+   b. The operation X + Y is defined as follows: words X and Y represent
+      w-bit integers x and y, where 0 <= x < 2^w and 0 <= y < 2^w.  For
+      positive integers n and m, let
+
+         n mod m
+
+      be the remainder upon dividing n by m.  Compute
+
+         z  =  (x + y) mod 2^w.
+
+      Then 0 <= z < 2^w.  Convert z to a word, Z, and define Z = X + Y.
+
+   c. The right shift operation SHR^n(x), where x is a w-bit word and n
+      is an integer with 0 <= n < w, is defined by
+
+         SHR^n(x) = x>>n
+
+   d. The rotate right (circular right shift) operation ROTR^n(x), where
+      x is a w-bit word and n is an integer with 0 <= n < w, is defined
+      by
+
+         ROTR^n(x) = (x>>n) OR (x<<(w-n))
+
+   e. The rotate left (circular left shift) operation ROTL^n(x), where x
+      is a w-bit word and n is an integer with 0 <= n < w, is defined by
+
+         ROTL^n(X) = (x<<n) OR (x>>(w-n))
+
+      Note the following equivalence relationships, where w is fixed in
+      each relationship:
+
+         ROTL^n(x) = ROTR^(w-n)(x)
+
+         ROTR^n(x) = ROTL^(w-n)(x)
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                     [Page 7]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+4.  Message Padding and Parsing
+
+   The hash functions specified herein are used to compute a message
+   digest for a message or data file that is provided as input.  The
+   message or data file should be considered to be a bit string.  The
+   length of the message is the number of bits in the message (the empty
+   message has length 0).  If the number of bits in a message is a
+   multiple of 8, for compactness we can represent the message in hex.
+   The purpose of message padding is to make the total length of a
+   padded message a multiple of 512 for SHA-224 and SHA-256 or a
+   multiple of 1024 for SHA-384 and SHA-512.
+
+   The following specifies how this padding shall be performed.  As a
+   summary, a "1" followed by m "0"s followed by a 64-bit or 128-bit
+   integer are appended to the end of the message to produce a padded
+   message of length 512*n or 1024*n.  The appended integer is the
+   length of the original message.  The padded message is then processed
+   by the hash function as n 512-bit or 1024-bit blocks.
+
+4.1.  SHA-224 and SHA-256
+
+   Suppose a message has length L < 2^64.  Before it is input to the
+   hash function, the message is padded on the right as follows:
+
+   a. "1" is appended.  Example: if the original message is "01010000",
+      this is padded to "010100001".
+
+   b. K "0"s are appended where K is the smallest, non-negative solution
+      to the equation
+
+         ( L + 1 + K ) mod 512 = 448
+
+   c. Then append the 64-bit block that is L in binary representation.
+      After appending this block, the length of the message will be a
+      multiple of 512 bits.
+
+      Example: Suppose the original message is the bit string
+
+         01100001 01100010 01100011 01100100 01100101
+
+      After step (a) this gives
+
+         01100001 01100010 01100011 01100100 01100101 1
+
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                     [Page 8]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+      Since L = 40, the number of bits in the above is 41 and K = 407
+      "0"s are appended, making the total now 448.  This gives the
+      following in hex:
+
+         61626364 65800000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000
+
+      The 64-bit representation of L = 40 is hex 00000000 00000028.
+      Hence the final padded message is the following hex
+
+         61626364 65800000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000028
+
+4.2.  SHA-384 and SHA-512
+
+   Suppose a message has length L < 2^128.  Before it is input to the
+   hash function, the message is padded on the right as follows:
+
+   a. "1" is appended.  Example: if the original message is "01010000",
+      this is padded to "010100001".
+
+   b. K "0"s are appended where K is the smallest, non-negative solution
+      to the equation
+
+         ( L + 1 + K ) mod 1024 = 896
+
+   c. Then append the 128-bit block that is L in binary representation.
+      After appending this block, the length of the message will be a
+      multiple of 1024 bits.
+
+      Example: Suppose the original message is the bit string
+
+         01100001 01100010 01100011 01100100 01100101
+
+      After step (a) this gives
+
+         01100001 01100010 01100011 01100100 01100101 1
+
+
+
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                     [Page 9]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+      Since L = 40, the number of bits in the above is 41 and K = 855
+      "0"s are appended, making the total now 896.  This gives the
+      following in hex:
+
+         61626364 65800000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000000
+
+      The 128-bit representation of L = 40 is hex 00000000 00000000
+      00000000 00000028.  Hence the final padded message is the
+      following hex:
+
+         61626364 65800000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000000
+         00000000 00000000 00000000 00000028
+
+5.  Functions and Constants Used
+
+   The following subsections give the six logical functions and the
+   table of constants used in each of the hash functions.
+
+5.1.  SHA-224 and SHA-256
+
+   SHA-224 and SHA-256 use six logical functions, where each function
+   operates on 32-bit words, which are represented as x, y, and z.  The
+   result of each function is a new 32-bit word.
+
+      CH( x, y, z) = (x AND y) XOR ( (NOT x) AND z)
+
+      MAJ( x, y, z) = (x AND y) XOR (x AND z) XOR (y AND z)
+
+      BSIG0(x) = ROTR^2(x) XOR ROTR^13(x) XOR ROTR^22(x)
+
+      BSIG1(x) = ROTR^6(x) XOR ROTR^11(x) XOR ROTR^25(x)
+
+      SSIG0(x) = ROTR^7(x) XOR ROTR^18(x) XOR SHR^3(x)
+
+      SSIG1(x) = ROTR^17(x) XOR ROTR^19(x) XOR SHR^10(x)
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 10]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+   SHA-224 and SHA-256 use the same sequence of sixty-four constant
+   32-bit words, K0, K1, ..., K63.  These words represent the first 32
+   bits of the fractional parts of the cube roots of the first sixty-
+   four prime numbers.  In hex, these constant words are as follows
+   (from left to right):
+
+      428a2f98 71374491 b5c0fbcf e9b5dba5
+      3956c25b 59f111f1 923f82a4 ab1c5ed5
+      d807aa98 12835b01 243185be 550c7dc3
+      72be5d74 80deb1fe 9bdc06a7 c19bf174
+      e49b69c1 efbe4786 0fc19dc6 240ca1cc
+      2de92c6f 4a7484aa 5cb0a9dc 76f988da
+      983e5152 a831c66d b00327c8 bf597fc7
+      c6e00bf3 d5a79147 06ca6351 14292967
+      27b70a85 2e1b2138 4d2c6dfc 53380d13
+      650a7354 766a0abb 81c2c92e 92722c85
+      a2bfe8a1 a81a664b c24b8b70 c76c51a3
+      d192e819 d6990624 f40e3585 106aa070
+      19a4c116 1e376c08 2748774c 34b0bcb5
+      391c0cb3 4ed8aa4a 5b9cca4f 682e6ff3
+      748f82ee 78a5636f 84c87814 8cc70208
+      90befffa a4506ceb bef9a3f7 c67178f2
+
+5.2.  SHA-384 and SHA-512
+
+   SHA-384 and SHA-512 each use six logical functions, where each
+   function operates on 64-bit words, which are represented as x, y, and
+   z.  The result of each function is a new 64-bit word.
+
+      CH( x, y, z) = (x AND y) XOR ( (NOT x) AND z)
+
+      MAJ( x, y, z) = (x AND y) XOR (x AND z) XOR (y AND z)
+
+      BSIG0(x) = ROTR^28(x) XOR ROTR^34(x) XOR ROTR^39(x)
+
+      BSIG1(x) = ROTR^14(x) XOR ROTR^18(x) XOR ROTR^41(x)
+
+      SSIG0(x) = ROTR^1(x) XOR ROTR^8(x) XOR SHR^7(x)
+
+      SSIG1(x) = ROTR^19(x) XOR ROTR^61(x) XOR SHR^6(x)
+
+   SHA-384 and SHA-512 use the same sequence of eighty constant 64-bit
+   words, K0, K1, ... K79.  These words represent the first 64 bits of
+   the fractional parts of the cube roots of the first eighty prime
+   numbers.  In hex, these constant words are as follows (from left to
+   right):
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 11]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+   428a2f98d728ae22 7137449123ef65cd b5c0fbcfec4d3b2f e9b5dba58189dbbc
+   3956c25bf348b538 59f111f1b605d019 923f82a4af194f9b ab1c5ed5da6d8118
+   d807aa98a3030242 12835b0145706fbe 243185be4ee4b28c 550c7dc3d5ffb4e2
+   72be5d74f27b896f 80deb1fe3b1696b1 9bdc06a725c71235 c19bf174cf692694
+   e49b69c19ef14ad2 efbe4786384f25e3 0fc19dc68b8cd5b5 240ca1cc77ac9c65
+   2de92c6f592b0275 4a7484aa6ea6e483 5cb0a9dcbd41fbd4 76f988da831153b5
+   983e5152ee66dfab a831c66d2db43210 b00327c898fb213f bf597fc7beef0ee4
+   c6e00bf33da88fc2 d5a79147930aa725 06ca6351e003826f 142929670a0e6e70
+   27b70a8546d22ffc 2e1b21385c26c926 4d2c6dfc5ac42aed 53380d139d95b3df
+   650a73548baf63de 766a0abb3c77b2a8 81c2c92e47edaee6 92722c851482353b
+   a2bfe8a14cf10364 a81a664bbc423001 c24b8b70d0f89791 c76c51a30654be30
+   d192e819d6ef5218 d69906245565a910 f40e35855771202a 106aa07032bbd1b8
+   19a4c116b8d2d0c8 1e376c085141ab53 2748774cdf8eeb99 34b0bcb5e19b48a8
+   391c0cb3c5c95a63 4ed8aa4ae3418acb 5b9cca4f7763e373 682e6ff3d6b2b8a3
+   748f82ee5defb2fc 78a5636f43172f60 84c87814a1f0ab72 8cc702081a6439ec
+   90befffa23631e28 a4506cebde82bde9 bef9a3f7b2c67915 c67178f2e372532b
+   ca273eceea26619c d186b8c721c0c207 eada7dd6cde0eb1e f57d4f7fee6ed178
+   06f067aa72176fba 0a637dc5a2c898a6 113f9804bef90dae 1b710b35131c471b
+   28db77f523047d84 32caab7b40c72493 3c9ebe0a15c9bebc 431d67c49c100d4c
+   4cc5d4becb3e42b6 597f299cfc657e2a 5fcb6fab3ad6faec 6c44198c4a475817
+
+6.  Computing the Message Digest
+
+   The output of each of the secure hash functions, after being applied
+   to a message of N blocks, is the hash quantity H(N).  For SHA-224 and
+   SHA-256, H(i) can be considered to be eight 32-bit words, H(i)0,
+   H(i)1, ... H(i)7.  For SHA-384 and SHA-512, it can be considered to
+   be eight 64-bit words, H(i)0, H(i)1, ..., H(i)7.
+
+   As described below, the hash words are initialized, modified as each
+   message block is processed, and finally concatenated after processing
+   the last block to yield the output.  For SHA-256 and SHA-512, all of
+   the H(N) variables are concatenated while the SHA-224 and SHA-384
+   hashes are produced by omitting some from the final concatenation.
+
+6.1.  SHA-224 and SHA-256 Initialization
+
+   For SHA-224, the initial hash value, H(0), consists of the following
+   32-bit words in hex:
+
+      H(0)0 = c1059ed8
+      H(0)1 = 367cd507
+      H(0)2 = 3070dd17
+      H(0)3 = f70e5939
+      H(0)4 = ffc00b31
+      H(0)5 = 68581511
+      H(0)6 = 64f98fa7
+      H(0)7 = befa4fa4
+
+
+
+Eastlake & Hansen             Informational                    [Page 12]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+   For SHA-256, the initial hash value, H(0), consists of the following
+   eight 32-bit words, in hex.  These words were obtained by taking the
+   first 32 bits of the fractional parts of the square roots of the
+   first eight prime numbers.
+
+      H(0)0 = 6a09e667
+      H(0)1 = bb67ae85
+      H(0)2 = 3c6ef372
+      H(0)3 = a54ff53a
+      H(0)4 = 510e527f
+      H(0)5 = 9b05688c
+      H(0)6 = 1f83d9ab
+      H(0)7 = 5be0cd19
+
+6.2.  SHA-224 and SHA-256 Processing
+
+   SHA-224 and SHA-256 perform identical processing on message blocks
+   and differ only in how H(0) is initialized and how they produce their
+   final output.  They may be used to hash a message, M, having a length
+   of L bits, where 0 <= L < 2^64.  The algorithm uses (1) a message
+   schedule of sixty-four 32-bit words, (2) eight working variables of
+   32 bits each, and (3) a hash value of eight 32-bit words.
+
+   The words of the message schedule are labeled W0, W1, ..., W63.  The
+   eight working variables are labeled a, b, c, d, e, f, g, and h.  The
+   words of the hash value are labeled H(i)0, H(i)1, ..., H(i)7, which
+   will hold the initial hash value, H(0), replaced by each successive
+   intermediate hash value (after each message block is processed),
+   H(i), and ending with the final hash value, H(N), after all N blocks
+   are processed.  They also use two temporary words, T1 and T2.
+
+   The input message is padded as described in Section 4.1 above, then
+   parsed into 512-bit blocks that are considered to be composed of
+   sixteen 32-bit words M(i)0, M(i)1, ..., M(i)15.  The following
+   computations are then performed for each of the N message blocks.
+   All addition is performed modulo 2^32.
+
+   For i = 1 to N
+
+      1. Prepare the message schedule W:
+         For t = 0 to 15
+            Wt = M(i)t
+         For t = 16 to 63
+            Wt = SSIG1(W(t-2)) + W(t-7) + SSIG0(w(t-15)) + W(t-16)
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 13]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+      2. Initialize the working variables:
+         a = H(i-1)0
+         b = H(i-1)1
+         c = H(i-1)2
+         d = H(i-1)3
+         e = H(i-1)4
+         f = H(i-1)5
+         g = H(i-1)6
+         h = H(i-1)7
+
+      3. Perform the main hash computation:
+         For t = 0 to 63
+            T1 = h + BSIG1(e) + CH(e,f,g) + Kt + Wt
+            T2 = BSIG0(a) + MAJ(a,b,c)
+            h = g
+            g = f
+            f = e
+            e = d + T1
+            d = c
+            c = b
+            b = a
+            a = T1 + T2
+
+      4. Compute the intermediate hash value H(i)
+         H(i)0 = a + H(i-1)0
+         H(i)1 = b + H(i-1)1
+         H(i)2 = c + H(i-1)2
+         H(i)3 = d + H(i-1)3
+         H(i)4 = e + H(i-1)4
+         H(i)5 = f + H(i-1)5
+         H(i)6 = g + H(i-1)6
+         H(i)7 = h + H(i-1)7
+
+   After the above computations have been sequentially performed for all
+   of the blocks in the message, the final output is calculated.  For
+   SHA-256, this is the concatenation of all of H(N)0, H(N)1, through
+   H(N)7.  For SHA-224, this is the concatenation of H(N)0, H(N)1,
+   through H(N)6.
+
+6.3.  SHA-384 and SHA-512 Initialization
+
+   For SHA-384, the initial hash value, H(0), consists of the following
+   eight 64-bit words, in hex.  These words were obtained by taking the
+   first 64 bits of the fractional parts of the square roots of the
+   ninth through sixteenth prime numbers.
+
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 14]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+         H(0)0 = cbbb9d5dc1059ed8
+         H(0)1 = 629a292a367cd507
+         H(0)2 = 9159015a3070dd17
+         H(0)3 = 152fecd8f70e5939
+         H(0)4 = 67332667ffc00b31
+         H(0)5 = 8eb44a8768581511
+         H(0)6 = db0c2e0d64f98fa7
+         H(0)7 = 47b5481dbefa4fa4
+
+   For SHA-512, the initial hash value, H(0), consists of the following
+   eight 64-bit words, in hex.  These words were obtained by taking the
+   first 64 bits of the fractional parts of the square roots of the
+   first eight prime numbers.
+
+         H(0)0 = 6a09e667f3bcc908
+         H(0)1 = bb67ae8584caa73b
+         H(0)2 = 3c6ef372fe94f82b
+         H(0)3 = a54ff53a5f1d36f1
+         H(0)4 = 510e527fade682d1
+         H(0)5 = 9b05688c2b3e6c1f
+         H(0)6 = 1f83d9abfb41bd6b
+         H(0)7 = 5be0cd19137e2179
+
+6.4.  SHA-384 and SHA-512 Processing
+
+   SHA-384 and SHA-512 perform identical processing on message blocks
+   and differ only in how H(0) is initialized and how they produce their
+   final output.  They may be used to hash a message, M, having a length
+   of L bits, where 0 <= L < 2^128.  The algorithm uses (1) a message
+   schedule of eighty 64-bit words, (2) eight working variables of 64
+   bits each, and (3) a hash value of eight 64-bit words.
+
+   The words of the message schedule are labeled W0, W1, ..., W79.  The
+   eight working variables are labeled a, b, c, d, e, f, g, and h.  The
+   words of the hash value are labeled H(i)0, H(i)1, ..., H(i)7, which
+   will hold the initial hash value, H(0), replaced by each successive
+   intermediate hash value (after each message block is processed),
+   H(i), and ending with the final hash value, H(N) after all N blocks
+   are processed.
+
+   The input message is padded as described in Section 4.2 above, then
+   parsed into 1024-bit blocks that are considered to be composed of
+   sixteen 64-bit words M(i)0, M(i)1, ..., M(i)15.  The following
+   computations are then performed for each of the N message blocks.
+   All addition is performed modulo 2^64.
+
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 15]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+   For i = 1 to N
+
+      1. Prepare the message schedule W:
+         For t = 0 to 15
+            Wt = M(i)t
+         For t = 16 to 79
+            Wt = SSIG1(W(t-2)) + W(t-7) + SSIG0(W(t-15)) + W(t-16)
+
+      2. Initialize the working variables:
+         a = H(i-1)0
+         b = H(i-1)1
+         c = H(i-1)2
+         d = H(i-1)3
+         e = H(i-1)4
+         f = H(i-1)5
+         g = H(i-1)6
+         h = H(i-1)7
+
+      3. Perform the main hash computation:
+         For t = 0 to 79
+            T1 = h + BSIG1(e) + CH(e,f,g) + Kt + Wt
+            T2 = BSIG0(a) + MAJ(a,b,c)
+            h = g
+            g = f
+            f = e
+            e = d + T1
+            d = c
+            c = b
+            b = a
+            a = T1 + T2
+
+         4. Compute the intermediate hash value H(i)
+            H(i)0 = a + H(i-1)0
+            H(i)1 = b + H(i-1)1
+            H(i)2 = c + H(i-1)2
+            H(i)3 = d + H(i-1)3
+            H(i)4 = e + H(i-1)4
+            H(i)5 = f + H(i-1)5
+            H(i)6 = g + H(i-1)6
+            H(i)7 = h + H(i-1)7
+
+   After the above computations have been sequentially performed for all
+   of the blocks in the message, the final output is calculated.  For
+   SHA-512, this is the concatenation of all of H(N)0, H(N)1, through
+   H(N)7.  For SHA-384, this is the concatenation of H(N)0, H(N)1,
+   through H(N)5.
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 16]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+7.  HKDF- and SHA-Based HMACs
+
+   Below are brief descriptions and pointers to more complete
+   descriptions and code for (1) SHA-based HMACs and (2) an HMAC-based
+   extract-and-expand key derivation function.  Both HKDF and HMAC were
+   devised by Hugo Krawczyk.
+
+7.1.  SHA-Based HMACs
+
+   HMAC is a method for computing a keyed MAC (Message Authentication
+   Code) using a hash function as described in [RFC2104].  It uses a key
+   to mix in with the input text to produce the final hash.
+
+   Sample code is also provided, in Section 8.3 below, to perform HMAC
+   based on any of the SHA algorithms described herein.  The sample code
+   found in [RFC2104] was written in terms of a specified text size.
+   Since SHA is defined in terms of an arbitrary number of bits, the
+   sample HMAC code has been written to allow the text input to HMAC to
+   have an arbitrary number of octets and bits.  A fixed-length
+   interface is also provided.
+
+7.2.  HKDF
+
+   HKDF is a specific Key Derivation Function (KDF), that is, a function
+   of initial keying material from which the KDF derives one or more
+   cryptographically strong secret keys.  HKDF, which is described in
+   [RFC5869], is based on HMAC.
+
+   Sample code for HKDF is provided in Section 8.4 below.
+
+8.  C Code for SHAs, HMAC, and HKDF
+
+   Below is a demonstration implementation of these secure hash
+   functions in C.  Section 8.1 contains the header file sha.h that
+   declares all constants, structures, and functions used by the SHA and
+   HMAC functions.  It includes conditionals based on the state of
+   definition of USE_32BIT_ONLY that, if that symbol is defined at
+   compile time, avoids 64-bit operations.  It also contains sha-
+   private.h that provides some declarations common to all the SHA
+   functions.  Section 8.2 contains the C code for sha1.c, sha224-256.c,
+   sha384-512.c, and usha.c.  Section 8.3 contains the C code for the
+   HMAC functions, and Section 8.4 contains the C code for HKDF.
+   Section 8.5 contains a test driver to exercise the code.
+
+   For each of the digest lengths $$$, there is the following set of
+   constants, a structure, and functions:
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 17]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+   Constants:
+      SHA$$$HashSize      number of octets in the hash
+      SHA$$$HashSizeBits  number of bits in the hash
+      SHA$$$_Message_Block_Size
+                          number of octets used in the intermediate
+                          message blocks
+      Most functions return an enum value that is one of:
+        shaSuccess(0)      on success
+        shaNull(1)         when presented with a null pointer parameter
+        shaInputTooLong(2)  when the input data is too long
+        shaStateError(3)   when SHA$$$Input is called after
+                          SHA$$$FinalBits or SHA$$$Result
+
+   Structure:
+      typedef SHA$$$Context
+                          an opaque structure holding the complete state
+                          for producing the hash
+
+   Functions:
+      int SHA$$$Reset(SHA$$$Context *context);
+            Reset the hash context state.
+      int SHA$$$Input(SHA$$$Context *context, const uint8_t *octets,
+                  unsigned int bytecount);
+            Incorporate bytecount octets into the hash.
+      int SHA$$$FinalBits(SHA$$$Context *, const uint8_t octet,
+                  unsigned int bitcount);
+            Incorporate bitcount bits into the hash.  The bits are in
+            the upper portion of the octet.  SHA$$$Input() cannot be
+            called after this.
+      int SHA$$$Result(SHA$$$Context *,
+                  uint8_t Message_Digest[SHA$$$HashSize]);
+            Do the final calculations on the hash and copy the value
+            into Message_Digest.
+
+   In addition, functions with the prefix USHA are provided that take a
+   SHAversion value (SHA$$$) to select the SHA function suite.  They add
+   the following constants, structure, and functions:
+
+   Constants:
+      shaBadParam(4)      constant returned by USHA functions when
+                          presented with a bad SHAversion (SHA$$$)
+                          parameter or other illegal parameter values
+      USAMaxHashSize      maximum of the SHA hash sizes
+      SHA$$$              SHAversion enumeration values, used by USHA,
+                          HMAC, and HKDF functions to select the SHA
+                          function suite
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 18]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+   Structure:
+      typedef USHAContext
+                          an opaque structure holding the complete state
+                          for producing the hash
+
+   Functions:
+      int USHAReset(USHAContext *context, SHAversion whichSha);
+            Reset the hash context state.
+      int USHAInput(USHAContext context*,
+                  const uint8_t *bytes, unsigned int bytecount);
+            Incorporate bytecount octets into the hash.
+      int USHAFinalBits(USHAContext *context,
+                  const uint8_t bits, unsigned int bitcount);
+            Incorporate bitcount bits into the hash.
+      int USHAResult(USHAContext *context,
+                  uint8_t Message_Digest[USHAMaxHashSize]);
+            Do the final calculations on the hash and copy the value
+            into Message_Digest.  Octets in Message_Digest beyond
+            USHAHashSize(whichSha) are left untouched.
+      int USHAHashSize(enum SHAversion whichSha);
+            The number of octets in the given hash.
+      int USHAHashSizeBits(enum SHAversion whichSha);
+            The number of bits in the given hash.
+      int USHABlockSize(enum SHAversion whichSha);
+            The internal block size for the given hash.
+      const char *USHAHashName(enum SHAversion whichSha);
+            This function will return the name of the given SHA
+            algorithm as a string.
+
+   The HMAC functions follow the same pattern to allow any length of
+   text input to be used.
+
+   Structure:
+      typedef HMACContext an opaque structure holding the complete state
+                          for producing the keyed message digest (MAC)
+
+   Functions:
+      int hmacReset(HMACContext *ctx, enum SHAversion whichSha,
+                  const unsigned char *key, int key_len);
+            Reset the MAC context state.
+      int hmacInput(HMACContext *ctx, const unsigned char *text,
+                  int text_len);
+            Incorporate text_len octets into the MAC.
+      int hmacFinalBits(HMACContext *ctx, const uint8_t bits,
+                  unsigned int bitcount);
+            Incorporate bitcount bits into the MAC.
+      int hmacResult(HMACContext *ctx,
+                  uint8_t Message_Digest[USHAMaxHashSize]);
+
+
+
+Eastlake & Hansen             Informational                    [Page 19]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+            Do the final calculations on the MAC and copy the value into
+            Message_Digest.  Octets in Message_Digest beyond
+            USHAHashSize(whichSha) are left untouched.
+
+   In addition, a combined interface is provided, similar to that shown
+   in [RFC2104], that allows a fixed-length text input to be used.
+
+      int hmac(SHAversion whichSha,
+                  const unsigned char *text, int text_len,
+                  const unsigned char *key, int key_len,
+                  uint8_t Message_Digest[USHAMaxHashSize]);
+            Calculate the given digest for the given text and key, and
+            return the resulting MAC.  Octets in Message_Digest beyond
+            USHAHashSize(whichSha) are left untouched.
+
+   The HKDF functions follow the same pattern to allow any length of
+   text input to be used.
+
+   Structure:
+      typedef HKDFContext an opaque structure holding the complete state
+                          for producing the keying material
+   Functions:
+      int hkdfReset(HKDFContext *context, enum SHAversion whichSha,
+                  const unsigned char *salt, int salt_len)
+            Reset the key derivation state and initialize it with the
+            salt_len octets of the optional salt.
+      int hkdfInput(HKDFContext *context, const unsigned char *ikm,
+                  int ikm_len)
+            Incorporate ikm_len octets into the entropy extractor.
+      int hkdfFinalBits(HKDFContext *context, uint8_t ikm_bits,
+                  unsigned int ikm_bit_count)
+            Incorporate ikm_bit_count bits into the entropy extractor.
+      int hkdfResult(HKDFContext *context,
+                  uint8_t prk[USHAMaxHashSize],
+                  const unsigned char *info, int info_len,
+                  uint8_t okm[ ], int okm_len)
+            Finish the HKDF extraction and perform the final HKDF
+            expansion, storing the okm_len octets into output keying
+            material (okm).  Optionally store the pseudo-random key
+            (prk) that is generated internally.
+
+   In addition, combined interfaces are provided, similar to that shown
+   in [RFC5869], that allows a fixed-length text input to be used.
+
+      int hkdfExtract(SHAversion whichSha,
+                  const unsigned char *salt, int salt_len,
+                  const unsigned char *ikm, int ikm_len,
+                  uint8_t prk[USHAMaxHashSize])
+
+
+
+Eastlake & Hansen             Informational                    [Page 20]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+            Perform HKDF extraction, combining the salt_len octets of
+            the optional salt with the ikm_len octets of the input
+            keying material (ikm) to form the pseudo-random key prk.
+            The output prk must be large enough to hold the octets
+            appropriate for the given hash type.
+
+      int hkdfExpand(SHAversion whichSha,
+                  const uint8_t prk[ ], int prk_len,
+                  const unsigned char *info, int info_len,
+                  uint8_t okm[ ], int okm_len)
+            Perform HKDF expansion, combining the prk_len octets of the
+            pseudo-random key prk with the info_len octets of info to
+            form the okm_len octets stored in okm.
+
+      int hkdf(SHAversion whichSha,
+                  const unsigned char *salt, int salt_len,
+                  const unsigned char *ikm, int ikm_len,
+                  const unsigned char *info, int info_len,
+                  uint8_t okm[ ], int okm_len)
+            This combined interface performs both HKDF extraction and
+            expansion.  The variables are the same as in hkdfExtract()
+            and hkdfExpand().
+
+8.1.  The Header Files
+
+8.1.1.  The .h file
+
+   The following sha.h file, as stated in the comments within the file,
+   assumes that <stdint.h> is available on your system.  If it is not,
+   you should change to including <stdint-example.h>, provided in
+   Section 8.1.2, or the like.
+
+/**************************** sha.h ****************************/
+/***************** See RFC 6234 for details. *******************/
+/*
+   Copyright (c) 2011 IETF Trust and the persons identified as
+   authors of the code.  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or
+   without modification, are permitted provided that the following
+   conditions are met:
+
+   - Redistributions of source code must retain the above
+     copyright notice, this list of conditions and
+     the following disclaimer.
+
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 21]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+   - Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following
+     disclaimer in the documentation and/or other materials provided
+     with the distribution.
+
+   - Neither the name of Internet Society, IETF or IETF Trust, nor
+     the names of specific contributors, may be used to endorse or
+     promote products derived from this software without specific
+     prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+   CONTRIBUTORS "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 COPYRIGHT OWNER 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 _SHA_H_
+#define _SHA_H_
+
+/*
+ *  Description:
+ *      This file implements the Secure Hash Algorithms
+ *      as defined in the U.S. National Institute of Standards
+ *      and Technology Federal Information Processing Standards
+ *      Publication (FIPS PUB) 180-3 published in October 2008
+ *      and formerly defined in its predecessors, FIPS PUB 180-1
+ *      and FIP PUB 180-2.
+ *
+ *      A combined document showing all algorithms is available at
+ *              http://csrc.nist.gov/publications/fips/
+ *                     fips180-3/fips180-3_final.pdf
+ *
+ *      The five hashes are defined in these sizes:
+ *              SHA-1           20 byte / 160 bit
+ *              SHA-224         28 byte / 224 bit
+ *              SHA-256         32 byte / 256 bit
+ *              SHA-384         48 byte / 384 bit
+ *              SHA-512         64 byte / 512 bit
+ *
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 22]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *  Compilation Note:
+ *    These files may be compiled with two options:
+ *        USE_32BIT_ONLY - use 32-bit arithmetic only, for systems
+ *                         without 64-bit integers
+ *
+ *        USE_MODIFIED_MACROS - use alternate form of the SHA_Ch()
+ *                         and SHA_Maj() macros that are equivalent
+ *                         and potentially faster on many systems
+ *
+ */
+
+#include <stdint.h>
+/*
+ * If you do not have the ISO standard stdint.h header file, then you
+ * must typedef the following:
+ *    name              meaning
+ *  uint64_t         unsigned 64-bit integer
+ *  uint32_t         unsigned 32-bit integer
+ *  uint8_t          unsigned 8-bit integer (i.e., unsigned char)
+ *  int_least16_t    integer of >= 16 bits
+ *
+ * See stdint-example.h
+ */
+
+#ifndef _SHA_enum_
+#define _SHA_enum_
+/*
+ *  All SHA functions return one of these values.
+ */
+enum {
+    shaSuccess = 0,
+    shaNull,            /* Null pointer parameter */
+    shaInputTooLong,    /* input data too long */
+    shaStateError,      /* called Input after FinalBits or Result */
+    shaBadParam         /* passed a bad parameter */
+};
+#endif /* _SHA_enum_ */
+
+/*
+ *  These constants hold size information for each of the SHA
+ *  hashing operations
+ */
+enum {
+    SHA1_Message_Block_Size = 64, SHA224_Message_Block_Size = 64,
+    SHA256_Message_Block_Size = 64, SHA384_Message_Block_Size = 128,
+    SHA512_Message_Block_Size = 128,
+    USHA_Max_Message_Block_Size = SHA512_Message_Block_Size,
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 23]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    SHA1HashSize = 20, SHA224HashSize = 28, SHA256HashSize = 32,
+    SHA384HashSize = 48, SHA512HashSize = 64,
+    USHAMaxHashSize = SHA512HashSize,
+
+    SHA1HashSizeBits = 160, SHA224HashSizeBits = 224,
+    SHA256HashSizeBits = 256, SHA384HashSizeBits = 384,
+    SHA512HashSizeBits = 512, USHAMaxHashSizeBits = SHA512HashSizeBits
+};
+
+/*
+ *  These constants are used in the USHA (Unified SHA) functions.
+ */
+typedef enum SHAversion {
+    SHA1, SHA224, SHA256, SHA384, SHA512
+} SHAversion;
+
+/*
+ *  This structure will hold context information for the SHA-1
+ *  hashing operation.
+ */
+typedef struct SHA1Context {
+    uint32_t Intermediate_Hash[SHA1HashSize/4]; /* Message Digest */
+
+    uint32_t Length_High;               /* Message length in bits */
+    uint32_t Length_Low;                /* Message length in bits */
+
+    int_least16_t Message_Block_Index;  /* Message_Block array index */
+                                        /* 512-bit message blocks */
+    uint8_t Message_Block[SHA1_Message_Block_Size];
+
+    int Computed;                   /* Is the hash computed? */
+    int Corrupted;                  /* Cumulative corruption code */
+} SHA1Context;
+
+/*
+ *  This structure will hold context information for the SHA-256
+ *  hashing operation.
+ */
+typedef struct SHA256Context {
+    uint32_t Intermediate_Hash[SHA256HashSize/4]; /* Message Digest */
+
+    uint32_t Length_High;               /* Message length in bits */
+    uint32_t Length_Low;                /* Message length in bits */
+
+    int_least16_t Message_Block_Index;  /* Message_Block array index */
+                                        /* 512-bit message blocks */
+    uint8_t Message_Block[SHA256_Message_Block_Size];
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 24]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    int Computed;                   /* Is the hash computed? */
+    int Corrupted;                  /* Cumulative corruption code */
+} SHA256Context;
+
+/*
+ *  This structure will hold context information for the SHA-512
+ *  hashing operation.
+ */
+typedef struct SHA512Context {
+#ifdef USE_32BIT_ONLY
+    uint32_t Intermediate_Hash[SHA512HashSize/4]; /* Message Digest  */
+    uint32_t Length[4];                 /* Message length in bits */
+#else /* !USE_32BIT_ONLY */
+    uint64_t Intermediate_Hash[SHA512HashSize/8]; /* Message Digest */
+    uint64_t Length_High, Length_Low;   /* Message length in bits */
+#endif /* USE_32BIT_ONLY */
+
+    int_least16_t Message_Block_Index;  /* Message_Block array index */
+                                        /* 1024-bit message blocks */
+    uint8_t Message_Block[SHA512_Message_Block_Size];
+
+    int Computed;                   /* Is the hash computed?*/
+    int Corrupted;                  /* Cumulative corruption code */
+} SHA512Context;
+
+/*
+ *  This structure will hold context information for the SHA-224
+ *  hashing operation.  It uses the SHA-256 structure for computation.
+ */
+typedef struct SHA256Context SHA224Context;
+
+/*
+ *  This structure will hold context information for the SHA-384
+ *  hashing operation.  It uses the SHA-512 structure for computation.
+ */
+typedef struct SHA512Context SHA384Context;
+
+/*
+ *  This structure holds context information for all SHA
+ *  hashing operations.
+ */
+typedef struct USHAContext {
+    int whichSha;               /* which SHA is being used */
+    union {
+      SHA1Context sha1Context;
+      SHA224Context sha224Context; SHA256Context sha256Context;
+      SHA384Context sha384Context; SHA512Context sha512Context;
+    } ctx;
+
+
+
+Eastlake & Hansen             Informational                    [Page 25]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+} USHAContext;
+
+/*
+ *  This structure will hold context information for the HMAC
+ *  keyed-hashing operation.
+ */
+typedef struct HMACContext {
+    int whichSha;               /* which SHA is being used */
+    int hashSize;               /* hash size of SHA being used */
+    int blockSize;              /* block size of SHA being used */
+    USHAContext shaContext;     /* SHA context */
+    unsigned char k_opad[USHA_Max_Message_Block_Size];
+                        /* outer padding - key XORd with opad */
+    int Computed;               /* Is the MAC computed? */
+    int Corrupted;              /* Cumulative corruption code */
+
+} HMACContext;
+
+/*
+ *  This structure will hold context information for the HKDF
+ *  extract-and-expand Key Derivation Functions.
+ */
+typedef struct HKDFContext {
+    int whichSha;               /* which SHA is being used */
+    HMACContext hmacContext;
+    int hashSize;               /* hash size of SHA being used */
+    unsigned char prk[USHAMaxHashSize];
+                        /* pseudo-random key - output of hkdfInput */
+    int Computed;               /* Is the key material computed? */
+    int Corrupted;              /* Cumulative corruption code */
+} HKDFContext;
+
+/*
+ *  Function Prototypes
+ */
+
+/* SHA-1 */
+extern int SHA1Reset(SHA1Context *);
+extern int SHA1Input(SHA1Context *, const uint8_t *bytes,
+                     unsigned int bytecount);
+extern int SHA1FinalBits(SHA1Context *, uint8_t bits,
+                         unsigned int bit_count);
+extern int SHA1Result(SHA1Context *,
+                      uint8_t Message_Digest[SHA1HashSize]);
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 26]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+/* SHA-224 */
+extern int SHA224Reset(SHA224Context *);
+extern int SHA224Input(SHA224Context *, const uint8_t *bytes,
+                       unsigned int bytecount);
+extern int SHA224FinalBits(SHA224Context *, uint8_t bits,
+                           unsigned int bit_count);
+extern int SHA224Result(SHA224Context *,
+                        uint8_t Message_Digest[SHA224HashSize]);
+
+/* SHA-256 */
+extern int SHA256Reset(SHA256Context *);
+extern int SHA256Input(SHA256Context *, const uint8_t *bytes,
+                       unsigned int bytecount);
+extern int SHA256FinalBits(SHA256Context *, uint8_t bits,
+                           unsigned int bit_count);
+extern int SHA256Result(SHA256Context *,
+                        uint8_t Message_Digest[SHA256HashSize]);
+
+/* SHA-384 */
+extern int SHA384Reset(SHA384Context *);
+extern int SHA384Input(SHA384Context *, const uint8_t *bytes,
+                       unsigned int bytecount);
+extern int SHA384FinalBits(SHA384Context *, uint8_t bits,
+                           unsigned int bit_count);
+extern int SHA384Result(SHA384Context *,
+                        uint8_t Message_Digest[SHA384HashSize]);
+
+/* SHA-512 */
+extern int SHA512Reset(SHA512Context *);
+extern int SHA512Input(SHA512Context *, const uint8_t *bytes,
+                       unsigned int bytecount);
+extern int SHA512FinalBits(SHA512Context *, uint8_t bits,
+                           unsigned int bit_count);
+extern int SHA512Result(SHA512Context *,
+                        uint8_t Message_Digest[SHA512HashSize]);
+
+/* Unified SHA functions, chosen by whichSha */
+extern int USHAReset(USHAContext *context, SHAversion whichSha);
+extern int USHAInput(USHAContext *context,
+                     const uint8_t *bytes, unsigned int bytecount);
+extern int USHAFinalBits(USHAContext *context,
+                         uint8_t bits, unsigned int bit_count);
+extern int USHAResult(USHAContext *context,
+                      uint8_t Message_Digest[USHAMaxHashSize]);
+extern int USHABlockSize(enum SHAversion whichSha);
+extern int USHAHashSize(enum SHAversion whichSha);
+extern int USHAHashSizeBits(enum SHAversion whichSha);
+extern const char *USHAHashName(enum SHAversion whichSha);
+
+
+
+Eastlake & Hansen             Informational                    [Page 27]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+/*
+ * HMAC Keyed-Hashing for Message Authentication, RFC 2104,
+ * for all SHAs.
+ * This interface allows a fixed-length text input to be used.
+ */
+extern int hmac(SHAversion whichSha, /* which SHA algorithm to use */
+    const unsigned char *text,     /* pointer to data stream */
+    int text_len,                  /* length of data stream */
+    const unsigned char *key,      /* pointer to authentication key */
+    int key_len,                   /* length of authentication key */
+    uint8_t digest[USHAMaxHashSize]); /* caller digest to fill in */
+
+/*
+ * HMAC Keyed-Hashing for Message Authentication, RFC 2104,
+ * for all SHAs.
+ * This interface allows any length of text input to be used.
+ */
+extern int hmacReset(HMACContext *context, enum SHAversion whichSha,
+                     const unsigned char *key, int key_len);
+extern int hmacInput(HMACContext *context, const unsigned char *text,
+                     int text_len);
+extern int hmacFinalBits(HMACContext *context, uint8_t bits,
+                         unsigned int bit_count);
+extern int hmacResult(HMACContext *context,
+                      uint8_t digest[USHAMaxHashSize]);
+
+/*
+ * HKDF HMAC-based Extract-and-Expand Key Derivation Function,
+ * RFC 5869, for all SHAs.
+ */
+extern int hkdf(SHAversion whichSha, const unsigned char *salt,
+                int salt_len, const unsigned char *ikm, int ikm_len,
+                const unsigned char *info, int info_len,
+                uint8_t okm[ ], int okm_len);
+extern int hkdfExtract(SHAversion whichSha, const unsigned char *salt,
+                       int salt_len, const unsigned char *ikm,
+                       int ikm_len, uint8_t prk[USHAMaxHashSize]);
+extern int hkdfExpand(SHAversion whichSha, const uint8_t prk[ ],
+                      int prk_len, const unsigned char *info,
+                      int info_len, uint8_t okm[ ], int okm_len);
+
+/*
+ * HKDF HMAC-based Extract-and-Expand Key Derivation Function,
+ * RFC 5869, for all SHAs.
+ * This interface allows any length of text input to be used.
+ */
+extern int hkdfReset(HKDFContext *context, enum SHAversion whichSha,
+                     const unsigned char *salt, int salt_len);
+
+
+
+Eastlake & Hansen             Informational                    [Page 28]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+extern int hkdfInput(HKDFContext *context, const unsigned char *ikm,
+                     int ikm_len);
+extern int hkdfFinalBits(HKDFContext *context, uint8_t ikm_bits,
+                         unsigned int ikm_bit_count);
+extern int hkdfResult(HKDFContext *context,
+                      uint8_t prk[USHAMaxHashSize],
+                      const unsigned char *info, int info_len,
+                      uint8_t okm[USHAMaxHashSize], int okm_len);
+#endif /* _SHA_H_ */
+
+8.1.2.  stdint-example.h
+
+If your system does not have <stdint.h>, the following should be
+adequate as a substitute for compiling the other code in this document.
+
+/*********************** stdint-example.h **********************/
+/**** Use this file if your system does not have a stdint.h. ***/
+/***************** See RFC 6234 for details. *******************/
+#ifndef STDINT_H
+#define STDINT_H
+
+typedef unsigned long long uint64_t;    /* unsigned 64-bit integer */
+typedef unsigned int       uint32_t;    /* unsigned 32-bit integer */
+typedef unsigned char      uint8_t;     /* unsigned 8-bit integer */
+                                        /* (i.e., unsigned char) */
+typedef int int_least32_t;              /* integer of >= 32 bits */
+typedef short int_least16_t;            /* integer of >= 16 bits */
+
+#endif /* STDINT_H */
+
+8.1.3.  sha-private.h
+
+   The sha-private.h header file contains definitions that should only
+   be needed internally in the other code in this document.  These
+   definitions should not be needed in application code calling the code
+   provided in this document.
+
+/************************ sha-private.h ************************/
+/***************** See RFC 6234 for details. *******************/
+#ifndef _SHA_PRIVATE__H
+#define _SHA_PRIVATE__H
+/*
+ * These definitions are defined in FIPS 180-3, section 4.1.
+ * Ch() and Maj() are defined identically in sections 4.1.1,
+ * 4.1.2, and 4.1.3.
+ *
+ * The definitions used in FIPS 180-3 are as follows:
+ */
+
+
+
+Eastlake & Hansen             Informational                    [Page 29]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+#ifndef USE_MODIFIED_MACROS
+#define SHA_Ch(x,y,z)        (((x) & (y)) ^ ((~(x)) & (z)))
+#define SHA_Maj(x,y,z)       (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+#else /* USE_MODIFIED_MACROS */
+/*
+ * The following definitions are equivalent and potentially faster.
+ */
+
+#define SHA_Ch(x, y, z)      (((x) & ((y) ^ (z))) ^ (z))
+#define SHA_Maj(x, y, z)     (((x) & ((y) | (z))) | ((y) & (z)))
+
+#endif /* USE_MODIFIED_MACROS */
+
+#define SHA_Parity(x, y, z)  ((x) ^ (y) ^ (z))
+
+#endif /* _SHA_PRIVATE__H */
+
+8.2.  The SHA Code
+
+   This code is primarily intended as expository reference code and
+   could be optimized further.  For example, the assignment rotations
+   through the variables a, b, ..., h could be treated as a cycle and
+   the loop unrolled, rather than doing the explicit copying.
+
+   Note that there are alternative representations of the Ch() and Maj()
+   functions controlled by an ifdef.
+
+8.2.1.  sha1.c
+
+/**************************** sha1.c ***************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ *  Description:
+ *      This file implements the Secure Hash Algorithm SHA-1
+ *      as defined in the U.S. National Institute of Standards
+ *      and Technology Federal Information Processing Standards
+ *      Publication (FIPS PUB) 180-3 published in October 2008
+ *      and formerly defined in its predecessors, FIPS PUB 180-1
+ *      and FIP PUB 180-2.
+ *
+ *      A combined document showing all algorithms is available at
+ *              http://csrc.nist.gov/publications/fips/
+ *                     fips180-3/fips180-3_final.pdf
+ *
+
+
+
+Eastlake & Hansen             Informational                    [Page 30]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *      The SHA-1 algorithm produces a 160-bit message digest for a
+ *      given data stream that can serve as a means of providing a
+ *      "fingerprint" for a message.
+ *
+ *  Portability Issues:
+ *      SHA-1 is defined in terms of 32-bit "words".  This code
+ *      uses <stdint.h> (included via "sha.h") to define 32- and
+ *      8-bit unsigned integer types.  If your C compiler does
+ *      not support 32-bit unsigned integers, this code is not
+ *      appropriate.
+ *
+ *  Caveats:
+ *      SHA-1 is designed to work with messages less than 2^64 bits
+ *      long.  This implementation uses SHA1Input() to hash the bits
+ *      that are a multiple of the size of an 8-bit octet, and then
+ *      optionally uses SHA1FinalBits() to hash the final few bits of
+ *      the input.
+ */
+
+#include "sha.h"
+#include "sha-private.h"
+
+/*
+ *  Define the SHA1 circular left shift macro
+ */
+#define SHA1_ROTL(bits,word) \
+                (((word) << (bits)) | ((word) >> (32-(bits))))
+
+/*
+ * Add "length" to the length.
+ * Set Corrupted when overflow has occurred.
+ */
+static uint32_t addTemp;
+#define SHA1AddLength(context, length)                     \
+    (addTemp = (context)->Length_Low,                      \
+     (context)->Corrupted =                                \
+        (((context)->Length_Low += (length)) < addTemp) && \
+        (++(context)->Length_High == 0) ? shaInputTooLong  \
+                                        : (context)->Corrupted )
+
+/* Local Function Prototypes */
+static void SHA1ProcessMessageBlock(SHA1Context *context);
+static void SHA1Finalize(SHA1Context *context, uint8_t Pad_Byte);
+static void SHA1PadMessage(SHA1Context *context, uint8_t Pad_Byte);
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 31]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+/*
+ *  SHA1Reset
+ *
+ *  Description:
+ *      This function will initialize the SHA1Context in preparation
+ *      for computing a new SHA1 message digest.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The context to reset.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int SHA1Reset(SHA1Context *context)
+{
+  if (!context) return shaNull;
+
+  context->Length_High = context->Length_Low = 0;
+  context->Message_Block_Index = 0;
+
+  /* Initial Hash Values: FIPS 180-3 section 5.3.1 */
+  context->Intermediate_Hash[0]   = 0x67452301;
+  context->Intermediate_Hash[1]   = 0xEFCDAB89;
+  context->Intermediate_Hash[2]   = 0x98BADCFE;
+  context->Intermediate_Hash[3]   = 0x10325476;
+  context->Intermediate_Hash[4]   = 0xC3D2E1F0;
+
+  context->Computed   = 0;
+  context->Corrupted  = shaSuccess;
+
+  return shaSuccess;
+}
+
+/*
+ *  SHA1Input
+ *
+ *  Description:
+ *      This function accepts an array of octets as the next portion
+ *      of the message.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The SHA context to update.
+ *      message_array[ ]: [in]
+ *          An array of octets representing the next portion of
+ *          the message.
+
+
+
+Eastlake & Hansen             Informational                    [Page 32]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *      length: [in]
+ *          The length of the message in message_array.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int SHA1Input(SHA1Context *context,
+    const uint8_t *message_array, unsigned length)
+{
+  if (!context) return shaNull;
+  if (!length) return shaSuccess;
+  if (!message_array) return shaNull;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (context->Corrupted) return context->Corrupted;
+
+  while (length--) {
+    context->Message_Block[context->Message_Block_Index++] =
+      *message_array;
+
+    if ((SHA1AddLength(context, 8) == shaSuccess) &&
+      (context->Message_Block_Index == SHA1_Message_Block_Size))
+      SHA1ProcessMessageBlock(context);
+
+    message_array++;
+  }
+
+  return context->Corrupted;
+}
+
+/*
+ * SHA1FinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+
+
+
+Eastlake & Hansen             Informational                    [Page 33]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ */
+int SHA1FinalBits(SHA1Context *context, uint8_t message_bits,
+    unsigned int length)
+{
+  static uint8_t masks[8] = {
+      /* 0 0b00000000 */ 0x00, /* 1 0b10000000 */ 0x80,
+      /* 2 0b11000000 */ 0xC0, /* 3 0b11100000 */ 0xE0,
+      /* 4 0b11110000 */ 0xF0, /* 5 0b11111000 */ 0xF8,
+      /* 6 0b11111100 */ 0xFC, /* 7 0b11111110 */ 0xFE
+  };
+
+  static uint8_t markbit[8] = {
+      /* 0 0b10000000 */ 0x80, /* 1 0b01000000 */ 0x40,
+      /* 2 0b00100000 */ 0x20, /* 3 0b00010000 */ 0x10,
+      /* 4 0b00001000 */ 0x08, /* 5 0b00000100 */ 0x04,
+      /* 6 0b00000010 */ 0x02, /* 7 0b00000001 */ 0x01
+  };
+
+  if (!context) return shaNull;
+  if (!length) return shaSuccess;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (length >= 8) return context->Corrupted = shaBadParam;
+
+  SHA1AddLength(context, length);
+  SHA1Finalize(context,
+    (uint8_t) ((message_bits & masks[length]) | markbit[length]));
+
+  return context->Corrupted;
+}
+
+/*
+ * SHA1Result
+ *
+ * Description:
+ *   This function will return the 160-bit message digest
+ *   into the Message_Digest array provided by the caller.
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *      the last octet of hash in the element with index 19.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA-1 hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 34]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA1Result(SHA1Context *context,
+    uint8_t Message_Digest[SHA1HashSize])
+{
+  int i;
+
+  if (!context) return shaNull;
+  if (!Message_Digest) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+
+  if (!context->Computed)
+    SHA1Finalize(context, 0x80);
+
+  for (i = 0; i < SHA1HashSize; ++i)
+    Message_Digest[i] = (uint8_t) (context->Intermediate_Hash[i>>2]
+                                   >> (8 * ( 3 - ( i & 0x03 ) )));
+
+  return shaSuccess;
+}
+
+/*
+ * SHA1ProcessMessageBlock
+ *
+ * Description:
+ *   This helper function will process the next 512 bits of the
+ *   message stored in the Message_Block array.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *
+ * Returns:
+ *   Nothing.
+ *
+ * Comments:
+ *   Many of the variable names in this code, especially the
+ *   single character names, were used because those were the
+ *   names used in the Secure Hash Standard.
+ */
+static void SHA1ProcessMessageBlock(SHA1Context *context)
+{
+  /* Constants defined in FIPS 180-3, section 4.2.1 */
+  const uint32_t K[4] = {
+      0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xCA62C1D6
+  };
+
+
+
+Eastlake & Hansen             Informational                    [Page 35]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  int        t;               /* Loop counter */
+  uint32_t   temp;            /* Temporary word value */
+  uint32_t   W[80];           /* Word sequence */
+  uint32_t   A, B, C, D, E;   /* Word buffers */
+
+  /*
+   * Initialize the first 16 words in the array W
+   */
+  for (t = 0; t < 16; t++) {
+    W[t]  = ((uint32_t)context->Message_Block[t * 4]) << 24;
+    W[t] |= ((uint32_t)context->Message_Block[t * 4 + 1]) << 16;
+    W[t] |= ((uint32_t)context->Message_Block[t * 4 + 2]) << 8;
+    W[t] |= ((uint32_t)context->Message_Block[t * 4 + 3]);
+  }
+
+  for (t = 16; t < 80; t++)
+    W[t] = SHA1_ROTL(1, W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
+
+  A = context->Intermediate_Hash[0];
+  B = context->Intermediate_Hash[1];
+  C = context->Intermediate_Hash[2];
+  D = context->Intermediate_Hash[3];
+  E = context->Intermediate_Hash[4];
+
+  for (t = 0; t < 20; t++) {
+    temp = SHA1_ROTL(5,A) + SHA_Ch(B, C, D) + E + W[t] + K[0];
+    E = D;
+    D = C;
+    C = SHA1_ROTL(30,B);
+    B = A;
+    A = temp;
+  }
+
+  for (t = 20; t < 40; t++) {
+    temp = SHA1_ROTL(5,A) + SHA_Parity(B, C, D) + E + W[t] + K[1];
+    E = D;
+    D = C;
+    C = SHA1_ROTL(30,B);
+    B = A;
+    A = temp;
+  }
+
+  for (t = 40; t < 60; t++) {
+    temp = SHA1_ROTL(5,A) + SHA_Maj(B, C, D) + E + W[t] + K[2];
+    E = D;
+    D = C;
+    C = SHA1_ROTL(30,B);
+    B = A;
+
+
+
+Eastlake & Hansen             Informational                    [Page 36]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    A = temp;
+  }
+
+  for (t = 60; t < 80; t++) {
+    temp = SHA1_ROTL(5,A) + SHA_Parity(B, C, D) + E + W[t] + K[3];
+    E = D;
+    D = C;
+    C = SHA1_ROTL(30,B);
+    B = A;
+    A = temp;
+  }
+
+  context->Intermediate_Hash[0] += A;
+  context->Intermediate_Hash[1] += B;
+  context->Intermediate_Hash[2] += C;
+  context->Intermediate_Hash[3] += D;
+  context->Intermediate_Hash[4] += E;
+  context->Message_Block_Index = 0;
+}
+
+/*
+ * SHA1Finalize
+ *
+ * Description:
+ *   This helper function finishes off the digest calculations.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   Pad_Byte: [in]
+ *     The last byte to add to the message block before the 0-padding
+ *     and length.  This will contain the last bits of the message
+ *     followed by another single bit.  If the message was an
+ *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+static void SHA1Finalize(SHA1Context *context, uint8_t Pad_Byte)
+{
+  int i;
+  SHA1PadMessage(context, Pad_Byte);
+  /* message may be sensitive, clear it out */
+  for (i = 0; i < SHA1_Message_Block_Size; ++i)
+    context->Message_Block[i] = 0;
+  context->Length_High = 0;     /* and clear length */
+  context->Length_Low = 0;
+
+
+
+Eastlake & Hansen             Informational                    [Page 37]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  context->Computed = 1;
+}
+
+/*
+ * SHA1PadMessage
+ *
+ * Description:
+ *   According to the standard, the message must be padded to the next
+ *   even multiple of 512 bits.  The first padding bit must be a '1'.
+ *   The last 64 bits represent the length of the original message.
+ *   All bits in between should be 0.  This helper function will pad
+ *   the message according to those rules by filling the Message_Block
+ *   array accordingly.  When it returns, it can be assumed that the
+ *   message digest has been computed.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to pad.
+ *   Pad_Byte: [in]
+ *     The last byte to add to the message block before the 0-padding
+ *     and length.  This will contain the last bits of the message
+ *     followed by another single bit.  If the message was an
+ *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
+ *
+ * Returns:
+ *   Nothing.
+ */
+static void SHA1PadMessage(SHA1Context *context, uint8_t Pad_Byte)
+{
+  /*
+   * Check to see if the current message block is too small to hold
+   * the initial padding bits and length.  If so, we will pad the
+   * block, process it, and then continue padding into a second
+   * block.
+   */
+  if (context->Message_Block_Index >= (SHA1_Message_Block_Size - 8)) {
+    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
+    while (context->Message_Block_Index < SHA1_Message_Block_Size)
+      context->Message_Block[context->Message_Block_Index++] = 0;
+
+    SHA1ProcessMessageBlock(context);
+  } else
+    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
+
+  while (context->Message_Block_Index < (SHA1_Message_Block_Size - 8))
+    context->Message_Block[context->Message_Block_Index++] = 0;
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 38]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  /*
+   * Store the message length as the last 8 octets
+   */
+  context->Message_Block[56] = (uint8_t) (context->Length_High >> 24);
+  context->Message_Block[57] = (uint8_t) (context->Length_High >> 16);
+  context->Message_Block[58] = (uint8_t) (context->Length_High >> 8);
+  context->Message_Block[59] = (uint8_t) (context->Length_High);
+  context->Message_Block[60] = (uint8_t) (context->Length_Low >> 24);
+  context->Message_Block[61] = (uint8_t) (context->Length_Low >> 16);
+  context->Message_Block[62] = (uint8_t) (context->Length_Low >> 8);
+  context->Message_Block[63] = (uint8_t) (context->Length_Low);
+
+  SHA1ProcessMessageBlock(context);
+}
+
+8.2.2.  sha224-256.c
+
+/************************* sha224-256.c ************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ * Description:
+ *   This file implements the Secure Hash Algorithms SHA-224 and
+ *   SHA-256 as defined in the U.S. National Institute of Standards
+ *   and Technology Federal Information Processing Standards
+ *   Publication (FIPS PUB) 180-3 published in October 2008
+ *   and formerly defined in its predecessors, FIPS PUB 180-1
+ *   and FIP PUB 180-2.
+ *
+ *   A combined document showing all algorithms is available at
+ *       http://csrc.nist.gov/publications/fips/
+ *              fips180-3/fips180-3_final.pdf
+ *
+ *   The SHA-224 and SHA-256 algorithms produce 224-bit and 256-bit
+ *   message digests for a given data stream.  It should take about
+ *   2**n steps to find a message with the same digest as a given
+ *   message and 2**(n/2) to find any two messages with the same
+ *   digest, when n is the digest size in bits.  Therefore, this
+ *   algorithm can serve as a means of providing a
+ *   "fingerprint" for a message.
+ *
+ * Portability Issues:
+ *   SHA-224 and SHA-256 are defined in terms of 32-bit "words".
+ *   This code uses <stdint.h> (included via "sha.h") to define 32-
+ *   and 8-bit unsigned integer types.  If your C compiler does not
+
+
+
+Eastlake & Hansen             Informational                    [Page 39]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *   support 32-bit unsigned integers, this code is not
+ *   appropriate.
+ *
+ * Caveats:
+ *   SHA-224 and SHA-256 are designed to work with messages less
+ *   than 2^64 bits long.  This implementation uses SHA224/256Input()
+ *   to hash the bits that are a multiple of the size of an 8-bit
+ *   octet, and then optionally uses SHA224/256FinalBits()
+ *   to hash the final few bits of the input.
+ */
+
+#include "sha.h"
+#include "sha-private.h"
+
+/* Define the SHA shift, rotate left, and rotate right macros */
+#define SHA256_SHR(bits,word)      ((word) >> (bits))
+#define SHA256_ROTL(bits,word)                         \
+  (((word) << (bits)) | ((word) >> (32-(bits))))
+#define SHA256_ROTR(bits,word)                         \
+  (((word) >> (bits)) | ((word) << (32-(bits))))
+
+/* Define the SHA SIGMA and sigma macros */
+#define SHA256_SIGMA0(word)   \
+  (SHA256_ROTR( 2,word) ^ SHA256_ROTR(13,word) ^ SHA256_ROTR(22,word))
+#define SHA256_SIGMA1(word)   \
+  (SHA256_ROTR( 6,word) ^ SHA256_ROTR(11,word) ^ SHA256_ROTR(25,word))
+#define SHA256_sigma0(word)   \
+  (SHA256_ROTR( 7,word) ^ SHA256_ROTR(18,word) ^ SHA256_SHR( 3,word))
+#define SHA256_sigma1(word)   \
+  (SHA256_ROTR(17,word) ^ SHA256_ROTR(19,word) ^ SHA256_SHR(10,word))
+
+/*
+ * Add "length" to the length.
+ * Set Corrupted when overflow has occurred.
+ */
+static uint32_t addTemp;
+#define SHA224_256AddLength(context, length)               \
+  (addTemp = (context)->Length_Low, (context)->Corrupted = \
+    (((context)->Length_Low += (length)) < addTemp) &&     \
+    (++(context)->Length_High == 0) ? shaInputTooLong :    \
+                                      (context)->Corrupted )
+
+/* Local Function Prototypes */
+static int SHA224_256Reset(SHA256Context *context, uint32_t *H0);
+static void SHA224_256ProcessMessageBlock(SHA256Context *context);
+static void SHA224_256Finalize(SHA256Context *context,
+  uint8_t Pad_Byte);
+static void SHA224_256PadMessage(SHA256Context *context,
+
+
+
+Eastlake & Hansen             Informational                    [Page 40]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  uint8_t Pad_Byte);
+static int SHA224_256ResultN(SHA256Context *context,
+  uint8_t Message_Digest[ ], int HashSize);
+
+/* Initial Hash Values: FIPS 180-3 section 5.3.2 */
+static uint32_t SHA224_H0[SHA256HashSize/4] = {
+    0xC1059ED8, 0x367CD507, 0x3070DD17, 0xF70E5939,
+    0xFFC00B31, 0x68581511, 0x64F98FA7, 0xBEFA4FA4
+};
+
+/* Initial Hash Values: FIPS 180-3 section 5.3.3 */
+static uint32_t SHA256_H0[SHA256HashSize/4] = {
+  0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A,
+  0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19
+};
+
+/*
+ * SHA224Reset
+ *
+ * Description:
+ *   This function will initialize the SHA224Context in preparation
+ *   for computing a new SHA224 message digest.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to reset.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA224Reset(SHA224Context *context)
+{
+  return SHA224_256Reset(context, SHA224_H0);
+}
+
+/*
+ * SHA224Input
+ *
+ * Description:
+ *   This function accepts an array of octets as the next portion
+ *   of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_array[ ]: [in]
+ *     An array of octets representing the next portion of
+ *     the message.
+
+
+
+Eastlake & Hansen             Informational                    [Page 41]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *   length: [in]
+ *     The length of the message in message_array.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA224Input(SHA224Context *context, const uint8_t *message_array,
+    unsigned int length)
+{
+  return SHA256Input(context, message_array, length);
+}
+
+/*
+ * SHA224FinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA224FinalBits(SHA224Context *context,
+                    uint8_t message_bits, unsigned int length)
+{
+  return SHA256FinalBits(context, message_bits, length);
+}
+
+/*
+ * SHA224Result
+ *
+ * Description:
+ *   This function will return the 224-bit message digest
+ *   into the Message_Digest array provided by the caller.
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *    the last octet of hash in the element with index 27.
+ *
+
+
+
+Eastlake & Hansen             Informational                    [Page 42]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA224Result(SHA224Context *context,
+    uint8_t Message_Digest[SHA224HashSize])
+{
+  return SHA224_256ResultN(context, Message_Digest, SHA224HashSize);
+}
+
+/*
+ * SHA256Reset
+ *
+ * Description:
+ *   This function will initialize the SHA256Context in preparation
+ *   for computing a new SHA256 message digest.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to reset.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA256Reset(SHA256Context *context)
+{
+  return SHA224_256Reset(context, SHA256_H0);
+}
+
+/*
+ * SHA256Input
+ *
+ * Description:
+ *   This function accepts an array of octets as the next portion
+ *   of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_array[ ]: [in]
+ *     An array of octets representing the next portion of
+ *     the message.
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 43]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *   length: [in]
+ *     The length of the message in message_array.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA256Input(SHA256Context *context, const uint8_t *message_array,
+    unsigned int length)
+{
+  if (!context) return shaNull;
+  if (!length) return shaSuccess;
+  if (!message_array) return shaNull;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (context->Corrupted) return context->Corrupted;
+
+  while (length--) {
+    context->Message_Block[context->Message_Block_Index++] =
+            *message_array;
+
+    if ((SHA224_256AddLength(context, 8) == shaSuccess) &&
+      (context->Message_Block_Index == SHA256_Message_Block_Size))
+      SHA224_256ProcessMessageBlock(context);
+
+    message_array++;
+  }
+
+  return context->Corrupted;
+
+}
+
+/*
+ * SHA256FinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+
+
+
+Eastlake & Hansen             Informational                    [Page 44]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ */
+int SHA256FinalBits(SHA256Context *context,
+                    uint8_t message_bits, unsigned int length)
+{
+  static uint8_t masks[8] = {
+      /* 0 0b00000000 */ 0x00, /* 1 0b10000000 */ 0x80,
+      /* 2 0b11000000 */ 0xC0, /* 3 0b11100000 */ 0xE0,
+      /* 4 0b11110000 */ 0xF0, /* 5 0b11111000 */ 0xF8,
+      /* 6 0b11111100 */ 0xFC, /* 7 0b11111110 */ 0xFE
+  };
+  static uint8_t markbit[8] = {
+      /* 0 0b10000000 */ 0x80, /* 1 0b01000000 */ 0x40,
+      /* 2 0b00100000 */ 0x20, /* 3 0b00010000 */ 0x10,
+      /* 4 0b00001000 */ 0x08, /* 5 0b00000100 */ 0x04,
+      /* 6 0b00000010 */ 0x02, /* 7 0b00000001 */ 0x01
+  };
+
+  if (!context) return shaNull;
+  if (!length) return shaSuccess;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (length >= 8) return context->Corrupted = shaBadParam;
+
+  SHA224_256AddLength(context, length);
+  SHA224_256Finalize(context, (uint8_t)
+    ((message_bits & masks[length]) | markbit[length]));
+
+  return context->Corrupted;
+}
+
+/*
+ * SHA256Result
+ *
+ * Description:
+ *   This function will return the 256-bit message digest
+ *   into the Message_Digest array provided by the caller.
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *    the last octet of hash in the element with index 31.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *
+ * Returns:
+ *   sha Error Code.
+
+
+
+Eastlake & Hansen             Informational                    [Page 45]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ */
+int SHA256Result(SHA256Context *context,
+                 uint8_t Message_Digest[SHA256HashSize])
+{
+  return SHA224_256ResultN(context, Message_Digest, SHA256HashSize);
+}
+
+/*
+ * SHA224_256Reset
+ *
+ * Description:
+ *   This helper function will initialize the SHA256Context in
+ *   preparation for computing a new SHA-224 or SHA-256 message digest.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to reset.
+ *   H0[ ]: [in]
+ *     The initial hash value array to use.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+static int SHA224_256Reset(SHA256Context *context, uint32_t *H0)
+{
+  if (!context) return shaNull;
+
+  context->Length_High = context->Length_Low = 0;
+  context->Message_Block_Index  = 0;
+
+  context->Intermediate_Hash[0] = H0[0];
+  context->Intermediate_Hash[1] = H0[1];
+  context->Intermediate_Hash[2] = H0[2];
+  context->Intermediate_Hash[3] = H0[3];
+  context->Intermediate_Hash[4] = H0[4];
+  context->Intermediate_Hash[5] = H0[5];
+  context->Intermediate_Hash[6] = H0[6];
+  context->Intermediate_Hash[7] = H0[7];
+
+  context->Computed  = 0;
+  context->Corrupted = shaSuccess;
+
+  return shaSuccess;
+}
+
+/*
+ * SHA224_256ProcessMessageBlock
+ *
+
+
+
+Eastlake & Hansen             Informational                    [Page 46]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ * Description:
+ *   This helper function will process the next 512 bits of the
+ *   message stored in the Message_Block array.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *
+ * Returns:
+ *   Nothing.
+ *
+ * Comments:
+ *   Many of the variable names in this code, especially the
+ *   single character names, were used because those were the
+ *   names used in the Secure Hash Standard.
+ */
+static void SHA224_256ProcessMessageBlock(SHA256Context *context)
+{
+  /* Constants defined in FIPS 180-3, section 4.2.2 */
+  static const uint32_t K[64] = {
+      0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b,
+      0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01,
+      0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7,
+      0xc19bf174, 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
+      0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 0x983e5152,
+      0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147,
+      0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc,
+      0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+      0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819,
+      0xd6990624, 0xf40e3585, 0x106aa070, 0x19a4c116, 0x1e376c08,
+      0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f,
+      0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
+      0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+  };
+  int        t, t4;                   /* Loop counter */
+  uint32_t   temp1, temp2;            /* Temporary word value */
+  uint32_t   W[64];                   /* Word sequence */
+  uint32_t   A, B, C, D, E, F, G, H;  /* Word buffers */
+
+  /*
+   * Initialize the first 16 words in the array W
+   */
+  for (t = t4 = 0; t < 16; t++, t4 += 4)
+    W[t] = (((uint32_t)context->Message_Block[t4]) << 24) |
+           (((uint32_t)context->Message_Block[t4 + 1]) << 16) |
+           (((uint32_t)context->Message_Block[t4 + 2]) << 8) |
+           (((uint32_t)context->Message_Block[t4 + 3]));
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 47]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  for (t = 16; t < 64; t++)
+    W[t] = SHA256_sigma1(W[t-2]) + W[t-7] +
+        SHA256_sigma0(W[t-15]) + W[t-16];
+
+  A = context->Intermediate_Hash[0];
+  B = context->Intermediate_Hash[1];
+  C = context->Intermediate_Hash[2];
+  D = context->Intermediate_Hash[3];
+  E = context->Intermediate_Hash[4];
+  F = context->Intermediate_Hash[5];
+  G = context->Intermediate_Hash[6];
+  H = context->Intermediate_Hash[7];
+
+  for (t = 0; t < 64; t++) {
+    temp1 = H + SHA256_SIGMA1(E) + SHA_Ch(E,F,G) + K[t] + W[t];
+    temp2 = SHA256_SIGMA0(A) + SHA_Maj(A,B,C);
+    H = G;
+    G = F;
+    F = E;
+    E = D + temp1;
+    D = C;
+    C = B;
+    B = A;
+    A = temp1 + temp2;
+  }
+
+  context->Intermediate_Hash[0] += A;
+  context->Intermediate_Hash[1] += B;
+  context->Intermediate_Hash[2] += C;
+  context->Intermediate_Hash[3] += D;
+  context->Intermediate_Hash[4] += E;
+  context->Intermediate_Hash[5] += F;
+  context->Intermediate_Hash[6] += G;
+  context->Intermediate_Hash[7] += H;
+
+  context->Message_Block_Index = 0;
+}
+
+/*
+ * SHA224_256Finalize
+ *
+ * Description:
+ *   This helper function finishes off the digest calculations.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   Pad_Byte: [in]
+
+
+
+Eastlake & Hansen             Informational                    [Page 48]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *     The last byte to add to the message block before the 0-padding
+ *     and length.  This will contain the last bits of the message
+ *     followed by another single bit.  If the message was an
+ *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+static void SHA224_256Finalize(SHA256Context *context,
+    uint8_t Pad_Byte)
+{
+  int i;
+  SHA224_256PadMessage(context, Pad_Byte);
+  /* message may be sensitive, so clear it out */
+  for (i = 0; i < SHA256_Message_Block_Size; ++i)
+    context->Message_Block[i] = 0;
+  context->Length_High = 0;     /* and clear length */
+  context->Length_Low = 0;
+  context->Computed = 1;
+}
+
+/*
+ * SHA224_256PadMessage
+ *
+ * Description:
+ *   According to the standard, the message must be padded to the next
+ *   even multiple of 512 bits.  The first padding bit must be a '1'.
+ *   The last 64 bits represent the length of the original message.
+ *   All bits in between should be 0.  This helper function will pad
+ *   the message according to those rules by filling the
+ *   Message_Block array accordingly.  When it returns, it can be
+ *   assumed that the message digest has been computed.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to pad.
+ *   Pad_Byte: [in]
+ *     The last byte to add to the message block before the 0-padding
+ *     and length.  This will contain the last bits of the message
+ *     followed by another single bit.  If the message was an
+ *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
+ *
+ * Returns:
+ *   Nothing.
+ */
+static void SHA224_256PadMessage(SHA256Context *context,
+    uint8_t Pad_Byte)
+{
+
+
+
+Eastlake & Hansen             Informational                    [Page 49]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  /*
+   * Check to see if the current message block is too small to hold
+   * the initial padding bits and length.  If so, we will pad the
+   * block, process it, and then continue padding into a second
+   * block.
+   */
+  if (context->Message_Block_Index >= (SHA256_Message_Block_Size-8)) {
+    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
+    while (context->Message_Block_Index < SHA256_Message_Block_Size)
+      context->Message_Block[context->Message_Block_Index++] = 0;
+    SHA224_256ProcessMessageBlock(context);
+  } else
+    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
+
+  while (context->Message_Block_Index < (SHA256_Message_Block_Size-8))
+    context->Message_Block[context->Message_Block_Index++] = 0;
+
+  /*
+   * Store the message length as the last 8 octets
+   */
+  context->Message_Block[56] = (uint8_t)(context->Length_High >> 24);
+  context->Message_Block[57] = (uint8_t)(context->Length_High >> 16);
+  context->Message_Block[58] = (uint8_t)(context->Length_High >> 8);
+  context->Message_Block[59] = (uint8_t)(context->Length_High);
+  context->Message_Block[60] = (uint8_t)(context->Length_Low >> 24);
+  context->Message_Block[61] = (uint8_t)(context->Length_Low >> 16);
+  context->Message_Block[62] = (uint8_t)(context->Length_Low >> 8);
+  context->Message_Block[63] = (uint8_t)(context->Length_Low);
+
+  SHA224_256ProcessMessageBlock(context);
+}
+
+/*
+ * SHA224_256ResultN
+ *
+ * Description:
+ *   This helper function will return the 224-bit or 256-bit message
+ *   digest into the Message_Digest array provided by the caller.
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *    the last octet of hash in the element with index 27/31.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *   HashSize: [in]
+
+
+
+Eastlake & Hansen             Informational                    [Page 50]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *     The size of the hash, either 28 or 32.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+static int SHA224_256ResultN(SHA256Context *context,
+    uint8_t Message_Digest[ ], int HashSize)
+{
+  int i;
+
+  if (!context) return shaNull;
+  if (!Message_Digest) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+
+  if (!context->Computed)
+    SHA224_256Finalize(context, 0x80);
+
+  for (i = 0; i < HashSize; ++i)
+    Message_Digest[i] = (uint8_t)
+      (context->Intermediate_Hash[i>>2] >> 8 * ( 3 - ( i & 0x03 ) ));
+
+  return shaSuccess;
+}
+
+8.2.3.  sha384-512.c
+
+/************************* sha384-512.c ************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ * Description:
+ *   This file implements the Secure Hash Algorithms SHA-384 and
+ *   SHA-512 as defined in the U.S. National Institute of Standards
+ *   and Technology Federal Information Processing Standards
+ *   Publication (FIPS PUB) 180-3 published in October 2008
+ *   and formerly defined in its predecessors, FIPS PUB 180-1
+ *   and FIP PUB 180-2.
+ *
+ *   A combined document showing all algorithms is available at
+ *       http://csrc.nist.gov/publications/fips/
+ *              fips180-3/fips180-3_final.pdf
+ *
+ *   The SHA-384 and SHA-512 algorithms produce 384-bit and 512-bit
+ *   message digests for a given data stream.  It should take about
+ *   2**n steps to find a message with the same digest as a given
+
+
+
+Eastlake & Hansen             Informational                    [Page 51]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *   message and 2**(n/2) to find any two messages with the same
+ *   digest, when n is the digest size in bits.  Therefore, this
+ *   algorithm can serve as a means of providing a
+ *   "fingerprint" for a message.
+ *
+ * Portability Issues:
+ *   SHA-384 and SHA-512 are defined in terms of 64-bit "words",
+ *   but if USE_32BIT_ONLY is #defined, this code is implemented in
+ *   terms of 32-bit "words".  This code uses <stdint.h> (included
+ *   via "sha.h") to define the 64-, 32- and 8-bit unsigned integer
+ *   types.  If your C compiler does not support 64-bit unsigned
+ *   integers and you do not #define USE_32BIT_ONLY, this code is
+ *   not appropriate.
+ *
+ * Caveats:
+ *   SHA-384 and SHA-512 are designed to work with messages less
+ *   than 2^128 bits long.  This implementation uses SHA384/512Input()
+ *   to hash the bits that are a multiple of the size of an 8-bit
+ *   octet, and then optionally uses SHA384/256FinalBits()
+ *   to hash the final few bits of the input.
+ *
+ */
+
+#include "sha.h"
+
+#ifdef USE_32BIT_ONLY
+/*
+ * Define 64-bit arithmetic in terms of 32-bit arithmetic.
+ * Each 64-bit number is represented in a 2-word array.
+ * All macros are defined such that the result is the last parameter.
+ */
+
+/*
+ * Define shift, rotate left, and rotate right functions
+ */
+#define SHA512_SHR(bits, word, ret) (                          \
+    /* (((uint64_t)((word))) >> (bits)) */                     \
+    (ret)[0] = (((bits) < 32) && ((bits) >= 0)) ?              \
+      ((word)[0] >> (bits)) : 0,                               \
+    (ret)[1] = ((bits) > 32) ? ((word)[0] >> ((bits) - 32)) :  \
+      ((bits) == 32) ? (word)[0] :                             \
+      ((bits) >= 0) ?                                          \
+        (((word)[0] << (32 - (bits))) |                        \
+        ((word)[1] >> (bits))) : 0 )
+
+#define SHA512_SHL(bits, word, ret) (                          \
+    /* (((uint64_t)(word)) << (bits)) */                       \
+    (ret)[0] = ((bits) > 32) ? ((word)[1] << ((bits) - 32)) :  \
+
+
+
+Eastlake & Hansen             Informational                    [Page 52]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+         ((bits) == 32) ? (word)[1] :                          \
+         ((bits) >= 0) ?                                       \
+           (((word)[0] << (bits)) |                            \
+           ((word)[1] >> (32 - (bits)))) :                     \
+         0,                                                    \
+    (ret)[1] = (((bits) < 32) && ((bits) >= 0)) ?              \
+        ((word)[1] << (bits)) : 0 )
+
+/*
+ * Define 64-bit OR
+ */
+#define SHA512_OR(word1, word2, ret) (                         \
+    (ret)[0] = (word1)[0] | (word2)[0],                        \
+    (ret)[1] = (word1)[1] | (word2)[1] )
+
+/*
+ * Define 64-bit XOR
+ */
+#define SHA512_XOR(word1, word2, ret) (                        \
+    (ret)[0] = (word1)[0] ^ (word2)[0],                        \
+    (ret)[1] = (word1)[1] ^ (word2)[1] )
+
+/*
+ * Define 64-bit AND
+ */
+#define SHA512_AND(word1, word2, ret) (                        \
+    (ret)[0] = (word1)[0] & (word2)[0],                        \
+    (ret)[1] = (word1)[1] & (word2)[1] )
+
+/*
+ * Define 64-bit TILDA
+ */
+#define SHA512_TILDA(word, ret)                                \
+  ( (ret)[0] = ~(word)[0], (ret)[1] = ~(word)[1] )
+
+/*
+ * Define 64-bit ADD
+ */
+#define SHA512_ADD(word1, word2, ret) (                        \
+    (ret)[1] = (word1)[1], (ret)[1] += (word2)[1],             \
+    (ret)[0] = (word1)[0] + (word2)[0] + ((ret)[1] < (word1)[1]) )
+
+/*
+ * Add the 4word value in word2 to word1.
+ */
+static uint32_t ADDTO4_temp, ADDTO4_temp2;
+#define SHA512_ADDTO4(word1, word2) (                          \
+    ADDTO4_temp = (word1)[3],                                  \
+
+
+
+Eastlake & Hansen             Informational                    [Page 53]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    (word1)[3] += (word2)[3],                                  \
+    ADDTO4_temp2 = (word1)[2],                                 \
+    (word1)[2] += (word2)[2] + ((word1)[3] < ADDTO4_temp),     \
+    ADDTO4_temp = (word1)[1],                                  \
+    (word1)[1] += (word2)[1] + ((word1)[2] < ADDTO4_temp2),    \
+    (word1)[0] += (word2)[0] + ((word1)[1] < ADDTO4_temp) )
+
+/*
+ * Add the 2word value in word2 to word1.
+ */
+static uint32_t ADDTO2_temp;
+#define SHA512_ADDTO2(word1, word2) (                          \
+    ADDTO2_temp = (word1)[1],                                  \
+    (word1)[1] += (word2)[1],                                  \
+    (word1)[0] += (word2)[0] + ((word1)[1] < ADDTO2_temp) )
+
+/*
+ * SHA rotate   ((word >> bits) | (word << (64-bits)))
+ */
+static uint32_t ROTR_temp1[2], ROTR_temp2[2];
+#define SHA512_ROTR(bits, word, ret) (                         \
+    SHA512_SHR((bits), (word), ROTR_temp1),                    \
+    SHA512_SHL(64-(bits), (word), ROTR_temp2),                 \
+    SHA512_OR(ROTR_temp1, ROTR_temp2, (ret)) )
+
+/*
+ * Define the SHA SIGMA and sigma macros
+ *
+ *  SHA512_ROTR(28,word) ^ SHA512_ROTR(34,word) ^ SHA512_ROTR(39,word)
+ */
+static uint32_t SIGMA0_temp1[2], SIGMA0_temp2[2],
+  SIGMA0_temp3[2], SIGMA0_temp4[2];
+#define SHA512_SIGMA0(word, ret) (                             \
+    SHA512_ROTR(28, (word), SIGMA0_temp1),                     \
+    SHA512_ROTR(34, (word), SIGMA0_temp2),                     \
+    SHA512_ROTR(39, (word), SIGMA0_temp3),                     \
+    SHA512_XOR(SIGMA0_temp2, SIGMA0_temp3, SIGMA0_temp4),      \
+    SHA512_XOR(SIGMA0_temp1, SIGMA0_temp4, (ret)) )
+
+/*
+ * SHA512_ROTR(14,word) ^ SHA512_ROTR(18,word) ^ SHA512_ROTR(41,word)
+ */
+static uint32_t SIGMA1_temp1[2], SIGMA1_temp2[2],
+  SIGMA1_temp3[2], SIGMA1_temp4[2];
+#define SHA512_SIGMA1(word, ret) (                             \
+    SHA512_ROTR(14, (word), SIGMA1_temp1),                     \
+    SHA512_ROTR(18, (word), SIGMA1_temp2),                     \
+    SHA512_ROTR(41, (word), SIGMA1_temp3),                     \
+
+
+
+Eastlake & Hansen             Informational                    [Page 54]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    SHA512_XOR(SIGMA1_temp2, SIGMA1_temp3, SIGMA1_temp4),      \
+    SHA512_XOR(SIGMA1_temp1, SIGMA1_temp4, (ret)) )
+
+/*
+ * (SHA512_ROTR( 1,word) ^ SHA512_ROTR( 8,word) ^ SHA512_SHR( 7,word))
+ */
+static uint32_t sigma0_temp1[2], sigma0_temp2[2],
+  sigma0_temp3[2], sigma0_temp4[2];
+#define SHA512_sigma0(word, ret) (                             \
+    SHA512_ROTR( 1, (word), sigma0_temp1),                     \
+    SHA512_ROTR( 8, (word), sigma0_temp2),                     \
+    SHA512_SHR( 7, (word), sigma0_temp3),                      \
+    SHA512_XOR(sigma0_temp2, sigma0_temp3, sigma0_temp4),      \
+    SHA512_XOR(sigma0_temp1, sigma0_temp4, (ret)) )
+
+/*
+ * (SHA512_ROTR(19,word) ^ SHA512_ROTR(61,word) ^ SHA512_SHR( 6,word))
+ */
+static uint32_t sigma1_temp1[2], sigma1_temp2[2],
+  sigma1_temp3[2], sigma1_temp4[2];
+#define SHA512_sigma1(word, ret) (                             \
+    SHA512_ROTR(19, (word), sigma1_temp1),                     \
+    SHA512_ROTR(61, (word), sigma1_temp2),                     \
+    SHA512_SHR( 6, (word), sigma1_temp3),                      \
+    SHA512_XOR(sigma1_temp2, sigma1_temp3, sigma1_temp4),      \
+    SHA512_XOR(sigma1_temp1, sigma1_temp4, (ret)) )
+
+#ifndef USE_MODIFIED_MACROS
+/*
+ * These definitions are the ones used in FIPS 180-3, section 4.1.3
+ *  Ch(x,y,z)   ((x & y) ^ (~x & z))
+ */
+static uint32_t Ch_temp1[2], Ch_temp2[2], Ch_temp3[2];
+#define SHA_Ch(x, y, z, ret) (                                 \
+    SHA512_AND(x, y, Ch_temp1),                                \
+    SHA512_TILDA(x, Ch_temp2),                                 \
+    SHA512_AND(Ch_temp2, z, Ch_temp3),                         \
+    SHA512_XOR(Ch_temp1, Ch_temp3, (ret)) )
+
+/*
+ *  Maj(x,y,z)  (((x)&(y)) ^ ((x)&(z)) ^ ((y)&(z)))
+ */
+static uint32_t Maj_temp1[2], Maj_temp2[2],
+  Maj_temp3[2], Maj_temp4[2];
+#define SHA_Maj(x, y, z, ret) (                                \
+    SHA512_AND(x, y, Maj_temp1),                               \
+    SHA512_AND(x, z, Maj_temp2),                               \
+    SHA512_AND(y, z, Maj_temp3),                               \
+
+
+
+Eastlake & Hansen             Informational                    [Page 55]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    SHA512_XOR(Maj_temp2, Maj_temp3, Maj_temp4),               \
+    SHA512_XOR(Maj_temp1, Maj_temp4, (ret)) )
+#else /* !USE_MODIFIED_MACROS */
+/*
+ * These definitions are potentially faster equivalents for the ones
+ * used in FIPS 180-3, section 4.1.3.
+ *   ((x & y) ^ (~x & z)) becomes
+ *   ((x & (y ^ z)) ^ z)
+ */
+#define SHA_Ch(x, y, z, ret) (                                 \
+   (ret)[0] = (((x)[0] & ((y)[0] ^ (z)[0])) ^ (z)[0]),         \
+   (ret)[1] = (((x)[1] & ((y)[1] ^ (z)[1])) ^ (z)[1]) )
+
+/*
+ *   ((x & y) ^ (x & z) ^ (y & z)) becomes
+ *   ((x & (y | z)) | (y & z))
+ */
+#define SHA_Maj(x, y, z, ret) (                                 \
+   ret[0] = (((x)[0] & ((y)[0] | (z)[0])) | ((y)[0] & (z)[0])), \
+   ret[1] = (((x)[1] & ((y)[1] | (z)[1])) | ((y)[1] & (z)[1])) )
+#endif /* USE_MODIFIED_MACROS */
+
+/*
+ * Add "length" to the length.
+ * Set Corrupted when overflow has occurred.
+ */
+static uint32_t addTemp[4] = { 0, 0, 0, 0 };
+#define SHA384_512AddLength(context, length) (                        \
+    addTemp[3] = (length), SHA512_ADDTO4((context)->Length, addTemp), \
+    (context)->Corrupted = (((context)->Length[3] < (length)) &&      \
+       ((context)->Length[2] == 0) && ((context)->Length[1] == 0) &&  \
+       ((context)->Length[0] == 0)) ? shaInputTooLong :               \
+                                      (context)->Corrupted )
+
+/* Local Function Prototypes */
+static int SHA384_512Reset(SHA512Context *context,
+                           uint32_t H0[SHA512HashSize/4]);
+static void SHA384_512ProcessMessageBlock(SHA512Context *context);
+static void SHA384_512Finalize(SHA512Context *context,
+  uint8_t Pad_Byte);
+static void SHA384_512PadMessage(SHA512Context *context,
+  uint8_t Pad_Byte);
+static int SHA384_512ResultN( SHA512Context *context,
+  uint8_t Message_Digest[ ], int HashSize);
+
+/* Initial Hash Values: FIPS 180-3 sections 5.3.4 and 5.3.5 */
+static uint32_t SHA384_H0[SHA512HashSize/4] = {
+    0xCBBB9D5D, 0xC1059ED8, 0x629A292A, 0x367CD507, 0x9159015A,
+
+
+
+Eastlake & Hansen             Informational                    [Page 56]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    0x3070DD17, 0x152FECD8, 0xF70E5939, 0x67332667, 0xFFC00B31,
+    0x8EB44A87, 0x68581511, 0xDB0C2E0D, 0x64F98FA7, 0x47B5481D,
+    0xBEFA4FA4
+};
+static uint32_t SHA512_H0[SHA512HashSize/4] = {
+    0x6A09E667, 0xF3BCC908, 0xBB67AE85, 0x84CAA73B, 0x3C6EF372,
+    0xFE94F82B, 0xA54FF53A, 0x5F1D36F1, 0x510E527F, 0xADE682D1,
+    0x9B05688C, 0x2B3E6C1F, 0x1F83D9AB, 0xFB41BD6B, 0x5BE0CD19,
+    0x137E2179
+};
+
+#else /* !USE_32BIT_ONLY */
+
+#include "sha-private.h"
+
+/* Define the SHA shift, rotate left and rotate right macros */
+#define SHA512_SHR(bits,word)  (((uint64_t)(word)) >> (bits))
+#define SHA512_ROTR(bits,word) ((((uint64_t)(word)) >> (bits)) | \
+                                (((uint64_t)(word)) << (64-(bits))))
+
+/*
+ * Define the SHA SIGMA and sigma macros
+ *
+ *  SHA512_ROTR(28,word) ^ SHA512_ROTR(34,word) ^ SHA512_ROTR(39,word)
+ */
+#define SHA512_SIGMA0(word)   \
+ (SHA512_ROTR(28,word) ^ SHA512_ROTR(34,word) ^ SHA512_ROTR(39,word))
+#define SHA512_SIGMA1(word)   \
+ (SHA512_ROTR(14,word) ^ SHA512_ROTR(18,word) ^ SHA512_ROTR(41,word))
+#define SHA512_sigma0(word)   \
+ (SHA512_ROTR( 1,word) ^ SHA512_ROTR( 8,word) ^ SHA512_SHR( 7,word))
+#define SHA512_sigma1(word)   \
+ (SHA512_ROTR(19,word) ^ SHA512_ROTR(61,word) ^ SHA512_SHR( 6,word))
+
+/*
+ * Add "length" to the length.
+ * Set Corrupted when overflow has occurred.
+ */
+static uint64_t addTemp;
+#define SHA384_512AddLength(context, length)                   \
+   (addTemp = context->Length_Low, context->Corrupted =        \
+    ((context->Length_Low += length) < addTemp) &&             \
+    (++context->Length_High == 0) ? shaInputTooLong :          \
+                                    (context)->Corrupted)
+
+/* Local Function Prototypes */
+static int SHA384_512Reset(SHA512Context *context,
+                           uint64_t H0[SHA512HashSize/8]);
+
+
+
+Eastlake & Hansen             Informational                    [Page 57]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+static void SHA384_512ProcessMessageBlock(SHA512Context *context);
+static void SHA384_512Finalize(SHA512Context *context,
+  uint8_t Pad_Byte);
+static void SHA384_512PadMessage(SHA512Context *context,
+  uint8_t Pad_Byte);
+static int SHA384_512ResultN(SHA512Context *context,
+  uint8_t Message_Digest[ ], int HashSize);
+
+/* Initial Hash Values: FIPS 180-3 sections 5.3.4 and 5.3.5 */
+static uint64_t SHA384_H0[ ] = {
+    0xCBBB9D5DC1059ED8ll, 0x629A292A367CD507ll, 0x9159015A3070DD17ll,
+    0x152FECD8F70E5939ll, 0x67332667FFC00B31ll, 0x8EB44A8768581511ll,
+    0xDB0C2E0D64F98FA7ll, 0x47B5481DBEFA4FA4ll
+};
+static uint64_t SHA512_H0[ ] = {
+    0x6A09E667F3BCC908ll, 0xBB67AE8584CAA73Bll, 0x3C6EF372FE94F82Bll,
+    0xA54FF53A5F1D36F1ll, 0x510E527FADE682D1ll, 0x9B05688C2B3E6C1Fll,
+    0x1F83D9ABFB41BD6Bll, 0x5BE0CD19137E2179ll
+};
+
+#endif /* USE_32BIT_ONLY */
+
+/*
+ * SHA384Reset
+ *
+ * Description:
+ *   This function will initialize the SHA384Context in preparation
+ *   for computing a new SHA384 message digest.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to reset.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA384Reset(SHA384Context *context)
+{
+  return SHA384_512Reset(context, SHA384_H0);
+}
+
+/*
+ * SHA384Input
+ *
+ * Description:
+ *   This function accepts an array of octets as the next portion
+ *   of the message.
+
+
+
+Eastlake & Hansen             Informational                    [Page 58]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_array[ ]: [in]
+ *     An array of octets representing the next portion of
+ *     the message.
+ *   length: [in]
+ *     The length of the message in message_array.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA384Input(SHA384Context *context,
+    const uint8_t *message_array, unsigned int length)
+{
+  return SHA512Input(context, message_array, length);
+}
+
+/*
+ * SHA384FinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA384FinalBits(SHA384Context *context,
+                    uint8_t message_bits, unsigned int length)
+{
+  return SHA512FinalBits(context, message_bits, length);
+}
+
+/*
+ * SHA384Result
+
+
+
+Eastlake & Hansen             Informational                    [Page 59]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *
+ * Description:
+ *   This function will return the 384-bit message digest
+ *   into the Message_Digest array provided by the caller.
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *    the last octet of hash in the element with index 47.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA384Result(SHA384Context *context,
+    uint8_t Message_Digest[SHA384HashSize])
+{
+  return SHA384_512ResultN(context, Message_Digest, SHA384HashSize);
+}
+
+/*
+ * SHA512Reset
+ *
+ * Description:
+ *   This function will initialize the SHA512Context in preparation
+ *   for computing a new SHA512 message digest.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to reset.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA512Reset(SHA512Context *context)
+{
+  return SHA384_512Reset(context, SHA512_H0);
+}
+
+/*
+ * SHA512Input
+ *
+ * Description:
+
+
+
+Eastlake & Hansen             Informational                    [Page 60]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *   This function accepts an array of octets as the next portion
+ *   of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_array[ ]: [in]
+ *     An array of octets representing the next portion of
+ *     the message.
+ *   length: [in]
+ *     The length of the message in message_array.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA512Input(SHA512Context *context,
+        const uint8_t *message_array,
+        unsigned int length)
+{
+  if (!context) return shaNull;
+  if (!length) return shaSuccess;
+  if (!message_array) return shaNull;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (context->Corrupted) return context->Corrupted;
+
+  while (length--) {
+    context->Message_Block[context->Message_Block_Index++] =
+            *message_array;
+
+    if ((SHA384_512AddLength(context, 8) == shaSuccess) &&
+      (context->Message_Block_Index == SHA512_Message_Block_Size))
+      SHA384_512ProcessMessageBlock(context);
+
+    message_array++;
+  }
+
+  return context->Corrupted;
+}
+
+/*
+ * SHA512FinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+
+
+
+Eastlake & Hansen             Informational                    [Page 61]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *     The SHA context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA512FinalBits(SHA512Context *context,
+                    uint8_t message_bits, unsigned int length)
+{
+  static uint8_t masks[8] = {
+      /* 0 0b00000000 */ 0x00, /* 1 0b10000000 */ 0x80,
+      /* 2 0b11000000 */ 0xC0, /* 3 0b11100000 */ 0xE0,
+      /* 4 0b11110000 */ 0xF0, /* 5 0b11111000 */ 0xF8,
+      /* 6 0b11111100 */ 0xFC, /* 7 0b11111110 */ 0xFE
+  };
+  static uint8_t markbit[8] = {
+      /* 0 0b10000000 */ 0x80, /* 1 0b01000000 */ 0x40,
+      /* 2 0b00100000 */ 0x20, /* 3 0b00010000 */ 0x10,
+      /* 4 0b00001000 */ 0x08, /* 5 0b00000100 */ 0x04,
+      /* 6 0b00000010 */ 0x02, /* 7 0b00000001 */ 0x01
+  };
+
+  if (!context) return shaNull;
+  if (!length) return shaSuccess;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (length >= 8) return context->Corrupted = shaBadParam;
+
+  SHA384_512AddLength(context, length);
+  SHA384_512Finalize(context, (uint8_t)
+    ((message_bits & masks[length]) | markbit[length]));
+
+  return context->Corrupted;
+}
+
+/*
+ * SHA512Result
+ *
+ * Description:
+ *   This function will return the 512-bit message digest
+ *   into the Message_Digest array provided by the caller.
+ *   NOTE:
+
+
+
+Eastlake & Hansen             Informational                    [Page 62]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *    The first octet of hash is stored in the element with index 0,
+ *    the last octet of hash in the element with index 63.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA512Result(SHA512Context *context,
+    uint8_t Message_Digest[SHA512HashSize])
+{
+  return SHA384_512ResultN(context, Message_Digest, SHA512HashSize);
+}
+
+/*
+ * SHA384_512Reset
+ *
+ * Description:
+ *   This helper function will initialize the SHA512Context in
+ *   preparation for computing a new SHA384 or SHA512 message
+ *   digest.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to reset.
+ *   H0[ ]: [in]
+ *     The initial hash value array to use.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+#ifdef USE_32BIT_ONLY
+static int SHA384_512Reset(SHA512Context *context,
+                           uint32_t H0[SHA512HashSize/4])
+#else /* !USE_32BIT_ONLY */
+static int SHA384_512Reset(SHA512Context *context,
+                           uint64_t H0[SHA512HashSize/8])
+#endif /* USE_32BIT_ONLY */
+{
+  int i;
+  if (!context) return shaNull;
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 63]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  context->Message_Block_Index = 0;
+
+#ifdef USE_32BIT_ONLY
+  context->Length[0] = context->Length[1] =
+  context->Length[2] = context->Length[3] = 0;
+
+  for (i = 0; i < SHA512HashSize/4; i++)
+    context->Intermediate_Hash[i] = H0[i];
+#else /* !USE_32BIT_ONLY */
+  context->Length_High = context->Length_Low = 0;
+
+  for (i = 0; i < SHA512HashSize/8; i++)
+    context->Intermediate_Hash[i] = H0[i];
+#endif /* USE_32BIT_ONLY */
+
+  context->Computed = 0;
+  context->Corrupted = shaSuccess;
+
+  return shaSuccess;
+}
+
+/*
+ * SHA384_512ProcessMessageBlock
+ *
+ * Description:
+ *   This helper function will process the next 1024 bits of the
+ *   message stored in the Message_Block array.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *
+ * Returns:
+ *   Nothing.
+ *
+ * Comments:
+ *   Many of the variable names in this code, especially the
+ *   single character names, were used because those were the
+ *   names used in the Secure Hash Standard.
+ *
+ *
+ */
+static void SHA384_512ProcessMessageBlock(SHA512Context *context)
+{
+#ifdef USE_32BIT_ONLY
+  /* Constants defined in FIPS 180-3, section 4.2.3 */
+  static const uint32_t K[80*2] = {
+      0x428A2F98, 0xD728AE22, 0x71374491, 0x23EF65CD, 0xB5C0FBCF,
+
+
+
+Eastlake & Hansen             Informational                    [Page 64]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+      0xEC4D3B2F, 0xE9B5DBA5, 0x8189DBBC, 0x3956C25B, 0xF348B538,
+      0x59F111F1, 0xB605D019, 0x923F82A4, 0xAF194F9B, 0xAB1C5ED5,
+      0xDA6D8118, 0xD807AA98, 0xA3030242, 0x12835B01, 0x45706FBE,
+      0x243185BE, 0x4EE4B28C, 0x550C7DC3, 0xD5FFB4E2, 0x72BE5D74,
+      0xF27B896F, 0x80DEB1FE, 0x3B1696B1, 0x9BDC06A7, 0x25C71235,
+      0xC19BF174, 0xCF692694, 0xE49B69C1, 0x9EF14AD2, 0xEFBE4786,
+      0x384F25E3, 0x0FC19DC6, 0x8B8CD5B5, 0x240CA1CC, 0x77AC9C65,
+      0x2DE92C6F, 0x592B0275, 0x4A7484AA, 0x6EA6E483, 0x5CB0A9DC,
+      0xBD41FBD4, 0x76F988DA, 0x831153B5, 0x983E5152, 0xEE66DFAB,
+      0xA831C66D, 0x2DB43210, 0xB00327C8, 0x98FB213F, 0xBF597FC7,
+      0xBEEF0EE4, 0xC6E00BF3, 0x3DA88FC2, 0xD5A79147, 0x930AA725,
+      0x06CA6351, 0xE003826F, 0x14292967, 0x0A0E6E70, 0x27B70A85,
+      0x46D22FFC, 0x2E1B2138, 0x5C26C926, 0x4D2C6DFC, 0x5AC42AED,
+      0x53380D13, 0x9D95B3DF, 0x650A7354, 0x8BAF63DE, 0x766A0ABB,
+      0x3C77B2A8, 0x81C2C92E, 0x47EDAEE6, 0x92722C85, 0x1482353B,
+      0xA2BFE8A1, 0x4CF10364, 0xA81A664B, 0xBC423001, 0xC24B8B70,
+      0xD0F89791, 0xC76C51A3, 0x0654BE30, 0xD192E819, 0xD6EF5218,
+      0xD6990624, 0x5565A910, 0xF40E3585, 0x5771202A, 0x106AA070,
+      0x32BBD1B8, 0x19A4C116, 0xB8D2D0C8, 0x1E376C08, 0x5141AB53,
+      0x2748774C, 0xDF8EEB99, 0x34B0BCB5, 0xE19B48A8, 0x391C0CB3,
+      0xC5C95A63, 0x4ED8AA4A, 0xE3418ACB, 0x5B9CCA4F, 0x7763E373,
+      0x682E6FF3, 0xD6B2B8A3, 0x748F82EE, 0x5DEFB2FC, 0x78A5636F,
+      0x43172F60, 0x84C87814, 0xA1F0AB72, 0x8CC70208, 0x1A6439EC,
+      0x90BEFFFA, 0x23631E28, 0xA4506CEB, 0xDE82BDE9, 0xBEF9A3F7,
+      0xB2C67915, 0xC67178F2, 0xE372532B, 0xCA273ECE, 0xEA26619C,
+      0xD186B8C7, 0x21C0C207, 0xEADA7DD6, 0xCDE0EB1E, 0xF57D4F7F,
+      0xEE6ED178, 0x06F067AA, 0x72176FBA, 0x0A637DC5, 0xA2C898A6,
+      0x113F9804, 0xBEF90DAE, 0x1B710B35, 0x131C471B, 0x28DB77F5,
+      0x23047D84, 0x32CAAB7B, 0x40C72493, 0x3C9EBE0A, 0x15C9BEBC,
+      0x431D67C4, 0x9C100D4C, 0x4CC5D4BE, 0xCB3E42B6, 0x597F299C,
+      0xFC657E2A, 0x5FCB6FAB, 0x3AD6FAEC, 0x6C44198C, 0x4A475817
+  };
+  int     t, t2, t8;                  /* Loop counter */
+  uint32_t  temp1[2], temp2[2],       /* Temporary word values */
+        temp3[2], temp4[2], temp5[2];
+  uint32_t  W[2*80];                  /* Word sequence */
+  uint32_t  A[2], B[2], C[2], D[2],   /* Word buffers */
+        E[2], F[2], G[2], H[2];
+
+  /* Initialize the first 16 words in the array W */
+  for (t = t2 = t8 = 0; t < 16; t++, t8 += 8) {
+    W[t2++] = ((((uint32_t)context->Message_Block[t8    ])) << 24) |
+              ((((uint32_t)context->Message_Block[t8 + 1])) << 16) |
+              ((((uint32_t)context->Message_Block[t8 + 2])) << 8) |
+              ((((uint32_t)context->Message_Block[t8 + 3])));
+    W[t2++] = ((((uint32_t)context->Message_Block[t8 + 4])) << 24) |
+              ((((uint32_t)context->Message_Block[t8 + 5])) << 16) |
+              ((((uint32_t)context->Message_Block[t8 + 6])) << 8) |
+
+
+
+Eastlake & Hansen             Informational                    [Page 65]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+              ((((uint32_t)context->Message_Block[t8 + 7])));
+  }
+
+  for (t = 16; t < 80; t++, t2 += 2) {
+    /* W[t] = SHA512_sigma1(W[t-2]) + W[t-7] +
+      SHA512_sigma0(W[t-15]) + W[t-16]; */
+    uint32_t *Wt2 = &W[t2-2*2];
+    uint32_t *Wt7 = &W[t2-7*2];
+    uint32_t *Wt15 = &W[t2-15*2];
+    uint32_t *Wt16 = &W[t2-16*2];
+    SHA512_sigma1(Wt2, temp1);
+    SHA512_ADD(temp1, Wt7, temp2);
+    SHA512_sigma0(Wt15, temp1);
+    SHA512_ADD(temp1, Wt16, temp3);
+    SHA512_ADD(temp2, temp3, &W[t2]);
+  }
+
+  A[0] = context->Intermediate_Hash[0];
+  A[1] = context->Intermediate_Hash[1];
+  B[0] = context->Intermediate_Hash[2];
+  B[1] = context->Intermediate_Hash[3];
+  C[0] = context->Intermediate_Hash[4];
+  C[1] = context->Intermediate_Hash[5];
+  D[0] = context->Intermediate_Hash[6];
+  D[1] = context->Intermediate_Hash[7];
+  E[0] = context->Intermediate_Hash[8];
+  E[1] = context->Intermediate_Hash[9];
+  F[0] = context->Intermediate_Hash[10];
+  F[1] = context->Intermediate_Hash[11];
+  G[0] = context->Intermediate_Hash[12];
+  G[1] = context->Intermediate_Hash[13];
+  H[0] = context->Intermediate_Hash[14];
+  H[1] = context->Intermediate_Hash[15];
+
+  for (t = t2 = 0; t < 80; t++, t2 += 2) {
+    /*
+     * temp1 = H + SHA512_SIGMA1(E) + SHA_Ch(E,F,G) + K[t] + W[t];
+     */
+    SHA512_SIGMA1(E,temp1);
+    SHA512_ADD(H, temp1, temp2);
+    SHA_Ch(E,F,G,temp3);
+    SHA512_ADD(temp2, temp3, temp4);
+    SHA512_ADD(&K[t2], &W[t2], temp5);
+    SHA512_ADD(temp4, temp5, temp1);
+    /*
+     * temp2 = SHA512_SIGMA0(A) + SHA_Maj(A,B,C);
+     */
+    SHA512_SIGMA0(A,temp3);
+
+
+
+Eastlake & Hansen             Informational                    [Page 66]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    SHA_Maj(A,B,C,temp4);
+    SHA512_ADD(temp3, temp4, temp2);
+    H[0] = G[0]; H[1] = G[1];
+    G[0] = F[0]; G[1] = F[1];
+    F[0] = E[0]; F[1] = E[1];
+    SHA512_ADD(D, temp1, E);
+    D[0] = C[0]; D[1] = C[1];
+    C[0] = B[0]; C[1] = B[1];
+    B[0] = A[0]; B[1] = A[1];
+    SHA512_ADD(temp1, temp2, A);
+  }
+
+  SHA512_ADDTO2(&context->Intermediate_Hash[0], A);
+  SHA512_ADDTO2(&context->Intermediate_Hash[2], B);
+  SHA512_ADDTO2(&context->Intermediate_Hash[4], C);
+  SHA512_ADDTO2(&context->Intermediate_Hash[6], D);
+  SHA512_ADDTO2(&context->Intermediate_Hash[8], E);
+  SHA512_ADDTO2(&context->Intermediate_Hash[10], F);
+  SHA512_ADDTO2(&context->Intermediate_Hash[12], G);
+  SHA512_ADDTO2(&context->Intermediate_Hash[14], H);
+
+#else /* !USE_32BIT_ONLY */
+  /* Constants defined in FIPS 180-3, section 4.2.3 */
+  static const uint64_t K[80] = {
+      0x428A2F98D728AE22ll, 0x7137449123EF65CDll, 0xB5C0FBCFEC4D3B2Fll,
+      0xE9B5DBA58189DBBCll, 0x3956C25BF348B538ll, 0x59F111F1B605D019ll,
+      0x923F82A4AF194F9Bll, 0xAB1C5ED5DA6D8118ll, 0xD807AA98A3030242ll,
+      0x12835B0145706FBEll, 0x243185BE4EE4B28Cll, 0x550C7DC3D5FFB4E2ll,
+      0x72BE5D74F27B896Fll, 0x80DEB1FE3B1696B1ll, 0x9BDC06A725C71235ll,
+      0xC19BF174CF692694ll, 0xE49B69C19EF14AD2ll, 0xEFBE4786384F25E3ll,
+      0x0FC19DC68B8CD5B5ll, 0x240CA1CC77AC9C65ll, 0x2DE92C6F592B0275ll,
+      0x4A7484AA6EA6E483ll, 0x5CB0A9DCBD41FBD4ll, 0x76F988DA831153B5ll,
+      0x983E5152EE66DFABll, 0xA831C66D2DB43210ll, 0xB00327C898FB213Fll,
+      0xBF597FC7BEEF0EE4ll, 0xC6E00BF33DA88FC2ll, 0xD5A79147930AA725ll,
+      0x06CA6351E003826Fll, 0x142929670A0E6E70ll, 0x27B70A8546D22FFCll,
+      0x2E1B21385C26C926ll, 0x4D2C6DFC5AC42AEDll, 0x53380D139D95B3DFll,
+      0x650A73548BAF63DEll, 0x766A0ABB3C77B2A8ll, 0x81C2C92E47EDAEE6ll,
+      0x92722C851482353Bll, 0xA2BFE8A14CF10364ll, 0xA81A664BBC423001ll,
+      0xC24B8B70D0F89791ll, 0xC76C51A30654BE30ll, 0xD192E819D6EF5218ll,
+      0xD69906245565A910ll, 0xF40E35855771202All, 0x106AA07032BBD1B8ll,
+      0x19A4C116B8D2D0C8ll, 0x1E376C085141AB53ll, 0x2748774CDF8EEB99ll,
+      0x34B0BCB5E19B48A8ll, 0x391C0CB3C5C95A63ll, 0x4ED8AA4AE3418ACBll,
+      0x5B9CCA4F7763E373ll, 0x682E6FF3D6B2B8A3ll, 0x748F82EE5DEFB2FCll,
+      0x78A5636F43172F60ll, 0x84C87814A1F0AB72ll, 0x8CC702081A6439ECll,
+      0x90BEFFFA23631E28ll, 0xA4506CEBDE82BDE9ll, 0xBEF9A3F7B2C67915ll,
+      0xC67178F2E372532Bll, 0xCA273ECEEA26619Cll, 0xD186B8C721C0C207ll,
+      0xEADA7DD6CDE0EB1Ell, 0xF57D4F7FEE6ED178ll, 0x06F067AA72176FBAll,
+      0x0A637DC5A2C898A6ll, 0x113F9804BEF90DAEll, 0x1B710B35131C471Bll,
+
+
+
+Eastlake & Hansen             Informational                    [Page 67]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+      0x28DB77F523047D84ll, 0x32CAAB7B40C72493ll, 0x3C9EBE0A15C9BEBCll,
+      0x431D67C49C100D4Cll, 0x4CC5D4BECB3E42B6ll, 0x597F299CFC657E2All,
+      0x5FCB6FAB3AD6FAECll, 0x6C44198C4A475817ll
+  };
+  int        t, t8;                   /* Loop counter */
+  uint64_t   temp1, temp2;            /* Temporary word value */
+  uint64_t   W[80];                   /* Word sequence */
+  uint64_t   A, B, C, D, E, F, G, H;  /* Word buffers */
+
+  /*
+   * Initialize the first 16 words in the array W
+   */
+  for (t = t8 = 0; t < 16; t++, t8 += 8)
+    W[t] = ((uint64_t)(context->Message_Block[t8  ]) << 56) |
+           ((uint64_t)(context->Message_Block[t8 + 1]) << 48) |
+           ((uint64_t)(context->Message_Block[t8 + 2]) << 40) |
+           ((uint64_t)(context->Message_Block[t8 + 3]) << 32) |
+           ((uint64_t)(context->Message_Block[t8 + 4]) << 24) |
+           ((uint64_t)(context->Message_Block[t8 + 5]) << 16) |
+           ((uint64_t)(context->Message_Block[t8 + 6]) << 8) |
+           ((uint64_t)(context->Message_Block[t8 + 7]));
+
+  for (t = 16; t < 80; t++)
+    W[t] = SHA512_sigma1(W[t-2]) + W[t-7] +
+        SHA512_sigma0(W[t-15]) + W[t-16];
+  A = context->Intermediate_Hash[0];
+  B = context->Intermediate_Hash[1];
+  C = context->Intermediate_Hash[2];
+  D = context->Intermediate_Hash[3];
+  E = context->Intermediate_Hash[4];
+  F = context->Intermediate_Hash[5];
+  G = context->Intermediate_Hash[6];
+  H = context->Intermediate_Hash[7];
+
+  for (t = 0; t < 80; t++) {
+    temp1 = H + SHA512_SIGMA1(E) + SHA_Ch(E,F,G) + K[t] + W[t];
+    temp2 = SHA512_SIGMA0(A) + SHA_Maj(A,B,C);
+    H = G;
+    G = F;
+    F = E;
+    E = D + temp1;
+    D = C;
+    C = B;
+    B = A;
+    A = temp1 + temp2;
+  }
+
+  context->Intermediate_Hash[0] += A;
+
+
+
+Eastlake & Hansen             Informational                    [Page 68]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  context->Intermediate_Hash[1] += B;
+  context->Intermediate_Hash[2] += C;
+  context->Intermediate_Hash[3] += D;
+  context->Intermediate_Hash[4] += E;
+  context->Intermediate_Hash[5] += F;
+  context->Intermediate_Hash[6] += G;
+  context->Intermediate_Hash[7] += H;
+#endif /* USE_32BIT_ONLY */
+
+  context->Message_Block_Index = 0;
+}
+
+/*
+ * SHA384_512Finalize
+ *
+ * Description:
+ *   This helper function finishes off the digest calculations.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   Pad_Byte: [in]
+ *     The last byte to add to the message block before the 0-padding
+ *     and length.  This will contain the last bits of the message
+ *     followed by another single bit.  If the message was an
+ *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+static void SHA384_512Finalize(SHA512Context *context,
+    uint8_t Pad_Byte)
+{
+  int_least16_t i;
+  SHA384_512PadMessage(context, Pad_Byte);
+  /* message may be sensitive, clear it out */
+  for (i = 0; i < SHA512_Message_Block_Size; ++i)
+    context->Message_Block[i] = 0;
+#ifdef USE_32BIT_ONLY    /* and clear length */
+  context->Length[0] = context->Length[1] = 0;
+  context->Length[2] = context->Length[3] = 0;
+#else /* !USE_32BIT_ONLY */
+  context->Length_High = context->Length_Low = 0;
+#endif /* USE_32BIT_ONLY */
+  context->Computed = 1;
+}
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 69]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+/*
+ * SHA384_512PadMessage
+ *
+ * Description:
+ *   According to the standard, the message must be padded to the next
+ *   even multiple of 1024 bits.  The first padding bit must be a '1'.
+ *   The last 128 bits represent the length of the original message.
+ *   All bits in between should be 0.  This helper function will
+ *   pad the message according to those rules by filling the
+ *   Message_Block array accordingly.  When it returns, it can be
+ *   assumed that the message digest has been computed.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to pad.
+ *   Pad_Byte: [in]
+ *     The last byte to add to the message block before the 0-padding
+ *     and length.  This will contain the last bits of the message
+ *     followed by another single bit.  If the message was an
+ *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
+ *
+ * Returns:
+ *   Nothing.
+ *
+ */
+static void SHA384_512PadMessage(SHA512Context *context,
+    uint8_t Pad_Byte)
+{
+  /*
+   * Check to see if the current message block is too small to hold
+   * the initial padding bits and length.  If so, we will pad the
+   * block, process it, and then continue padding into a second
+   * block.
+   */
+  if (context->Message_Block_Index >= (SHA512_Message_Block_Size-16)) {
+    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
+    while (context->Message_Block_Index < SHA512_Message_Block_Size)
+      context->Message_Block[context->Message_Block_Index++] = 0;
+
+    SHA384_512ProcessMessageBlock(context);
+  } else
+    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
+
+  while (context->Message_Block_Index < (SHA512_Message_Block_Size-16))
+    context->Message_Block[context->Message_Block_Index++] = 0;
+
+  /*
+   * Store the message length as the last 16 octets
+
+
+
+Eastlake & Hansen             Informational                    [Page 70]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+   */
+#ifdef USE_32BIT_ONLY
+  context->Message_Block[112] = (uint8_t)(context->Length[0] >> 24);
+  context->Message_Block[113] = (uint8_t)(context->Length[0] >> 16);
+  context->Message_Block[114] = (uint8_t)(context->Length[0] >> 8);
+  context->Message_Block[115] = (uint8_t)(context->Length[0]);
+  context->Message_Block[116] = (uint8_t)(context->Length[1] >> 24);
+  context->Message_Block[117] = (uint8_t)(context->Length[1] >> 16);
+  context->Message_Block[118] = (uint8_t)(context->Length[1] >> 8);
+  context->Message_Block[119] = (uint8_t)(context->Length[1]);
+
+  context->Message_Block[120] = (uint8_t)(context->Length[2] >> 24);
+  context->Message_Block[121] = (uint8_t)(context->Length[2] >> 16);
+  context->Message_Block[122] = (uint8_t)(context->Length[2] >> 8);
+  context->Message_Block[123] = (uint8_t)(context->Length[2]);
+  context->Message_Block[124] = (uint8_t)(context->Length[3] >> 24);
+  context->Message_Block[125] = (uint8_t)(context->Length[3] >> 16);
+  context->Message_Block[126] = (uint8_t)(context->Length[3] >> 8);
+  context->Message_Block[127] = (uint8_t)(context->Length[3]);
+#else /* !USE_32BIT_ONLY */
+  context->Message_Block[112] = (uint8_t)(context->Length_High >> 56);
+  context->Message_Block[113] = (uint8_t)(context->Length_High >> 48);
+  context->Message_Block[114] = (uint8_t)(context->Length_High >> 40);
+  context->Message_Block[115] = (uint8_t)(context->Length_High >> 32);
+  context->Message_Block[116] = (uint8_t)(context->Length_High >> 24);
+  context->Message_Block[117] = (uint8_t)(context->Length_High >> 16);
+  context->Message_Block[118] = (uint8_t)(context->Length_High >> 8);
+  context->Message_Block[119] = (uint8_t)(context->Length_High);
+
+  context->Message_Block[120] = (uint8_t)(context->Length_Low >> 56);
+  context->Message_Block[121] = (uint8_t)(context->Length_Low >> 48);
+  context->Message_Block[122] = (uint8_t)(context->Length_Low >> 40);
+  context->Message_Block[123] = (uint8_t)(context->Length_Low >> 32);
+  context->Message_Block[124] = (uint8_t)(context->Length_Low >> 24);
+  context->Message_Block[125] = (uint8_t)(context->Length_Low >> 16);
+  context->Message_Block[126] = (uint8_t)(context->Length_Low >> 8);
+  context->Message_Block[127] = (uint8_t)(context->Length_Low);
+#endif /* USE_32BIT_ONLY */
+
+  SHA384_512ProcessMessageBlock(context);
+}
+
+/*
+ * SHA384_512ResultN
+ *
+ * Description:
+ *   This helper function will return the 384-bit or 512-bit message
+ *   digest into the Message_Digest array provided by the caller.
+
+
+
+Eastlake & Hansen             Informational                    [Page 71]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *    the last octet of hash in the element with index 47/63.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *   HashSize: [in]
+ *     The size of the hash, either 48 or 64.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+static int SHA384_512ResultN(SHA512Context *context,
+    uint8_t Message_Digest[ ], int HashSize)
+{
+  int i;
+#ifdef USE_32BIT_ONLY
+  int i2;
+#endif /* USE_32BIT_ONLY */
+
+  if (!context) return shaNull;
+  if (!Message_Digest) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+
+  if (!context->Computed)
+    SHA384_512Finalize(context, 0x80);
+
+#ifdef USE_32BIT_ONLY
+  for (i = i2 = 0; i < HashSize; ) {
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>24);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>16);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>8);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2++]);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>24);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>16);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>8);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2++]);
+  }
+#else /* !USE_32BIT_ONLY */
+  for (i = 0; i < HashSize; ++i)
+    Message_Digest[i] = (uint8_t)
+      (context->Intermediate_Hash[i>>3] >> 8 * ( 7 - ( i % 8 ) ));
+#endif /* USE_32BIT_ONLY */
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 72]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  return shaSuccess;
+}
+
+8.2.4.  usha.c
+
+/**************************** usha.c ***************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ *  Description:
+ *     This file implements a unified interface to the SHA algorithms.
+ */
+
+#include "sha.h"
+
+/*
+ *  USHAReset
+ *
+ *  Description:
+ *      This function will initialize the SHA Context in preparation
+ *      for computing a new SHA message digest.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The context to reset.
+ *      whichSha: [in]
+ *          Selects which SHA reset to call
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int USHAReset(USHAContext *context, enum SHAversion whichSha)
+{
+  if (!context) return shaNull;
+  context->whichSha = whichSha;
+  switch (whichSha) {
+    case SHA1:   return SHA1Reset((SHA1Context*)&context->ctx);
+    case SHA224: return SHA224Reset((SHA224Context*)&context->ctx);
+    case SHA256: return SHA256Reset((SHA256Context*)&context->ctx);
+    case SHA384: return SHA384Reset((SHA384Context*)&context->ctx);
+    case SHA512: return SHA512Reset((SHA512Context*)&context->ctx);
+    default: return shaBadParam;
+  }
+}
+
+
+
+Eastlake & Hansen             Informational                    [Page 73]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+/*
+ *  USHAInput
+ *
+ *  Description:
+ *      This function accepts an array of octets as the next portion
+ *      of the message.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The SHA context to update.
+ *      message_array: [in]
+ *          An array of octets representing the next portion of
+ *          the message.
+ *      length: [in]
+ *          The length of the message in message_array.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int USHAInput(USHAContext *context,
+              const uint8_t *bytes, unsigned int bytecount)
+{
+  if (!context) return shaNull;
+  switch (context->whichSha) {
+    case SHA1:
+      return SHA1Input((SHA1Context*)&context->ctx, bytes,
+                       bytecount);
+    case SHA224:
+      return SHA224Input((SHA224Context*)&context->ctx, bytes,
+          bytecount);
+    case SHA256:
+      return SHA256Input((SHA256Context*)&context->ctx, bytes,
+          bytecount);
+    case SHA384:
+      return SHA384Input((SHA384Context*)&context->ctx, bytes,
+          bytecount);
+    case SHA512:
+      return SHA512Input((SHA512Context*)&context->ctx, bytes,
+          bytecount);
+    default: return shaBadParam;
+  }
+}
+
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 74]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+/*
+ * USHAFinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int USHAFinalBits(USHAContext *context,
+                  uint8_t bits, unsigned int bit_count)
+{
+  if (!context) return shaNull;
+  switch (context->whichSha) {
+    case SHA1:
+      return SHA1FinalBits((SHA1Context*)&context->ctx, bits,
+                           bit_count);
+    case SHA224:
+      return SHA224FinalBits((SHA224Context*)&context->ctx, bits,
+          bit_count);
+    case SHA256:
+      return SHA256FinalBits((SHA256Context*)&context->ctx, bits,
+          bit_count);
+    case SHA384:
+      return SHA384FinalBits((SHA384Context*)&context->ctx, bits,
+          bit_count);
+    case SHA512:
+      return SHA512FinalBits((SHA512Context*)&context->ctx, bits,
+          bit_count);
+    default: return shaBadParam;
+  }
+}
+
+
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 75]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+/*
+ * USHAResult
+ *
+ * Description:
+ *   This function will return the message digest of the appropriate
+ *   bit size, as returned by USHAHashSizeBits(whichSHA) for the
+ *   'whichSHA' value used in the preceeding call to USHAReset,
+ *   into the Message_Digest array provided by the caller.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA-1 hash.
+ *   Message_Digest: [out]
+ *     Where the digest is returned.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int USHAResult(USHAContext *context,
+               uint8_t Message_Digest[USHAMaxHashSize])
+{
+  if (!context) return shaNull;
+  switch (context->whichSha) {
+    case SHA1:
+      return SHA1Result((SHA1Context*)&context->ctx, Message_Digest);
+    case SHA224:
+      return SHA224Result((SHA224Context*)&context->ctx,
+                          Message_Digest);
+    case SHA256:
+      return SHA256Result((SHA256Context*)&context->ctx,
+                          Message_Digest);
+    case SHA384:
+      return SHA384Result((SHA384Context*)&context->ctx,
+                          Message_Digest);
+    case SHA512:
+      return SHA512Result((SHA512Context*)&context->ctx,
+                          Message_Digest);
+    default: return shaBadParam;
+  }
+}
+
+/*
+ * USHABlockSize
+ *
+ * Description:
+ *   This function will return the blocksize for the given SHA
+ *   algorithm.
+
+
+
+Eastlake & Hansen             Informational                    [Page 76]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *
+ * Parameters:
+ *   whichSha:
+ *     which SHA algorithm to query
+ *
+ * Returns:
+ *   block size
+ *
+ */
+int USHABlockSize(enum SHAversion whichSha)
+{
+  switch (whichSha) {
+    case SHA1:   return SHA1_Message_Block_Size;
+    case SHA224: return SHA224_Message_Block_Size;
+    case SHA256: return SHA256_Message_Block_Size;
+    case SHA384: return SHA384_Message_Block_Size;
+    default:
+    case SHA512: return SHA512_Message_Block_Size;
+  }
+}
+
+/*
+ * USHAHashSize
+ *
+ * Description:
+ *   This function will return the hashsize for the given SHA
+ *   algorithm.
+ *
+ * Parameters:
+ *   whichSha:
+ *     which SHA algorithm to query
+ *
+ * Returns:
+ *   hash size
+ *
+ */
+int USHAHashSize(enum SHAversion whichSha)
+{
+  switch (whichSha) {
+    case SHA1:   return SHA1HashSize;
+    case SHA224: return SHA224HashSize;
+    case SHA256: return SHA256HashSize;
+    case SHA384: return SHA384HashSize;
+    default:
+    case SHA512: return SHA512HashSize;
+  }
+}
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 77]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+/*
+ * USHAHashSizeBits
+ *
+ * Description:
+ *   This function will return the hashsize for the given SHA
+ *   algorithm, expressed in bits.
+ *
+ * Parameters:
+ *   whichSha:
+ *     which SHA algorithm to query
+ *
+ * Returns:
+ *   hash size in bits
+ *
+ */
+int USHAHashSizeBits(enum SHAversion whichSha)
+{
+  switch (whichSha) {
+    case SHA1:   return SHA1HashSizeBits;
+    case SHA224: return SHA224HashSizeBits;
+    case SHA256: return SHA256HashSizeBits;
+    case SHA384: return SHA384HashSizeBits;
+    default:
+    case SHA512: return SHA512HashSizeBits;
+  }
+}
+
+/*
+ * USHAHashName
+ *
+ * Description:
+ *   This function will return the name of the given SHA algorithm
+ *   as a string.
+ *
+ * Parameters:
+ *   whichSha:
+ *     which SHA algorithm to query
+ *
+ * Returns:
+ *   character string with the name in it
+ *
+ */
+const char *USHAHashName(enum SHAversion whichSha)
+{
+  switch (whichSha) {
+    case SHA1:   return "SHA1";
+    case SHA224: return "SHA224";
+    case SHA256: return "SHA256";
+
+
+
+Eastlake & Hansen             Informational                    [Page 78]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    case SHA384: return "SHA384";
+    default:
+    case SHA512: return "SHA512";
+  }
+}
+
+8.3.  The HMAC Code
+
+/**************************** hmac.c ***************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ *  Description:
+ *      This file implements the HMAC algorithm (Keyed-Hashing for
+ *      Message Authentication, [RFC 2104]), expressed in terms of
+ *      the various SHA algorithms.
+ */
+
+#include "sha.h"
+
+/*
+ *  hmac
+ *
+ *  Description:
+ *      This function will compute an HMAC message digest.
+ *
+ *  Parameters:
+ *      whichSha: [in]
+ *          One of SHA1, SHA224, SHA256, SHA384, SHA512
+ *      message_array[ ]: [in]
+ *          An array of octets representing the message.
+ *          Note: in RFC 2104, this parameter is known
+ *          as 'text'.
+ *      length: [in]
+ *          The length of the message in message_array.
+ *      key[ ]: [in]
+ *          The secret shared key.
+ *      key_len: [in]
+ *          The length of the secret shared key.
+ *      digest[ ]: [out]
+ *          Where the digest is to be returned.
+ *          NOTE: The length of the digest is determined by
+ *              the value of whichSha.
+ *
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 79]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+
+int hmac(SHAversion whichSha,
+    const unsigned char *message_array, int length,
+    const unsigned char *key, int key_len,
+    uint8_t digest[USHAMaxHashSize])
+{
+  HMACContext context;
+  return hmacReset(&context, whichSha, key, key_len) ||
+         hmacInput(&context, message_array, length) ||
+         hmacResult(&context, digest);
+}
+
+/*
+ *  hmacReset
+ *
+ *  Description:
+ *      This function will initialize the hmacContext in preparation
+ *      for computing a new HMAC message digest.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The context to reset.
+ *      whichSha: [in]
+ *          One of SHA1, SHA224, SHA256, SHA384, SHA512
+ *      key[ ]: [in]
+ *          The secret shared key.
+ *      key_len: [in]
+ *          The length of the secret shared key.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hmacReset(HMACContext *context, enum SHAversion whichSha,
+    const unsigned char *key, int key_len)
+{
+  int i, blocksize, hashsize, ret;
+
+  /* inner padding - key XORd with ipad */
+  unsigned char k_ipad[USHA_Max_Message_Block_Size];
+
+  /* temporary buffer when keylen > blocksize */
+  unsigned char tempkey[USHAMaxHashSize];
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 80]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  if (!context) return shaNull;
+  context->Computed = 0;
+  context->Corrupted = shaSuccess;
+
+  blocksize = context->blockSize = USHABlockSize(whichSha);
+  hashsize = context->hashSize = USHAHashSize(whichSha);
+  context->whichSha = whichSha;
+
+  /*
+   * If key is longer than the hash blocksize,
+   * reset it to key = HASH(key).
+   */
+  if (key_len > blocksize) {
+    USHAContext tcontext;
+    int err = USHAReset(&tcontext, whichSha) ||
+              USHAInput(&tcontext, key, key_len) ||
+              USHAResult(&tcontext, tempkey);
+    if (err != shaSuccess) return err;
+
+    key = tempkey;
+    key_len = hashsize;
+  }
+
+  /*
+   * The HMAC transform looks like:
+   *
+   * SHA(K XOR opad, SHA(K XOR ipad, text))
+   *
+   * where K is an n byte key, 0-padded to a total of blocksize bytes,
+   * ipad is the byte 0x36 repeated blocksize times,
+   * opad is the byte 0x5c repeated blocksize times,
+   * and text is the data being protected.
+   */
+
+  /* store key into the pads, XOR'd with ipad and opad values */
+  for (i = 0; i < key_len; i++) {
+    k_ipad[i] = key[i] ^ 0x36;
+    context->k_opad[i] = key[i] ^ 0x5c;
+  }
+  /* remaining pad bytes are '\0' XOR'd with ipad and opad values */
+  for ( ; i < blocksize; i++) {
+    k_ipad[i] = 0x36;
+    context->k_opad[i] = 0x5c;
+  }
+
+  /* perform inner hash */
+  /* init context for 1st pass */
+  ret = USHAReset(&context->shaContext, whichSha) ||
+
+
+
+Eastlake & Hansen             Informational                    [Page 81]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+        /* and start with inner pad */
+        USHAInput(&context->shaContext, k_ipad, blocksize);
+  return context->Corrupted = ret;
+}
+
+/*
+ *  hmacInput
+ *
+ *  Description:
+ *      This function accepts an array of octets as the next portion
+ *      of the message.  It may be called multiple times.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The HMAC context to update.
+ *      text[ ]: [in]
+ *          An array of octets representing the next portion of
+ *          the message.
+ *      text_len: [in]
+ *          The length of the message in text.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hmacInput(HMACContext *context, const unsigned char *text,
+    int text_len)
+{
+  if (!context) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  /* then text of datagram */
+  return context->Corrupted =
+    USHAInput(&context->shaContext, text, text_len);
+}
+
+/*
+ * hmacFinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The HMAC context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+
+
+
+Eastlake & Hansen             Informational                    [Page 82]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int hmacFinalBits(HMACContext *context,
+    uint8_t bits, unsigned int bit_count)
+{
+  if (!context) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  /* then final bits of datagram */
+  return context->Corrupted =
+    USHAFinalBits(&context->shaContext, bits, bit_count);
+}
+
+/*
+ * hmacResult
+ *
+ * Description:
+ *   This function will return the N-byte message digest into the
+ *   Message_Digest array provided by the caller.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the HMAC hash.
+ *   digest[ ]: [out]
+ *     Where the digest is returned.
+ *     NOTE 2: The length of the hash is determined by the value of
+ *      whichSha that was passed to hmacReset().
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int hmacResult(HMACContext *context, uint8_t *digest)
+{
+  int ret;
+  if (!context) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+
+  /* finish up 1st pass */
+  /* (Use digest here as a temporary buffer.) */
+  ret =
+    USHAResult(&context->shaContext, digest) ||
+
+
+
+Eastlake & Hansen             Informational                    [Page 83]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+         /* perform outer SHA */
+         /* init context for 2nd pass */
+         USHAReset(&context->shaContext, context->whichSha) ||
+
+         /* start with outer pad */
+         USHAInput(&context->shaContext, context->k_opad,
+                   context->blockSize) ||
+
+         /* then results of 1st hash */
+         USHAInput(&context->shaContext, digest, context->hashSize) ||
+         /* finish up 2nd pass */
+         USHAResult(&context->shaContext, digest);
+
+  context->Computed = 1;
+  return context->Corrupted = ret;
+}
+
+8.4.  The HKDF Code
+
+/**************************** hkdf.c ***************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ *  Description:
+ *      This file implements the HKDF algorithm (HMAC-based
+ *      Extract-and-Expand Key Derivation Function, RFC 5869),
+ *      expressed in terms of the various SHA algorithms.
+ */
+
+#include "sha.h"
+#include <string.h>
+#include <stdlib.h>
+
+/*
+ *  hkdf
+ *
+ *  Description:
+ *      This function will generate keying material using HKDF.
+ *
+ *  Parameters:
+ *      whichSha: [in]
+ *          One of SHA1, SHA224, SHA256, SHA384, SHA512
+ *      salt[ ]: [in]
+ *          The optional salt value (a non-secret random value);
+ *          if not provided (salt == NULL), it is set internally
+
+
+
+Eastlake & Hansen             Informational                    [Page 84]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *          to a string of HashLen(whichSha) zeros.
+ *      salt_len: [in]
+ *          The length of the salt value.  (Ignored if salt == NULL.)
+ *      ikm[ ]: [in]
+ *          Input keying material.
+ *      ikm_len: [in]
+ *          The length of the input keying material.
+ *      info[ ]: [in]
+ *          The optional context and application specific information.
+ *          If info == NULL or a zero-length string, it is ignored.
+ *      info_len: [in]
+ *          The length of the optional context and application specific
+ *          information.  (Ignored if info == NULL.)
+ *      okm[ ]: [out]
+ *          Where the HKDF is to be stored.
+ *      okm_len: [in]
+ *          The length of the buffer to hold okm.
+ *          okm_len must be <= 255 * USHABlockSize(whichSha)
+ *
+ *  Notes:
+ *      Calls hkdfExtract() and hkdfExpand().
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hkdf(SHAversion whichSha,
+    const unsigned char *salt, int salt_len,
+    const unsigned char *ikm, int ikm_len,
+    const unsigned char *info, int info_len,
+    uint8_t okm[ ], int okm_len)
+{
+  uint8_t prk[USHAMaxHashSize];
+  return hkdfExtract(whichSha, salt, salt_len, ikm, ikm_len, prk) ||
+         hkdfExpand(whichSha, prk, USHAHashSize(whichSha), info,
+                    info_len, okm, okm_len);
+}
+
+/*
+ *  hkdfExtract
+ *
+ *  Description:
+ *      This function will perform HKDF extraction.
+ *
+ *  Parameters:
+ *      whichSha: [in]
+ *          One of SHA1, SHA224, SHA256, SHA384, SHA512
+ *      salt[ ]: [in]
+
+
+
+Eastlake & Hansen             Informational                    [Page 85]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *          The optional salt value (a non-secret random value);
+ *          if not provided (salt == NULL), it is set internally
+ *          to a string of HashLen(whichSha) zeros.
+ *      salt_len: [in]
+ *          The length of the salt value.  (Ignored if salt == NULL.)
+ *      ikm[ ]: [in]
+ *          Input keying material.
+ *      ikm_len: [in]
+ *          The length of the input keying material.
+ *      prk[ ]: [out]
+ *          Array where the HKDF extraction is to be stored.
+ *          Must be larger than USHAHashSize(whichSha);
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hkdfExtract(SHAversion whichSha,
+    const unsigned char *salt, int salt_len,
+    const unsigned char *ikm, int ikm_len,
+    uint8_t prk[USHAMaxHashSize])
+{
+  unsigned char nullSalt[USHAMaxHashSize];
+  if (salt == 0) {
+    salt = nullSalt;
+    salt_len = USHAHashSize(whichSha);
+    memset(nullSalt, '\0', salt_len);
+  } else if (salt_len < 0) {
+    return shaBadParam;
+  }
+  return hmac(whichSha, ikm, ikm_len, salt, salt_len, prk);
+}
+
+/*
+ *  hkdfExpand
+ *
+ *  Description:
+ *      This function will perform HKDF expansion.
+ *
+ *  Parameters:
+ *      whichSha: [in]
+ *          One of SHA1, SHA224, SHA256, SHA384, SHA512
+ *      prk[ ]: [in]
+ *          The pseudo-random key to be expanded; either obtained
+ *          directly from a cryptographically strong, uniformly
+ *          distributed pseudo-random number generator, or as the
+ *          output from hkdfExtract().
+ *      prk_len: [in]
+
+
+
+Eastlake & Hansen             Informational                    [Page 86]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *          The length of the pseudo-random key in prk;
+ *          should at least be equal to USHAHashSize(whichSHA).
+ *      info[ ]: [in]
+ *          The optional context and application specific information.
+ *          If info == NULL or a zero-length string, it is ignored.
+ *      info_len: [in]
+ *          The length of the optional context and application specific
+ *          information.  (Ignored if info == NULL.)
+ *      okm[ ]: [out]
+ *          Where the HKDF is to be stored.
+ *      okm_len: [in]
+ *          The length of the buffer to hold okm.
+ *          okm_len must be <= 255 * USHABlockSize(whichSha)
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hkdfExpand(SHAversion whichSha, const uint8_t prk[ ], int prk_len,
+    const unsigned char *info, int info_len,
+    uint8_t okm[ ], int okm_len)
+{
+  int hash_len, N;
+  unsigned char T[USHAMaxHashSize];
+  int Tlen, where, i;
+
+  if (info == 0) {
+    info = (const unsigned char *)"";
+    info_len = 0;
+  } else if (info_len < 0) {
+    return shaBadParam;
+  }
+  if (okm_len <= 0) return shaBadParam;
+  if (!okm) return shaBadParam;
+
+  hash_len = USHAHashSize(whichSha);
+  if (prk_len < hash_len) return shaBadParam;
+  N = okm_len / hash_len;
+  if ((okm_len % hash_len) != 0) N++;
+  if (N > 255) return shaBadParam;
+
+  Tlen = 0;
+  where = 0;
+  for (i = 1; i <= N; i++) {
+    HMACContext context;
+    unsigned char c = i;
+    int ret = hmacReset(&context, whichSha, prk, prk_len) ||
+              hmacInput(&context, T, Tlen) ||
+
+
+
+Eastlake & Hansen             Informational                    [Page 87]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+              hmacInput(&context, info, info_len) ||
+              hmacInput(&context, &c, 1) ||
+              hmacResult(&context, T);
+    if (ret != shaSuccess) return ret;
+    memcpy(okm + where, T,
+           (i != N) ? hash_len : (okm_len - where));
+    where += hash_len;
+    Tlen = hash_len;
+  }
+  return shaSuccess;
+}
+
+/*
+ *  hkdfReset
+ *
+ *  Description:
+ *      This function will initialize the hkdfContext in preparation
+ *      for key derivation using the modular HKDF interface for
+ *      arbitrary length inputs.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The context to reset.
+ *      whichSha: [in]
+ *          One of SHA1, SHA224, SHA256, SHA384, SHA512
+ *      salt[ ]: [in]
+ *          The optional salt value (a non-secret random value);
+ *          if not provided (salt == NULL), it is set internally
+ *          to a string of HashLen(whichSha) zeros.
+ *      salt_len: [in]
+ *          The length of the salt value.  (Ignored if salt == NULL.)
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hkdfReset(HKDFContext *context, enum SHAversion whichSha,
+              const unsigned char *salt, int salt_len)
+{
+  unsigned char nullSalt[USHAMaxHashSize];
+  if (!context) return shaNull;
+
+  context->whichSha = whichSha;
+  context->hashSize = USHAHashSize(whichSha);
+  if (salt == 0) {
+    salt = nullSalt;
+    salt_len = context->hashSize;
+    memset(nullSalt, '\0', salt_len);
+
+
+
+Eastlake & Hansen             Informational                    [Page 88]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  }
+
+  return hmacReset(&context->hmacContext, whichSha, salt, salt_len);
+}
+
+/*
+ *  hkdfInput
+ *
+ *  Description:
+ *      This function accepts an array of octets as the next portion
+ *      of the input keying material.  It may be called multiple times.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The HKDF context to update.
+ *      ikm[ ]: [in]
+ *          An array of octets representing the next portion of
+ *          the input keying material.
+ *      ikm_len: [in]
+ *          The length of ikm.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int hkdfInput(HKDFContext *context, const unsigned char *ikm,
+              int ikm_len)
+{
+  if (!context) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  return hmacInput(&context->hmacContext, ikm, ikm_len);
+}
+
+/*
+ * hkdfFinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the
+ *   input keying material.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The HKDF context to update
+ *   ikm_bits: [in]
+ *     The final bits of the input keying material, in the upper
+ *     portion of the byte.  (Use 0b###00000 instead of 0b00000###
+ *     to input the three bits ###.)
+
+
+
+Eastlake & Hansen             Informational                    [Page 89]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *   ikm_bit_count: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int hkdfFinalBits(HKDFContext *context, uint8_t ikm_bits,
+                  unsigned int ikm_bit_count)
+{
+  if (!context) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  return hmacFinalBits(&context->hmacContext, ikm_bits, ikm_bit_count);
+}
+
+/*
+ * hkdfResult
+ *
+ * Description:
+ *   This function will finish the HKDF extraction and perform the
+ *   final HKDF expansion.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The HKDF context to use to calculate the HKDF hash.
+ *   prk[ ]: [out]
+ *     An optional location to store the HKDF extraction.
+ *     Either NULL, or pointer to a buffer that must be
+ *     larger than USHAHashSize(whichSha);
+ *   info[ ]: [in]
+ *     The optional context and application specific information.
+ *     If info == NULL or a zero-length string, it is ignored.
+ *   info_len: [in]
+ *     The length of the optional context and application specific
+ *     information.  (Ignored if info == NULL.)
+ *   okm[ ]: [out]
+ *     Where the HKDF is to be stored.
+ *   okm_len: [in]
+ *     The length of the buffer to hold okm.
+ *     okm_len must be <= 255 * USHABlockSize(whichSha)
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int hkdfResult(HKDFContext *context,
+               uint8_t prk[USHAMaxHashSize],
+               const unsigned char *info, int info_len,
+
+
+
+Eastlake & Hansen             Informational                    [Page 90]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+               uint8_t okm[ ], int okm_len)
+{
+  uint8_t prkbuf[USHAMaxHashSize];
+  int ret;
+
+  if (!context) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (!okm) return context->Corrupted = shaBadParam;
+  if (!prk) prk = prkbuf;
+
+  ret = hmacResult(&context->hmacContext, prk) ||
+        hkdfExpand(context->whichSha, prk, context->hashSize, info,
+                   info_len, okm, okm_len);
+  context->Computed = 1;
+  return context->Corrupted = ret;
+}
+
+8.5.  The Test Driver
+
+   The following code is a main program test driver to exercise the code
+   in sha1.c, sha224-256.c, sha384-512.c, hmac.c, and hkdf.c.  The test
+   driver can also be used as a standalone program for generating the
+   hashes.  Note that the tests assume that character values are as in
+   [US-ASCII] and a run time check warns if the code appears to have
+   been compiled with some other character system.
+
+   See also [SHAVS].
+
+/************************** shatest.c **************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ *  Description:
+ *    This file will exercise the SHA code performing
+ *      the three tests documented in FIPS PUB 180-3
+ *        (http://csrc.nist.gov/publications/fips/
+ *         fips180-2/fips180-2withchangenotice.pdf)
+ *      one that calls SHAInput with an exact multiple of 512 bits
+ *      the seven tests documented for each algorithm in
+ *        "The Secure Hash Algorithm Validation System (SHAVS)"
+ *        (http://csrc.nist.gov/cryptval/shs/SHAVS.pdf),
+ *        three of which are bit-level tests
+ *
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 91]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+ *    These tests have subsequently been moved to pages linked from
+ *      http://csrc.nist.gov/groups/ST/toolkit/examples.html
+ *
+ *    This file will exercise the HMAC SHA1 code performing
+ *      the seven tests documented in RFCs [RFC 2202] and [RFC 4231].
+ *
+ *    This file will exercise the HKDF code performing
+ *      the seven tests documented in RFC 4869.
+ *
+ *    To run the tests and just see PASSED/FAILED, use the -p option.
+ *
+ *    Other options exercise:
+ *      hashing an arbitrary string
+ *      hashing a file's contents
+ *      a few error test checks
+ *      printing the results in raw format
+ *
+ *  Portability Issues:
+ *    None.
+ *
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>     /* defines getopt() and optarg */
+#include "sha.h"
+
+static int scasecmp(const char *s1, const char *s2);
+
+/*
+ *  Define patterns for testing
+ */
+#define TEST1    "abc"
+#define TEST2_1  \
+        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+#define TEST2_2a \
+        "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
+#define TEST2_2b \
+        "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"
+#define TEST2_2  TEST2_2a TEST2_2b
+#define TEST3    "a"                            /* times 1000000 */
+#define TEST4a   "01234567012345670123456701234567"
+#define TEST4b   "01234567012345670123456701234567"
+    /* an exact multiple of 512 bits */
+#define TEST4   TEST4a TEST4b                   /* times 10 */
+
+
+
+Eastlake & Hansen             Informational                    [Page 92]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+#define TEST7_1 \
+  "\x49\xb2\xae\xc2\x59\x4b\xbe\x3a\x3b\x11\x75\x42\xd9\x4a\xc8"
+#define TEST8_1 \
+  "\x9a\x7d\xfd\xf1\xec\xea\xd0\x6e\xd6\x46\xaa\x55\xfe\x75\x71\x46"
+#define TEST9_1 \
+  "\x65\xf9\x32\x99\x5b\xa4\xce\x2c\xb1\xb4\xa2\xe7\x1a\xe7\x02\x20" \
+  "\xaa\xce\xc8\x96\x2d\xd4\x49\x9c\xbd\x7c\x88\x7a\x94\xea\xaa\x10" \
+  "\x1e\xa5\xaa\xbc\x52\x9b\x4e\x7e\x43\x66\x5a\x5a\xf2\xcd\x03\xfe" \
+  "\x67\x8e\xa6\xa5\x00\x5b\xba\x3b\x08\x22\x04\xc2\x8b\x91\x09\xf4" \
+  "\x69\xda\xc9\x2a\xaa\xb3\xaa\x7c\x11\xa1\xb3\x2a"
+#define TEST10_1 \
+  "\xf7\x8f\x92\x14\x1b\xcd\x17\x0a\xe8\x9b\x4f\xba\x15\xa1\xd5\x9f" \
+  "\x3f\xd8\x4d\x22\x3c\x92\x51\xbd\xac\xbb\xae\x61\xd0\x5e\xd1\x15" \
+  "\xa0\x6a\x7c\xe1\x17\xb7\xbe\xea\xd2\x44\x21\xde\xd9\xc3\x25\x92" \
+  "\xbd\x57\xed\xea\xe3\x9c\x39\xfa\x1f\xe8\x94\x6a\x84\xd0\xcf\x1f" \
+  "\x7b\xee\xad\x17\x13\xe2\xe0\x95\x98\x97\x34\x7f\x67\xc8\x0b\x04" \
+  "\x00\xc2\x09\x81\x5d\x6b\x10\xa6\x83\x83\x6f\xd5\x56\x2a\x56\xca" \
+  "\xb1\xa2\x8e\x81\xb6\x57\x66\x54\x63\x1c\xf1\x65\x66\xb8\x6e\x3b" \
+  "\x33\xa1\x08\xb0\x53\x07\xc0\x0a\xff\x14\xa7\x68\xed\x73\x50\x60" \
+  "\x6a\x0f\x85\xe6\xa9\x1d\x39\x6f\x5b\x5c\xbe\x57\x7f\x9b\x38\x80" \
+  "\x7c\x7d\x52\x3d\x6d\x79\x2f\x6e\xbc\x24\xa4\xec\xf2\xb3\xa4\x27" \
+  "\xcd\xbb\xfb"
+#define TEST7_224 \
+  "\xf0\x70\x06\xf2\x5a\x0b\xea\x68\xcd\x76\xa2\x95\x87\xc2\x8d"
+#define TEST8_224 \
+  "\x18\x80\x40\x05\xdd\x4f\xbd\x15\x56\x29\x9d\x6f\x9d\x93\xdf\x62"
+#define TEST9_224 \
+  "\xa2\xbe\x6e\x46\x32\x81\x09\x02\x94\xd9\xce\x94\x82\x65\x69\x42" \
+  "\x3a\x3a\x30\x5e\xd5\xe2\x11\x6c\xd4\xa4\xc9\x87\xfc\x06\x57\x00" \
+  "\x64\x91\xb1\x49\xcc\xd4\xb5\x11\x30\xac\x62\xb1\x9d\xc2\x48\xc7" \
+  "\x44\x54\x3d\x20\xcd\x39\x52\xdc\xed\x1f\x06\xcc\x3b\x18\xb9\x1f" \
+  "\x3f\x55\x63\x3e\xcc\x30\x85\xf4\x90\x70\x60\xd2"
+#define TEST10_224 \
+  "\x55\xb2\x10\x07\x9c\x61\xb5\x3a\xdd\x52\x06\x22\xd1\xac\x97\xd5" \
+  "\xcd\xbe\x8c\xb3\x3a\xa0\xae\x34\x45\x17\xbe\xe4\xd7\xba\x09\xab" \
+  "\xc8\x53\x3c\x52\x50\x88\x7a\x43\xbe\xbb\xac\x90\x6c\x2e\x18\x37" \
+  "\xf2\x6b\x36\xa5\x9a\xe3\xbe\x78\x14\xd5\x06\x89\x6b\x71\x8b\x2a" \
+  "\x38\x3e\xcd\xac\x16\xb9\x61\x25\x55\x3f\x41\x6f\xf3\x2c\x66\x74" \
+  "\xc7\x45\x99\xa9\x00\x53\x86\xd9\xce\x11\x12\x24\x5f\x48\xee\x47" \
+  "\x0d\x39\x6c\x1e\xd6\x3b\x92\x67\x0c\xa5\x6e\xc8\x4d\xee\xa8\x14" \
+  "\xb6\x13\x5e\xca\x54\x39\x2b\xde\xdb\x94\x89\xbc\x9b\x87\x5a\x8b" \
+  "\xaf\x0d\xc1\xae\x78\x57\x36\x91\x4a\xb7\xda\xa2\x64\xbc\x07\x9d" \
+  "\x26\x9f\x2c\x0d\x7e\xdd\xd8\x10\xa4\x26\x14\x5a\x07\x76\xf6\x7c" \
+  "\x87\x82\x73"
+#define TEST7_256 \
+  "\xbe\x27\x46\xc6\xdb\x52\x76\x5f\xdb\x2f\x88\x70\x0f\x9a\x73"
+#define TEST8_256 \
+  "\xe3\xd7\x25\x70\xdc\xdd\x78\x7c\xe3\x88\x7a\xb2\xcd\x68\x46\x52"
+
+
+
+Eastlake & Hansen             Informational                    [Page 93]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+#define TEST9_256 \
+  "\x3e\x74\x03\x71\xc8\x10\xc2\xb9\x9f\xc0\x4e\x80\x49\x07\xef\x7c" \
+  "\xf2\x6b\xe2\x8b\x57\xcb\x58\xa3\xe2\xf3\xc0\x07\x16\x6e\x49\xc1" \
+  "\x2e\x9b\xa3\x4c\x01\x04\x06\x91\x29\xea\x76\x15\x64\x25\x45\x70" \
+  "\x3a\x2b\xd9\x01\xe1\x6e\xb0\xe0\x5d\xeb\xa0\x14\xeb\xff\x64\x06" \
+  "\xa0\x7d\x54\x36\x4e\xff\x74\x2d\xa7\x79\xb0\xb3"
+#define TEST10_256 \
+  "\x83\x26\x75\x4e\x22\x77\x37\x2f\x4f\xc1\x2b\x20\x52\x7a\xfe\xf0" \
+  "\x4d\x8a\x05\x69\x71\xb1\x1a\xd5\x71\x23\xa7\xc1\x37\x76\x00\x00" \
+  "\xd7\xbe\xf6\xf3\xc1\xf7\xa9\x08\x3a\xa3\x9d\x81\x0d\xb3\x10\x77" \
+  "\x7d\xab\x8b\x1e\x7f\x02\xb8\x4a\x26\xc7\x73\x32\x5f\x8b\x23\x74" \
+  "\xde\x7a\x4b\x5a\x58\xcb\x5c\x5c\xf3\x5b\xce\xe6\xfb\x94\x6e\x5b" \
+  "\xd6\x94\xfa\x59\x3a\x8b\xeb\x3f\x9d\x65\x92\xec\xed\xaa\x66\xca" \
+  "\x82\xa2\x9d\x0c\x51\xbc\xf9\x33\x62\x30\xe5\xd7\x84\xe4\xc0\xa4" \
+  "\x3f\x8d\x79\xa3\x0a\x16\x5c\xba\xbe\x45\x2b\x77\x4b\x9c\x71\x09" \
+  "\xa9\x7d\x13\x8f\x12\x92\x28\x96\x6f\x6c\x0a\xdc\x10\x6a\xad\x5a" \
+  "\x9f\xdd\x30\x82\x57\x69\xb2\xc6\x71\xaf\x67\x59\xdf\x28\xeb\x39" \
+  "\x3d\x54\xd6"
+#define TEST7_384 \
+  "\x8b\xc5\x00\xc7\x7c\xee\xd9\x87\x9d\xa9\x89\x10\x7c\xe0\xaa"
+#define TEST8_384 \
+  "\xa4\x1c\x49\x77\x79\xc0\x37\x5f\xf1\x0a\x7f\x4e\x08\x59\x17\x39"
+#define TEST9_384 \
+  "\x68\xf5\x01\x79\x2d\xea\x97\x96\x76\x70\x22\xd9\x3d\xa7\x16\x79" \
+  "\x30\x99\x20\xfa\x10\x12\xae\xa3\x57\xb2\xb1\x33\x1d\x40\xa1\xd0" \
+  "\x3c\x41\xc2\x40\xb3\xc9\xa7\x5b\x48\x92\xf4\xc0\x72\x4b\x68\xc8" \
+  "\x75\x32\x1a\xb8\xcf\xe5\x02\x3b\xd3\x75\xbc\x0f\x94\xbd\x89\xfe" \
+  "\x04\xf2\x97\x10\x5d\x7b\x82\xff\xc0\x02\x1a\xeb\x1c\xcb\x67\x4f" \
+  "\x52\x44\xea\x34\x97\xde\x26\xa4\x19\x1c\x5f\x62\xe5\xe9\xa2\xd8" \
+  "\x08\x2f\x05\x51\xf4\xa5\x30\x68\x26\xe9\x1c\xc0\x06\xce\x1b\xf6" \
+  "\x0f\xf7\x19\xd4\x2f\xa5\x21\xc8\x71\xcd\x23\x94\xd9\x6e\xf4\x46" \
+  "\x8f\x21\x96\x6b\x41\xf2\xba\x80\xc2\x6e\x83\xa9"
+#define TEST10_384 \
+  "\x39\x96\x69\xe2\x8f\x6b\x9c\x6d\xbc\xbb\x69\x12\xec\x10\xff\xcf" \
+  "\x74\x79\x03\x49\xb7\xdc\x8f\xbe\x4a\x8e\x7b\x3b\x56\x21\xdb\x0f" \
+  "\x3e\x7d\xc8\x7f\x82\x32\x64\xbb\xe4\x0d\x18\x11\xc9\xea\x20\x61" \
+  "\xe1\xc8\x4a\xd1\x0a\x23\xfa\xc1\x72\x7e\x72\x02\xfc\x3f\x50\x42" \
+  "\xe6\xbf\x58\xcb\xa8\xa2\x74\x6e\x1f\x64\xf9\xb9\xea\x35\x2c\x71" \
+  "\x15\x07\x05\x3c\xf4\xe5\x33\x9d\x52\x86\x5f\x25\xcc\x22\xb5\xe8" \
+  "\x77\x84\xa1\x2f\xc9\x61\xd6\x6c\xb6\xe8\x95\x73\x19\x9a\x2c\xe6" \
+  "\x56\x5c\xbd\xf1\x3d\xca\x40\x38\x32\xcf\xcb\x0e\x8b\x72\x11\xe8" \
+  "\x3a\xf3\x2a\x11\xac\x17\x92\x9f\xf1\xc0\x73\xa5\x1c\xc0\x27\xaa" \
+  "\xed\xef\xf8\x5a\xad\x7c\x2b\x7c\x5a\x80\x3e\x24\x04\xd9\x6d\x2a" \
+  "\x77\x35\x7b\xda\x1a\x6d\xae\xed\x17\x15\x1c\xb9\xbc\x51\x25\xa4" \
+  "\x22\xe9\x41\xde\x0c\xa0\xfc\x50\x11\xc2\x3e\xcf\xfe\xfd\xd0\x96" \
+  "\x76\x71\x1c\xf3\xdb\x0a\x34\x40\x72\x0e\x16\x15\xc1\xf2\x2f\xbc" \
+  "\x3c\x72\x1d\xe5\x21\xe1\xb9\x9b\xa1\xbd\x55\x77\x40\x86\x42\x14" \
+  "\x7e\xd0\x96"
+
+
+
+Eastlake & Hansen             Informational                    [Page 94]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+#define TEST7_512 \
+  "\x08\xec\xb5\x2e\xba\xe1\xf7\x42\x2d\xb6\x2b\xcd\x54\x26\x70"
+#define TEST8_512 \
+  "\x8d\x4e\x3c\x0e\x38\x89\x19\x14\x91\x81\x6e\x9d\x98\xbf\xf0\xa0"
+#define TEST9_512 \
+  "\x3a\xdd\xec\x85\x59\x32\x16\xd1\x61\x9a\xa0\x2d\x97\x56\x97\x0b" \
+  "\xfc\x70\xac\xe2\x74\x4f\x7c\x6b\x27\x88\x15\x10\x28\xf7\xb6\xa2" \
+  "\x55\x0f\xd7\x4a\x7e\x6e\x69\xc2\xc9\xb4\x5f\xc4\x54\x96\x6d\xc3" \
+  "\x1d\x2e\x10\xda\x1f\x95\xce\x02\xbe\xb4\xbf\x87\x65\x57\x4c\xbd" \
+  "\x6e\x83\x37\xef\x42\x0a\xdc\x98\xc1\x5c\xb6\xd5\xe4\xa0\x24\x1b" \
+  "\xa0\x04\x6d\x25\x0e\x51\x02\x31\xca\xc2\x04\x6c\x99\x16\x06\xab" \
+  "\x4e\xe4\x14\x5b\xee\x2f\xf4\xbb\x12\x3a\xab\x49\x8d\x9d\x44\x79" \
+  "\x4f\x99\xcc\xad\x89\xa9\xa1\x62\x12\x59\xed\xa7\x0a\x5b\x6d\xd4" \
+  "\xbd\xd8\x77\x78\xc9\x04\x3b\x93\x84\xf5\x49\x06"
+#define TEST10_512 \
+  "\xa5\x5f\x20\xc4\x11\xaa\xd1\x32\x80\x7a\x50\x2d\x65\x82\x4e\x31" \
+  "\xa2\x30\x54\x32\xaa\x3d\x06\xd3\xe2\x82\xa8\xd8\x4e\x0d\xe1\xde" \
+  "\x69\x74\xbf\x49\x54\x69\xfc\x7f\x33\x8f\x80\x54\xd5\x8c\x26\xc4" \
+  "\x93\x60\xc3\xe8\x7a\xf5\x65\x23\xac\xf6\xd8\x9d\x03\xe5\x6f\xf2" \
+  "\xf8\x68\x00\x2b\xc3\xe4\x31\xed\xc4\x4d\xf2\xf0\x22\x3d\x4b\xb3" \
+  "\xb2\x43\x58\x6e\x1a\x7d\x92\x49\x36\x69\x4f\xcb\xba\xf8\x8d\x95" \
+  "\x19\xe4\xeb\x50\xa6\x44\xf8\xe4\xf9\x5e\xb0\xea\x95\xbc\x44\x65" \
+  "\xc8\x82\x1a\xac\xd2\xfe\x15\xab\x49\x81\x16\x4b\xbb\x6d\xc3\x2f" \
+  "\x96\x90\x87\xa1\x45\xb0\xd9\xcc\x9c\x67\xc2\x2b\x76\x32\x99\x41" \
+  "\x9c\xc4\x12\x8b\xe9\xa0\x77\xb3\xac\xe6\x34\x06\x4e\x6d\x99\x28" \
+  "\x35\x13\xdc\x06\xe7\x51\x5d\x0d\x73\x13\x2e\x9a\x0d\xc6\xd3\xb1" \
+  "\xf8\xb2\x46\xf1\xa9\x8a\x3f\xc7\x29\x41\xb1\xe3\xbb\x20\x98\xe8" \
+  "\xbf\x16\xf2\x68\xd6\x4f\x0b\x0f\x47\x07\xfe\x1e\xa1\xa1\x79\x1b" \
+  "\xa2\xf3\xc0\xc7\x58\xe5\xf5\x51\x86\x3a\x96\xc9\x49\xad\x47\xd7" \
+  "\xfb\x40\xd2"
+#define SHA1_SEED "\xd0\x56\x9c\xb3\x66\x5a\x8a\x43\xeb\x6e\xa2\x3d" \
+  "\x75\xa3\xc4\xd2\x05\x4a\x0d\x7d"
+#define SHA224_SEED "\xd0\x56\x9c\xb3\x66\x5a\x8a\x43\xeb\x6e\xa2" \
+  "\x3d\x75\xa3\xc4\xd2\x05\x4a\x0d\x7d\x66\xa9\xca\x99\xc9\xce\xb0" \
+  "\x27"
+#define SHA256_SEED "\xf4\x1e\xce\x26\x13\xe4\x57\x39\x15\x69\x6b" \
+  "\x5a\xdc\xd5\x1c\xa3\x28\xbe\x3b\xf5\x66\xa9\xca\x99\xc9\xce\xb0" \
+  "\x27\x9c\x1c\xb0\xa7"
+#define SHA384_SEED "\x82\x40\xbc\x51\xe4\xec\x7e\xf7\x6d\x18\xe3" \
+  "\x52\x04\xa1\x9f\x51\xa5\x21\x3a\x73\xa8\x1d\x6f\x94\x46\x80\xd3" \
+  "\x07\x59\x48\xb7\xe4\x63\x80\x4e\xa3\xd2\x6e\x13\xea\x82\x0d\x65" \
+  "\xa4\x84\xbe\x74\x53"
+#define SHA512_SEED "\x47\x3f\xf1\xb9\xb3\xff\xdf\xa1\x26\x69\x9a" \
+  "\xc7\xef\x9e\x8e\x78\x77\x73\x09\x58\x24\xc6\x42\x55\x7c\x13\x99" \
+  "\xd9\x8e\x42\x20\x44\x8d\xc3\x5b\x99\xbf\xdd\x44\x77\x95\x43\x92" \
+  "\x4c\x1c\xe9\x3b\xc5\x94\x15\x38\x89\x5d\xb9\x88\x26\x1b\x00\x77" \
+  "\x4b\x12\x27\x20\x39"
+
+
+
+
+Eastlake & Hansen             Informational                    [Page 95]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+#define TESTCOUNT 10
+#define HASHCOUNT 5
+#define RANDOMCOUNT 4
+#define HMACTESTCOUNT 7
+#define HKDFTESTCOUNT 7
+
+#define PRINTNONE 0
+#define PRINTTEXT 1
+#define PRINTRAW 2
+#define PRINTHEX 3
+#define PRINTBASE64 4
+
+#define PRINTPASSFAIL 1
+#define PRINTFAIL 2
+
+#define length(x) (sizeof(x)-1)
+
+/* Test arrays for hashes. */
+struct hash {
+    const char *name;
+    SHAversion whichSha;
+    int hashsize;
+    struct {
+        const char *testarray;
+        int length;
+        long repeatcount;
+        int extrabits;
+        int numberExtrabits;
+        const char *resultarray;
+    } tests[TESTCOUNT];
+    const char *randomtest;
+    const char *randomresults[RANDOMCOUNT];
+} hashes[HASHCOUNT] = {
+  { "SHA1", SHA1, SHA1HashSize,
+    {
+      /* 1 */ { TEST1, length(TEST1), 1, 0, 0,
+        "A9993E364706816ABA3E25717850C26C9CD0D89D" },
+      /* 2 */ { TEST2_1, length(TEST2_1), 1, 0, 0,
+        "84983E441C3BD26EBAAE4AA1F95129E5E54670F1" },
+      /* 3 */ { TEST3, length(TEST3), 1000000, 0, 0,
+        "34AA973CD4C4DAA4F61EEB2BDBAD27316534016F" },
+      /* 4 */ { TEST4, length(TEST4), 10, 0, 0,
+        "DEA356A2CDDD90C7A7ECEDC5EBB563934F460452" },
+      /* 5 */ { "", 0, 0, 0x98, 5,
+        "29826B003B906E660EFF4027CE98AF3531AC75BA" },
+      /* 6 */ { "\x5e", 1, 1, 0, 0,
+        "5E6F80A34A9798CAFC6A5DB96CC57BA4C4DB59C2" },
+      /* 7 */ { TEST7_1, length(TEST7_1), 1, 0x80, 3,
+
+
+
+Eastlake & Hansen             Informational                    [Page 96]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+        "6239781E03729919C01955B3FFA8ACB60B988340" },
+      /* 8 */ { TEST8_1, length(TEST8_1), 1, 0, 0,
+        "82ABFF6605DBE1C17DEF12A394FA22A82B544A35" },
+      /* 9 */ { TEST9_1, length(TEST9_1), 1, 0xE0, 3,
+        "8C5B2A5DDAE5A97FC7F9D85661C672ADBF7933D4" },
+      /* 10 */ { TEST10_1, length(TEST10_1), 1, 0, 0,
+        "CB0082C8F197D260991BA6A460E76E202BAD27B3" }
+    }, SHA1_SEED, { "E216836819477C7F78E0D843FE4FF1B6D6C14CD4",
+        "A2DBC7A5B1C6C0A8BCB7AAA41252A6A7D0690DBC",
+        "DB1F9050BB863DFEF4CE37186044E2EEB17EE013",
+        "127FDEDF43D372A51D5747C48FBFFE38EF6CDF7B"
+     } },
+  { "SHA224", SHA224, SHA224HashSize,
+    {
+      /* 1 */ { TEST1, length(TEST1), 1, 0, 0,
+        "23097D223405D8228642A477BDA255B32AADBCE4BDA0B3F7E36C9DA7" },
+      /* 2 */ { TEST2_1, length(TEST2_1), 1, 0, 0,
+        "75388B16512776CC5DBA5DA1FD890150B0C6455CB4F58B1952522525" },
+      /* 3 */ { TEST3, length(TEST3), 1000000, 0, 0,
+        "20794655980C91D8BBB4C1EA97618A4BF03F42581948B2EE4EE7AD67" },
+      /* 4 */ { TEST4, length(TEST4), 10, 0, 0,
+        "567F69F168CD7844E65259CE658FE7AADFA25216E68ECA0EB7AB8262" },
+      /* 5 */ { "", 0, 0, 0x68, 5,
+        "E3B048552C3C387BCAB37F6EB06BB79B96A4AEE5FF27F51531A9551C" },
+      /* 6 */ { "\x07", 1, 1, 0, 0,
+        "00ECD5F138422B8AD74C9799FD826C531BAD2FCABC7450BEE2AA8C2A" },
+      /* 7 */ { TEST7_224, length(TEST7_224), 1, 0xA0, 3,
+        "1B01DB6CB4A9E43DED1516BEB3DB0B87B6D1EA43187462C608137150" },
+      /* 8 */ { TEST8_224, length(TEST8_224), 1, 0, 0,
+        "DF90D78AA78821C99B40BA4C966921ACCD8FFB1E98AC388E56191DB1" },
+      /* 9 */ { TEST9_224, length(TEST9_224), 1, 0xE0, 3,
+        "54BEA6EAB8195A2EB0A7906A4B4A876666300EEFBD1F3B8474F9CD57" },
+      /* 10 */ { TEST10_224, length(TEST10_224), 1, 0, 0,
+        "0B31894EC8937AD9B91BDFBCBA294D9ADEFAA18E09305E9F20D5C3A4" }
+    }, SHA224_SEED, { "100966A5B4FDE0B42E2A6C5953D4D7F41BA7CF79FD"
+        "2DF431416734BE", "1DCA396B0C417715DEFAAE9641E10A2E99D55A"
+        "BCB8A00061EB3BE8BD", "1864E627BDB2319973CD5ED7D68DA71D8B"
+        "F0F983D8D9AB32C34ADB34", "A2406481FC1BCAF24DD08E6752E844"
+        "709563FB916227FED598EB621F"
+     } },
+  { "SHA256", SHA256, SHA256HashSize,
+  {
+      /* 1 */ { TEST1, length(TEST1), 1, 0, 0, "BA7816BF8F01CFEA4141"
+        "40DE5DAE2223B00361A396177A9CB410FF61F20015AD" },
+      /* 2 */ { TEST2_1, length(TEST2_1), 1, 0, 0, "248D6A61D20638B8"
+        "E5C026930C3E6039A33CE45964FF2167F6ECEDD419DB06C1" },
+      /* 3 */ { TEST3, length(TEST3), 1000000, 0, 0, "CDC76E5C9914FB92"
+        "81A1C7E284D73E67F1809A48A497200E046D39CCC7112CD0" },
+
+
+
+Eastlake & Hansen             Informational                    [Page 97]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+      /* 4 */ { TEST4, length(TEST4), 10, 0, 0, "594847328451BDFA"
+        "85056225462CC1D867D877FB388DF0CE35F25AB5562BFBB5" },
+      /* 5 */ { "", 0, 0, 0x68, 5, "D6D3E02A31A84A8CAA9718ED6C2057BE"
+        "09DB45E7823EB5079CE7A573A3760F95" },
+      /* 6 */ { "\x19", 1, 1, 0, 0, "68AA2E2EE5DFF96E3355E6C7EE373E3D"
+        "6A4E17F75F9518D843709C0C9BC3E3D4" },
+      /* 7 */ { TEST7_256, length(TEST7_256), 1, 0x60, 3, "77EC1DC8"
+        "9C821FF2A1279089FA091B35B8CD960BCAF7DE01C6A7680756BEB972" },
+      /* 8 */ { TEST8_256, length(TEST8_256), 1, 0, 0, "175EE69B02BA"
+        "9B58E2B0A5FD13819CEA573F3940A94F825128CF4209BEABB4E8" },
+      /* 9 */ { TEST9_256, length(TEST9_256), 1, 0xA0, 3, "3E9AD646"
+        "8BBBAD2AC3C2CDC292E018BA5FD70B960CF1679777FCE708FDB066E9" },
+      /* 10 */ { TEST10_256, length(TEST10_256), 1, 0, 0, "97DBCA7D"
+        "F46D62C8A422C941DD7E835B8AD3361763F7E9B2D95F4F0DA6E1CCBC" },
+    }, SHA256_SEED, { "83D28614D49C3ADC1D6FC05DB5F48037C056F8D2A4CE44"
+        "EC6457DEA5DD797CD1", "99DBE3127EF2E93DD9322D6A07909EB33B6399"
+        "5E529B3F954B8581621BB74D39", "8D4BE295BB64661CA3C7EFD129A2F7"
+        "25B33072DBDDE32385B9A87B9AF88EA76F", "40AF5D3F9716B040DF9408"
+        "E31536B70FF906EC51B00447CA97D7DD97C12411F4"
+    } },
+  { "SHA384", SHA384, SHA384HashSize,
+    {
+      /* 1 */ { TEST1, length(TEST1), 1, 0, 0,
+        "CB00753F45A35E8BB5A03D699AC65007272C32AB0EDED163"
+        "1A8B605A43FF5BED8086072BA1E7CC2358BAECA134C825A7" },
+      /* 2 */ { TEST2_2, length(TEST2_2), 1, 0, 0,
+        "09330C33F71147E83D192FC782CD1B4753111B173B3B05D2"
+        "2FA08086E3B0F712FCC7C71A557E2DB966C3E9FA91746039" },
+      /* 3 */ { TEST3, length(TEST3), 1000000, 0, 0,
+        "9D0E1809716474CB086E834E310A4A1CED149E9C00F24852"
+        "7972CEC5704C2A5B07B8B3DC38ECC4EBAE97DDD87F3D8985" },
+      /* 4 */ { TEST4, length(TEST4), 10, 0, 0,
+        "2FC64A4F500DDB6828F6A3430B8DD72A368EB7F3A8322A70"
+        "BC84275B9C0B3AB00D27A5CC3C2D224AA6B61A0D79FB4596" },
+      /* 5 */ { "", 0, 0, 0x10, 5,
+        "8D17BE79E32B6718E07D8A603EB84BA0478F7FCFD1BB9399"
+        "5F7D1149E09143AC1FFCFC56820E469F3878D957A15A3FE4" },
+      /* 6 */ { "\xb9", 1, 1, 0, 0,
+        "BC8089A19007C0B14195F4ECC74094FEC64F01F90929282C"
+        "2FB392881578208AD466828B1C6C283D2722CF0AD1AB6938" },
+      /* 7 */ { TEST7_384, length(TEST7_384), 1, 0xA0, 3,
+        "D8C43B38E12E7C42A7C9B810299FD6A770BEF30920F17532"
+        "A898DE62C7A07E4293449C0B5FA70109F0783211CFC4BCE3" },
+      /* 8 */ { TEST8_384, length(TEST8_384), 1, 0, 0,
+        "C9A68443A005812256B8EC76B00516F0DBB74FAB26D66591"
+        "3F194B6FFB0E91EA9967566B58109CBC675CC208E4C823F7" },
+      /* 9 */ { TEST9_384, length(TEST9_384), 1, 0xE0, 3,
+        "5860E8DE91C21578BB4174D227898A98E0B45C4C760F0095"
+
+
+
+Eastlake & Hansen             Informational                    [Page 98]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+        "49495614DAEDC0775D92D11D9F8CE9B064EEAC8DAFC3A297" },
+      /* 10 */ { TEST10_384, length(TEST10_384), 1, 0, 0,
+        "4F440DB1E6EDD2899FA335F09515AA025EE177A79F4B4AAF"
+        "38E42B5C4DE660F5DE8FB2A5B2FBD2A3CBFFD20CFF1288C0" }
+    }, SHA384_SEED, { "CE44D7D63AE0C91482998CF662A51EC80BF6FC68661A3C"
+        "57F87566112BD635A743EA904DEB7D7A42AC808CABE697F38F", "F9C6D2"
+        "61881FEE41ACD39E67AA8D0BAD507C7363EB67E2B81F45759F9C0FD7B503"
+        "DF1A0B9E80BDE7BC333D75B804197D", "D96512D8C9F4A7A4967A366C01"
+        "C6FD97384225B58343A88264847C18E4EF8AB7AEE4765FFBC3E30BD485D3"
+        "638A01418F", "0CA76BD0813AF1509E170907A96005938BC985628290B2"
+        "5FEF73CF6FAD68DDBA0AC8920C94E0541607B0915A7B4457F7"
+    } },
+  { "SHA512", SHA512, SHA512HashSize,
+    {
+      /* 1 */ { TEST1, length(TEST1), 1, 0, 0,
+        "DDAF35A193617ABACC417349AE20413112E6FA4E89A97EA2"
+        "0A9EEEE64B55D39A2192992A274FC1A836BA3C23A3FEEBBD"
+        "454D4423643CE80E2A9AC94FA54CA49F" },
+      /* 2 */ { TEST2_2, length(TEST2_2), 1, 0, 0,
+        "8E959B75DAE313DA8CF4F72814FC143F8F7779C6EB9F7FA1"
+        "7299AEADB6889018501D289E4900F7E4331B99DEC4B5433A"
+        "C7D329EEB6DD26545E96E55B874BE909" },
+       /* 3 */ { TEST3, length(TEST3), 1000000, 0, 0,
+        "E718483D0CE769644E2E42C7BC15B4638E1F98B13B204428"
+        "5632A803AFA973EBDE0FF244877EA60A4CB0432CE577C31B"
+        "EB009C5C2C49AA2E4EADB217AD8CC09B" },
+      /* 4 */ { TEST4, length(TEST4), 10, 0, 0,
+        "89D05BA632C699C31231DED4FFC127D5A894DAD412C0E024"
+        "DB872D1ABD2BA8141A0F85072A9BE1E2AA04CF33C765CB51"
+        "0813A39CD5A84C4ACAA64D3F3FB7BAE9" },
+      /* 5 */ { "", 0, 0, 0xB0, 5,
+        "D4EE29A9E90985446B913CF1D1376C836F4BE2C1CF3CADA0"
+        "720A6BF4857D886A7ECB3C4E4C0FA8C7F95214E41DC1B0D2"
+        "1B22A84CC03BF8CE4845F34DD5BDBAD4" },
+      /* 6 */ { "\xD0", 1, 1, 0, 0,
+        "9992202938E882E73E20F6B69E68A0A7149090423D93C81B"
+        "AB3F21678D4ACEEEE50E4E8CAFADA4C85A54EA8306826C4A"
+        "D6E74CECE9631BFA8A549B4AB3FBBA15" },
+      /* 7 */ { TEST7_512, length(TEST7_512), 1, 0x80, 3,
+        "ED8DC78E8B01B69750053DBB7A0A9EDA0FB9E9D292B1ED71"
+        "5E80A7FE290A4E16664FD913E85854400C5AF05E6DAD316B"
+        "7359B43E64F8BEC3C1F237119986BBB6" },
+      /* 8 */ { TEST8_512, length(TEST8_512), 1, 0, 0,
+        "CB0B67A4B8712CD73C9AABC0B199E9269B20844AFB75ACBD"
+        "D1C153C9828924C3DDEDAAFE669C5FDD0BC66F630F677398"
+        "8213EB1B16F517AD0DE4B2F0C95C90F8" },
+      /* 9 */ { TEST9_512, length(TEST9_512), 1, 0x80, 3,
+        "32BA76FC30EAA0208AEB50FFB5AF1864FDBF17902A4DC0A6"
+
+
+
+Eastlake & Hansen             Informational                    [Page 99]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+        "82C61FCEA6D92B783267B21080301837F59DE79C6B337DB2"
+        "526F8A0A510E5E53CAFED4355FE7C2F1" },
+      /* 10 */ { TEST10_512, length(TEST10_512), 1, 0, 0,
+        "C665BEFB36DA189D78822D10528CBF3B12B3EEF726039909"
+        "C1A16A270D48719377966B957A878E720584779A62825C18"
+        "DA26415E49A7176A894E7510FD1451F5" }
+    }, SHA512_SEED, { "2FBB1E7E00F746BA514FBC8C421F36792EC0E11FF5EFC3"
+        "78E1AB0C079AA5F0F66A1E3EDBAEB4F9984BE14437123038A452004A5576"
+        "8C1FD8EED49E4A21BEDCD0", "25CBE5A4F2C7B1D7EF07011705D50C62C5"
+        "000594243EAFD1241FC9F3D22B58184AE2FEE38E171CF8129E29459C9BC2"
+        "EF461AF5708887315F15419D8D17FE7949", "5B8B1F2687555CE2D7182B"
+        "92E5C3F6C36547DA1C13DBB9EA4F73EA4CBBAF89411527906D35B1B06C1B"
+        "6A8007D05EC66DF0A406066829EAB618BDE3976515AAFC", "46E36B007D"
+        "19876CDB0B29AD074FE3C08CDD174D42169D6ABE5A1414B6E79707DF5877"
+        "6A98091CF431854147BB6D3C66D43BFBC108FD715BDE6AA127C2B0E79F"
+    }
+  }
+};
+
+/* Test arrays for HMAC. */
+struct hmachash {
+    const char *keyarray[5];
+    int keylength[5];
+    const char *dataarray[5];
+    int datalength[5];
+    const char *resultarray[5];
+    int resultlength[5];
+} hmachashes[HMACTESTCOUNT] = {
+  { /* 1 */ {
+      "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
+      "\x0b\x0b\x0b\x0b\x0b"
+    }, { 20 }, {
+      "\x48\x69\x20\x54\x68\x65\x72\x65" /* "Hi There" */
+    }, { 8 }, {
+      /* HMAC-SHA-1 */
+      "B617318655057264E28BC0B6FB378C8EF146BE00",
+      /* HMAC-SHA-224 */
+      "896FB1128ABBDF196832107CD49DF33F47B4B1169912BA4F53684B22",
+      /* HMAC-SHA-256 */
+      "B0344C61D8DB38535CA8AFCEAF0BF12B881DC200C9833DA726E9376C2E32"
+      "CFF7",
+      /* HMAC-SHA-384 */
+      "AFD03944D84895626B0825F4AB46907F15F9DADBE4101EC682AA034C7CEB"
+      "C59CFAEA9EA9076EDE7F4AF152E8B2FA9CB6",
+      /* HMAC-SHA-512 */
+      "87AA7CDEA5EF619D4FF0B4241A1D6CB02379F4E2CE4EC2787AD0B30545E1"
+      "7CDEDAA833B7D6B8A702038B274EAEA3F4E4BE9D914EEB61F1702E696C20"
+      "3A126854"
+
+
+
+Eastlake & Hansen             Informational                   [Page 100]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    }, { SHA1HashSize, SHA224HashSize, SHA256HashSize,
+      SHA384HashSize, SHA512HashSize }
+  },
+  { /* 2 */ {
+      "\x4a\x65\x66\x65" /* "Jefe" */
+    }, { 4 }, {
+      "\x77\x68\x61\x74\x20\x64\x6f\x20\x79\x61\x20\x77\x61\x6e\x74"
+      "\x20\x66\x6f\x72\x20\x6e\x6f\x74\x68\x69\x6e\x67\x3f"
+      /* "what do ya want for nothing?" */
+    }, { 28 }, {
+      /* HMAC-SHA-1 */
+      "EFFCDF6AE5EB2FA2D27416D5F184DF9C259A7C79",
+      /* HMAC-SHA-224 */
+      "A30E01098BC6DBBF45690F3A7E9E6D0F8BBEA2A39E6148008FD05E44",
+      /* HMAC-SHA-256 */
+      "5BDCC146BF60754E6A042426089575C75A003F089D2739839DEC58B964EC"
+      "3843",
+      /* HMAC-SHA-384 */
+      "AF45D2E376484031617F78D2B58A6B1B9C7EF464F5A01B47E42EC3736322"
+      "445E8E2240CA5E69E2C78B3239ECFAB21649",
+      /* HMAC-SHA-512 */
+      "164B7A7BFCF819E2E395FBE73B56E0A387BD64222E831FD610270CD7EA25"
+      "05549758BF75C05A994A6D034F65F8F0E6FDCAEAB1A34D4A6B4B636E070A"
+      "38BCE737"
+    }, { SHA1HashSize, SHA224HashSize, SHA256HashSize,
+      SHA384HashSize, SHA512HashSize }
+  },
+  { /* 3 */
+    {
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa"
+    }, { 20 }, {
+      "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
+      "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
+      "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
+      "\xdd\xdd\xdd\xdd\xdd"
+    }, { 50 }, {
+      /* HMAC-SHA-1 */
+      "125D7342B9AC11CD91A39AF48AA17B4F63F175D3",
+      /* HMAC-SHA-224 */
+      "7FB3CB3588C6C1F6FFA9694D7D6AD2649365B0C1F65D69D1EC8333EA",
+      /* HMAC-SHA-256 */
+      "773EA91E36800E46854DB8EBD09181A72959098B3EF8C122D9635514CED5"
+      "65FE",
+      /* HMAC-SHA-384 */
+      "88062608D3E6AD8A0AA2ACE014C8A86F0AA635D947AC9FEBE83EF4E55966"
+      "144B2A5AB39DC13814B94E3AB6E101A34F27",
+      /* HMAC-SHA-512 */
+
+
+
+Eastlake & Hansen             Informational                   [Page 101]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+      "FA73B0089D56A284EFB0F0756C890BE9B1B5DBDD8EE81A3655F83E33B227"
+      "9D39BF3E848279A722C806B485A47E67C807B946A337BEE8942674278859"
+      "E13292FB"
+    }, { SHA1HashSize, SHA224HashSize, SHA256HashSize,
+      SHA384HashSize, SHA512HashSize }
+  },
+  { /* 4 */ {
+      "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+      "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19"
+    }, { 25 }, {
+      "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
+      "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
+      "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
+      "\xcd\xcd\xcd\xcd\xcd"
+    }, { 50 }, {
+      /* HMAC-SHA-1 */
+      "4C9007F4026250C6BC8414F9BF50C86C2D7235DA",
+      /* HMAC-SHA-224 */
+      "6C11506874013CAC6A2ABC1BB382627CEC6A90D86EFC012DE7AFEC5A",
+      /* HMAC-SHA-256 */
+      "82558A389A443C0EA4CC819899F2083A85F0FAA3E578F8077A2E3FF46729"
+      "665B",
+      /* HMAC-SHA-384 */
+      "3E8A69B7783C25851933AB6290AF6CA77A9981480850009CC5577C6E1F57"
+      "3B4E6801DD23C4A7D679CCF8A386C674CFFB",
+      /* HMAC-SHA-512 */
+      "B0BA465637458C6990E5A8C5F61D4AF7E576D97FF94B872DE76F8050361E"
+      "E3DBA91CA5C11AA25EB4D679275CC5788063A5F19741120C4F2DE2ADEBEB"
+      "10A298DD"
+    }, { SHA1HashSize, SHA224HashSize, SHA256HashSize,
+      SHA384HashSize, SHA512HashSize }
+  },
+  { /* 5 */ {
+      "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"
+      "\x0c\x0c\x0c\x0c\x0c"
+    }, { 20 }, {
+      "Test With Truncation"
+    }, { 20 }, {
+      /* HMAC-SHA-1 */
+      "4C1A03424B55E07FE7F27BE1",
+      /* HMAC-SHA-224 */
+      "0E2AEA68A90C8D37C988BCDB9FCA6FA8",
+      /* HMAC-SHA-256 */
+      "A3B6167473100EE06E0C796C2955552B",
+      /* HMAC-SHA-384 */
+      "3ABF34C3503B2A23A46EFC619BAEF897",
+      /* HMAC-SHA-512 */
+      "415FAD6271580A531D4179BC891D87A6"
+
+
+
+Eastlake & Hansen             Informational                   [Page 102]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    }, { 12, 16, 16, 16, 16 }
+  },
+  { /* 6 */ {
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+    }, { 80, 131 }, {
+      "Test Using Larger Than Block-Size Key - Hash Key First"
+    }, { 54 }, {
+      /* HMAC-SHA-1 */
+      "AA4AE5E15272D00E95705637CE8A3B55ED402112",
+      /* HMAC-SHA-224 */
+      "95E9A0DB962095ADAEBE9B2D6F0DBCE2D499F112F2D2B7273FA6870E",
+      /* HMAC-SHA-256 */
+      "60E431591EE0B67F0D8A26AACBF5B77F8E0BC6213728C5140546040F0EE3"
+      "7F54",
+      /* HMAC-SHA-384 */
+      "4ECE084485813E9088D2C63A041BC5B44F9EF1012A2B588F3CD11F05033A"
+      "C4C60C2EF6AB4030FE8296248DF163F44952",
+      /* HMAC-SHA-512 */
+      "80B24263C7C1A3EBB71493C1DD7BE8B49B46D1F41B4AEEC1121B013783F8"
+      "F3526B56D037E05F2598BD0FD2215D6A1E5295E64F73F63F0AEC8B915A98"
+      "5D786598"
+    }, { SHA1HashSize, SHA224HashSize, SHA256HashSize,
+      SHA384HashSize, SHA512HashSize }
+  },
+  { /* 7 */ {
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+    }, { 80, 131 }, {
+      "Test Using Larger Than Block-Size Key and "
+      "Larger Than One Block-Size Data",
+      "\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x74\x65\x73\x74\x20"
+      "\x75\x73\x69\x6e\x67\x20\x61\x20\x6c\x61\x72\x67\x65\x72\x20"
+      "\x74\x68\x61\x6e\x20\x62\x6c\x6f\x63\x6b\x2d\x73\x69\x7a\x65"
+
+
+
+Eastlake & Hansen             Informational                   [Page 103]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+      "\x20\x6b\x65\x79\x20\x61\x6e\x64\x20\x61\x20\x6c\x61\x72\x67"
+      "\x65\x72\x20\x74\x68\x61\x6e\x20\x62\x6c\x6f\x63\x6b\x2d\x73"
+      "\x69\x7a\x65\x20\x64\x61\x74\x61\x2e\x20\x54\x68\x65\x20\x6b"
+      "\x65\x79\x20\x6e\x65\x65\x64\x73\x20\x74\x6f\x20\x62\x65\x20"
+      "\x68\x61\x73\x68\x65\x64\x20\x62\x65\x66\x6f\x72\x65\x20\x62"
+      "\x65\x69\x6e\x67\x20\x75\x73\x65\x64\x20\x62\x79\x20\x74\x68"
+      "\x65\x20\x48\x4d\x41\x43\x20\x61\x6c\x67\x6f\x72\x69\x74\x68"
+      "\x6d\x2e"
+      /* "This is a test using a larger than block-size key and a "
+          "larger than block-size data.  The key needs to be hashed "
+          "before being used by the HMAC algorithm." */
+    }, { 73, 152 }, {
+      /* HMAC-SHA-1 */
+      "E8E99D0F45237D786D6BBAA7965C7808BBFF1A91",
+      /* HMAC-SHA-224 */
+      "3A854166AC5D9F023F54D517D0B39DBD946770DB9C2B95C9F6F565D1",
+      /* HMAC-SHA-256 */
+      "9B09FFA71B942FCB27635FBCD5B0E944BFDC63644F0713938A7F51535C3A"
+      "35E2",
+      /* HMAC-SHA-384 */
+      "6617178E941F020D351E2F254E8FD32C602420FEB0B8FB9ADCCEBB82461E"
+      "99C5A678CC31E799176D3860E6110C46523E",
+      /* HMAC-SHA-512 */
+      "E37B6A775DC87DBAA4DFA9F96E5E3FFDDEBD71F8867289865DF5A32D20CD"
+      "C944B6022CAC3C4982B10D5EEB55C3E4DE15134676FB6DE0446065C97440"
+      "FA8C6A58"
+    }, { SHA1HashSize, SHA224HashSize, SHA256HashSize,
+      SHA384HashSize, SHA512HashSize }
+  }
+};
+
+/* Test arrays for HKDF. */
+struct hkdfhash {
+    SHAversion whichSha;
+    int ikmlength;
+    const char *ikmarray;
+    int saltlength;
+    const char *saltarray;
+    int infolength;
+    const char *infoarray;
+    int prklength;
+    const char *prkarray;
+    int okmlength;
+    const char *okmarray;
+} hkdfhashes[HKDFTESTCOUNT] = {
+    {   /* RFC 5869 A.1. Test Case 1 */
+        SHA256,
+        22, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
+
+
+
+Eastlake & Hansen             Informational                   [Page 104]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+            "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
+        13, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c",
+        10, "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9",
+        32, "077709362C2E32DF0DDC3F0DC47BBA6390B6C73BB50F9C3122EC844A"
+            "D7C2B3E5",
+        42, "3CB25F25FAACD57A90434F64D0362F2A2D2D0A90CF1A5A4C5DB02D56"
+            "ECC4C5BF34007208D5B887185865"
+    },
+    {   /* RFC 5869 A.2. Test Case 2 */
+        SHA256,
+        80, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d"
+            "\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b"
+            "\x1c\x1d\x1e\x1f\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29"
+            "\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34\x35\x36\x37"
+            "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40\x41\x42\x43\x44\x45"
+            "\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f",
+        80, "\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d"
+            "\x6e\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b"
+            "\x7c\x7d\x7e\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89"
+            "\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97"
+            "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5"
+            "\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf",
+        80, "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd"
+            "\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb"
+            "\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9"
+            "\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"
+            "\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5"
+            "\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
+        32, "06A6B88C5853361A06104C9CEB35B45C"
+            "EF760014904671014A193F40C15FC244",
+        82, "B11E398DC80327A1C8E7F78C596A4934"
+            "4F012EDA2D4EFAD8A050CC4C19AFA97C"
+            "59045A99CAC7827271CB41C65E590E09"
+            "DA3275600C2F09B8367793A9ACA3DB71"
+            "CC30C58179EC3E87C14C01D5C1F3434F"
+            "1D87"
+    },
+    {   /* RFC 5869 A.3. Test Case 3 */
+        SHA256,
+        22, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
+            "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
+        0, "",
+        0, "",
+        32, "19EF24A32C717B167F33A91D6F648BDF"
+            "96596776AFDB6377AC434C1C293CCB04",
+        42, "8DA4E775A563C18F715F802A063C5A31"
+            "B8A11F5C5EE1879EC3454E5F3C738D2D"
+            "9D201395FAA4B61A96C8"
+
+
+
+Eastlake & Hansen             Informational                   [Page 105]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    },
+    {   /* RFC 5869 A.4. Test Case 4 */
+        SHA1,
+        11, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
+        13, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c",
+        10, "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9",
+        20, "9B6C18C432A7BF8F0E71C8EB88F4B30BAA2BA243",
+        42, "085A01EA1B10F36933068B56EFA5AD81"
+            "A4F14B822F5B091568A9CDD4F155FDA2"
+            "C22E422478D305F3F896"
+    },
+    {   /* RFC 5869 A.5. Test Case 5 */
+        SHA1,
+        80, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d"
+            "\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b"
+            "\x1c\x1d\x1e\x1f\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29"
+            "\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34\x35\x36\x37"
+            "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40\x41\x42\x43\x44\x45"
+            "\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f",
+        80, "\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6A\x6B\x6C\x6D"
+            "\x6E\x6F\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7A\x7B"
+            "\x7C\x7D\x7E\x7F\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89"
+            "\x8A\x8B\x8C\x8D\x8E\x8F\x90\x91\x92\x93\x94\x95\x96\x97"
+            "\x98\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA0\xA1\xA2\xA3\xA4\xA5"
+            "\xA6\xA7\xA8\xA9\xAA\xAB\xAC\xAD\xAE\xAF",
+        80, "\xB0\xB1\xB2\xB3\xB4\xB5\xB6\xB7\xB8\xB9\xBA\xBB\xBC\xBD"
+            "\xBE\xBF\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB"
+            "\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9"
+            "\xDA\xDB\xDC\xDD\xDE\xDF\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7"
+            "\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5"
+            "\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF",
+        20, "8ADAE09A2A307059478D309B26C4115A224CFAF6",
+        82, "0BD770A74D1160F7C9F12CD5912A06EB"
+            "FF6ADCAE899D92191FE4305673BA2FFE"
+            "8FA3F1A4E5AD79F3F334B3B202B2173C"
+            "486EA37CE3D397ED034C7F9DFEB15C5E"
+            "927336D0441F4C4300E2CFF0D0900B52"
+            "D3B4"
+    },
+    {   /* RFC 5869 A.6. Test Case 6 */
+        SHA1,
+        22, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
+            "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
+        0, "",
+        0, "",
+        20, "DA8C8A73C7FA77288EC6F5E7C297786AA0D32D01",
+        42, "0AC1AF7002B3D761D1E55298DA9D0506"
+            "B9AE52057220A306E07B6B87E8DF21D0"
+
+
+
+Eastlake & Hansen             Informational                   [Page 106]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+            "EA00033DE03984D34918"
+    },
+    {   /* RFC 5869 A.7. Test Case 7. */
+        SHA1,
+        22, "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"
+            "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",
+        0, 0,
+        0, "",
+        20, "2ADCCADA18779E7C2077AD2EB19D3F3E731385DD",
+        42, "2C91117204D745F3500D636A62F64F0A"
+            "B3BAE548AA53D423B0D1F27EBBA6F5E5"
+            "673A081D70CCE7ACFC48"
+    }
+};
+
+/*
+ * Check the hash value against the expected string, expressed in hex
+ */
+static const char hexdigits[ ] = "0123456789ABCDEF";
+int checkmatch(const unsigned char *hashvalue,
+  const char *hexstr, int hashsize)
+{
+  int i;
+  for (i = 0; i < hashsize; ++i) {
+    if (*hexstr++ != hexdigits[(hashvalue[i] >> 4) & 0xF])
+      return 0;
+    if (*hexstr++ != hexdigits[hashvalue[i] & 0xF]) return 0;
+  }
+  return 1;
+}
+
+/*
+ * Print the string, converting non-printable characters to "."
+ */
+void printstr(const char *str, int len)
+{
+  for ( ; len-- > 0; str++)
+    putchar(isprint((unsigned char)*str) ? *str : '.');
+}
+
+/*
+ * Print the string, converting all characters to hex "## ".
+ */
+void printxstr(const char *str, int len)
+{
+  char *sep = "";
+  for ( ; len-- > 0; str++) {
+    printf("%s%c%c", sep, hexdigits[(*str >> 4) & 0xF],
+
+
+
+Eastlake & Hansen             Informational                   [Page 107]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+      hexdigits[*str & 0xF]);
+    sep = " ";
+  }
+}
+
+/*
+ * Print a usage message.
+ */
+void usage(const char *argv0)
+{
+  fprintf(stderr,
+    "Usage:\n"
+    "Common options: [-h hash] [-w|-x|-6] [-H]\n"
+    "Hash a string:\n"
+      "\t%s [-S expectedresult] -s hashstr [-k key] "
+           "[-i info -L okm-len]\n"
+    "Hash a file:\n"
+      "\t%s [-S expectedresult] -f file [-k key] "
+           "[-i info -L okm-len]\n"
+    "Hash a file, ignoring whitespace:\n"
+      "\t%s [-S expectedresult] -F file [-k key] "
+           "[-i info -L okm-len]\n"
+    "Additional bits to add in: [-B bitcount -b bits]\n"
+    "(If -k,-i&-L are used, run HKDF-SHA###.\n"
+    " If -k is used, but not -i&-L, run HMAC-SHA###.\n"
+    " Otherwise, run SHA###.)\n"
+    "Standard tests:\n"
+      "\t%s [-m | -d] [-l loopcount] [-t test#] [-e]\n"
+      "\t\t[-r randomseed] [-R randomloop-count] "
+        "[-p] [-P|-X]\n"
+    "-h\thash to test: "
+      "0|SHA1, 1|SHA224, 2|SHA256, 3|SHA384, 4|SHA512\n"
+    "-m\tperform hmac standard tests\n"
+    "-k\tkey for hmac test\n"
+    "-d\tperform hkdf standard tests\n"
+    "-t\ttest case to run, 1-10\n"
+    "-l\thow many times to run the test\n"
+    "-e\ttest error returns\n"
+    "-p\tdo not print results\n"
+    "-P\tdo not print PASSED/FAILED\n"
+    "-X\tprint FAILED, but not PASSED\n"
+    "-r\tseed for random test\n"
+    "-R\thow many times to run random test\n"
+    "-s\tstring to hash\n"
+    "-S\texpected result of hashed string, in hex\n"
+    "-w\toutput hash in raw format\n"
+    "-x\toutput hash in hex format\n"
+    "-6\toutput hash in base64 format\n"
+
+
+
+Eastlake & Hansen             Informational                   [Page 108]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    "-B\t# extra bits to add in after string or file input\n"
+    "-b\textra bits to add (high order bits of #, 0# or 0x#)\n"
+    "-H\tinput hashstr or randomseed is in hex\n"
+    , argv0, argv0, argv0, argv0);
+  exit(1);
+}
+
+/*
+ * Print the results and PASS/FAIL.
+ */
+void printResult(uint8_t *Message_Digest, int hashsize,
+    const char *hashname, const char *testtype, const char *testname,
+    const char *resultarray, int printResults, int printPassFail)
+{
+  int i, k;
+  if (printResults == PRINTTEXT) {
+    printf("\nhashsize=%d\n", hashsize);
+    putchar('\t');
+    for (i = 0; i < hashsize; ++i) {
+      putchar(hexdigits[(Message_Digest[i] >> 4) & 0xF]);
+      putchar(hexdigits[Message_Digest[i] & 0xF]);
+      putchar(' ');
+    }
+    putchar('\n');
+  } else if (printResults == PRINTRAW) {
+    fwrite(Message_Digest, 1, hashsize, stdout);
+  } else if (printResults == PRINTHEX) {
+    for (i = 0; i < hashsize; ++i) {
+      putchar(hexdigits[(Message_Digest[i] >> 4) & 0xF]);
+      putchar(hexdigits[Message_Digest[i] & 0xF]);
+    }
+    putchar('\n');
+  } else if (printResults == PRINTBASE64) {
+    unsigned char b;
+    char *sm = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+               "0123456789+/";
+    for (i = 0; i < hashsize; i += 3) {
+      putchar(sm[Message_Digest[i] >> 2]);
+      b = (Message_Digest[i] & 0x03) << 4;
+      if (i+1 < hashsize) b |= Message_Digest[i+1] >> 4;
+      putchar(sm[b]);
+      if (i+1 < hashsize) {
+        b = (Message_Digest[i+1] & 0x0f) << 2;
+        if (i+2 < hashsize) b |= Message_Digest[i+2] >> 6;
+        putchar(sm[b]);
+      } else putchar('=');
+      if (i+2 < hashsize) putchar(sm[Message_Digest[i+2] & 0x3f]);
+      else putchar('=');
+
+
+
+Eastlake & Hansen             Informational                   [Page 109]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    }
+    putchar('\n');
+  }
+
+  if (printResults && resultarray) {
+    printf("    Should match:\n\t");
+    for (i = 0, k = 0; i < hashsize; i++, k += 2) {
+      putchar(resultarray[k]);
+      putchar(resultarray[k+1]);
+      putchar(' ');
+    }
+    putchar('\n');
+  }
+
+  if (printPassFail && resultarray) {
+    int ret = checkmatch(Message_Digest, resultarray, hashsize);
+    if ((printPassFail == PRINTPASSFAIL) || !ret)
+      printf("%s %s %s: %s\n", hashname, testtype, testname,
+        ret ? "PASSED" : "FAILED");
+  }
+}
+
+/*
+ * Exercise a hash series of functions.  The input is the testarray,
+ * repeated repeatcount times, followed by the extrabits.  If the
+ * result is known, it is in resultarray in uppercase hex.
+ */
+int hash(int testno, int loopno, int hashno,
+  const char *testarray, int length, long repeatcount,
+  int numberExtrabits, int extrabits, const unsigned char *keyarray,
+  int keylen, const unsigned char *info, int infolen, int okmlen,
+  const char *resultarray, int hashsize, int printResults,
+  int printPassFail)
+{
+  USHAContext sha;
+  HMACContext hmac;
+  HKDFContext hkdf;
+  int err, i;
+  uint8_t Message_Digest_Buf[USHAMaxHashSize];
+  uint8_t *Message_Digest = Message_Digest_Buf;
+  char buf[20];
+
+  if (printResults == PRINTTEXT) {
+    printf("\nTest %d: Iteration %d, Repeat %ld\n\t'", testno+1,
+      loopno, repeatcount);
+    printstr(testarray, length);
+    printf("'\n\t'");
+    printxstr(testarray, length);
+
+
+
+Eastlake & Hansen             Informational                   [Page 110]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    printf("'\n");
+    printf("    Length=%d bytes (%d bits), ", length, length * 8);
+    printf("ExtraBits %d: %2.2x\n", numberExtrabits, extrabits);
+  }
+
+  if (info) Message_Digest = malloc(okmlen);
+  memset(&sha, '\343', sizeof(sha)); /* force bad data into struct */
+  memset(&hmac, '\343', sizeof(hmac));
+  memset(&hkdf, '\343', sizeof(hkdf));
+
+  err = info ? hkdfReset(&hkdf, hashes[hashno].whichSha,
+                             keyarray, keylen) :
+        keyarray ? hmacReset(&hmac, hashes[hashno].whichSha,
+                             keyarray, keylen) :
+                   USHAReset(&sha, hashes[hashno].whichSha);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hash(): %sReset Error %d.\n",
+            info ? "hkdf" : keyarray ? "hmac" : "sha", err);
+    return err;
+  }
+
+  for (i = 0; i < repeatcount; ++i) {
+    err = info ? hkdfInput(&hkdf, (const uint8_t *)testarray, length) :
+          keyarray ? hmacInput(&hmac, (const uint8_t *) testarray,
+                               length) :
+                     USHAInput(&sha, (const uint8_t *) testarray,
+                               length);
+    if (err != shaSuccess) {
+      fprintf(stderr, "hash(): %sInput Error %d.\n",
+              info ? "hkdf" : keyarray ? "hmac" : "sha", err);
+      return err;
+    }
+  }
+
+  if (numberExtrabits > 0) {
+    err = info ? hkdfFinalBits(&hkdf, extrabits, numberExtrabits) :
+          keyarray ? hmacFinalBits(&hmac, (uint8_t) extrabits,
+                                   numberExtrabits) :
+                     USHAFinalBits(&sha, (uint8_t) extrabits,
+                                   numberExtrabits);
+    if (err != shaSuccess) {
+      fprintf(stderr, "hash(): %sFinalBits Error %d.\n",
+              info ? "hkdf" : keyarray ? "hmac" : "sha", err);
+      return err;
+    }
+  }
+
+  err = info ? hkdfResult(&hkdf, 0, info, infolen,
+
+
+
+Eastlake & Hansen             Informational                   [Page 111]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+                          Message_Digest, okmlen) :
+        keyarray ? hmacResult(&hmac, Message_Digest) :
+                   USHAResult(&sha, Message_Digest);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hash(): %s Result Error %d, could not compute "
+      "message digest.\n",
+      info ? "hkdf" : keyarray ? "hmac" : "sha", err);
+    return err;
+  }
+
+  sprintf(buf, "%d", testno+1);
+  printResult(Message_Digest, info ? okmlen : hashsize,
+    hashes[hashno].name, info ? "hkdf standard test" :
+    keyarray ? "hmac standard test" : "sha standard test", buf,
+    resultarray, printResults, printPassFail);
+
+  return err;
+}
+
+/*
+ * Exercise an HKDF series.  The input is the testarray,
+ * repeated repeatcount times, followed by the extrabits.  If the
+ * result is known, it is in resultarray in uppercase hex.
+ */
+int hashHkdf(int testno, int loopno, int hashno,
+  int printResults, int printPassFail)
+{
+  int err;
+  unsigned char prk[USHAMaxHashSize+1];
+  uint8_t okm[255 * USHAMaxHashSize+1];
+  char buf[20];
+
+  if (printResults == PRINTTEXT) {
+    printf("\nTest %d: Iteration %d\n\tSALT\t'", testno+1, loopno);
+    printxstr(hkdfhashes[testno].saltarray,
+      hkdfhashes[testno].saltlength);
+    printf("'\n\tIKM\t'");
+    printxstr(hkdfhashes[testno].ikmarray,
+      hkdfhashes[testno].ikmlength);
+    printf("'\n\tINFO\t'");
+    printxstr(hkdfhashes[testno].infoarray,
+      hkdfhashes[testno].infolength);
+    printf("'\n");
+    printf("    L=%d bytes\n", hkdfhashes[testno].okmlength);
+  }
+
+  /* Run hkdf() against the test vectors */
+  err = hkdf(hkdfhashes[testno].whichSha,
+
+
+
+Eastlake & Hansen             Informational                   [Page 112]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+             (const uint8_t *) hkdfhashes[testno].saltarray,
+             hkdfhashes[testno].saltlength,
+             (const uint8_t *) hkdfhashes[testno].ikmarray,
+             hkdfhashes[testno].ikmlength,
+             (const uint8_t *) hkdfhashes[testno].infoarray,
+             hkdfhashes[testno].infolength, okm,
+             hkdfhashes[testno].okmlength);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hashHkdf(): hkdf Error %d.\n", err);
+    return err;
+  }
+  sprintf(buf, "hkdf %d", testno+1);
+  printResult(okm, hkdfhashes[testno].okmlength,
+    USHAHashName(hkdfhashes[testno].whichSha), "hkdf standard test",
+    buf, hkdfhashes[testno].okmarray, printResults, printPassFail);
+
+  /* Now run hkdfExtract() by itself against the test vectors */
+  /* to verify the intermediate results. */
+  err = hkdfExtract(hkdfhashes[testno].whichSha,
+                    (const uint8_t *) hkdfhashes[testno].saltarray,
+                    hkdfhashes[testno].saltlength,
+                    (const uint8_t *) hkdfhashes[testno].ikmarray,
+                    hkdfhashes[testno].ikmlength, prk);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hashHkdf(): hkdfExtract Error %d.\n", err);
+    return err;
+  }
+  sprintf(buf, "hkdfExtract %d", testno+1);
+  printResult(prk, USHAHashSize(hkdfhashes[testno].whichSha),
+    USHAHashName(hkdfhashes[testno].whichSha), "hkdf standard test",
+    buf, hkdfhashes[testno].prkarray, printResults, printPassFail);
+
+  /* Now run hkdfExpand() by itself against the test vectors */
+  /* using the intermediate results from hkdfExtract. */
+  err = hkdfExpand(hkdfhashes[testno].whichSha, prk,
+    USHAHashSize(hkdfhashes[testno].whichSha),
+    (const uint8_t *)hkdfhashes[testno].infoarray,
+    hkdfhashes[testno].infolength, okm, hkdfhashes[testno].okmlength);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hashHkdf(): hkdfExpand Error %d.\n", err);
+    return err;
+  }
+  sprintf(buf, "hkdfExpand %d", testno+1);
+  printResult(okm, hkdfhashes[testno].okmlength,
+    USHAHashName(hkdfhashes[testno].whichSha), "hkdf standard test",
+    buf, hkdfhashes[testno].okmarray, printResults, printPassFail);
+
+  return err;
+
+
+
+Eastlake & Hansen             Informational                   [Page 113]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+}
+
+/*
+ * Exercise a hash series of functions.  The input is a filename.
+ * If the result is known, it is in resultarray in uppercase hex.
+ */
+int hashfile(int hashno, const char *hashfilename, int bits,
+  int bitcount, int skipSpaces, const unsigned char *keyarray,
+  int keylen, const unsigned char *info, int infolen, int okmlen,
+  const char *resultarray, int hashsize,
+  int printResults, int printPassFail)
+{
+  USHAContext sha;
+  HMACContext hmac;
+  HKDFContext hkdf;
+  int err, nread, c;
+  unsigned char buf[4096];
+  uint8_t Message_Digest_Buf[USHAMaxHashSize];
+  uint8_t *Message_Digest = Message_Digest_Buf;
+  unsigned char cc;
+  FILE *hashfp = (strcmp(hashfilename, "-") == 0) ? stdin :
+    fopen(hashfilename, "r");
+
+  if (!hashfp) {
+    fprintf(stderr, "cannot open file '%s'\n", hashfilename);
+    return shaStateError;
+  }
+
+  if (info) Message_Digest = malloc(okmlen);
+  memset(&sha, '\343', sizeof(sha)); /* force bad data into struct */
+  memset(&hmac, '\343', sizeof(hmac));
+  memset(&hkdf, '\343', sizeof(hkdf));
+  err = info ? hkdfReset(&hkdf, hashes[hashno].whichSha,
+                             keyarray, keylen) :
+        keyarray ? hmacReset(&hmac, hashes[hashno].whichSha,
+                             keyarray, keylen) :
+                   USHAReset(&sha, hashes[hashno].whichSha);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hashfile(): %sReset Error %d.\n",
+            info ? "hkdf" : keyarray ? "hmac" : "sha", err);
+    return err;
+  }
+
+  if (skipSpaces)
+    while ((c = getc(hashfp)) != EOF) {
+      if (!isspace(c)) {
+        cc = (unsigned char)c;
+        err = info ? hkdfInput(&hkdf, &cc, 1) :
+
+
+
+Eastlake & Hansen             Informational                   [Page 114]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+              keyarray ? hmacInput(&hmac, &cc, 1) :
+                         USHAInput(&sha, &cc, 1);
+        if (err != shaSuccess) {
+          fprintf(stderr, "hashfile(): %sInput Error %d.\n",
+                  info ? "hkdf" : keyarray ? "hmac" : "sha", err);
+          if (hashfp != stdin) fclose(hashfp);
+          return err;
+        }
+      }
+    }
+  else
+    while ((nread = fread(buf, 1, sizeof(buf), hashfp)) > 0) {
+      err = info ? hkdfInput(&hkdf, buf, nread) :
+            keyarray ? hmacInput(&hmac, buf, nread) :
+                       USHAInput(&sha, buf, nread);
+      if (err != shaSuccess) {
+        fprintf(stderr, "hashfile(): %s Error %d.\n",
+                info ? "hkdf" : keyarray ? "hmacInput" :
+                "shaInput", err);
+        if (hashfp != stdin) fclose(hashfp);
+        return err;
+      }
+    }
+
+  if (bitcount > 0)
+    err = info ? hkdfFinalBits(&hkdf, bits, bitcount) :
+          keyarray ? hmacFinalBits(&hmac, bits, bitcount) :
+                   USHAFinalBits(&sha, bits, bitcount);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hashfile(): %s Error %d.\n",
+            info ? "hkdf" : keyarray ? "hmacFinalBits" :
+            "shaFinalBits", err);
+    if (hashfp != stdin) fclose(hashfp);
+    return err;
+  }
+
+  err = info ? hkdfResult(&hkdf, 0, info, infolen,
+                          Message_Digest, okmlen) :
+        keyarray ? hmacResult(&hmac, Message_Digest) :
+                   USHAResult(&sha, Message_Digest);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hashfile(): %s Error %d.\n",
+            info ? "hkdf" : keyarray ? "hmacResult" :
+            "shaResult", err);
+    if (hashfp != stdin) fclose(hashfp);
+    return err;
+  }
+
+
+
+
+Eastlake & Hansen             Informational                   [Page 115]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  printResult(Message_Digest, info ? okmlen : hashsize,
+    hashes[hashno].name, "file", hashfilename, resultarray,
+    printResults, printPassFail);
+
+  if (hashfp != stdin) fclose(hashfp);
+  if (info) free(Message_Digest);
+  return err;
+}
+
+/*
+ * Exercise a hash series of functions through multiple permutations.
+ * The input is an initial seed.  That seed is replicated 3 times.
+ * For 1000 rounds, the previous three results are used as the input.
+ * This result is then checked, and used to seed the next cycle.
+ * If the result is known, it is in resultarrays in uppercase hex.
+ */
+void randomtest(int hashno, const char *seed, int hashsize,
+    const char **resultarrays, int randomcount,
+    int printResults, int printPassFail)
+{
+  int i, j; char buf[20];
+  unsigned char SEED[USHAMaxHashSize], MD[1003][USHAMaxHashSize];
+
+  /* INPUT: Seed - A random seed n bits long */
+  memcpy(SEED, seed, hashsize);
+  if (printResults == PRINTTEXT) {
+    printf("%s random test seed= '", hashes[hashno].name);
+    printxstr(seed, hashsize);
+    printf("'\n");
+  }
+
+  for (j = 0; j < randomcount; j++) {
+    /* MD0 = MD1 = MD2 = Seed; */
+    memcpy(MD[0], SEED, hashsize);
+    memcpy(MD[1], SEED, hashsize);
+    memcpy(MD[2], SEED, hashsize);
+    for (i=3; i<1003; i++) {
+      /* Mi = MDi-3 || MDi-2 || MDi-1; */
+      USHAContext Mi;
+      memset(&Mi, '\343', sizeof(Mi)); /* force bad data into struct */
+      USHAReset(&Mi, hashes[hashno].whichSha);
+      USHAInput(&Mi, MD[i-3], hashsize);
+      USHAInput(&Mi, MD[i-2], hashsize);
+      USHAInput(&Mi, MD[i-1], hashsize);
+      /* MDi = SHA(Mi); */
+      USHAResult(&Mi, MD[i]);
+    }
+
+
+
+
+Eastlake & Hansen             Informational                   [Page 116]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    /* MDj = Seed = MDi; */
+    memcpy(SEED, MD[i-1], hashsize);
+
+    /* OUTPUT: MDj */
+    sprintf(buf, "%d", j);
+    printResult(SEED, hashsize, hashes[hashno].name, "random test",
+      buf, resultarrays ? resultarrays[j] : 0, printResults,
+      (j < RANDOMCOUNT) ? printPassFail : 0);
+  }
+}
+
+/*
+ * Look up a hash name.
+ */
+int findhash(const char *argv0, const char *opt)
+{
+  int i;
+  const char *names[HASHCOUNT][2] = {
+    { "0", "sha1" }, { "1", "sha224" }, { "2", "sha256" },
+    { "3", "sha384" }, { "4", "sha512" }
+  };
+  for (i = 0; i < HASHCOUNT; i++)
+    if ((strcmp(opt, names[i][0]) == 0) ||
+        (scasecmp(opt, names[i][1]) == 0))
+      return i;
+
+  fprintf(stderr, "%s: Unknown hash name: '%s'\n", argv0, opt);
+  usage(argv0);
+  return 0;
+}
+
+/*
+ * Run some tests that should invoke errors.
+ */
+void testErrors(int hashnolow, int hashnohigh, int printResults,
+    int printPassFail)
+{
+  USHAContext usha;
+  uint8_t Message_Digest[USHAMaxHashSize];
+  int hashno, err;
+
+  for (hashno = hashnolow; hashno <= hashnohigh; hashno++) {
+    memset(&usha, '\343', sizeof(usha)); /* force bad data */
+    USHAReset(&usha, hashno);
+    USHAResult(&usha, Message_Digest);
+    err = USHAInput(&usha, (const unsigned char *)"foo", 3);
+    if (printResults == PRINTTEXT)
+      printf ("\nError %d. Should be %d.\n", err, shaStateError);
+
+
+
+Eastlake & Hansen             Informational                   [Page 117]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    if ((printPassFail == PRINTPASSFAIL) ||
+        ((printPassFail == PRINTFAIL) && (err != shaStateError)))
+      printf("%s se: %s\n", hashes[hashno].name,
+        (err == shaStateError) ? "PASSED" : "FAILED");
+
+    err = USHAFinalBits(&usha, 0x80, 3);
+    if (printResults == PRINTTEXT)
+      printf ("\nError %d. Should be %d.\n", err, shaStateError);
+    if ((printPassFail == PRINTPASSFAIL) ||
+        ((printPassFail == PRINTFAIL) && (err != shaStateError)))
+      printf("%s se: %s\n", hashes[hashno].name,
+        (err == shaStateError) ? "PASSED" : "FAILED");
+
+    err = USHAReset(0, hashes[hashno].whichSha);
+    if (printResults == PRINTTEXT)
+       printf("\nError %d. Should be %d.\n", err, shaNull);
+    if ((printPassFail == PRINTPASSFAIL) ||
+        ((printPassFail == PRINTFAIL) && (err != shaNull)))
+       printf("%s usha null: %s\n", hashes[hashno].name,
+        (err == shaNull) ? "PASSED" : "FAILED");
+
+    switch (hashno) {
+      case SHA1: err = SHA1Reset(0); break;
+      case SHA224: err = SHA224Reset(0); break;
+      case SHA256: err = SHA256Reset(0); break;
+      case SHA384: err = SHA384Reset(0); break;
+      case SHA512: err = SHA512Reset(0); break;
+    }
+    if (printResults == PRINTTEXT)
+       printf("\nError %d. Should be %d.\n", err, shaNull);
+    if ((printPassFail == PRINTPASSFAIL) ||
+        ((printPassFail == PRINTFAIL) && (err != shaNull)))
+       printf("%s sha null: %s\n", hashes[hashno].name,
+        (err == shaNull) ? "PASSED" : "FAILED");
+  }
+}
+
+/* replace a hex string in place with its value */
+int unhexStr(char *hexstr)
+{
+  char *o = hexstr;
+  int len = 0, nibble1 = 0, nibble2 = 0;
+  if (!hexstr) return 0;
+  for ( ; *hexstr; hexstr++) {
+    if (isalpha((int)(unsigned char)(*hexstr))) {
+      nibble1 = tolower((int)(unsigned char)(*hexstr)) - 'a' + 10;
+    } else if (isdigit((int)(unsigned char)(*hexstr))) {
+      nibble1 = *hexstr - '0';
+
+
+
+Eastlake & Hansen             Informational                   [Page 118]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+    } else {
+      printf("\nError: bad hex character '%c'\n", *hexstr);
+    }
+    if (!*++hexstr) break;
+    if (isalpha((int)(unsigned char)(*hexstr))) {
+      nibble2 = tolower((int)(unsigned char)(*hexstr)) - 'a' + 10;
+    } else if (isdigit((int)(unsigned char)(*hexstr))) {
+      nibble2 = *hexstr - '0';
+    } else {
+      printf("\nError: bad hex character '%c'\n", *hexstr);
+    }
+    *o++ = (char)((nibble1 << 4) | nibble2);
+    len++;
+  }
+  return len;
+}
+
+int main(int argc, char **argv)
+{
+  int i, err;
+  int loopno, loopnohigh = 1;
+  int hashno, hashnolow = 0, hashnohigh = HASHCOUNT - 1;
+  int testno, testnolow = 0, testnohigh;
+  int ntestnohigh = 0;
+  int printResults = PRINTTEXT;
+  int printPassFail = 1;
+  int checkErrors = 0;
+  char *hashstr = 0;
+  int hashlen = 0;
+  const char *resultstr = 0;
+  char *randomseedstr = 0;
+  int runHmacTests = 0;
+  int runHkdfTests = 0;
+  char *hmacKey = 0;
+  int hmaclen = 0;
+  char *info = 0;
+  int infolen = 0, okmlen = 0;
+  int randomcount = RANDOMCOUNT;
+  const char *hashfilename = 0;
+  const char *hashFilename = 0;
+  int extrabits = 0, numberExtrabits = 0;
+  int strIsHex = 0;
+
+  if ('A' != 0x41) {
+    fprintf(stderr, "%s: these tests require ASCII\n", argv[0]);
+  }
+
+  while ((i = getopt(argc, argv,
+
+
+
+Eastlake & Hansen             Informational                   [Page 119]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+                      "6b:B:def:F:h:i:Hk:l:L:mpPr:R:s:S:t:wxX")) != -1)
+    switch (i) {
+      case 'b': extrabits = strtol(optarg, 0, 0); break;
+      case 'B': numberExtrabits = atoi(optarg); break;
+      case 'd': runHkdfTests = 1; break;
+      case 'e': checkErrors = 1; break;
+      case 'f': hashfilename = optarg; break;
+      case 'F': hashFilename = optarg; break;
+      case 'h': hashnolow = hashnohigh = findhash(argv[0], optarg);
+        break;
+      case 'H': strIsHex = 1; break;
+      case 'i': info = optarg; infolen = strlen(optarg); break;
+      case 'k': hmacKey = optarg; hmaclen = strlen(optarg); break;
+      case 'l': loopnohigh = atoi(optarg); break;
+      case 'L': okmlen = strtol(optarg, 0, 0); break;
+      case 'm': runHmacTests = 1; break;
+      case 'P': printPassFail = 0; break;
+      case 'p': printResults = PRINTNONE; break;
+      case 'R': randomcount = atoi(optarg); break;
+      case 'r': randomseedstr = optarg; break;
+      case 's': hashstr = optarg; hashlen = strlen(hashstr); break;
+      case 'S': resultstr = optarg; break;
+      case 't': testnolow = ntestnohigh = atoi(optarg) - 1; break;
+      case 'w': printResults = PRINTRAW; break;
+      case 'x': printResults = PRINTHEX; break;
+      case 'X': printPassFail = 2; break;
+      case '6': printResults = PRINTBASE64; break;
+      default: usage(argv[0]);
+      }
+
+  if (strIsHex) {
+    hashlen = unhexStr(hashstr);
+    unhexStr(randomseedstr);
+    hmaclen = unhexStr(hmacKey);
+    infolen = unhexStr(info);
+  }
+  testnohigh = (ntestnohigh != 0) ? ntestnohigh:
+               runHmacTests ? (HMACTESTCOUNT-1) :
+               runHkdfTests ? (HKDFTESTCOUNT-1) :
+               (TESTCOUNT-1);
+  if ((testnolow < 0) ||
+      (testnohigh >= (runHmacTests ? HMACTESTCOUNT : TESTCOUNT)) ||
+      (hashnolow < 0) || (hashnohigh >= HASHCOUNT) ||
+      (hashstr && (testnolow == testnohigh)) ||
+      (randomcount < 0) ||
+      (resultstr && (!hashstr && !hashfilename && !hashFilename)) ||
+      ((runHmacTests || hmacKey) && randomseedstr) ||
+      (hashfilename && hashFilename) ||
+
+
+
+Eastlake & Hansen             Informational                   [Page 120]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+      (info && ((infolen <= 0) || (okmlen <= 0))) ||
+      (info && !hmacKey))
+    usage(argv[0]);
+
+  /*
+   *  Perform SHA/HMAC tests
+   */
+  for (hashno = hashnolow; hashno <= hashnohigh; ++hashno) {
+    if (printResults == PRINTTEXT)
+      printf("Hash %s\n", hashes[hashno].name);
+    err = shaSuccess;
+
+    for (loopno = 1; (loopno <= loopnohigh) && (err == shaSuccess);
+         ++loopno) {
+      if (hashstr)
+        err = hash(0, loopno, hashno, hashstr, hashlen, 1,
+          numberExtrabits, extrabits, (const unsigned char *)hmacKey,
+          hmaclen, (const uint8_t *) info, infolen, okmlen, resultstr,
+          hashes[hashno].hashsize, printResults, printPassFail);
+
+      else if (randomseedstr)
+        randomtest(hashno, randomseedstr, hashes[hashno].hashsize, 0,
+          randomcount, printResults, printPassFail);
+
+      else if (hashfilename)
+        err = hashfile(hashno, hashfilename, extrabits,
+                       numberExtrabits, 0,
+                       (const unsigned char *)hmacKey, hmaclen,
+                       (const uint8_t *) info, infolen, okmlen,
+                       resultstr, hashes[hashno].hashsize,
+                       printResults, printPassFail);
+
+      else if (hashFilename)
+        err = hashfile(hashno, hashFilename, extrabits,
+                       numberExtrabits, 1,
+                       (const unsigned char *)hmacKey, hmaclen,
+                       (const uint8_t *) info, infolen, okmlen,
+                       resultstr, hashes[hashno].hashsize,
+                       printResults, printPassFail);
+
+      else /* standard tests */ {
+        for (testno = testnolow;
+             (testno <= testnohigh) && (err == shaSuccess); ++testno) {
+          if (runHmacTests) {
+            err = hash(testno, loopno, hashno,
+                       hmachashes[testno].dataarray[hashno] ?
+                       hmachashes[testno].dataarray[hashno] :
+                       hmachashes[testno].dataarray[1] ?
+
+
+
+Eastlake & Hansen             Informational                   [Page 121]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+                       hmachashes[testno].dataarray[1] :
+                       hmachashes[testno].dataarray[0],
+                       hmachashes[testno].datalength[hashno] ?
+                       hmachashes[testno].datalength[hashno] :
+                       hmachashes[testno].datalength[1] ?
+                       hmachashes[testno].datalength[1] :
+                       hmachashes[testno].datalength[0],
+                       1, 0, 0,
+                       (const unsigned char *)(
+                        hmachashes[testno].keyarray[hashno] ?
+                        hmachashes[testno].keyarray[hashno] :
+                        hmachashes[testno].keyarray[1] ?
+                        hmachashes[testno].keyarray[1] :
+                        hmachashes[testno].keyarray[0]),
+                       hmachashes[testno].keylength[hashno] ?
+                       hmachashes[testno].keylength[hashno] :
+                       hmachashes[testno].keylength[1] ?
+                       hmachashes[testno].keylength[1] :
+                       hmachashes[testno].keylength[0],
+                       0, 0, 0,
+                       hmachashes[testno].resultarray[hashno],
+                       hmachashes[testno].resultlength[hashno],
+                       printResults, printPassFail);
+          } else if (runHkdfTests) {
+            err = hashHkdf(testno, loopno, hashno,
+                       printResults, printPassFail);
+          } else { /* sha tests */
+            err = hash(testno, loopno, hashno,
+                       hashes[hashno].tests[testno].testarray,
+                       hashes[hashno].tests[testno].length,
+                       hashes[hashno].tests[testno].repeatcount,
+                       hashes[hashno].tests[testno].numberExtrabits,
+                       hashes[hashno].tests[testno].extrabits,
+                       0, 0, 0, 0, 0,
+                       hashes[hashno].tests[testno].resultarray,
+                       hashes[hashno].hashsize,
+                       printResults, printPassFail);
+          }
+        }
+        if (!runHmacTests && !runHkdfTests) {
+          randomtest(hashno, hashes[hashno].randomtest,
+            hashes[hashno].hashsize, hashes[hashno].randomresults,
+            RANDOMCOUNT, printResults, printPassFail);
+        }
+      }
+    }
+  }
+
+
+
+
+Eastlake & Hansen             Informational                   [Page 122]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+  /* Test some error returns */
+  if (checkErrors) {
+    testErrors(hashnolow, hashnohigh, printResults, printPassFail);
+  }
+
+  return 0;
+}
+
+/*
+ * Compare two strings, case independently.
+ * Equivalent to strcasecmp() found on some systems.
+ */
+int scasecmp(const char *s1, const char *s2)
+{
+  for (;;) {
+    char u1 = tolower((int)(unsigned char)(*s1++));
+    char u2 = tolower((int)(unsigned char)(*s2++));
+    if (u1 != u2)
+      return u1 - u2;
+    if (u1 == '\0')
+      return 0;
+   }
+}
+
+9.  Security Considerations
+
+   This document is intended to provide convenient open source access by
+   the Internet community to the United States of America Federal
+   Information Processing Standard Secure Hash Algorithms (SHAs) [FIPS
+   180-2], HMACs based thereon, and HKDF.  No independent assertion of
+   the security of these functions by the authors for any particular use
+   is intended.
+
+   See [RFC6194] for a discussion of SHA-1 Security Considerations.
+
+10.  Acknowledgements
+
+   Thanks for the corrections to [RFC4634] that were provided by Alfred
+   Hoenes and Jan Andres and to Alfred's comments on the document
+   hereof.
+
+   Also to the following in alphabetic order, whose comments lead to
+   improvements in the document: James Carlson, Russ Housley, Tero
+   Kivinen, Juergen Quittek, and Sean Turner.
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                   [Page 123]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+11.  References
+
+11.1.  Normative References
+
+   [RFC2104]  Krawczyk, H., Bellare, M., and R. Canetti, "HMAC: Keyed-
+              Hashing for Message Authentication", RFC 2104, February
+              1997.
+
+   [RFC5869]  Krawczyk, H. and P. Eronen, "HMAC-based Extract-and-Expand
+              Key Derivation Function (HKDF)", RFC 5869, May 2010.
+
+   [SHS]      "Secure Hash Standard", United States of American,
+              National Institute of Science and Technology, Federal
+              Information Processing Standard (FIPS) 180-3,
+              http://csrc.nist.gov/publications/fips/fips180-3/
+              fips180-3_final.pdf.
+
+   [US-ASCII] ANSI, "USA Standard Code for Information Interchange",
+              X3.4, American National Standards Institute: New York,
+              1968.
+
+11.2.  Informative References
+
+   [RFC3174]  Eastlake 3rd, D. and P. Jones, "US Secure Hash Algorithm 1
+              (SHA1)", RFC 3174, September 2001.
+
+              [RFC3874]  Housley, R., "A 224-bit One-way Hash Function:
+              SHA-224", RFC 3874, September 2004.
+
+   [RFC4055]  Schaad, J., Kaliski, B., and R. Housley, "Additional
+              Algorithms and Identifiers for RSA Cryptography for use in
+              the Internet X.509 Public Key Infrastructure Certificate
+              and Certificate Revocation List (CRL) Profile", RFC 4055,
+              June 2005.
+
+   [RFC4086]  Eastlake 3rd, D., Schiller, J., and S. Crocker,
+              "Randomness Requirements for Security", BCP 106, RFC 4086,
+              June 2005.
+
+   [RFC4634]  Eastlake 3rd, D. and T. Hansen, "US Secure Hash Algorithms
+              (SHA and HMAC-SHA)", RFC 4634, July 2006.
+
+   [RFC6194]  Polk, T., Chen, L., Turner, S., and P. Hoffman, "Security
+              Considerations for the SHA-0 and SHA-1 Message-Digest
+              Algorithms", RFC 6194, March 2011.
+
+
+
+
+
+
+Eastlake & Hansen             Informational                   [Page 124]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+   [SHAVS]    "The Secure Hash Algorithm Validation System (SHAVS)",
+              http://csrc.nist.gov/groups/STM/cavp/documents/shs/
+              SHAVS.pdf,  July 2004.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                   [Page 125]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+Appendix: Changes from RFC 4634
+
+   The following changes were made to RFC 4634 to produce this document:
+
+   1. Add code for HKDF and brief text about HKDF with pointer to
+      [RFC5869].
+
+   2. Fix numerous errata filed against [RFC4634] as included below.
+      Note that in no case did the old code return an incorrect hash
+      value.
+
+      2.a. Correct some of the error return values which has erroneously
+           been "shaNull" to the correct "shaInputTooLong" error.
+
+      2.b. Update comments and variable names within the code for
+           consistency and clarity and other editorial changes.
+
+      2.c. The previous code for SHA-384 and SHA-512 would stop after
+           2^93 bytes (2^96 bits).  The fixed code handles up to 2^125
+           bytes (2^128 bits).
+
+      2.d. Add additional error checking including a run time check in
+           the test driver to detect attempts to run the test driver
+           after compilation using some other character set instead of
+           [US-ASCII].
+
+   3. Update boilerplate, remove special license in [RFC4634] as new
+      boilerplate mandates simplified BSD license.
+
+   4. Replace MIT version of getopt with new code to satisfy IETF
+      incoming and outgoing license restrictions.
+
+   5. Add references to [RFC6194].
+
+   6. Other assorted editorial improvements.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                   [Page 126]
+
+RFC 6234                SHAs, HMAC-SHAs, and HKDF               May 2011
+
+
+Author's Address
+
+   Donald Eastlake
+   Huawei
+   155 Beaver Street
+   Milford, MA 01757 USA
+
+   Telephone:   +1-508-333-2270
+   EMail:       d3e3e3@gmail.com
+
+
+   Tony Hansen
+   AT&T Laboratories
+   200 Laurel Ave.
+   Middletown, NJ 07748 USA
+
+   Telephone:   +1-732-420-8934
+   EMail:       tony+shs@maillennium.att.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Eastlake & Hansen             Informational                   [Page 127]
+
diff --git a/components/homekit/hkdf-sha/upstream/sha-private.h b/components/homekit/hkdf-sha/upstream/sha-private.h
new file mode 100644
index 0000000..9ccc8dd
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/sha-private.h
@@ -0,0 +1,29 @@
+/************************ sha-private.h ************************/
+/***************** See RFC 6234 for details. *******************/
+#ifndef _SHA_PRIVATE__H
+#define _SHA_PRIVATE__H
+/*
+ * These definitions are defined in FIPS 180-3, section 4.1.
+ * Ch() and Maj() are defined identically in sections 4.1.1,
+ * 4.1.2, and 4.1.3.
+ *
+ * The definitions used in FIPS 180-3 are as follows:
+ */
+
+#ifndef USE_MODIFIED_MACROS
+#define SHA_Ch(x,y,z)        (((x) & (y)) ^ ((~(x)) & (z)))
+#define SHA_Maj(x,y,z)       (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+#else /* USE_MODIFIED_MACROS */
+/*
+ * The following definitions are equivalent and potentially faster.
+ */
+
+#define SHA_Ch(x, y, z)      (((x) & ((y) ^ (z))) ^ (z))
+#define SHA_Maj(x, y, z)     (((x) & ((y) | (z))) | ((y) & (z)))
+
+#endif /* USE_MODIFIED_MACROS */
+
+#define SHA_Parity(x, y, z)  ((x) ^ (y) ^ (z))
+
+#endif /* _SHA_PRIVATE__H */
+
diff --git a/components/homekit/hkdf-sha/upstream/sha.h b/components/homekit/hkdf-sha/upstream/sha.h
new file mode 100644
index 0000000..276c368
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/sha.h
@@ -0,0 +1,358 @@
+/**************************** sha.h ****************************/
+/***************** See RFC 6234 for details. *******************/
+/*
+   Copyright (c) 2011 IETF Trust and the persons identified as
+   authors of the code.  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or
+   without modification, are permitted provided that the following
+   conditions are met:
+
+   - Redistributions of source code must retain the above
+     copyright notice, this list of conditions and
+     the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following
+     disclaimer in the documentation and/or other materials provided
+     with the distribution.
+
+   - Neither the name of Internet Society, IETF or IETF Trust, nor
+     the names of specific contributors, may be used to endorse or
+     promote products derived from this software without specific
+     prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+   CONTRIBUTORS "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 COPYRIGHT OWNER 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 _SHA_H_
+#define _SHA_H_
+
+/*
+ *  Description:
+ *      This file implements the Secure Hash Algorithms
+ *      as defined in the U.S. National Institute of Standards
+ *      and Technology Federal Information Processing Standards
+ *      Publication (FIPS PUB) 180-3 published in October 2008
+ *      and formerly defined in its predecessors, FIPS PUB 180-1
+ *      and FIP PUB 180-2.
+ *
+ *      A combined document showing all algorithms is available at
+ *              http://csrc.nist.gov/publications/fips/
+ *                     fips180-3/fips180-3_final.pdf
+ *
+ *      The five hashes are defined in these sizes:
+ *              SHA-1           20 byte / 160 bit
+ *              SHA-224         28 byte / 224 bit
+ *              SHA-256         32 byte / 256 bit
+ *              SHA-384         48 byte / 384 bit
+ *              SHA-512         64 byte / 512 bit
+ *
+ *  Compilation Note:
+ *    These files may be compiled with two options:
+ *        USE_32BIT_ONLY - use 32-bit arithmetic only, for systems
+ *                         without 64-bit integers
+ *
+ *        USE_MODIFIED_MACROS - use alternate form of the SHA_Ch()
+ *                         and SHA_Maj() macros that are equivalent
+ *                         and potentially faster on many systems
+ *
+ */
+
+#include <stdint.h>
+/*
+ * If you do not have the ISO standard stdint.h header file, then you
+ * must typedef the following:
+ *    name              meaning
+ *  uint64_t         unsigned 64-bit integer
+ *  uint32_t         unsigned 32-bit integer
+ *  uint8_t          unsigned 8-bit integer (i.e., unsigned char)
+ *  int_least16_t    integer of >= 16 bits
+ *
+ * See stdint-example.h
+ */
+
+#ifndef _SHA_enum_
+#define _SHA_enum_
+/*
+ *  All SHA functions return one of these values.
+ */
+enum {
+    shaSuccess = 0,
+    shaNull,            /* Null pointer parameter */
+    shaInputTooLong,    /* input data too long */
+    shaStateError,      /* called Input after FinalBits or Result */
+    shaBadParam         /* passed a bad parameter */
+};
+#endif /* _SHA_enum_ */
+
+/*
+ *  These constants hold size information for each of the SHA
+ *  hashing operations
+ */
+enum {
+    SHA1_Message_Block_Size = 64, SHA224_Message_Block_Size = 64,
+    SHA256_Message_Block_Size = 64, SHA384_Message_Block_Size = 128,
+    SHA512_Message_Block_Size = 128,
+    USHA_Max_Message_Block_Size = SHA512_Message_Block_Size,
+
+    SHA1HashSize = 20, SHA224HashSize = 28, SHA256HashSize = 32,
+    SHA384HashSize = 48, SHA512HashSize = 64,
+    USHAMaxHashSize = SHA512HashSize,
+
+    SHA1HashSizeBits = 160, SHA224HashSizeBits = 224,
+    SHA256HashSizeBits = 256, SHA384HashSizeBits = 384,
+    SHA512HashSizeBits = 512, USHAMaxHashSizeBits = SHA512HashSizeBits
+};
+
+/*
+ *  These constants are used in the USHA (Unified SHA) functions.
+ */
+typedef enum SHAversion {
+    SHA1, SHA224, SHA256, SHA384, SHA512
+} SHAversion;
+
+/*
+ *  This structure will hold context information for the SHA-1
+ *  hashing operation.
+ */
+typedef struct SHA1Context {
+    uint32_t Intermediate_Hash[SHA1HashSize/4]; /* Message Digest */
+
+    uint32_t Length_High;               /* Message length in bits */
+    uint32_t Length_Low;                /* Message length in bits */
+
+    int_least16_t Message_Block_Index;  /* Message_Block array index */
+                                        /* 512-bit message blocks */
+    uint8_t Message_Block[SHA1_Message_Block_Size];
+
+    int Computed;                   /* Is the hash computed? */
+    int Corrupted;                  /* Cumulative corruption code */
+} SHA1Context;
+
+/*
+ *  This structure will hold context information for the SHA-256
+ *  hashing operation.
+ */
+typedef struct SHA256Context {
+    uint32_t Intermediate_Hash[SHA256HashSize/4]; /* Message Digest */
+
+    uint32_t Length_High;               /* Message length in bits */
+    uint32_t Length_Low;                /* Message length in bits */
+
+    int_least16_t Message_Block_Index;  /* Message_Block array index */
+                                        /* 512-bit message blocks */
+    uint8_t Message_Block[SHA256_Message_Block_Size];
+
+    int Computed;                   /* Is the hash computed? */
+    int Corrupted;                  /* Cumulative corruption code */
+} SHA256Context;
+
+/*
+ *  This structure will hold context information for the SHA-512
+ *  hashing operation.
+ */
+typedef struct SHA512Context {
+#ifdef USE_32BIT_ONLY
+    uint32_t Intermediate_Hash[SHA512HashSize/4]; /* Message Digest  */
+    uint32_t Length[4];                 /* Message length in bits */
+#else /* !USE_32BIT_ONLY */
+    uint64_t Intermediate_Hash[SHA512HashSize/8]; /* Message Digest */
+    uint64_t Length_High, Length_Low;   /* Message length in bits */
+#endif /* USE_32BIT_ONLY */
+
+    int_least16_t Message_Block_Index;  /* Message_Block array index */
+                                        /* 1024-bit message blocks */
+    uint8_t Message_Block[SHA512_Message_Block_Size];
+
+    int Computed;                   /* Is the hash computed?*/
+    int Corrupted;                  /* Cumulative corruption code */
+} SHA512Context;
+
+/*
+ *  This structure will hold context information for the SHA-224
+ *  hashing operation.  It uses the SHA-256 structure for computation.
+ */
+typedef struct SHA256Context SHA224Context;
+
+/*
+ *  This structure will hold context information for the SHA-384
+ *  hashing operation.  It uses the SHA-512 structure for computation.
+ */
+typedef struct SHA512Context SHA384Context;
+
+/*
+ *  This structure holds context information for all SHA
+ *  hashing operations.
+ */
+typedef struct USHAContext {
+    int whichSha;               /* which SHA is being used */
+    union {
+      SHA1Context sha1Context;
+      SHA224Context sha224Context; SHA256Context sha256Context;
+      SHA384Context sha384Context; SHA512Context sha512Context;
+    } ctx;
+
+} USHAContext;
+
+/*
+ *  This structure will hold context information for the HMAC
+ *  keyed-hashing operation.
+ */
+typedef struct HMACContext {
+    int whichSha;               /* which SHA is being used */
+    int hashSize;               /* hash size of SHA being used */
+    int blockSize;              /* block size of SHA being used */
+    USHAContext shaContext;     /* SHA context */
+    unsigned char k_opad[USHA_Max_Message_Block_Size];
+                        /* outer padding - key XORd with opad */
+    int Computed;               /* Is the MAC computed? */
+    int Corrupted;              /* Cumulative corruption code */
+
+} HMACContext;
+
+/*
+ *  This structure will hold context information for the HKDF
+ *  extract-and-expand Key Derivation Functions.
+ */
+typedef struct HKDFContext {
+    int whichSha;               /* which SHA is being used */
+    HMACContext hmacContext;
+    int hashSize;               /* hash size of SHA being used */
+    unsigned char prk[USHAMaxHashSize];
+                        /* pseudo-random key - output of hkdfInput */
+    int Computed;               /* Is the key material computed? */
+    int Corrupted;              /* Cumulative corruption code */
+} HKDFContext;
+
+/*
+ *  Function Prototypes
+ */
+
+/* SHA-1 */
+extern int SHA1Reset(SHA1Context *);
+extern int SHA1Input(SHA1Context *, const uint8_t *bytes,
+                     unsigned int bytecount);
+extern int SHA1FinalBits(SHA1Context *, uint8_t bits,
+                         unsigned int bit_count);
+extern int SHA1Result(SHA1Context *,
+                      uint8_t Message_Digest[SHA1HashSize]);
+
+/* SHA-224 */
+extern int SHA224Reset(SHA224Context *);
+extern int SHA224Input(SHA224Context *, const uint8_t *bytes,
+                       unsigned int bytecount);
+extern int SHA224FinalBits(SHA224Context *, uint8_t bits,
+                           unsigned int bit_count);
+extern int SHA224Result(SHA224Context *,
+                        uint8_t Message_Digest[SHA224HashSize]);
+
+/* SHA-256 */
+extern int SHA256Reset(SHA256Context *);
+extern int SHA256Input(SHA256Context *, const uint8_t *bytes,
+                       unsigned int bytecount);
+extern int SHA256FinalBits(SHA256Context *, uint8_t bits,
+                           unsigned int bit_count);
+extern int SHA256Result(SHA256Context *,
+                        uint8_t Message_Digest[SHA256HashSize]);
+
+/* SHA-384 */
+extern int SHA384Reset(SHA384Context *);
+extern int SHA384Input(SHA384Context *, const uint8_t *bytes,
+                       unsigned int bytecount);
+extern int SHA384FinalBits(SHA384Context *, uint8_t bits,
+                           unsigned int bit_count);
+extern int SHA384Result(SHA384Context *,
+                        uint8_t Message_Digest[SHA384HashSize]);
+
+/* SHA-512 */
+extern int SHA512Reset(SHA512Context *);
+extern int SHA512Input(SHA512Context *, const uint8_t *bytes,
+                       unsigned int bytecount);
+extern int SHA512FinalBits(SHA512Context *, uint8_t bits,
+                           unsigned int bit_count);
+extern int SHA512Result(SHA512Context *,
+                        uint8_t Message_Digest[SHA512HashSize]);
+
+/* Unified SHA functions, chosen by whichSha */
+extern int USHAReset(USHAContext *context, SHAversion whichSha);
+extern int USHAInput(USHAContext *context,
+                     const uint8_t *bytes, unsigned int bytecount);
+extern int USHAFinalBits(USHAContext *context,
+                         uint8_t bits, unsigned int bit_count);
+extern int USHAResult(USHAContext *context,
+                      uint8_t Message_Digest[USHAMaxHashSize]);
+extern int USHABlockSize(enum SHAversion whichSha);
+extern int USHAHashSize(enum SHAversion whichSha);
+extern int USHAHashSizeBits(enum SHAversion whichSha);
+extern const char *USHAHashName(enum SHAversion whichSha);
+
+/*
+ * HMAC Keyed-Hashing for Message Authentication, RFC 2104,
+ * for all SHAs.
+ * This interface allows a fixed-length text input to be used.
+ */
+extern int hmac(SHAversion whichSha, /* which SHA algorithm to use */
+    const unsigned char *text,     /* pointer to data stream */
+    int text_len,                  /* length of data stream */
+    const unsigned char *key,      /* pointer to authentication key */
+    int key_len,                   /* length of authentication key */
+    uint8_t digest[USHAMaxHashSize]); /* caller digest to fill in */
+
+/*
+ * HMAC Keyed-Hashing for Message Authentication, RFC 2104,
+ * for all SHAs.
+ * This interface allows any length of text input to be used.
+ */
+extern int hmacReset(HMACContext *context, enum SHAversion whichSha,
+                     const unsigned char *key, int key_len);
+extern int hmacInput(HMACContext *context, const unsigned char *text,
+                     int text_len);
+extern int hmacFinalBits(HMACContext *context, uint8_t bits,
+                         unsigned int bit_count);
+extern int hmacResult(HMACContext *context,
+                      uint8_t digest[USHAMaxHashSize]);
+
+/*
+ * HKDF HMAC-based Extract-and-Expand Key Derivation Function,
+ * RFC 5869, for all SHAs.
+ */
+extern int hkdf(SHAversion whichSha, const unsigned char *salt,
+                int salt_len, const unsigned char *ikm, int ikm_len,
+                const unsigned char *info, int info_len,
+                uint8_t okm[ ], int okm_len);
+extern int hkdfExtract(SHAversion whichSha, const unsigned char *salt,
+                       int salt_len, const unsigned char *ikm,
+                       int ikm_len, uint8_t prk[USHAMaxHashSize]);
+extern int hkdfExpand(SHAversion whichSha, const uint8_t prk[ ],
+                      int prk_len, const unsigned char *info,
+                      int info_len, uint8_t okm[ ], int okm_len);
+
+/*
+ * HKDF HMAC-based Extract-and-Expand Key Derivation Function,
+ * RFC 5869, for all SHAs.
+ * This interface allows any length of text input to be used.
+ */
+extern int hkdfReset(HKDFContext *context, enum SHAversion whichSha,
+                     const unsigned char *salt, int salt_len);
+extern int hkdfInput(HKDFContext *context, const unsigned char *ikm,
+                     int ikm_len);
+extern int hkdfFinalBits(HKDFContext *context, uint8_t ikm_bits,
+                         unsigned int ikm_bit_count);
+extern int hkdfResult(HKDFContext *context,
+                      uint8_t prk[USHAMaxHashSize],
+                      const unsigned char *info, int info_len,
+                      uint8_t okm[USHAMaxHashSize], int okm_len);
+#endif /* _SHA_H_ */
+
diff --git a/components/homekit/hkdf-sha/upstream/sha1.c b/components/homekit/hkdf-sha/upstream/sha1.c
new file mode 100644
index 0000000..53f1872
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/sha1.c
@@ -0,0 +1,414 @@
+/**************************** sha1.c ***************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ *  Description:
+ *      This file implements the Secure Hash Algorithm SHA-1
+ *      as defined in the U.S. National Institute of Standards
+ *      and Technology Federal Information Processing Standards
+ *      Publication (FIPS PUB) 180-3 published in October 2008
+ *      and formerly defined in its predecessors, FIPS PUB 180-1
+ *      and FIP PUB 180-2.
+ *
+ *      A combined document showing all algorithms is available at
+ *              http://csrc.nist.gov/publications/fips/
+ *                     fips180-3/fips180-3_final.pdf
+ *
+ *      The SHA-1 algorithm produces a 160-bit message digest for a
+ *      given data stream that can serve as a means of providing a
+ *      "fingerprint" for a message.
+ *
+ *  Portability Issues:
+ *      SHA-1 is defined in terms of 32-bit "words".  This code
+ *      uses <stdint.h> (included via "sha.h") to define 32- and
+ *      8-bit unsigned integer types.  If your C compiler does
+ *      not support 32-bit unsigned integers, this code is not
+ *      appropriate.
+ *
+ *  Caveats:
+ *      SHA-1 is designed to work with messages less than 2^64 bits
+ *      long.  This implementation uses SHA1Input() to hash the bits
+ *      that are a multiple of the size of an 8-bit octet, and then
+ *      optionally uses SHA1FinalBits() to hash the final few bits of
+ *      the input.
+ */
+
+#include "sha.h"
+#include "sha-private.h"
+
+/*
+ *  Define the SHA1 circular left shift macro
+ */
+#define SHA1_ROTL(bits,word) \
+                (((word) << (bits)) | ((word) >> (32-(bits))))
+
+/*
+ * Add "length" to the length.
+ * Set Corrupted when overflow has occurred.
+ */
+static uint32_t addTemp;
+#define SHA1AddLength(context, length)                     \
+    (addTemp = (context)->Length_Low,                      \
+     (context)->Corrupted =                                \
+        (((context)->Length_Low += (length)) < addTemp) && \
+        (++(context)->Length_High == 0) ? shaInputTooLong  \
+                                        : (context)->Corrupted )
+
+/* Local Function Prototypes */
+static void SHA1ProcessMessageBlock(SHA1Context *context);
+static void SHA1Finalize(SHA1Context *context, uint8_t Pad_Byte);
+static void SHA1PadMessage(SHA1Context *context, uint8_t Pad_Byte);
+
+/*
+ *  SHA1Reset
+ *
+ *  Description:
+ *      This function will initialize the SHA1Context in preparation
+ *      for computing a new SHA1 message digest.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The context to reset.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int SHA1Reset(SHA1Context *context)
+{
+  if (!context) return shaNull;
+
+  context->Length_High = context->Length_Low = 0;
+  context->Message_Block_Index = 0;
+
+  /* Initial Hash Values: FIPS 180-3 section 5.3.1 */
+  context->Intermediate_Hash[0]   = 0x67452301;
+  context->Intermediate_Hash[1]   = 0xEFCDAB89;
+  context->Intermediate_Hash[2]   = 0x98BADCFE;
+  context->Intermediate_Hash[3]   = 0x10325476;
+  context->Intermediate_Hash[4]   = 0xC3D2E1F0;
+
+  context->Computed   = 0;
+  context->Corrupted  = shaSuccess;
+
+  return shaSuccess;
+}
+
+/*
+ *  SHA1Input
+ *
+ *  Description:
+ *      This function accepts an array of octets as the next portion
+ *      of the message.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The SHA context to update.
+ *      message_array[ ]: [in]
+ *          An array of octets representing the next portion of
+ *          the message.
+ *      length: [in]
+ *          The length of the message in message_array.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int SHA1Input(SHA1Context *context,
+    const uint8_t *message_array, unsigned length)
+{
+  if (!context) return shaNull;
+  if (!length) return shaSuccess;
+  if (!message_array) return shaNull;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (context->Corrupted) return context->Corrupted;
+
+  while (length--) {
+    context->Message_Block[context->Message_Block_Index++] =
+      *message_array;
+
+    if ((SHA1AddLength(context, 8) == shaSuccess) &&
+      (context->Message_Block_Index == SHA1_Message_Block_Size))
+      SHA1ProcessMessageBlock(context);
+
+    message_array++;
+  }
+
+  return context->Corrupted;
+}
+
+/*
+ * SHA1FinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA1FinalBits(SHA1Context *context, uint8_t message_bits,
+    unsigned int length)
+{
+  static uint8_t masks[8] = {
+      /* 0 0b00000000 */ 0x00, /* 1 0b10000000 */ 0x80,
+      /* 2 0b11000000 */ 0xC0, /* 3 0b11100000 */ 0xE0,
+      /* 4 0b11110000 */ 0xF0, /* 5 0b11111000 */ 0xF8,
+      /* 6 0b11111100 */ 0xFC, /* 7 0b11111110 */ 0xFE
+  };
+
+  static uint8_t markbit[8] = {
+      /* 0 0b10000000 */ 0x80, /* 1 0b01000000 */ 0x40,
+      /* 2 0b00100000 */ 0x20, /* 3 0b00010000 */ 0x10,
+      /* 4 0b00001000 */ 0x08, /* 5 0b00000100 */ 0x04,
+      /* 6 0b00000010 */ 0x02, /* 7 0b00000001 */ 0x01
+  };
+
+  if (!context) return shaNull;
+  if (!length) return shaSuccess;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (length >= 8) return context->Corrupted = shaBadParam;
+
+  SHA1AddLength(context, length);
+  SHA1Finalize(context,
+    (uint8_t) ((message_bits & masks[length]) | markbit[length]));
+
+  return context->Corrupted;
+}
+
+/*
+ * SHA1Result
+ *
+ * Description:
+ *   This function will return the 160-bit message digest
+ *   into the Message_Digest array provided by the caller.
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *      the last octet of hash in the element with index 19.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA-1 hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA1Result(SHA1Context *context,
+    uint8_t Message_Digest[SHA1HashSize])
+{
+  int i;
+
+  if (!context) return shaNull;
+  if (!Message_Digest) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+
+  if (!context->Computed)
+    SHA1Finalize(context, 0x80);
+
+  for (i = 0; i < SHA1HashSize; ++i)
+    Message_Digest[i] = (uint8_t) (context->Intermediate_Hash[i>>2]
+                                   >> (8 * ( 3 - ( i & 0x03 ) )));
+
+  return shaSuccess;
+}
+
+/*
+ * SHA1ProcessMessageBlock
+ *
+ * Description:
+ *   This helper function will process the next 512 bits of the
+ *   message stored in the Message_Block array.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *
+ * Returns:
+ *   Nothing.
+ *
+ * Comments:
+ *   Many of the variable names in this code, especially the
+ *   single character names, were used because those were the
+ *   names used in the Secure Hash Standard.
+ */
+static void SHA1ProcessMessageBlock(SHA1Context *context)
+{
+  /* Constants defined in FIPS 180-3, section 4.2.1 */
+  const uint32_t K[4] = {
+      0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xCA62C1D6
+  };
+
+  int        t;               /* Loop counter */
+  uint32_t   temp;            /* Temporary word value */
+  uint32_t   W[80];           /* Word sequence */
+  uint32_t   A, B, C, D, E;   /* Word buffers */
+
+  /*
+   * Initialize the first 16 words in the array W
+   */
+  for (t = 0; t < 16; t++) {
+    W[t]  = ((uint32_t)context->Message_Block[t * 4]) << 24;
+    W[t] |= ((uint32_t)context->Message_Block[t * 4 + 1]) << 16;
+    W[t] |= ((uint32_t)context->Message_Block[t * 4 + 2]) << 8;
+    W[t] |= ((uint32_t)context->Message_Block[t * 4 + 3]);
+  }
+
+  for (t = 16; t < 80; t++)
+    W[t] = SHA1_ROTL(1, W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
+
+  A = context->Intermediate_Hash[0];
+  B = context->Intermediate_Hash[1];
+  C = context->Intermediate_Hash[2];
+  D = context->Intermediate_Hash[3];
+  E = context->Intermediate_Hash[4];
+
+  for (t = 0; t < 20; t++) {
+    temp = SHA1_ROTL(5,A) + SHA_Ch(B, C, D) + E + W[t] + K[0];
+    E = D;
+    D = C;
+    C = SHA1_ROTL(30,B);
+    B = A;
+    A = temp;
+  }
+
+  for (t = 20; t < 40; t++) {
+    temp = SHA1_ROTL(5,A) + SHA_Parity(B, C, D) + E + W[t] + K[1];
+    E = D;
+    D = C;
+    C = SHA1_ROTL(30,B);
+    B = A;
+    A = temp;
+  }
+
+  for (t = 40; t < 60; t++) {
+    temp = SHA1_ROTL(5,A) + SHA_Maj(B, C, D) + E + W[t] + K[2];
+    E = D;
+    D = C;
+    C = SHA1_ROTL(30,B);
+    B = A;
+    A = temp;
+  }
+
+  for (t = 60; t < 80; t++) {
+    temp = SHA1_ROTL(5,A) + SHA_Parity(B, C, D) + E + W[t] + K[3];
+    E = D;
+    D = C;
+    C = SHA1_ROTL(30,B);
+    B = A;
+    A = temp;
+  }
+
+  context->Intermediate_Hash[0] += A;
+  context->Intermediate_Hash[1] += B;
+  context->Intermediate_Hash[2] += C;
+  context->Intermediate_Hash[3] += D;
+  context->Intermediate_Hash[4] += E;
+  context->Message_Block_Index = 0;
+}
+
+/*
+ * SHA1Finalize
+ *
+ * Description:
+ *   This helper function finishes off the digest calculations.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   Pad_Byte: [in]
+ *     The last byte to add to the message block before the 0-padding
+ *     and length.  This will contain the last bits of the message
+ *     followed by another single bit.  If the message was an
+ *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+static void SHA1Finalize(SHA1Context *context, uint8_t Pad_Byte)
+{
+  int i;
+  SHA1PadMessage(context, Pad_Byte);
+  /* message may be sensitive, clear it out */
+  for (i = 0; i < SHA1_Message_Block_Size; ++i)
+    context->Message_Block[i] = 0;
+  context->Length_High = 0;     /* and clear length */
+  context->Length_Low = 0;
+  context->Computed = 1;
+}
+
+/*
+ * SHA1PadMessage
+ *
+ * Description:
+ *   According to the standard, the message must be padded to the next
+ *   even multiple of 512 bits.  The first padding bit must be a '1'.
+ *   The last 64 bits represent the length of the original message.
+ *   All bits in between should be 0.  This helper function will pad
+ *   the message according to those rules by filling the Message_Block
+ *   array accordingly.  When it returns, it can be assumed that the
+ *   message digest has been computed.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to pad.
+ *   Pad_Byte: [in]
+ *     The last byte to add to the message block before the 0-padding
+ *     and length.  This will contain the last bits of the message
+ *     followed by another single bit.  If the message was an
+ *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
+ *
+ * Returns:
+ *   Nothing.
+ */
+static void SHA1PadMessage(SHA1Context *context, uint8_t Pad_Byte)
+{
+  /*
+   * Check to see if the current message block is too small to hold
+   * the initial padding bits and length.  If so, we will pad the
+   * block, process it, and then continue padding into a second
+   * block.
+   */
+  if (context->Message_Block_Index >= (SHA1_Message_Block_Size - 8)) {
+    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
+    while (context->Message_Block_Index < SHA1_Message_Block_Size)
+      context->Message_Block[context->Message_Block_Index++] = 0;
+
+    SHA1ProcessMessageBlock(context);
+  } else
+    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
+
+  while (context->Message_Block_Index < (SHA1_Message_Block_Size - 8))
+    context->Message_Block[context->Message_Block_Index++] = 0;
+
+  /*
+   * Store the message length as the last 8 octets
+   */
+  context->Message_Block[56] = (uint8_t) (context->Length_High >> 24);
+  context->Message_Block[57] = (uint8_t) (context->Length_High >> 16);
+  context->Message_Block[58] = (uint8_t) (context->Length_High >> 8);
+  context->Message_Block[59] = (uint8_t) (context->Length_High);
+  context->Message_Block[60] = (uint8_t) (context->Length_Low >> 24);
+  context->Message_Block[61] = (uint8_t) (context->Length_Low >> 16);
+  context->Message_Block[62] = (uint8_t) (context->Length_Low >> 8);
+  context->Message_Block[63] = (uint8_t) (context->Length_Low);
+
+  SHA1ProcessMessageBlock(context);
+}
+
diff --git a/components/homekit/hkdf-sha/upstream/sha224-256.c b/components/homekit/hkdf-sha/upstream/sha224-256.c
new file mode 100644
index 0000000..2c9bc9c
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/sha224-256.c
@@ -0,0 +1,581 @@
+/************************* sha224-256.c ************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ * Description:
+ *   This file implements the Secure Hash Algorithms SHA-224 and
+ *   SHA-256 as defined in the U.S. National Institute of Standards
+ *   and Technology Federal Information Processing Standards
+ *   Publication (FIPS PUB) 180-3 published in October 2008
+ *   and formerly defined in its predecessors, FIPS PUB 180-1
+ *   and FIP PUB 180-2.
+ *
+ *   A combined document showing all algorithms is available at
+ *       http://csrc.nist.gov/publications/fips/
+ *              fips180-3/fips180-3_final.pdf
+ *
+ *   The SHA-224 and SHA-256 algorithms produce 224-bit and 256-bit
+ *   message digests for a given data stream.  It should take about
+ *   2**n steps to find a message with the same digest as a given
+ *   message and 2**(n/2) to find any two messages with the same
+ *   digest, when n is the digest size in bits.  Therefore, this
+ *   algorithm can serve as a means of providing a
+ *   "fingerprint" for a message.
+ *
+ * Portability Issues:
+ *   SHA-224 and SHA-256 are defined in terms of 32-bit "words".
+ *   This code uses <stdint.h> (included via "sha.h") to define 32-
+ *   and 8-bit unsigned integer types.  If your C compiler does not
+ *   support 32-bit unsigned integers, this code is not
+ *   appropriate.
+ *
+ * Caveats:
+ *   SHA-224 and SHA-256 are designed to work with messages less
+ *   than 2^64 bits long.  This implementation uses SHA224/256Input()
+ *   to hash the bits that are a multiple of the size of an 8-bit
+ *   octet, and then optionally uses SHA224/256FinalBits()
+ *   to hash the final few bits of the input.
+ */
+
+#include "sha.h"
+#include "sha-private.h"
+
+/* Define the SHA shift, rotate left, and rotate right macros */
+#define SHA256_SHR(bits,word)      ((word) >> (bits))
+#define SHA256_ROTL(bits,word)                         \
+  (((word) << (bits)) | ((word) >> (32-(bits))))
+#define SHA256_ROTR(bits,word)                         \
+  (((word) >> (bits)) | ((word) << (32-(bits))))
+
+/* Define the SHA SIGMA and sigma macros */
+#define SHA256_SIGMA0(word)   \
+  (SHA256_ROTR( 2,word) ^ SHA256_ROTR(13,word) ^ SHA256_ROTR(22,word))
+#define SHA256_SIGMA1(word)   \
+  (SHA256_ROTR( 6,word) ^ SHA256_ROTR(11,word) ^ SHA256_ROTR(25,word))
+#define SHA256_sigma0(word)   \
+  (SHA256_ROTR( 7,word) ^ SHA256_ROTR(18,word) ^ SHA256_SHR( 3,word))
+#define SHA256_sigma1(word)   \
+  (SHA256_ROTR(17,word) ^ SHA256_ROTR(19,word) ^ SHA256_SHR(10,word))
+
+/*
+ * Add "length" to the length.
+ * Set Corrupted when overflow has occurred.
+ */
+static uint32_t addTemp;
+#define SHA224_256AddLength(context, length)               \
+  (addTemp = (context)->Length_Low, (context)->Corrupted = \
+    (((context)->Length_Low += (length)) < addTemp) &&     \
+    (++(context)->Length_High == 0) ? shaInputTooLong :    \
+                                      (context)->Corrupted )
+
+/* Local Function Prototypes */
+static int SHA224_256Reset(SHA256Context *context, uint32_t *H0);
+static void SHA224_256ProcessMessageBlock(SHA256Context *context);
+static void SHA224_256Finalize(SHA256Context *context,
+  uint8_t Pad_Byte);
+static void SHA224_256PadMessage(SHA256Context *context,
+  uint8_t Pad_Byte);
+static int SHA224_256ResultN(SHA256Context *context,
+  uint8_t Message_Digest[ ], int HashSize);
+
+/* Initial Hash Values: FIPS 180-3 section 5.3.2 */
+static uint32_t SHA224_H0[SHA256HashSize/4] = {
+    0xC1059ED8, 0x367CD507, 0x3070DD17, 0xF70E5939,
+    0xFFC00B31, 0x68581511, 0x64F98FA7, 0xBEFA4FA4
+};
+
+/* Initial Hash Values: FIPS 180-3 section 5.3.3 */
+static uint32_t SHA256_H0[SHA256HashSize/4] = {
+  0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A,
+  0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19
+};
+
+/*
+ * SHA224Reset
+ *
+ * Description:
+ *   This function will initialize the SHA224Context in preparation
+ *   for computing a new SHA224 message digest.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to reset.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA224Reset(SHA224Context *context)
+{
+  return SHA224_256Reset(context, SHA224_H0);
+}
+
+/*
+ * SHA224Input
+ *
+ * Description:
+ *   This function accepts an array of octets as the next portion
+ *   of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_array[ ]: [in]
+ *     An array of octets representing the next portion of
+ *     the message.
+ *   length: [in]
+ *     The length of the message in message_array.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA224Input(SHA224Context *context, const uint8_t *message_array,
+    unsigned int length)
+{
+  return SHA256Input(context, message_array, length);
+}
+
+/*
+ * SHA224FinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA224FinalBits(SHA224Context *context,
+                    uint8_t message_bits, unsigned int length)
+{
+  return SHA256FinalBits(context, message_bits, length);
+}
+
+/*
+ * SHA224Result
+ *
+ * Description:
+ *   This function will return the 224-bit message digest
+ *   into the Message_Digest array provided by the caller.
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *    the last octet of hash in the element with index 27.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA224Result(SHA224Context *context,
+    uint8_t Message_Digest[SHA224HashSize])
+{
+  return SHA224_256ResultN(context, Message_Digest, SHA224HashSize);
+}
+
+/*
+ * SHA256Reset
+ *
+ * Description:
+ *   This function will initialize the SHA256Context in preparation
+ *   for computing a new SHA256 message digest.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to reset.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA256Reset(SHA256Context *context)
+{
+  return SHA224_256Reset(context, SHA256_H0);
+}
+
+/*
+ * SHA256Input
+ *
+ * Description:
+ *   This function accepts an array of octets as the next portion
+ *   of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_array[ ]: [in]
+ *     An array of octets representing the next portion of
+ *     the message.
+ *   length: [in]
+ *     The length of the message in message_array.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA256Input(SHA256Context *context, const uint8_t *message_array,
+    unsigned int length)
+{
+  if (!context) return shaNull;
+  if (!length) return shaSuccess;
+  if (!message_array) return shaNull;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (context->Corrupted) return context->Corrupted;
+
+  while (length--) {
+    context->Message_Block[context->Message_Block_Index++] =
+            *message_array;
+
+    if ((SHA224_256AddLength(context, 8) == shaSuccess) &&
+      (context->Message_Block_Index == SHA256_Message_Block_Size))
+      SHA224_256ProcessMessageBlock(context);
+
+    message_array++;
+  }
+
+  return context->Corrupted;
+
+}
+
+/*
+ * SHA256FinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA256FinalBits(SHA256Context *context,
+                    uint8_t message_bits, unsigned int length)
+{
+  static uint8_t masks[8] = {
+      /* 0 0b00000000 */ 0x00, /* 1 0b10000000 */ 0x80,
+      /* 2 0b11000000 */ 0xC0, /* 3 0b11100000 */ 0xE0,
+      /* 4 0b11110000 */ 0xF0, /* 5 0b11111000 */ 0xF8,
+      /* 6 0b11111100 */ 0xFC, /* 7 0b11111110 */ 0xFE
+  };
+  static uint8_t markbit[8] = {
+      /* 0 0b10000000 */ 0x80, /* 1 0b01000000 */ 0x40,
+      /* 2 0b00100000 */ 0x20, /* 3 0b00010000 */ 0x10,
+      /* 4 0b00001000 */ 0x08, /* 5 0b00000100 */ 0x04,
+      /* 6 0b00000010 */ 0x02, /* 7 0b00000001 */ 0x01
+  };
+
+  if (!context) return shaNull;
+  if (!length) return shaSuccess;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (length >= 8) return context->Corrupted = shaBadParam;
+
+  SHA224_256AddLength(context, length);
+  SHA224_256Finalize(context, (uint8_t)
+    ((message_bits & masks[length]) | markbit[length]));
+
+  return context->Corrupted;
+}
+
+/*
+ * SHA256Result
+ *
+ * Description:
+ *   This function will return the 256-bit message digest
+ *   into the Message_Digest array provided by the caller.
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *    the last octet of hash in the element with index 31.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int SHA256Result(SHA256Context *context,
+                 uint8_t Message_Digest[SHA256HashSize])
+{
+  return SHA224_256ResultN(context, Message_Digest, SHA256HashSize);
+}
+
+/*
+ * SHA224_256Reset
+ *
+ * Description:
+ *   This helper function will initialize the SHA256Context in
+ *   preparation for computing a new SHA-224 or SHA-256 message digest.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to reset.
+ *   H0[ ]: [in]
+ *     The initial hash value array to use.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+static int SHA224_256Reset(SHA256Context *context, uint32_t *H0)
+{
+  if (!context) return shaNull;
+
+  context->Length_High = context->Length_Low = 0;
+  context->Message_Block_Index  = 0;
+
+  context->Intermediate_Hash[0] = H0[0];
+  context->Intermediate_Hash[1] = H0[1];
+  context->Intermediate_Hash[2] = H0[2];
+  context->Intermediate_Hash[3] = H0[3];
+  context->Intermediate_Hash[4] = H0[4];
+  context->Intermediate_Hash[5] = H0[5];
+  context->Intermediate_Hash[6] = H0[6];
+  context->Intermediate_Hash[7] = H0[7];
+
+  context->Computed  = 0;
+  context->Corrupted = shaSuccess;
+
+  return shaSuccess;
+}
+
+/*
+ * SHA224_256ProcessMessageBlock
+ *
+ * Description:
+ *   This helper function will process the next 512 bits of the
+ *   message stored in the Message_Block array.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *
+ * Returns:
+ *   Nothing.
+ *
+ * Comments:
+ *   Many of the variable names in this code, especially the
+ *   single character names, were used because those were the
+ *   names used in the Secure Hash Standard.
+ */
+static void SHA224_256ProcessMessageBlock(SHA256Context *context)
+{
+  /* Constants defined in FIPS 180-3, section 4.2.2 */
+  static const uint32_t K[64] = {
+      0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b,
+      0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01,
+      0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7,
+      0xc19bf174, 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
+      0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 0x983e5152,
+      0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147,
+      0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc,
+      0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+      0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819,
+      0xd6990624, 0xf40e3585, 0x106aa070, 0x19a4c116, 0x1e376c08,
+      0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f,
+      0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
+      0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+  };
+  int        t, t4;                   /* Loop counter */
+  uint32_t   temp1, temp2;            /* Temporary word value */
+  uint32_t   W[64];                   /* Word sequence */
+  uint32_t   A, B, C, D, E, F, G, H;  /* Word buffers */
+
+  /*
+   * Initialize the first 16 words in the array W
+   */
+  for (t = t4 = 0; t < 16; t++, t4 += 4)
+    W[t] = (((uint32_t)context->Message_Block[t4]) << 24) |
+           (((uint32_t)context->Message_Block[t4 + 1]) << 16) |
+           (((uint32_t)context->Message_Block[t4 + 2]) << 8) |
+           (((uint32_t)context->Message_Block[t4 + 3]));
+  for (t = 16; t < 64; t++)
+    W[t] = SHA256_sigma1(W[t-2]) + W[t-7] +
+        SHA256_sigma0(W[t-15]) + W[t-16];
+
+  A = context->Intermediate_Hash[0];
+  B = context->Intermediate_Hash[1];
+  C = context->Intermediate_Hash[2];
+  D = context->Intermediate_Hash[3];
+  E = context->Intermediate_Hash[4];
+  F = context->Intermediate_Hash[5];
+  G = context->Intermediate_Hash[6];
+  H = context->Intermediate_Hash[7];
+
+  for (t = 0; t < 64; t++) {
+    temp1 = H + SHA256_SIGMA1(E) + SHA_Ch(E,F,G) + K[t] + W[t];
+    temp2 = SHA256_SIGMA0(A) + SHA_Maj(A,B,C);
+    H = G;
+    G = F;
+    F = E;
+    E = D + temp1;
+    D = C;
+    C = B;
+    B = A;
+    A = temp1 + temp2;
+  }
+
+  context->Intermediate_Hash[0] += A;
+  context->Intermediate_Hash[1] += B;
+  context->Intermediate_Hash[2] += C;
+  context->Intermediate_Hash[3] += D;
+  context->Intermediate_Hash[4] += E;
+  context->Intermediate_Hash[5] += F;
+  context->Intermediate_Hash[6] += G;
+  context->Intermediate_Hash[7] += H;
+
+  context->Message_Block_Index = 0;
+}
+
+/*
+ * SHA224_256Finalize
+ *
+ * Description:
+ *   This helper function finishes off the digest calculations.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   Pad_Byte: [in]
+ *     The last byte to add to the message block before the 0-padding
+ *     and length.  This will contain the last bits of the message
+ *     followed by another single bit.  If the message was an
+ *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+static void SHA224_256Finalize(SHA256Context *context,
+    uint8_t Pad_Byte)
+{
+  int i;
+  SHA224_256PadMessage(context, Pad_Byte);
+  /* message may be sensitive, so clear it out */
+  for (i = 0; i < SHA256_Message_Block_Size; ++i)
+    context->Message_Block[i] = 0;
+  context->Length_High = 0;     /* and clear length */
+  context->Length_Low = 0;
+  context->Computed = 1;
+}
+
+/*
+ * SHA224_256PadMessage
+ *
+ * Description:
+ *   According to the standard, the message must be padded to the next
+ *   even multiple of 512 bits.  The first padding bit must be a '1'.
+ *   The last 64 bits represent the length of the original message.
+ *   All bits in between should be 0.  This helper function will pad
+ *   the message according to those rules by filling the
+ *   Message_Block array accordingly.  When it returns, it can be
+ *   assumed that the message digest has been computed.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to pad.
+ *   Pad_Byte: [in]
+ *     The last byte to add to the message block before the 0-padding
+ *     and length.  This will contain the last bits of the message
+ *     followed by another single bit.  If the message was an
+ *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
+ *
+ * Returns:
+ *   Nothing.
+ */
+static void SHA224_256PadMessage(SHA256Context *context,
+    uint8_t Pad_Byte)
+{
+  /*
+   * Check to see if the current message block is too small to hold
+   * the initial padding bits and length.  If so, we will pad the
+   * block, process it, and then continue padding into a second
+   * block.
+   */
+  if (context->Message_Block_Index >= (SHA256_Message_Block_Size-8)) {
+    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
+    while (context->Message_Block_Index < SHA256_Message_Block_Size)
+      context->Message_Block[context->Message_Block_Index++] = 0;
+    SHA224_256ProcessMessageBlock(context);
+  } else
+    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
+
+  while (context->Message_Block_Index < (SHA256_Message_Block_Size-8))
+    context->Message_Block[context->Message_Block_Index++] = 0;
+
+  /*
+   * Store the message length as the last 8 octets
+   */
+  context->Message_Block[56] = (uint8_t)(context->Length_High >> 24);
+  context->Message_Block[57] = (uint8_t)(context->Length_High >> 16);
+  context->Message_Block[58] = (uint8_t)(context->Length_High >> 8);
+  context->Message_Block[59] = (uint8_t)(context->Length_High);
+  context->Message_Block[60] = (uint8_t)(context->Length_Low >> 24);
+  context->Message_Block[61] = (uint8_t)(context->Length_Low >> 16);
+  context->Message_Block[62] = (uint8_t)(context->Length_Low >> 8);
+  context->Message_Block[63] = (uint8_t)(context->Length_Low);
+
+  SHA224_256ProcessMessageBlock(context);
+}
+
+/*
+ * SHA224_256ResultN
+ *
+ * Description:
+ *   This helper function will return the 224-bit or 256-bit message
+ *   digest into the Message_Digest array provided by the caller.
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *    the last octet of hash in the element with index 27/31.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *   HashSize: [in]
+ *     The size of the hash, either 28 or 32.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+static int SHA224_256ResultN(SHA256Context *context,
+    uint8_t Message_Digest[ ], int HashSize)
+{
+  int i;
+
+  if (!context) return shaNull;
+  if (!Message_Digest) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+
+  if (!context->Computed)
+    SHA224_256Finalize(context, 0x80);
+
+  for (i = 0; i < HashSize; ++i)
+    Message_Digest[i] = (uint8_t)
+      (context->Intermediate_Hash[i>>2] >> 8 * ( 3 - ( i & 0x03 ) ));
+
+  return shaSuccess;
+}
+
diff --git a/components/homekit/hkdf-sha/upstream/sha384-512.c b/components/homekit/hkdf-sha/upstream/sha384-512.c
new file mode 100644
index 0000000..de5956f
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/sha384-512.c
@@ -0,0 +1,1032 @@
+/************************* sha384-512.c ************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ * Description:
+ *   This file implements the Secure Hash Algorithms SHA-384 and
+ *   SHA-512 as defined in the U.S. National Institute of Standards
+ *   and Technology Federal Information Processing Standards
+ *   Publication (FIPS PUB) 180-3 published in October 2008
+ *   and formerly defined in its predecessors, FIPS PUB 180-1
+ *   and FIP PUB 180-2.
+ *
+ *   A combined document showing all algorithms is available at
+ *       http://csrc.nist.gov/publications/fips/
+ *              fips180-3/fips180-3_final.pdf
+ *
+ *   The SHA-384 and SHA-512 algorithms produce 384-bit and 512-bit
+ *   message digests for a given data stream.  It should take about
+ *   2**n steps to find a message with the same digest as a given
+ *   message and 2**(n/2) to find any two messages with the same
+ *   digest, when n is the digest size in bits.  Therefore, this
+ *   algorithm can serve as a means of providing a
+ *   "fingerprint" for a message.
+ *
+ * Portability Issues:
+ *   SHA-384 and SHA-512 are defined in terms of 64-bit "words",
+ *   but if USE_32BIT_ONLY is #defined, this code is implemented in
+ *   terms of 32-bit "words".  This code uses <stdint.h> (included
+ *   via "sha.h") to define the 64-, 32- and 8-bit unsigned integer
+ *   types.  If your C compiler does not support 64-bit unsigned
+ *   integers and you do not #define USE_32BIT_ONLY, this code is
+ *   not appropriate.
+ *
+ * Caveats:
+ *   SHA-384 and SHA-512 are designed to work with messages less
+ *   than 2^128 bits long.  This implementation uses SHA384/512Input()
+ *   to hash the bits that are a multiple of the size of an 8-bit
+ *   octet, and then optionally uses SHA384/256FinalBits()
+ *   to hash the final few bits of the input.
+ *
+ */
+
+#include "sha.h"
+
+#ifdef USE_32BIT_ONLY
+/*
+ * Define 64-bit arithmetic in terms of 32-bit arithmetic.
+ * Each 64-bit number is represented in a 2-word array.
+ * All macros are defined such that the result is the last parameter.
+ */
+
+/*
+ * Define shift, rotate left, and rotate right functions
+ */
+#define SHA512_SHR(bits, word, ret) (                          \
+    /* (((uint64_t)((word))) >> (bits)) */                     \
+    (ret)[0] = (((bits) < 32) && ((bits) >= 0)) ?              \
+      ((word)[0] >> (bits)) : 0,                               \
+    (ret)[1] = ((bits) > 32) ? ((word)[0] >> ((bits) - 32)) :  \
+      ((bits) == 32) ? (word)[0] :                             \
+      ((bits) >= 0) ?                                          \
+        (((word)[0] << (32 - (bits))) |                        \
+        ((word)[1] >> (bits))) : 0 )
+
+#define SHA512_SHL(bits, word, ret) (                          \
+    /* (((uint64_t)(word)) << (bits)) */                       \
+    (ret)[0] = ((bits) > 32) ? ((word)[1] << ((bits) - 32)) :  \
+         ((bits) == 32) ? (word)[1] :                          \
+         ((bits) >= 0) ?                                       \
+           (((word)[0] << (bits)) |                            \
+           ((word)[1] >> (32 - (bits)))) :                     \
+         0,                                                    \
+    (ret)[1] = (((bits) < 32) && ((bits) >= 0)) ?              \
+        ((word)[1] << (bits)) : 0 )
+
+/*
+ * Define 64-bit OR
+ */
+#define SHA512_OR(word1, word2, ret) (                         \
+    (ret)[0] = (word1)[0] | (word2)[0],                        \
+    (ret)[1] = (word1)[1] | (word2)[1] )
+
+/*
+ * Define 64-bit XOR
+ */
+#define SHA512_XOR(word1, word2, ret) (                        \
+    (ret)[0] = (word1)[0] ^ (word2)[0],                        \
+    (ret)[1] = (word1)[1] ^ (word2)[1] )
+
+/*
+ * Define 64-bit AND
+ */
+#define SHA512_AND(word1, word2, ret) (                        \
+    (ret)[0] = (word1)[0] & (word2)[0],                        \
+    (ret)[1] = (word1)[1] & (word2)[1] )
+
+/*
+ * Define 64-bit TILDA
+ */
+#define SHA512_TILDA(word, ret)                                \
+  ( (ret)[0] = ~(word)[0], (ret)[1] = ~(word)[1] )
+
+/*
+ * Define 64-bit ADD
+ */
+#define SHA512_ADD(word1, word2, ret) (                        \
+    (ret)[1] = (word1)[1], (ret)[1] += (word2)[1],             \
+    (ret)[0] = (word1)[0] + (word2)[0] + ((ret)[1] < (word1)[1]) )
+
+/*
+ * Add the 4word value in word2 to word1.
+ */
+static uint32_t ADDTO4_temp, ADDTO4_temp2;
+#define SHA512_ADDTO4(word1, word2) (                          \
+    ADDTO4_temp = (word1)[3],                                  \
+    (word1)[3] += (word2)[3],                                  \
+    ADDTO4_temp2 = (word1)[2],                                 \
+    (word1)[2] += (word2)[2] + ((word1)[3] < ADDTO4_temp),     \
+    ADDTO4_temp = (word1)[1],                                  \
+    (word1)[1] += (word2)[1] + ((word1)[2] < ADDTO4_temp2),    \
+    (word1)[0] += (word2)[0] + ((word1)[1] < ADDTO4_temp) )
+
+/*
+ * Add the 2word value in word2 to word1.
+ */
+static uint32_t ADDTO2_temp;
+#define SHA512_ADDTO2(word1, word2) (                          \
+    ADDTO2_temp = (word1)[1],                                  \
+    (word1)[1] += (word2)[1],                                  \
+    (word1)[0] += (word2)[0] + ((word1)[1] < ADDTO2_temp) )
+
+/*
+ * SHA rotate   ((word >> bits) | (word << (64-bits)))
+ */
+static uint32_t ROTR_temp1[2], ROTR_temp2[2];
+#define SHA512_ROTR(bits, word, ret) (                         \
+    SHA512_SHR((bits), (word), ROTR_temp1),                    \
+    SHA512_SHL(64-(bits), (word), ROTR_temp2),                 \
+    SHA512_OR(ROTR_temp1, ROTR_temp2, (ret)) )
+
+/*
+ * Define the SHA SIGMA and sigma macros
+ *
+ *  SHA512_ROTR(28,word) ^ SHA512_ROTR(34,word) ^ SHA512_ROTR(39,word)
+ */
+static uint32_t SIGMA0_temp1[2], SIGMA0_temp2[2],
+  SIGMA0_temp3[2], SIGMA0_temp4[2];
+#define SHA512_SIGMA0(word, ret) (                             \
+    SHA512_ROTR(28, (word), SIGMA0_temp1),                     \
+    SHA512_ROTR(34, (word), SIGMA0_temp2),                     \
+    SHA512_ROTR(39, (word), SIGMA0_temp3),                     \
+    SHA512_XOR(SIGMA0_temp2, SIGMA0_temp3, SIGMA0_temp4),      \
+    SHA512_XOR(SIGMA0_temp1, SIGMA0_temp4, (ret)) )
+
+/*
+ * SHA512_ROTR(14,word) ^ SHA512_ROTR(18,word) ^ SHA512_ROTR(41,word)
+ */
+static uint32_t SIGMA1_temp1[2], SIGMA1_temp2[2],
+  SIGMA1_temp3[2], SIGMA1_temp4[2];
+#define SHA512_SIGMA1(word, ret) (                             \
+    SHA512_ROTR(14, (word), SIGMA1_temp1),                     \
+    SHA512_ROTR(18, (word), SIGMA1_temp2),                     \
+    SHA512_ROTR(41, (word), SIGMA1_temp3),                     \
+    SHA512_XOR(SIGMA1_temp2, SIGMA1_temp3, SIGMA1_temp4),      \
+    SHA512_XOR(SIGMA1_temp1, SIGMA1_temp4, (ret)) )
+
+/*
+ * (SHA512_ROTR( 1,word) ^ SHA512_ROTR( 8,word) ^ SHA512_SHR( 7,word))
+ */
+static uint32_t sigma0_temp1[2], sigma0_temp2[2],
+  sigma0_temp3[2], sigma0_temp4[2];
+#define SHA512_sigma0(word, ret) (                             \
+    SHA512_ROTR( 1, (word), sigma0_temp1),                     \
+    SHA512_ROTR( 8, (word), sigma0_temp2),                     \
+    SHA512_SHR( 7, (word), sigma0_temp3),                      \
+    SHA512_XOR(sigma0_temp2, sigma0_temp3, sigma0_temp4),      \
+    SHA512_XOR(sigma0_temp1, sigma0_temp4, (ret)) )
+
+/*
+ * (SHA512_ROTR(19,word) ^ SHA512_ROTR(61,word) ^ SHA512_SHR( 6,word))
+ */
+static uint32_t sigma1_temp1[2], sigma1_temp2[2],
+  sigma1_temp3[2], sigma1_temp4[2];
+#define SHA512_sigma1(word, ret) (                             \
+    SHA512_ROTR(19, (word), sigma1_temp1),                     \
+    SHA512_ROTR(61, (word), sigma1_temp2),                     \
+    SHA512_SHR( 6, (word), sigma1_temp3),                      \
+    SHA512_XOR(sigma1_temp2, sigma1_temp3, sigma1_temp4),      \
+    SHA512_XOR(sigma1_temp1, sigma1_temp4, (ret)) )
+
+#ifndef USE_MODIFIED_MACROS
+/*
+ * These definitions are the ones used in FIPS 180-3, section 4.1.3
+ *  Ch(x,y,z)   ((x & y) ^ (~x & z))
+ */
+static uint32_t Ch_temp1[2], Ch_temp2[2], Ch_temp3[2];
+#define SHA_Ch(x, y, z, ret) (                                 \
+    SHA512_AND(x, y, Ch_temp1),                                \
+    SHA512_TILDA(x, Ch_temp2),                                 \
+    SHA512_AND(Ch_temp2, z, Ch_temp3),                         \
+    SHA512_XOR(Ch_temp1, Ch_temp3, (ret)) )
+
+/*
+ *  Maj(x,y,z)  (((x)&(y)) ^ ((x)&(z)) ^ ((y)&(z)))
+ */
+static uint32_t Maj_temp1[2], Maj_temp2[2],
+  Maj_temp3[2], Maj_temp4[2];
+#define SHA_Maj(x, y, z, ret) (                                \
+    SHA512_AND(x, y, Maj_temp1),                               \
+    SHA512_AND(x, z, Maj_temp2),                               \
+    SHA512_AND(y, z, Maj_temp3),                               \
+    SHA512_XOR(Maj_temp2, Maj_temp3, Maj_temp4),               \
+    SHA512_XOR(Maj_temp1, Maj_temp4, (ret)) )
+#else /* !USE_MODIFIED_MACROS */
+/*
+ * These definitions are potentially faster equivalents for the ones
+ * used in FIPS 180-3, section 4.1.3.
+ *   ((x & y) ^ (~x & z)) becomes
+ *   ((x & (y ^ z)) ^ z)
+ */
+#define SHA_Ch(x, y, z, ret) (                                 \
+   (ret)[0] = (((x)[0] & ((y)[0] ^ (z)[0])) ^ (z)[0]),         \
+   (ret)[1] = (((x)[1] & ((y)[1] ^ (z)[1])) ^ (z)[1]) )
+
+/*
+ *   ((x & y) ^ (x & z) ^ (y & z)) becomes
+ *   ((x & (y | z)) | (y & z))
+ */
+#define SHA_Maj(x, y, z, ret) (                                 \
+   ret[0] = (((x)[0] & ((y)[0] | (z)[0])) | ((y)[0] & (z)[0])), \
+   ret[1] = (((x)[1] & ((y)[1] | (z)[1])) | ((y)[1] & (z)[1])) )
+#endif /* USE_MODIFIED_MACROS */
+
+/*
+ * Add "length" to the length.
+ * Set Corrupted when overflow has occurred.
+ */
+static uint32_t addTemp[4] = { 0, 0, 0, 0 };
+#define SHA384_512AddLength(context, length) (                        \
+    addTemp[3] = (length), SHA512_ADDTO4((context)->Length, addTemp), \
+    (context)->Corrupted = (((context)->Length[3] < (length)) &&      \
+       ((context)->Length[2] == 0) && ((context)->Length[1] == 0) &&  \
+       ((context)->Length[0] == 0)) ? shaInputTooLong :               \
+                                      (context)->Corrupted )
+
+/* Local Function Prototypes */
+static int SHA384_512Reset(SHA512Context *context,
+                           uint32_t H0[SHA512HashSize/4]);
+static void SHA384_512ProcessMessageBlock(SHA512Context *context);
+static void SHA384_512Finalize(SHA512Context *context,
+  uint8_t Pad_Byte);
+static void SHA384_512PadMessage(SHA512Context *context,
+  uint8_t Pad_Byte);
+static int SHA384_512ResultN( SHA512Context *context,
+  uint8_t Message_Digest[ ], int HashSize);
+
+/* Initial Hash Values: FIPS 180-3 sections 5.3.4 and 5.3.5 */
+static uint32_t SHA384_H0[SHA512HashSize/4] = {
+    0xCBBB9D5D, 0xC1059ED8, 0x629A292A, 0x367CD507, 0x9159015A,
+    0x3070DD17, 0x152FECD8, 0xF70E5939, 0x67332667, 0xFFC00B31,
+    0x8EB44A87, 0x68581511, 0xDB0C2E0D, 0x64F98FA7, 0x47B5481D,
+    0xBEFA4FA4
+};
+static uint32_t SHA512_H0[SHA512HashSize/4] = {
+    0x6A09E667, 0xF3BCC908, 0xBB67AE85, 0x84CAA73B, 0x3C6EF372,
+    0xFE94F82B, 0xA54FF53A, 0x5F1D36F1, 0x510E527F, 0xADE682D1,
+    0x9B05688C, 0x2B3E6C1F, 0x1F83D9AB, 0xFB41BD6B, 0x5BE0CD19,
+    0x137E2179
+};
+
+#else /* !USE_32BIT_ONLY */
+
+#include "sha-private.h"
+
+/* Define the SHA shift, rotate left and rotate right macros */
+#define SHA512_SHR(bits,word)  (((uint64_t)(word)) >> (bits))
+#define SHA512_ROTR(bits,word) ((((uint64_t)(word)) >> (bits)) | \
+                                (((uint64_t)(word)) << (64-(bits))))
+
+/*
+ * Define the SHA SIGMA and sigma macros
+ *
+ *  SHA512_ROTR(28,word) ^ SHA512_ROTR(34,word) ^ SHA512_ROTR(39,word)
+ */
+#define SHA512_SIGMA0(word)   \
+ (SHA512_ROTR(28,word) ^ SHA512_ROTR(34,word) ^ SHA512_ROTR(39,word))
+#define SHA512_SIGMA1(word)   \
+ (SHA512_ROTR(14,word) ^ SHA512_ROTR(18,word) ^ SHA512_ROTR(41,word))
+#define SHA512_sigma0(word)   \
+ (SHA512_ROTR( 1,word) ^ SHA512_ROTR( 8,word) ^ SHA512_SHR( 7,word))
+#define SHA512_sigma1(word)   \
+ (SHA512_ROTR(19,word) ^ SHA512_ROTR(61,word) ^ SHA512_SHR( 6,word))
+
+/*
+ * Add "length" to the length.
+ * Set Corrupted when overflow has occurred.
+ */
+static uint64_t addTemp;
+#define SHA384_512AddLength(context, length)                   \
+   (addTemp = context->Length_Low, context->Corrupted =        \
+    ((context->Length_Low += length) < addTemp) &&             \
+    (++context->Length_High == 0) ? shaInputTooLong :          \
+                                    (context)->Corrupted)
+
+/* Local Function Prototypes */
+static int SHA384_512Reset(SHA512Context *context,
+                           uint64_t H0[SHA512HashSize/8]);
+static void SHA384_512ProcessMessageBlock(SHA512Context *context);
+static void SHA384_512Finalize(SHA512Context *context,
+  uint8_t Pad_Byte);
+static void SHA384_512PadMessage(SHA512Context *context,
+  uint8_t Pad_Byte);
+static int SHA384_512ResultN(SHA512Context *context,
+  uint8_t Message_Digest[ ], int HashSize);
+
+/* Initial Hash Values: FIPS 180-3 sections 5.3.4 and 5.3.5 */
+static uint64_t SHA384_H0[ ] = {
+    0xCBBB9D5DC1059ED8ll, 0x629A292A367CD507ll, 0x9159015A3070DD17ll,
+    0x152FECD8F70E5939ll, 0x67332667FFC00B31ll, 0x8EB44A8768581511ll,
+    0xDB0C2E0D64F98FA7ll, 0x47B5481DBEFA4FA4ll
+};
+static uint64_t SHA512_H0[ ] = {
+    0x6A09E667F3BCC908ll, 0xBB67AE8584CAA73Bll, 0x3C6EF372FE94F82Bll,
+    0xA54FF53A5F1D36F1ll, 0x510E527FADE682D1ll, 0x9B05688C2B3E6C1Fll,
+    0x1F83D9ABFB41BD6Bll, 0x5BE0CD19137E2179ll
+};
+
+#endif /* USE_32BIT_ONLY */
+
+/*
+ * SHA384Reset
+ *
+ * Description:
+ *   This function will initialize the SHA384Context in preparation
+ *   for computing a new SHA384 message digest.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to reset.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA384Reset(SHA384Context *context)
+{
+  return SHA384_512Reset(context, SHA384_H0);
+}
+
+/*
+ * SHA384Input
+ *
+ * Description:
+ *   This function accepts an array of octets as the next portion
+ *   of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_array[ ]: [in]
+ *     An array of octets representing the next portion of
+ *     the message.
+ *   length: [in]
+ *     The length of the message in message_array.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA384Input(SHA384Context *context,
+    const uint8_t *message_array, unsigned int length)
+{
+  return SHA512Input(context, message_array, length);
+}
+
+/*
+ * SHA384FinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA384FinalBits(SHA384Context *context,
+                    uint8_t message_bits, unsigned int length)
+{
+  return SHA512FinalBits(context, message_bits, length);
+}
+
+/*
+ * SHA384Result
+ *
+ * Description:
+ *   This function will return the 384-bit message digest
+ *   into the Message_Digest array provided by the caller.
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *    the last octet of hash in the element with index 47.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA384Result(SHA384Context *context,
+    uint8_t Message_Digest[SHA384HashSize])
+{
+  return SHA384_512ResultN(context, Message_Digest, SHA384HashSize);
+}
+
+/*
+ * SHA512Reset
+ *
+ * Description:
+ *   This function will initialize the SHA512Context in preparation
+ *   for computing a new SHA512 message digest.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to reset.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA512Reset(SHA512Context *context)
+{
+  return SHA384_512Reset(context, SHA512_H0);
+}
+
+/*
+ * SHA512Input
+ *
+ * Description:
+ *   This function accepts an array of octets as the next portion
+ *   of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_array[ ]: [in]
+ *     An array of octets representing the next portion of
+ *     the message.
+ *   length: [in]
+ *     The length of the message in message_array.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA512Input(SHA512Context *context,
+        const uint8_t *message_array,
+        unsigned int length)
+{
+  if (!context) return shaNull;
+  if (!length) return shaSuccess;
+  if (!message_array) return shaNull;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (context->Corrupted) return context->Corrupted;
+
+  while (length--) {
+    context->Message_Block[context->Message_Block_Index++] =
+            *message_array;
+
+    if ((SHA384_512AddLength(context, 8) == shaSuccess) &&
+      (context->Message_Block_Index == SHA512_Message_Block_Size))
+      SHA384_512ProcessMessageBlock(context);
+
+    message_array++;
+  }
+
+  return context->Corrupted;
+}
+
+/*
+ * SHA512FinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA512FinalBits(SHA512Context *context,
+                    uint8_t message_bits, unsigned int length)
+{
+  static uint8_t masks[8] = {
+      /* 0 0b00000000 */ 0x00, /* 1 0b10000000 */ 0x80,
+      /* 2 0b11000000 */ 0xC0, /* 3 0b11100000 */ 0xE0,
+      /* 4 0b11110000 */ 0xF0, /* 5 0b11111000 */ 0xF8,
+      /* 6 0b11111100 */ 0xFC, /* 7 0b11111110 */ 0xFE
+  };
+  static uint8_t markbit[8] = {
+      /* 0 0b10000000 */ 0x80, /* 1 0b01000000 */ 0x40,
+      /* 2 0b00100000 */ 0x20, /* 3 0b00010000 */ 0x10,
+      /* 4 0b00001000 */ 0x08, /* 5 0b00000100 */ 0x04,
+      /* 6 0b00000010 */ 0x02, /* 7 0b00000001 */ 0x01
+  };
+
+  if (!context) return shaNull;
+  if (!length) return shaSuccess;
+  if (context->Corrupted) return context->Corrupted;
+  if (context->Computed) return context->Corrupted = shaStateError;
+  if (length >= 8) return context->Corrupted = shaBadParam;
+
+  SHA384_512AddLength(context, length);
+  SHA384_512Finalize(context, (uint8_t)
+    ((message_bits & masks[length]) | markbit[length]));
+
+  return context->Corrupted;
+}
+
+/*
+ * SHA512Result
+ *
+ * Description:
+ *   This function will return the 512-bit message digest
+ *   into the Message_Digest array provided by the caller.
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *    the last octet of hash in the element with index 63.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int SHA512Result(SHA512Context *context,
+    uint8_t Message_Digest[SHA512HashSize])
+{
+  return SHA384_512ResultN(context, Message_Digest, SHA512HashSize);
+}
+
+/*
+ * SHA384_512Reset
+ *
+ * Description:
+ *   This helper function will initialize the SHA512Context in
+ *   preparation for computing a new SHA384 or SHA512 message
+ *   digest.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to reset.
+ *   H0[ ]: [in]
+ *     The initial hash value array to use.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+#ifdef USE_32BIT_ONLY
+static int SHA384_512Reset(SHA512Context *context,
+                           uint32_t H0[SHA512HashSize/4])
+#else /* !USE_32BIT_ONLY */
+static int SHA384_512Reset(SHA512Context *context,
+                           uint64_t H0[SHA512HashSize/8])
+#endif /* USE_32BIT_ONLY */
+{
+  int i;
+  if (!context) return shaNull;
+  context->Message_Block_Index = 0;
+
+#ifdef USE_32BIT_ONLY
+  context->Length[0] = context->Length[1] =
+  context->Length[2] = context->Length[3] = 0;
+
+  for (i = 0; i < SHA512HashSize/4; i++)
+    context->Intermediate_Hash[i] = H0[i];
+#else /* !USE_32BIT_ONLY */
+  context->Length_High = context->Length_Low = 0;
+
+  for (i = 0; i < SHA512HashSize/8; i++)
+    context->Intermediate_Hash[i] = H0[i];
+#endif /* USE_32BIT_ONLY */
+
+  context->Computed = 0;
+  context->Corrupted = shaSuccess;
+
+  return shaSuccess;
+}
+
+/*
+ * SHA384_512ProcessMessageBlock
+ *
+ * Description:
+ *   This helper function will process the next 1024 bits of the
+ *   message stored in the Message_Block array.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *
+ * Returns:
+ *   Nothing.
+ *
+ * Comments:
+ *   Many of the variable names in this code, especially the
+ *   single character names, were used because those were the
+ *   names used in the Secure Hash Standard.
+ *
+ *
+ */
+static void SHA384_512ProcessMessageBlock(SHA512Context *context)
+{
+#ifdef USE_32BIT_ONLY
+  /* Constants defined in FIPS 180-3, section 4.2.3 */
+  static const uint32_t K[80*2] = {
+      0x428A2F98, 0xD728AE22, 0x71374491, 0x23EF65CD, 0xB5C0FBCF,
+      0xEC4D3B2F, 0xE9B5DBA5, 0x8189DBBC, 0x3956C25B, 0xF348B538,
+      0x59F111F1, 0xB605D019, 0x923F82A4, 0xAF194F9B, 0xAB1C5ED5,
+      0xDA6D8118, 0xD807AA98, 0xA3030242, 0x12835B01, 0x45706FBE,
+      0x243185BE, 0x4EE4B28C, 0x550C7DC3, 0xD5FFB4E2, 0x72BE5D74,
+      0xF27B896F, 0x80DEB1FE, 0x3B1696B1, 0x9BDC06A7, 0x25C71235,
+      0xC19BF174, 0xCF692694, 0xE49B69C1, 0x9EF14AD2, 0xEFBE4786,
+      0x384F25E3, 0x0FC19DC6, 0x8B8CD5B5, 0x240CA1CC, 0x77AC9C65,
+      0x2DE92C6F, 0x592B0275, 0x4A7484AA, 0x6EA6E483, 0x5CB0A9DC,
+      0xBD41FBD4, 0x76F988DA, 0x831153B5, 0x983E5152, 0xEE66DFAB,
+      0xA831C66D, 0x2DB43210, 0xB00327C8, 0x98FB213F, 0xBF597FC7,
+      0xBEEF0EE4, 0xC6E00BF3, 0x3DA88FC2, 0xD5A79147, 0x930AA725,
+      0x06CA6351, 0xE003826F, 0x14292967, 0x0A0E6E70, 0x27B70A85,
+      0x46D22FFC, 0x2E1B2138, 0x5C26C926, 0x4D2C6DFC, 0x5AC42AED,
+      0x53380D13, 0x9D95B3DF, 0x650A7354, 0x8BAF63DE, 0x766A0ABB,
+      0x3C77B2A8, 0x81C2C92E, 0x47EDAEE6, 0x92722C85, 0x1482353B,
+      0xA2BFE8A1, 0x4CF10364, 0xA81A664B, 0xBC423001, 0xC24B8B70,
+      0xD0F89791, 0xC76C51A3, 0x0654BE30, 0xD192E819, 0xD6EF5218,
+      0xD6990624, 0x5565A910, 0xF40E3585, 0x5771202A, 0x106AA070,
+      0x32BBD1B8, 0x19A4C116, 0xB8D2D0C8, 0x1E376C08, 0x5141AB53,
+      0x2748774C, 0xDF8EEB99, 0x34B0BCB5, 0xE19B48A8, 0x391C0CB3,
+      0xC5C95A63, 0x4ED8AA4A, 0xE3418ACB, 0x5B9CCA4F, 0x7763E373,
+      0x682E6FF3, 0xD6B2B8A3, 0x748F82EE, 0x5DEFB2FC, 0x78A5636F,
+      0x43172F60, 0x84C87814, 0xA1F0AB72, 0x8CC70208, 0x1A6439EC,
+      0x90BEFFFA, 0x23631E28, 0xA4506CEB, 0xDE82BDE9, 0xBEF9A3F7,
+      0xB2C67915, 0xC67178F2, 0xE372532B, 0xCA273ECE, 0xEA26619C,
+      0xD186B8C7, 0x21C0C207, 0xEADA7DD6, 0xCDE0EB1E, 0xF57D4F7F,
+      0xEE6ED178, 0x06F067AA, 0x72176FBA, 0x0A637DC5, 0xA2C898A6,
+      0x113F9804, 0xBEF90DAE, 0x1B710B35, 0x131C471B, 0x28DB77F5,
+      0x23047D84, 0x32CAAB7B, 0x40C72493, 0x3C9EBE0A, 0x15C9BEBC,
+      0x431D67C4, 0x9C100D4C, 0x4CC5D4BE, 0xCB3E42B6, 0x597F299C,
+      0xFC657E2A, 0x5FCB6FAB, 0x3AD6FAEC, 0x6C44198C, 0x4A475817
+  };
+  int     t, t2, t8;                  /* Loop counter */
+  uint32_t  temp1[2], temp2[2],       /* Temporary word values */
+        temp3[2], temp4[2], temp5[2];
+  uint32_t  W[2*80];                  /* Word sequence */
+  uint32_t  A[2], B[2], C[2], D[2],   /* Word buffers */
+        E[2], F[2], G[2], H[2];
+
+  /* Initialize the first 16 words in the array W */
+  for (t = t2 = t8 = 0; t < 16; t++, t8 += 8) {
+    W[t2++] = ((((uint32_t)context->Message_Block[t8    ])) << 24) |
+              ((((uint32_t)context->Message_Block[t8 + 1])) << 16) |
+              ((((uint32_t)context->Message_Block[t8 + 2])) << 8) |
+              ((((uint32_t)context->Message_Block[t8 + 3])));
+    W[t2++] = ((((uint32_t)context->Message_Block[t8 + 4])) << 24) |
+              ((((uint32_t)context->Message_Block[t8 + 5])) << 16) |
+              ((((uint32_t)context->Message_Block[t8 + 6])) << 8) |
+              ((((uint32_t)context->Message_Block[t8 + 7])));
+  }
+
+  for (t = 16; t < 80; t++, t2 += 2) {
+    /* W[t] = SHA512_sigma1(W[t-2]) + W[t-7] +
+      SHA512_sigma0(W[t-15]) + W[t-16]; */
+    uint32_t *Wt2 = &W[t2-2*2];
+    uint32_t *Wt7 = &W[t2-7*2];
+    uint32_t *Wt15 = &W[t2-15*2];
+    uint32_t *Wt16 = &W[t2-16*2];
+    SHA512_sigma1(Wt2, temp1);
+    SHA512_ADD(temp1, Wt7, temp2);
+    SHA512_sigma0(Wt15, temp1);
+    SHA512_ADD(temp1, Wt16, temp3);
+    SHA512_ADD(temp2, temp3, &W[t2]);
+  }
+
+  A[0] = context->Intermediate_Hash[0];
+  A[1] = context->Intermediate_Hash[1];
+  B[0] = context->Intermediate_Hash[2];
+  B[1] = context->Intermediate_Hash[3];
+  C[0] = context->Intermediate_Hash[4];
+  C[1] = context->Intermediate_Hash[5];
+  D[0] = context->Intermediate_Hash[6];
+  D[1] = context->Intermediate_Hash[7];
+  E[0] = context->Intermediate_Hash[8];
+  E[1] = context->Intermediate_Hash[9];
+  F[0] = context->Intermediate_Hash[10];
+  F[1] = context->Intermediate_Hash[11];
+  G[0] = context->Intermediate_Hash[12];
+  G[1] = context->Intermediate_Hash[13];
+  H[0] = context->Intermediate_Hash[14];
+  H[1] = context->Intermediate_Hash[15];
+
+  for (t = t2 = 0; t < 80; t++, t2 += 2) {
+    /*
+     * temp1 = H + SHA512_SIGMA1(E) + SHA_Ch(E,F,G) + K[t] + W[t];
+     */
+    SHA512_SIGMA1(E,temp1);
+    SHA512_ADD(H, temp1, temp2);
+    SHA_Ch(E,F,G,temp3);
+    SHA512_ADD(temp2, temp3, temp4);
+    SHA512_ADD(&K[t2], &W[t2], temp5);
+    SHA512_ADD(temp4, temp5, temp1);
+    /*
+     * temp2 = SHA512_SIGMA0(A) + SHA_Maj(A,B,C);
+     */
+    SHA512_SIGMA0(A,temp3);
+    SHA_Maj(A,B,C,temp4);
+    SHA512_ADD(temp3, temp4, temp2);
+    H[0] = G[0]; H[1] = G[1];
+    G[0] = F[0]; G[1] = F[1];
+    F[0] = E[0]; F[1] = E[1];
+    SHA512_ADD(D, temp1, E);
+    D[0] = C[0]; D[1] = C[1];
+    C[0] = B[0]; C[1] = B[1];
+    B[0] = A[0]; B[1] = A[1];
+    SHA512_ADD(temp1, temp2, A);
+  }
+
+  SHA512_ADDTO2(&context->Intermediate_Hash[0], A);
+  SHA512_ADDTO2(&context->Intermediate_Hash[2], B);
+  SHA512_ADDTO2(&context->Intermediate_Hash[4], C);
+  SHA512_ADDTO2(&context->Intermediate_Hash[6], D);
+  SHA512_ADDTO2(&context->Intermediate_Hash[8], E);
+  SHA512_ADDTO2(&context->Intermediate_Hash[10], F);
+  SHA512_ADDTO2(&context->Intermediate_Hash[12], G);
+  SHA512_ADDTO2(&context->Intermediate_Hash[14], H);
+
+#else /* !USE_32BIT_ONLY */
+  /* Constants defined in FIPS 180-3, section 4.2.3 */
+  static const uint64_t K[80] = {
+      0x428A2F98D728AE22ll, 0x7137449123EF65CDll, 0xB5C0FBCFEC4D3B2Fll,
+      0xE9B5DBA58189DBBCll, 0x3956C25BF348B538ll, 0x59F111F1B605D019ll,
+      0x923F82A4AF194F9Bll, 0xAB1C5ED5DA6D8118ll, 0xD807AA98A3030242ll,
+      0x12835B0145706FBEll, 0x243185BE4EE4B28Cll, 0x550C7DC3D5FFB4E2ll,
+      0x72BE5D74F27B896Fll, 0x80DEB1FE3B1696B1ll, 0x9BDC06A725C71235ll,
+      0xC19BF174CF692694ll, 0xE49B69C19EF14AD2ll, 0xEFBE4786384F25E3ll,
+      0x0FC19DC68B8CD5B5ll, 0x240CA1CC77AC9C65ll, 0x2DE92C6F592B0275ll,
+      0x4A7484AA6EA6E483ll, 0x5CB0A9DCBD41FBD4ll, 0x76F988DA831153B5ll,
+      0x983E5152EE66DFABll, 0xA831C66D2DB43210ll, 0xB00327C898FB213Fll,
+      0xBF597FC7BEEF0EE4ll, 0xC6E00BF33DA88FC2ll, 0xD5A79147930AA725ll,
+      0x06CA6351E003826Fll, 0x142929670A0E6E70ll, 0x27B70A8546D22FFCll,
+      0x2E1B21385C26C926ll, 0x4D2C6DFC5AC42AEDll, 0x53380D139D95B3DFll,
+      0x650A73548BAF63DEll, 0x766A0ABB3C77B2A8ll, 0x81C2C92E47EDAEE6ll,
+      0x92722C851482353Bll, 0xA2BFE8A14CF10364ll, 0xA81A664BBC423001ll,
+      0xC24B8B70D0F89791ll, 0xC76C51A30654BE30ll, 0xD192E819D6EF5218ll,
+      0xD69906245565A910ll, 0xF40E35855771202All, 0x106AA07032BBD1B8ll,
+      0x19A4C116B8D2D0C8ll, 0x1E376C085141AB53ll, 0x2748774CDF8EEB99ll,
+      0x34B0BCB5E19B48A8ll, 0x391C0CB3C5C95A63ll, 0x4ED8AA4AE3418ACBll,
+      0x5B9CCA4F7763E373ll, 0x682E6FF3D6B2B8A3ll, 0x748F82EE5DEFB2FCll,
+      0x78A5636F43172F60ll, 0x84C87814A1F0AB72ll, 0x8CC702081A6439ECll,
+      0x90BEFFFA23631E28ll, 0xA4506CEBDE82BDE9ll, 0xBEF9A3F7B2C67915ll,
+      0xC67178F2E372532Bll, 0xCA273ECEEA26619Cll, 0xD186B8C721C0C207ll,
+      0xEADA7DD6CDE0EB1Ell, 0xF57D4F7FEE6ED178ll, 0x06F067AA72176FBAll,
+      0x0A637DC5A2C898A6ll, 0x113F9804BEF90DAEll, 0x1B710B35131C471Bll,
+      0x28DB77F523047D84ll, 0x32CAAB7B40C72493ll, 0x3C9EBE0A15C9BEBCll,
+      0x431D67C49C100D4Cll, 0x4CC5D4BECB3E42B6ll, 0x597F299CFC657E2All,
+      0x5FCB6FAB3AD6FAECll, 0x6C44198C4A475817ll
+  };
+  int        t, t8;                   /* Loop counter */
+  uint64_t   temp1, temp2;            /* Temporary word value */
+  uint64_t   W[80];                   /* Word sequence */
+  uint64_t   A, B, C, D, E, F, G, H;  /* Word buffers */
+
+  /*
+   * Initialize the first 16 words in the array W
+   */
+  for (t = t8 = 0; t < 16; t++, t8 += 8)
+    W[t] = ((uint64_t)(context->Message_Block[t8  ]) << 56) |
+           ((uint64_t)(context->Message_Block[t8 + 1]) << 48) |
+           ((uint64_t)(context->Message_Block[t8 + 2]) << 40) |
+           ((uint64_t)(context->Message_Block[t8 + 3]) << 32) |
+           ((uint64_t)(context->Message_Block[t8 + 4]) << 24) |
+           ((uint64_t)(context->Message_Block[t8 + 5]) << 16) |
+           ((uint64_t)(context->Message_Block[t8 + 6]) << 8) |
+           ((uint64_t)(context->Message_Block[t8 + 7]));
+
+  for (t = 16; t < 80; t++)
+    W[t] = SHA512_sigma1(W[t-2]) + W[t-7] +
+        SHA512_sigma0(W[t-15]) + W[t-16];
+  A = context->Intermediate_Hash[0];
+  B = context->Intermediate_Hash[1];
+  C = context->Intermediate_Hash[2];
+  D = context->Intermediate_Hash[3];
+  E = context->Intermediate_Hash[4];
+  F = context->Intermediate_Hash[5];
+  G = context->Intermediate_Hash[6];
+  H = context->Intermediate_Hash[7];
+
+  for (t = 0; t < 80; t++) {
+    temp1 = H + SHA512_SIGMA1(E) + SHA_Ch(E,F,G) + K[t] + W[t];
+    temp2 = SHA512_SIGMA0(A) + SHA_Maj(A,B,C);
+    H = G;
+    G = F;
+    F = E;
+    E = D + temp1;
+    D = C;
+    C = B;
+    B = A;
+    A = temp1 + temp2;
+  }
+
+  context->Intermediate_Hash[0] += A;
+  context->Intermediate_Hash[1] += B;
+  context->Intermediate_Hash[2] += C;
+  context->Intermediate_Hash[3] += D;
+  context->Intermediate_Hash[4] += E;
+  context->Intermediate_Hash[5] += F;
+  context->Intermediate_Hash[6] += G;
+  context->Intermediate_Hash[7] += H;
+#endif /* USE_32BIT_ONLY */
+
+  context->Message_Block_Index = 0;
+}
+
+/*
+ * SHA384_512Finalize
+ *
+ * Description:
+ *   This helper function finishes off the digest calculations.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   Pad_Byte: [in]
+ *     The last byte to add to the message block before the 0-padding
+ *     and length.  This will contain the last bits of the message
+ *     followed by another single bit.  If the message was an
+ *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+static void SHA384_512Finalize(SHA512Context *context,
+    uint8_t Pad_Byte)
+{
+  int_least16_t i;
+  SHA384_512PadMessage(context, Pad_Byte);
+  /* message may be sensitive, clear it out */
+  for (i = 0; i < SHA512_Message_Block_Size; ++i)
+    context->Message_Block[i] = 0;
+#ifdef USE_32BIT_ONLY    /* and clear length */
+  context->Length[0] = context->Length[1] = 0;
+  context->Length[2] = context->Length[3] = 0;
+#else /* !USE_32BIT_ONLY */
+  context->Length_High = context->Length_Low = 0;
+#endif /* USE_32BIT_ONLY */
+  context->Computed = 1;
+}
+
+/*
+ * SHA384_512PadMessage
+ *
+ * Description:
+ *   According to the standard, the message must be padded to the next
+ *   even multiple of 1024 bits.  The first padding bit must be a '1'.
+ *   The last 128 bits represent the length of the original message.
+ *   All bits in between should be 0.  This helper function will
+ *   pad the message according to those rules by filling the
+ *   Message_Block array accordingly.  When it returns, it can be
+ *   assumed that the message digest has been computed.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to pad.
+ *   Pad_Byte: [in]
+ *     The last byte to add to the message block before the 0-padding
+ *     and length.  This will contain the last bits of the message
+ *     followed by another single bit.  If the message was an
+ *     exact multiple of 8-bits long, Pad_Byte will be 0x80.
+ *
+ * Returns:
+ *   Nothing.
+ *
+ */
+static void SHA384_512PadMessage(SHA512Context *context,
+    uint8_t Pad_Byte)
+{
+  /*
+   * Check to see if the current message block is too small to hold
+   * the initial padding bits and length.  If so, we will pad the
+   * block, process it, and then continue padding into a second
+   * block.
+   */
+  if (context->Message_Block_Index >= (SHA512_Message_Block_Size-16)) {
+    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
+    while (context->Message_Block_Index < SHA512_Message_Block_Size)
+      context->Message_Block[context->Message_Block_Index++] = 0;
+
+    SHA384_512ProcessMessageBlock(context);
+  } else
+    context->Message_Block[context->Message_Block_Index++] = Pad_Byte;
+
+  while (context->Message_Block_Index < (SHA512_Message_Block_Size-16))
+    context->Message_Block[context->Message_Block_Index++] = 0;
+
+  /*
+   * Store the message length as the last 16 octets
+   */
+#ifdef USE_32BIT_ONLY
+  context->Message_Block[112] = (uint8_t)(context->Length[0] >> 24);
+  context->Message_Block[113] = (uint8_t)(context->Length[0] >> 16);
+  context->Message_Block[114] = (uint8_t)(context->Length[0] >> 8);
+  context->Message_Block[115] = (uint8_t)(context->Length[0]);
+  context->Message_Block[116] = (uint8_t)(context->Length[1] >> 24);
+  context->Message_Block[117] = (uint8_t)(context->Length[1] >> 16);
+  context->Message_Block[118] = (uint8_t)(context->Length[1] >> 8);
+  context->Message_Block[119] = (uint8_t)(context->Length[1]);
+
+  context->Message_Block[120] = (uint8_t)(context->Length[2] >> 24);
+  context->Message_Block[121] = (uint8_t)(context->Length[2] >> 16);
+  context->Message_Block[122] = (uint8_t)(context->Length[2] >> 8);
+  context->Message_Block[123] = (uint8_t)(context->Length[2]);
+  context->Message_Block[124] = (uint8_t)(context->Length[3] >> 24);
+  context->Message_Block[125] = (uint8_t)(context->Length[3] >> 16);
+  context->Message_Block[126] = (uint8_t)(context->Length[3] >> 8);
+  context->Message_Block[127] = (uint8_t)(context->Length[3]);
+#else /* !USE_32BIT_ONLY */
+  context->Message_Block[112] = (uint8_t)(context->Length_High >> 56);
+  context->Message_Block[113] = (uint8_t)(context->Length_High >> 48);
+  context->Message_Block[114] = (uint8_t)(context->Length_High >> 40);
+  context->Message_Block[115] = (uint8_t)(context->Length_High >> 32);
+  context->Message_Block[116] = (uint8_t)(context->Length_High >> 24);
+  context->Message_Block[117] = (uint8_t)(context->Length_High >> 16);
+  context->Message_Block[118] = (uint8_t)(context->Length_High >> 8);
+  context->Message_Block[119] = (uint8_t)(context->Length_High);
+
+  context->Message_Block[120] = (uint8_t)(context->Length_Low >> 56);
+  context->Message_Block[121] = (uint8_t)(context->Length_Low >> 48);
+  context->Message_Block[122] = (uint8_t)(context->Length_Low >> 40);
+  context->Message_Block[123] = (uint8_t)(context->Length_Low >> 32);
+  context->Message_Block[124] = (uint8_t)(context->Length_Low >> 24);
+  context->Message_Block[125] = (uint8_t)(context->Length_Low >> 16);
+  context->Message_Block[126] = (uint8_t)(context->Length_Low >> 8);
+  context->Message_Block[127] = (uint8_t)(context->Length_Low);
+#endif /* USE_32BIT_ONLY */
+
+  SHA384_512ProcessMessageBlock(context);
+}
+
+/*
+ * SHA384_512ResultN
+ *
+ * Description:
+ *   This helper function will return the 384-bit or 512-bit message
+ *   digest into the Message_Digest array provided by the caller.
+ *   NOTE:
+ *    The first octet of hash is stored in the element with index 0,
+ *    the last octet of hash in the element with index 47/63.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA hash.
+ *   Message_Digest[ ]: [out]
+ *     Where the digest is returned.
+ *   HashSize: [in]
+ *     The size of the hash, either 48 or 64.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+static int SHA384_512ResultN(SHA512Context *context,
+    uint8_t Message_Digest[ ], int HashSize)
+{
+  int i;
+#ifdef USE_32BIT_ONLY
+  int i2;
+#endif /* USE_32BIT_ONLY */
+
+  if (!context) return shaNull;
+  if (!Message_Digest) return shaNull;
+  if (context->Corrupted) return context->Corrupted;
+
+  if (!context->Computed)
+    SHA384_512Finalize(context, 0x80);
+
+#ifdef USE_32BIT_ONLY
+  for (i = i2 = 0; i < HashSize; ) {
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>24);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>16);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>8);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2++]);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>24);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>16);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2]>>8);
+    Message_Digest[i++]=(uint8_t)(context->Intermediate_Hash[i2++]);
+  }
+#else /* !USE_32BIT_ONLY */
+  for (i = 0; i < HashSize; ++i)
+    Message_Digest[i] = (uint8_t)
+      (context->Intermediate_Hash[i>>3] >> 8 * ( 7 - ( i % 8 ) ));
+#endif /* USE_32BIT_ONLY */
+
+  return shaSuccess;
+}
+
diff --git a/components/homekit/hkdf-sha/upstream/shatest.c b/components/homekit/hkdf-sha/upstream/shatest.c
new file mode 100644
index 0000000..3924a31
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/shatest.c
@@ -0,0 +1,1530 @@
+/************************** shatest.c **************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ *  Description:
+ *    This file will exercise the SHA code performing
+ *      the three tests documented in FIPS PUB 180-3
+ *        (http://csrc.nist.gov/publications/fips/
+ *         fips180-2/fips180-2withchangenotice.pdf)
+ *      one that calls SHAInput with an exact multiple of 512 bits
+ *      the seven tests documented for each algorithm in
+ *        "The Secure Hash Algorithm Validation System (SHAVS)"
+ *        (http://csrc.nist.gov/cryptval/shs/SHAVS.pdf),
+ *        three of which are bit-level tests
+ *
+ *    These tests have subsequently been moved to pages linked from
+ *      http://csrc.nist.gov/groups/ST/toolkit/examples.html
+ *
+ *    This file will exercise the HMAC SHA1 code performing
+ *      the seven tests documented in RFCs [RFC 2202] and [RFC 4231].
+ *
+ *    This file will exercise the HKDF code performing
+ *      the seven tests documented in RFC 4869.
+ *
+ *    To run the tests and just see PASSED/FAILED, use the -p option.
+ *
+ *    Other options exercise:
+ *      hashing an arbitrary string
+ *      hashing a file's contents
+ *      a few error test checks
+ *      printing the results in raw format
+ *
+ *  Portability Issues:
+ *    None.
+ *
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>     /* defines getopt() and optarg */
+#include "sha.h"
+
+static int scasecmp(const char *s1, const char *s2);
+
+/*
+ *  Define patterns for testing
+ */
+#define TEST1    "abc"
+#define TEST2_1  \
+        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+#define TEST2_2a \
+        "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
+#define TEST2_2b \
+        "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"
+#define TEST2_2  TEST2_2a TEST2_2b
+#define TEST3    "a"                            /* times 1000000 */
+#define TEST4a   "01234567012345670123456701234567"
+#define TEST4b   "01234567012345670123456701234567"
+    /* an exact multiple of 512 bits */
+#define TEST4   TEST4a TEST4b                   /* times 10 */
+#define TEST7_1 \
+  "\x49\xb2\xae\xc2\x59\x4b\xbe\x3a\x3b\x11\x75\x42\xd9\x4a\xc8"
+#define TEST8_1 \
+  "\x9a\x7d\xfd\xf1\xec\xea\xd0\x6e\xd6\x46\xaa\x55\xfe\x75\x71\x46"
+#define TEST9_1 \
+  "\x65\xf9\x32\x99\x5b\xa4\xce\x2c\xb1\xb4\xa2\xe7\x1a\xe7\x02\x20" \
+  "\xaa\xce\xc8\x96\x2d\xd4\x49\x9c\xbd\x7c\x88\x7a\x94\xea\xaa\x10" \
+  "\x1e\xa5\xaa\xbc\x52\x9b\x4e\x7e\x43\x66\x5a\x5a\xf2\xcd\x03\xfe" \
+  "\x67\x8e\xa6\xa5\x00\x5b\xba\x3b\x08\x22\x04\xc2\x8b\x91\x09\xf4" \
+  "\x69\xda\xc9\x2a\xaa\xb3\xaa\x7c\x11\xa1\xb3\x2a"
+#define TEST10_1 \
+  "\xf7\x8f\x92\x14\x1b\xcd\x17\x0a\xe8\x9b\x4f\xba\x15\xa1\xd5\x9f" \
+  "\x3f\xd8\x4d\x22\x3c\x92\x51\xbd\xac\xbb\xae\x61\xd0\x5e\xd1\x15" \
+  "\xa0\x6a\x7c\xe1\x17\xb7\xbe\xea\xd2\x44\x21\xde\xd9\xc3\x25\x92" \
+  "\xbd\x57\xed\xea\xe3\x9c\x39\xfa\x1f\xe8\x94\x6a\x84\xd0\xcf\x1f" \
+  "\x7b\xee\xad\x17\x13\xe2\xe0\x95\x98\x97\x34\x7f\x67\xc8\x0b\x04" \
+  "\x00\xc2\x09\x81\x5d\x6b\x10\xa6\x83\x83\x6f\xd5\x56\x2a\x56\xca" \
+  "\xb1\xa2\x8e\x81\xb6\x57\x66\x54\x63\x1c\xf1\x65\x66\xb8\x6e\x3b" \
+  "\x33\xa1\x08\xb0\x53\x07\xc0\x0a\xff\x14\xa7\x68\xed\x73\x50\x60" \
+  "\x6a\x0f\x85\xe6\xa9\x1d\x39\x6f\x5b\x5c\xbe\x57\x7f\x9b\x38\x80" \
+  "\x7c\x7d\x52\x3d\x6d\x79\x2f\x6e\xbc\x24\xa4\xec\xf2\xb3\xa4\x27" \
+  "\xcd\xbb\xfb"
+#define TEST7_224 \
+  "\xf0\x70\x06\xf2\x5a\x0b\xea\x68\xcd\x76\xa2\x95\x87\xc2\x8d"
+#define TEST8_224 \
+  "\x18\x80\x40\x05\xdd\x4f\xbd\x15\x56\x29\x9d\x6f\x9d\x93\xdf\x62"
+#define TEST9_224 \
+  "\xa2\xbe\x6e\x46\x32\x81\x09\x02\x94\xd9\xce\x94\x82\x65\x69\x42" \
+  "\x3a\x3a\x30\x5e\xd5\xe2\x11\x6c\xd4\xa4\xc9\x87\xfc\x06\x57\x00" \
+  "\x64\x91\xb1\x49\xcc\xd4\xb5\x11\x30\xac\x62\xb1\x9d\xc2\x48\xc7" \
+  "\x44\x54\x3d\x20\xcd\x39\x52\xdc\xed\x1f\x06\xcc\x3b\x18\xb9\x1f" \
+  "\x3f\x55\x63\x3e\xcc\x30\x85\xf4\x90\x70\x60\xd2"
+#define TEST10_224 \
+  "\x55\xb2\x10\x07\x9c\x61\xb5\x3a\xdd\x52\x06\x22\xd1\xac\x97\xd5" \
+  "\xcd\xbe\x8c\xb3\x3a\xa0\xae\x34\x45\x17\xbe\xe4\xd7\xba\x09\xab" \
+  "\xc8\x53\x3c\x52\x50\x88\x7a\x43\xbe\xbb\xac\x90\x6c\x2e\x18\x37" \
+  "\xf2\x6b\x36\xa5\x9a\xe3\xbe\x78\x14\xd5\x06\x89\x6b\x71\x8b\x2a" \
+  "\x38\x3e\xcd\xac\x16\xb9\x61\x25\x55\x3f\x41\x6f\xf3\x2c\x66\x74" \
+  "\xc7\x45\x99\xa9\x00\x53\x86\xd9\xce\x11\x12\x24\x5f\x48\xee\x47" \
+  "\x0d\x39\x6c\x1e\xd6\x3b\x92\x67\x0c\xa5\x6e\xc8\x4d\xee\xa8\x14" \
+  "\xb6\x13\x5e\xca\x54\x39\x2b\xde\xdb\x94\x89\xbc\x9b\x87\x5a\x8b" \
+  "\xaf\x0d\xc1\xae\x78\x57\x36\x91\x4a\xb7\xda\xa2\x64\xbc\x07\x9d" \
+  "\x26\x9f\x2c\x0d\x7e\xdd\xd8\x10\xa4\x26\x14\x5a\x07\x76\xf6\x7c" \
+  "\x87\x82\x73"
+#define TEST7_256 \
+  "\xbe\x27\x46\xc6\xdb\x52\x76\x5f\xdb\x2f\x88\x70\x0f\x9a\x73"
+#define TEST8_256 \
+  "\xe3\xd7\x25\x70\xdc\xdd\x78\x7c\xe3\x88\x7a\xb2\xcd\x68\x46\x52"
+#define TEST9_256 \
+  "\x3e\x74\x03\x71\xc8\x10\xc2\xb9\x9f\xc0\x4e\x80\x49\x07\xef\x7c" \
+  "\xf2\x6b\xe2\x8b\x57\xcb\x58\xa3\xe2\xf3\xc0\x07\x16\x6e\x49\xc1" \
+  "\x2e\x9b\xa3\x4c\x01\x04\x06\x91\x29\xea\x76\x15\x64\x25\x45\x70" \
+  "\x3a\x2b\xd9\x01\xe1\x6e\xb0\xe0\x5d\xeb\xa0\x14\xeb\xff\x64\x06" \
+  "\xa0\x7d\x54\x36\x4e\xff\x74\x2d\xa7\x79\xb0\xb3"
+#define TEST10_256 \
+  "\x83\x26\x75\x4e\x22\x77\x37\x2f\x4f\xc1\x2b\x20\x52\x7a\xfe\xf0" \
+  "\x4d\x8a\x05\x69\x71\xb1\x1a\xd5\x71\x23\xa7\xc1\x37\x76\x00\x00" \
+  "\xd7\xbe\xf6\xf3\xc1\xf7\xa9\x08\x3a\xa3\x9d\x81\x0d\xb3\x10\x77" \
+  "\x7d\xab\x8b\x1e\x7f\x02\xb8\x4a\x26\xc7\x73\x32\x5f\x8b\x23\x74" \
+  "\xde\x7a\x4b\x5a\x58\xcb\x5c\x5c\xf3\x5b\xce\xe6\xfb\x94\x6e\x5b" \
+  "\xd6\x94\xfa\x59\x3a\x8b\xeb\x3f\x9d\x65\x92\xec\xed\xaa\x66\xca" \
+  "\x82\xa2\x9d\x0c\x51\xbc\xf9\x33\x62\x30\xe5\xd7\x84\xe4\xc0\xa4" \
+  "\x3f\x8d\x79\xa3\x0a\x16\x5c\xba\xbe\x45\x2b\x77\x4b\x9c\x71\x09" \
+  "\xa9\x7d\x13\x8f\x12\x92\x28\x96\x6f\x6c\x0a\xdc\x10\x6a\xad\x5a" \
+  "\x9f\xdd\x30\x82\x57\x69\xb2\xc6\x71\xaf\x67\x59\xdf\x28\xeb\x39" \
+  "\x3d\x54\xd6"
+#define TEST7_384 \
+  "\x8b\xc5\x00\xc7\x7c\xee\xd9\x87\x9d\xa9\x89\x10\x7c\xe0\xaa"
+#define TEST8_384 \
+  "\xa4\x1c\x49\x77\x79\xc0\x37\x5f\xf1\x0a\x7f\x4e\x08\x59\x17\x39"
+#define TEST9_384 \
+  "\x68\xf5\x01\x79\x2d\xea\x97\x96\x76\x70\x22\xd9\x3d\xa7\x16\x79" \
+  "\x30\x99\x20\xfa\x10\x12\xae\xa3\x57\xb2\xb1\x33\x1d\x40\xa1\xd0" \
+  "\x3c\x41\xc2\x40\xb3\xc9\xa7\x5b\x48\x92\xf4\xc0\x72\x4b\x68\xc8" \
+  "\x75\x32\x1a\xb8\xcf\xe5\x02\x3b\xd3\x75\xbc\x0f\x94\xbd\x89\xfe" \
+  "\x04\xf2\x97\x10\x5d\x7b\x82\xff\xc0\x02\x1a\xeb\x1c\xcb\x67\x4f" \
+  "\x52\x44\xea\x34\x97\xde\x26\xa4\x19\x1c\x5f\x62\xe5\xe9\xa2\xd8" \
+  "\x08\x2f\x05\x51\xf4\xa5\x30\x68\x26\xe9\x1c\xc0\x06\xce\x1b\xf6" \
+  "\x0f\xf7\x19\xd4\x2f\xa5\x21\xc8\x71\xcd\x23\x94\xd9\x6e\xf4\x46" \
+  "\x8f\x21\x96\x6b\x41\xf2\xba\x80\xc2\x6e\x83\xa9"
+#define TEST10_384 \
+  "\x39\x96\x69\xe2\x8f\x6b\x9c\x6d\xbc\xbb\x69\x12\xec\x10\xff\xcf" \
+  "\x74\x79\x03\x49\xb7\xdc\x8f\xbe\x4a\x8e\x7b\x3b\x56\x21\xdb\x0f" \
+  "\x3e\x7d\xc8\x7f\x82\x32\x64\xbb\xe4\x0d\x18\x11\xc9\xea\x20\x61" \
+  "\xe1\xc8\x4a\xd1\x0a\x23\xfa\xc1\x72\x7e\x72\x02\xfc\x3f\x50\x42" \
+  "\xe6\xbf\x58\xcb\xa8\xa2\x74\x6e\x1f\x64\xf9\xb9\xea\x35\x2c\x71" \
+  "\x15\x07\x05\x3c\xf4\xe5\x33\x9d\x52\x86\x5f\x25\xcc\x22\xb5\xe8" \
+  "\x77\x84\xa1\x2f\xc9\x61\xd6\x6c\xb6\xe8\x95\x73\x19\x9a\x2c\xe6" \
+  "\x56\x5c\xbd\xf1\x3d\xca\x40\x38\x32\xcf\xcb\x0e\x8b\x72\x11\xe8" \
+  "\x3a\xf3\x2a\x11\xac\x17\x92\x9f\xf1\xc0\x73\xa5\x1c\xc0\x27\xaa" \
+  "\xed\xef\xf8\x5a\xad\x7c\x2b\x7c\x5a\x80\x3e\x24\x04\xd9\x6d\x2a" \
+  "\x77\x35\x7b\xda\x1a\x6d\xae\xed\x17\x15\x1c\xb9\xbc\x51\x25\xa4" \
+  "\x22\xe9\x41\xde\x0c\xa0\xfc\x50\x11\xc2\x3e\xcf\xfe\xfd\xd0\x96" \
+  "\x76\x71\x1c\xf3\xdb\x0a\x34\x40\x72\x0e\x16\x15\xc1\xf2\x2f\xbc" \
+  "\x3c\x72\x1d\xe5\x21\xe1\xb9\x9b\xa1\xbd\x55\x77\x40\x86\x42\x14" \
+  "\x7e\xd0\x96"
+#define TEST7_512 \
+  "\x08\xec\xb5\x2e\xba\xe1\xf7\x42\x2d\xb6\x2b\xcd\x54\x26\x70"
+#define TEST8_512 \
+  "\x8d\x4e\x3c\x0e\x38\x89\x19\x14\x91\x81\x6e\x9d\x98\xbf\xf0\xa0"
+#define TEST9_512 \
+  "\x3a\xdd\xec\x85\x59\x32\x16\xd1\x61\x9a\xa0\x2d\x97\x56\x97\x0b" \
+  "\xfc\x70\xac\xe2\x74\x4f\x7c\x6b\x27\x88\x15\x10\x28\xf7\xb6\xa2" \
+  "\x55\x0f\xd7\x4a\x7e\x6e\x69\xc2\xc9\xb4\x5f\xc4\x54\x96\x6d\xc3" \
+  "\x1d\x2e\x10\xda\x1f\x95\xce\x02\xbe\xb4\xbf\x87\x65\x57\x4c\xbd" \
+  "\x6e\x83\x37\xef\x42\x0a\xdc\x98\xc1\x5c\xb6\xd5\xe4\xa0\x24\x1b" \
+  "\xa0\x04\x6d\x25\x0e\x51\x02\x31\xca\xc2\x04\x6c\x99\x16\x06\xab" \
+  "\x4e\xe4\x14\x5b\xee\x2f\xf4\xbb\x12\x3a\xab\x49\x8d\x9d\x44\x79" \
+  "\x4f\x99\xcc\xad\x89\xa9\xa1\x62\x12\x59\xed\xa7\x0a\x5b\x6d\xd4" \
+  "\xbd\xd8\x77\x78\xc9\x04\x3b\x93\x84\xf5\x49\x06"
+#define TEST10_512 \
+  "\xa5\x5f\x20\xc4\x11\xaa\xd1\x32\x80\x7a\x50\x2d\x65\x82\x4e\x31" \
+  "\xa2\x30\x54\x32\xaa\x3d\x06\xd3\xe2\x82\xa8\xd8\x4e\x0d\xe1\xde" \
+  "\x69\x74\xbf\x49\x54\x69\xfc\x7f\x33\x8f\x80\x54\xd5\x8c\x26\xc4" \
+  "\x93\x60\xc3\xe8\x7a\xf5\x65\x23\xac\xf6\xd8\x9d\x03\xe5\x6f\xf2" \
+  "\xf8\x68\x00\x2b\xc3\xe4\x31\xed\xc4\x4d\xf2\xf0\x22\x3d\x4b\xb3" \
+  "\xb2\x43\x58\x6e\x1a\x7d\x92\x49\x36\x69\x4f\xcb\xba\xf8\x8d\x95" \
+  "\x19\xe4\xeb\x50\xa6\x44\xf8\xe4\xf9\x5e\xb0\xea\x95\xbc\x44\x65" \
+  "\xc8\x82\x1a\xac\xd2\xfe\x15\xab\x49\x81\x16\x4b\xbb\x6d\xc3\x2f" \
+  "\x96\x90\x87\xa1\x45\xb0\xd9\xcc\x9c\x67\xc2\x2b\x76\x32\x99\x41" \
+  "\x9c\xc4\x12\x8b\xe9\xa0\x77\xb3\xac\xe6\x34\x06\x4e\x6d\x99\x28" \
+  "\x35\x13\xdc\x06\xe7\x51\x5d\x0d\x73\x13\x2e\x9a\x0d\xc6\xd3\xb1" \
+  "\xf8\xb2\x46\xf1\xa9\x8a\x3f\xc7\x29\x41\xb1\xe3\xbb\x20\x98\xe8" \
+  "\xbf\x16\xf2\x68\xd6\x4f\x0b\x0f\x47\x07\xfe\x1e\xa1\xa1\x79\x1b" \
+  "\xa2\xf3\xc0\xc7\x58\xe5\xf5\x51\x86\x3a\x96\xc9\x49\xad\x47\xd7" \
+  "\xfb\x40\xd2"
+#define SHA1_SEED "\xd0\x56\x9c\xb3\x66\x5a\x8a\x43\xeb\x6e\xa2\x3d" \
+  "\x75\xa3\xc4\xd2\x05\x4a\x0d\x7d"
+#define SHA224_SEED "\xd0\x56\x9c\xb3\x66\x5a\x8a\x43\xeb\x6e\xa2" \
+  "\x3d\x75\xa3\xc4\xd2\x05\x4a\x0d\x7d\x66\xa9\xca\x99\xc9\xce\xb0" \
+  "\x27"
+#define SHA256_SEED "\xf4\x1e\xce\x26\x13\xe4\x57\x39\x15\x69\x6b" \
+  "\x5a\xdc\xd5\x1c\xa3\x28\xbe\x3b\xf5\x66\xa9\xca\x99\xc9\xce\xb0" \
+  "\x27\x9c\x1c\xb0\xa7"
+#define SHA384_SEED "\x82\x40\xbc\x51\xe4\xec\x7e\xf7\x6d\x18\xe3" \
+  "\x52\x04\xa1\x9f\x51\xa5\x21\x3a\x73\xa8\x1d\x6f\x94\x46\x80\xd3" \
+  "\x07\x59\x48\xb7\xe4\x63\x80\x4e\xa3\xd2\x6e\x13\xea\x82\x0d\x65" \
+  "\xa4\x84\xbe\x74\x53"
+#define SHA512_SEED "\x47\x3f\xf1\xb9\xb3\xff\xdf\xa1\x26\x69\x9a" \
+  "\xc7\xef\x9e\x8e\x78\x77\x73\x09\x58\x24\xc6\x42\x55\x7c\x13\x99" \
+  "\xd9\x8e\x42\x20\x44\x8d\xc3\x5b\x99\xbf\xdd\x44\x77\x95\x43\x92" \
+  "\x4c\x1c\xe9\x3b\xc5\x94\x15\x38\x89\x5d\xb9\x88\x26\x1b\x00\x77" \
+  "\x4b\x12\x27\x20\x39"
+
+#define TESTCOUNT 10
+#define HASHCOUNT 5
+#define RANDOMCOUNT 4
+#define HMACTESTCOUNT 7
+#define HKDFTESTCOUNT 7
+
+#define PRINTNONE 0
+#define PRINTTEXT 1
+#define PRINTRAW 2
+#define PRINTHEX 3
+#define PRINTBASE64 4
+
+#define PRINTPASSFAIL 1
+#define PRINTFAIL 2
+
+#define length(x) (sizeof(x)-1)
+
+/* Test arrays for hashes. */
+struct hash {
+    const char *name;
+    SHAversion whichSha;
+    int hashsize;
+    struct {
+        const char *testarray;
+        int length;
+        long repeatcount;
+        int extrabits;
+        int numberExtrabits;
+        const char *resultarray;
+    } tests[TESTCOUNT];
+    const char *randomtest;
+    const char *randomresults[RANDOMCOUNT];
+} hashes[HASHCOUNT] = {
+  { "SHA1", SHA1, SHA1HashSize,
+    {
+      /* 1 */ { TEST1, length(TEST1), 1, 0, 0,
+        "A9993E364706816ABA3E25717850C26C9CD0D89D" },
+      /* 2 */ { TEST2_1, length(TEST2_1), 1, 0, 0,
+        "84983E441C3BD26EBAAE4AA1F95129E5E54670F1" },
+      /* 3 */ { TEST3, length(TEST3), 1000000, 0, 0,
+        "34AA973CD4C4DAA4F61EEB2BDBAD27316534016F" },
+      /* 4 */ { TEST4, length(TEST4), 10, 0, 0,
+        "DEA356A2CDDD90C7A7ECEDC5EBB563934F460452" },
+      /* 5 */ { "", 0, 0, 0x98, 5,
+        "29826B003B906E660EFF4027CE98AF3531AC75BA" },
+      /* 6 */ { "\x5e", 1, 1, 0, 0,
+        "5E6F80A34A9798CAFC6A5DB96CC57BA4C4DB59C2" },
+      /* 7 */ { TEST7_1, length(TEST7_1), 1, 0x80, 3,
+        "6239781E03729919C01955B3FFA8ACB60B988340" },
+      /* 8 */ { TEST8_1, length(TEST8_1), 1, 0, 0,
+        "82ABFF6605DBE1C17DEF12A394FA22A82B544A35" },
+      /* 9 */ { TEST9_1, length(TEST9_1), 1, 0xE0, 3,
+        "8C5B2A5DDAE5A97FC7F9D85661C672ADBF7933D4" },
+      /* 10 */ { TEST10_1, length(TEST10_1), 1, 0, 0,
+        "CB0082C8F197D260991BA6A460E76E202BAD27B3" }
+    }, SHA1_SEED, { "E216836819477C7F78E0D843FE4FF1B6D6C14CD4",
+        "A2DBC7A5B1C6C0A8BCB7AAA41252A6A7D0690DBC",
+        "DB1F9050BB863DFEF4CE37186044E2EEB17EE013",
+        "127FDEDF43D372A51D5747C48FBFFE38EF6CDF7B"
+     } },
+  { "SHA224", SHA224, SHA224HashSize,
+    {
+      /* 1 */ { TEST1, length(TEST1), 1, 0, 0,
+        "23097D223405D8228642A477BDA255B32AADBCE4BDA0B3F7E36C9DA7" },
+      /* 2 */ { TEST2_1, length(TEST2_1), 1, 0, 0,
+        "75388B16512776CC5DBA5DA1FD890150B0C6455CB4F58B1952522525" },
+      /* 3 */ { TEST3, length(TEST3), 1000000, 0, 0,
+        "20794655980C91D8BBB4C1EA97618A4BF03F42581948B2EE4EE7AD67" },
+      /* 4 */ { TEST4, length(TEST4), 10, 0, 0,
+        "567F69F168CD7844E65259CE658FE7AADFA25216E68ECA0EB7AB8262" },
+      /* 5 */ { "", 0, 0, 0x68, 5,
+        "E3B048552C3C387BCAB37F6EB06BB79B96A4AEE5FF27F51531A9551C" },
+      /* 6 */ { "\x07", 1, 1, 0, 0,
+        "00ECD5F138422B8AD74C9799FD826C531BAD2FCABC7450BEE2AA8C2A" },
+      /* 7 */ { TEST7_224, length(TEST7_224), 1, 0xA0, 3,
+        "1B01DB6CB4A9E43DED1516BEB3DB0B87B6D1EA43187462C608137150" },
+      /* 8 */ { TEST8_224, length(TEST8_224), 1, 0, 0,
+        "DF90D78AA78821C99B40BA4C966921ACCD8FFB1E98AC388E56191DB1" },
+      /* 9 */ { TEST9_224, length(TEST9_224), 1, 0xE0, 3,
+        "54BEA6EAB8195A2EB0A7906A4B4A876666300EEFBD1F3B8474F9CD57" },
+      /* 10 */ { TEST10_224, length(TEST10_224), 1, 0, 0,
+        "0B31894EC8937AD9B91BDFBCBA294D9ADEFAA18E09305E9F20D5C3A4" }
+    }, SHA224_SEED, { "100966A5B4FDE0B42E2A6C5953D4D7F41BA7CF79FD"
+        "2DF431416734BE", "1DCA396B0C417715DEFAAE9641E10A2E99D55A"
+        "BCB8A00061EB3BE8BD", "1864E627BDB2319973CD5ED7D68DA71D8B"
+        "F0F983D8D9AB32C34ADB34", "A2406481FC1BCAF24DD08E6752E844"
+        "709563FB916227FED598EB621F"
+     } },
+  { "SHA256", SHA256, SHA256HashSize,
+  {
+      /* 1 */ { TEST1, length(TEST1), 1, 0, 0, "BA7816BF8F01CFEA4141"
+        "40DE5DAE2223B00361A396177A9CB410FF61F20015AD" },
+      /* 2 */ { TEST2_1, length(TEST2_1), 1, 0, 0, "248D6A61D20638B8"
+        "E5C026930C3E6039A33CE45964FF2167F6ECEDD419DB06C1" },
+      /* 3 */ { TEST3, length(TEST3), 1000000, 0, 0, "CDC76E5C9914FB92"
+        "81A1C7E284D73E67F1809A48A497200E046D39CCC7112CD0" },
+      /* 4 */ { TEST4, length(TEST4), 10, 0, 0, "594847328451BDFA"
+        "85056225462CC1D867D877FB388DF0CE35F25AB5562BFBB5" },
+      /* 5 */ { "", 0, 0, 0x68, 5, "D6D3E02A31A84A8CAA9718ED6C2057BE"
+        "09DB45E7823EB5079CE7A573A3760F95" },
+      /* 6 */ { "\x19", 1, 1, 0, 0, "68AA2E2EE5DFF96E3355E6C7EE373E3D"
+        "6A4E17F75F9518D843709C0C9BC3E3D4" },
+      /* 7 */ { TEST7_256, length(TEST7_256), 1, 0x60, 3, "77EC1DC8"
+        "9C821FF2A1279089FA091B35B8CD960BCAF7DE01C6A7680756BEB972" },
+      /* 8 */ { TEST8_256, length(TEST8_256), 1, 0, 0, "175EE69B02BA"
+        "9B58E2B0A5FD13819CEA573F3940A94F825128CF4209BEABB4E8" },
+      /* 9 */ { TEST9_256, length(TEST9_256), 1, 0xA0, 3, "3E9AD646"
+        "8BBBAD2AC3C2CDC292E018BA5FD70B960CF1679777FCE708FDB066E9" },
+      /* 10 */ { TEST10_256, length(TEST10_256), 1, 0, 0, "97DBCA7D"
+        "F46D62C8A422C941DD7E835B8AD3361763F7E9B2D95F4F0DA6E1CCBC" },
+    }, SHA256_SEED, { "83D28614D49C3ADC1D6FC05DB5F48037C056F8D2A4CE44"
+        "EC6457DEA5DD797CD1", "99DBE3127EF2E93DD9322D6A07909EB33B6399"
+        "5E529B3F954B8581621BB74D39", "8D4BE295BB64661CA3C7EFD129A2F7"
+        "25B33072DBDDE32385B9A87B9AF88EA76F", "40AF5D3F9716B040DF9408"
+        "E31536B70FF906EC51B00447CA97D7DD97C12411F4"
+    } },
+  { "SHA384", SHA384, SHA384HashSize,
+    {
+      /* 1 */ { TEST1, length(TEST1), 1, 0, 0,
+        "CB00753F45A35E8BB5A03D699AC65007272C32AB0EDED163"
+        "1A8B605A43FF5BED8086072BA1E7CC2358BAECA134C825A7" },
+      /* 2 */ { TEST2_2, length(TEST2_2), 1, 0, 0,
+        "09330C33F71147E83D192FC782CD1B4753111B173B3B05D2"
+        "2FA08086E3B0F712FCC7C71A557E2DB966C3E9FA91746039" },
+      /* 3 */ { TEST3, length(TEST3), 1000000, 0, 0,
+        "9D0E1809716474CB086E834E310A4A1CED149E9C00F24852"
+        "7972CEC5704C2A5B07B8B3DC38ECC4EBAE97DDD87F3D8985" },
+      /* 4 */ { TEST4, length(TEST4), 10, 0, 0,
+        "2FC64A4F500DDB6828F6A3430B8DD72A368EB7F3A8322A70"
+        "BC84275B9C0B3AB00D27A5CC3C2D224AA6B61A0D79FB4596" },
+      /* 5 */ { "", 0, 0, 0x10, 5,
+        "8D17BE79E32B6718E07D8A603EB84BA0478F7FCFD1BB9399"
+        "5F7D1149E09143AC1FFCFC56820E469F3878D957A15A3FE4" },
+      /* 6 */ { "\xb9", 1, 1, 0, 0,
+        "BC8089A19007C0B14195F4ECC74094FEC64F01F90929282C"
+        "2FB392881578208AD466828B1C6C283D2722CF0AD1AB6938" },
+      /* 7 */ { TEST7_384, length(TEST7_384), 1, 0xA0, 3,
+        "D8C43B38E12E7C42A7C9B810299FD6A770BEF30920F17532"
+        "A898DE62C7A07E4293449C0B5FA70109F0783211CFC4BCE3" },
+      /* 8 */ { TEST8_384, length(TEST8_384), 1, 0, 0,
+        "C9A68443A005812256B8EC76B00516F0DBB74FAB26D66591"
+        "3F194B6FFB0E91EA9967566B58109CBC675CC208E4C823F7" },
+      /* 9 */ { TEST9_384, length(TEST9_384), 1, 0xE0, 3,
+        "5860E8DE91C21578BB4174D227898A98E0B45C4C760F0095"
+        "49495614DAEDC0775D92D11D9F8CE9B064EEAC8DAFC3A297" },
+      /* 10 */ { TEST10_384, length(TEST10_384), 1, 0, 0,
+        "4F440DB1E6EDD2899FA335F09515AA025EE177A79F4B4AAF"
+        "38E42B5C4DE660F5DE8FB2A5B2FBD2A3CBFFD20CFF1288C0" }
+    }, SHA384_SEED, { "CE44D7D63AE0C91482998CF662A51EC80BF6FC68661A3C"
+        "57F87566112BD635A743EA904DEB7D7A42AC808CABE697F38F", "F9C6D2"
+        "61881FEE41ACD39E67AA8D0BAD507C7363EB67E2B81F45759F9C0FD7B503"
+        "DF1A0B9E80BDE7BC333D75B804197D", "D96512D8C9F4A7A4967A366C01"
+        "C6FD97384225B58343A88264847C18E4EF8AB7AEE4765FFBC3E30BD485D3"
+        "638A01418F", "0CA76BD0813AF1509E170907A96005938BC985628290B2"
+        "5FEF73CF6FAD68DDBA0AC8920C94E0541607B0915A7B4457F7"
+    } },
+  { "SHA512", SHA512, SHA512HashSize,
+    {
+      /* 1 */ { TEST1, length(TEST1), 1, 0, 0,
+        "DDAF35A193617ABACC417349AE20413112E6FA4E89A97EA2"
+        "0A9EEEE64B55D39A2192992A274FC1A836BA3C23A3FEEBBD"
+        "454D4423643CE80E2A9AC94FA54CA49F" },
+      /* 2 */ { TEST2_2, length(TEST2_2), 1, 0, 0,
+        "8E959B75DAE313DA8CF4F72814FC143F8F7779C6EB9F7FA1"
+        "7299AEADB6889018501D289E4900F7E4331B99DEC4B5433A"
+        "C7D329EEB6DD26545E96E55B874BE909" },
+       /* 3 */ { TEST3, length(TEST3), 1000000, 0, 0,
+        "E718483D0CE769644E2E42C7BC15B4638E1F98B13B204428"
+        "5632A803AFA973EBDE0FF244877EA60A4CB0432CE577C31B"
+        "EB009C5C2C49AA2E4EADB217AD8CC09B" },
+      /* 4 */ { TEST4, length(TEST4), 10, 0, 0,
+        "89D05BA632C699C31231DED4FFC127D5A894DAD412C0E024"
+        "DB872D1ABD2BA8141A0F85072A9BE1E2AA04CF33C765CB51"
+        "0813A39CD5A84C4ACAA64D3F3FB7BAE9" },
+      /* 5 */ { "", 0, 0, 0xB0, 5,
+        "D4EE29A9E90985446B913CF1D1376C836F4BE2C1CF3CADA0"
+        "720A6BF4857D886A7ECB3C4E4C0FA8C7F95214E41DC1B0D2"
+        "1B22A84CC03BF8CE4845F34DD5BDBAD4" },
+      /* 6 */ { "\xD0", 1, 1, 0, 0,
+        "9992202938E882E73E20F6B69E68A0A7149090423D93C81B"
+        "AB3F21678D4ACEEEE50E4E8CAFADA4C85A54EA8306826C4A"
+        "D6E74CECE9631BFA8A549B4AB3FBBA15" },
+      /* 7 */ { TEST7_512, length(TEST7_512), 1, 0x80, 3,
+        "ED8DC78E8B01B69750053DBB7A0A9EDA0FB9E9D292B1ED71"
+        "5E80A7FE290A4E16664FD913E85854400C5AF05E6DAD316B"
+        "7359B43E64F8BEC3C1F237119986BBB6" },
+      /* 8 */ { TEST8_512, length(TEST8_512), 1, 0, 0,
+        "CB0B67A4B8712CD73C9AABC0B199E9269B20844AFB75ACBD"
+        "D1C153C9828924C3DDEDAAFE669C5FDD0BC66F630F677398"
+        "8213EB1B16F517AD0DE4B2F0C95C90F8" },
+      /* 9 */ { TEST9_512, length(TEST9_512), 1, 0x80, 3,
+        "32BA76FC30EAA0208AEB50FFB5AF1864FDBF17902A4DC0A6"
+        "82C61FCEA6D92B783267B21080301837F59DE79C6B337DB2"
+        "526F8A0A510E5E53CAFED4355FE7C2F1" },
+      /* 10 */ { TEST10_512, length(TEST10_512), 1, 0, 0,
+        "C665BEFB36DA189D78822D10528CBF3B12B3EEF726039909"
+        "C1A16A270D48719377966B957A878E720584779A62825C18"
+        "DA26415E49A7176A894E7510FD1451F5" }
+    }, SHA512_SEED, { "2FBB1E7E00F746BA514FBC8C421F36792EC0E11FF5EFC3"
+        "78E1AB0C079AA5F0F66A1E3EDBAEB4F9984BE14437123038A452004A5576"
+        "8C1FD8EED49E4A21BEDCD0", "25CBE5A4F2C7B1D7EF07011705D50C62C5"
+        "000594243EAFD1241FC9F3D22B58184AE2FEE38E171CF8129E29459C9BC2"
+        "EF461AF5708887315F15419D8D17FE7949", "5B8B1F2687555CE2D7182B"
+        "92E5C3F6C36547DA1C13DBB9EA4F73EA4CBBAF89411527906D35B1B06C1B"
+        "6A8007D05EC66DF0A406066829EAB618BDE3976515AAFC", "46E36B007D"
+        "19876CDB0B29AD074FE3C08CDD174D42169D6ABE5A1414B6E79707DF5877"
+        "6A98091CF431854147BB6D3C66D43BFBC108FD715BDE6AA127C2B0E79F"
+    }
+  }
+};
+
+/* Test arrays for HMAC. */
+struct hmachash {
+    const char *keyarray[5];
+    int keylength[5];
+    const char *dataarray[5];
+    int datalength[5];
+    const char *resultarray[5];
+    int resultlength[5];
+} hmachashes[HMACTESTCOUNT] = {
+  { /* 1 */ {
+      "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
+      "\x0b\x0b\x0b\x0b\x0b"
+    }, { 20 }, {
+      "\x48\x69\x20\x54\x68\x65\x72\x65" /* "Hi There" */
+    }, { 8 }, {
+      /* HMAC-SHA-1 */
+      "B617318655057264E28BC0B6FB378C8EF146BE00",
+      /* HMAC-SHA-224 */
+      "896FB1128ABBDF196832107CD49DF33F47B4B1169912BA4F53684B22",
+      /* HMAC-SHA-256 */
+      "B0344C61D8DB38535CA8AFCEAF0BF12B881DC200C9833DA726E9376C2E32"
+      "CFF7",
+      /* HMAC-SHA-384 */
+      "AFD03944D84895626B0825F4AB46907F15F9DADBE4101EC682AA034C7CEB"
+      "C59CFAEA9EA9076EDE7F4AF152E8B2FA9CB6",
+      /* HMAC-SHA-512 */
+      "87AA7CDEA5EF619D4FF0B4241A1D6CB02379F4E2CE4EC2787AD0B30545E1"
+      "7CDEDAA833B7D6B8A702038B274EAEA3F4E4BE9D914EEB61F1702E696C20"
+      "3A126854"
+    }, { SHA1HashSize, SHA224HashSize, SHA256HashSize,
+      SHA384HashSize, SHA512HashSize }
+  },
+  { /* 2 */ {
+      "\x4a\x65\x66\x65" /* "Jefe" */
+    }, { 4 }, {
+      "\x77\x68\x61\x74\x20\x64\x6f\x20\x79\x61\x20\x77\x61\x6e\x74"
+      "\x20\x66\x6f\x72\x20\x6e\x6f\x74\x68\x69\x6e\x67\x3f"
+      /* "what do ya want for nothing?" */
+    }, { 28 }, {
+      /* HMAC-SHA-1 */
+      "EFFCDF6AE5EB2FA2D27416D5F184DF9C259A7C79",
+      /* HMAC-SHA-224 */
+      "A30E01098BC6DBBF45690F3A7E9E6D0F8BBEA2A39E6148008FD05E44",
+      /* HMAC-SHA-256 */
+      "5BDCC146BF60754E6A042426089575C75A003F089D2739839DEC58B964EC"
+      "3843",
+      /* HMAC-SHA-384 */
+      "AF45D2E376484031617F78D2B58A6B1B9C7EF464F5A01B47E42EC3736322"
+      "445E8E2240CA5E69E2C78B3239ECFAB21649",
+      /* HMAC-SHA-512 */
+      "164B7A7BFCF819E2E395FBE73B56E0A387BD64222E831FD610270CD7EA25"
+      "05549758BF75C05A994A6D034F65F8F0E6FDCAEAB1A34D4A6B4B636E070A"
+      "38BCE737"
+    }, { SHA1HashSize, SHA224HashSize, SHA256HashSize,
+      SHA384HashSize, SHA512HashSize }
+  },
+  { /* 3 */
+    {
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa"
+    }, { 20 }, {
+      "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
+      "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
+      "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
+      "\xdd\xdd\xdd\xdd\xdd"
+    }, { 50 }, {
+      /* HMAC-SHA-1 */
+      "125D7342B9AC11CD91A39AF48AA17B4F63F175D3",
+      /* HMAC-SHA-224 */
+      "7FB3CB3588C6C1F6FFA9694D7D6AD2649365B0C1F65D69D1EC8333EA",
+      /* HMAC-SHA-256 */
+      "773EA91E36800E46854DB8EBD09181A72959098B3EF8C122D9635514CED5"
+      "65FE",
+      /* HMAC-SHA-384 */
+      "88062608D3E6AD8A0AA2ACE014C8A86F0AA635D947AC9FEBE83EF4E55966"
+      "144B2A5AB39DC13814B94E3AB6E101A34F27",
+      /* HMAC-SHA-512 */
+      "FA73B0089D56A284EFB0F0756C890BE9B1B5DBDD8EE81A3655F83E33B227"
+      "9D39BF3E848279A722C806B485A47E67C807B946A337BEE8942674278859"
+      "E13292FB"
+    }, { SHA1HashSize, SHA224HashSize, SHA256HashSize,
+      SHA384HashSize, SHA512HashSize }
+  },
+  { /* 4 */ {
+      "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+      "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19"
+    }, { 25 }, {
+      "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
+      "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
+      "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
+      "\xcd\xcd\xcd\xcd\xcd"
+    }, { 50 }, {
+      /* HMAC-SHA-1 */
+      "4C9007F4026250C6BC8414F9BF50C86C2D7235DA",
+      /* HMAC-SHA-224 */
+      "6C11506874013CAC6A2ABC1BB382627CEC6A90D86EFC012DE7AFEC5A",
+      /* HMAC-SHA-256 */
+      "82558A389A443C0EA4CC819899F2083A85F0FAA3E578F8077A2E3FF46729"
+      "665B",
+      /* HMAC-SHA-384 */
+      "3E8A69B7783C25851933AB6290AF6CA77A9981480850009CC5577C6E1F57"
+      "3B4E6801DD23C4A7D679CCF8A386C674CFFB",
+      /* HMAC-SHA-512 */
+      "B0BA465637458C6990E5A8C5F61D4AF7E576D97FF94B872DE76F8050361E"
+      "E3DBA91CA5C11AA25EB4D679275CC5788063A5F19741120C4F2DE2ADEBEB"
+      "10A298DD"
+    }, { SHA1HashSize, SHA224HashSize, SHA256HashSize,
+      SHA384HashSize, SHA512HashSize }
+  },
+  { /* 5 */ {
+      "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"
+      "\x0c\x0c\x0c\x0c\x0c"
+    }, { 20 }, {
+      "Test With Truncation"
+    }, { 20 }, {
+      /* HMAC-SHA-1 */
+      "4C1A03424B55E07FE7F27BE1",
+      /* HMAC-SHA-224 */
+      "0E2AEA68A90C8D37C988BCDB9FCA6FA8",
+      /* HMAC-SHA-256 */
+      "A3B6167473100EE06E0C796C2955552B",
+      /* HMAC-SHA-384 */
+      "3ABF34C3503B2A23A46EFC619BAEF897",
+      /* HMAC-SHA-512 */
+      "415FAD6271580A531D4179BC891D87A6"
+    }, { 12, 16, 16, 16, 16 }
+  },
+  { /* 6 */ {
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+    }, { 80, 131 }, {
+      "Test Using Larger Than Block-Size Key - Hash Key First"
+    }, { 54 }, {
+      /* HMAC-SHA-1 */
+      "AA4AE5E15272D00E95705637CE8A3B55ED402112",
+      /* HMAC-SHA-224 */
+      "95E9A0DB962095ADAEBE9B2D6F0DBCE2D499F112F2D2B7273FA6870E",
+      /* HMAC-SHA-256 */
+      "60E431591EE0B67F0D8A26AACBF5B77F8E0BC6213728C5140546040F0EE3"
+      "7F54",
+      /* HMAC-SHA-384 */
+      "4ECE084485813E9088D2C63A041BC5B44F9EF1012A2B588F3CD11F05033A"
+      "C4C60C2EF6AB4030FE8296248DF163F44952",
+      /* HMAC-SHA-512 */
+      "80B24263C7C1A3EBB71493C1DD7BE8B49B46D1F41B4AEEC1121B013783F8"
+      "F3526B56D037E05F2598BD0FD2215D6A1E5295E64F73F63F0AEC8B915A98"
+      "5D786598"
+    }, { SHA1HashSize, SHA224HashSize, SHA256HashSize,
+      SHA384HashSize, SHA512HashSize }
+  },
+  { /* 7 */ {
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+      "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+    }, { 80, 131 }, {
+      "Test Using Larger Than Block-Size Key and "
+      "Larger Than One Block-Size Data",
+      "\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x74\x65\x73\x74\x20"
+      "\x75\x73\x69\x6e\x67\x20\x61\x20\x6c\x61\x72\x67\x65\x72\x20"
+      "\x74\x68\x61\x6e\x20\x62\x6c\x6f\x63\x6b\x2d\x73\x69\x7a\x65"
+      "\x20\x6b\x65\x79\x20\x61\x6e\x64\x20\x61\x20\x6c\x61\x72\x67"
+      "\x65\x72\x20\x74\x68\x61\x6e\x20\x62\x6c\x6f\x63\x6b\x2d\x73"
+      "\x69\x7a\x65\x20\x64\x61\x74\x61\x2e\x20\x54\x68\x65\x20\x6b"
+      "\x65\x79\x20\x6e\x65\x65\x64\x73\x20\x74\x6f\x20\x62\x65\x20"
+      "\x68\x61\x73\x68\x65\x64\x20\x62\x65\x66\x6f\x72\x65\x20\x62"
+      "\x65\x69\x6e\x67\x20\x75\x73\x65\x64\x20\x62\x79\x20\x74\x68"
+      "\x65\x20\x48\x4d\x41\x43\x20\x61\x6c\x67\x6f\x72\x69\x74\x68"
+      "\x6d\x2e"
+      /* "This is a test using a larger than block-size key and a "
+          "larger than block-size data.  The key needs to be hashed "
+          "before being used by the HMAC algorithm." */
+    }, { 73, 152 }, {
+      /* HMAC-SHA-1 */
+      "E8E99D0F45237D786D6BBAA7965C7808BBFF1A91",
+      /* HMAC-SHA-224 */
+      "3A854166AC5D9F023F54D517D0B39DBD946770DB9C2B95C9F6F565D1",
+      /* HMAC-SHA-256 */
+      "9B09FFA71B942FCB27635FBCD5B0E944BFDC63644F0713938A7F51535C3A"
+      "35E2",
+      /* HMAC-SHA-384 */
+      "6617178E941F020D351E2F254E8FD32C602420FEB0B8FB9ADCCEBB82461E"
+      "99C5A678CC31E799176D3860E6110C46523E",
+      /* HMAC-SHA-512 */
+      "E37B6A775DC87DBAA4DFA9F96E5E3FFDDEBD71F8867289865DF5A32D20CD"
+      "C944B6022CAC3C4982B10D5EEB55C3E4DE15134676FB6DE0446065C97440"
+      "FA8C6A58"
+    }, { SHA1HashSize, SHA224HashSize, SHA256HashSize,
+      SHA384HashSize, SHA512HashSize }
+  }
+};
+
+/* Test arrays for HKDF. */
+struct hkdfhash {
+    SHAversion whichSha;
+    int ikmlength;
+    const char *ikmarray;
+    int saltlength;
+    const char *saltarray;
+    int infolength;
+    const char *infoarray;
+    int prklength;
+    const char *prkarray;
+    int okmlength;
+    const char *okmarray;
+} hkdfhashes[HKDFTESTCOUNT] = {
+    {   /* RFC 5869 A.1. Test Case 1 */
+        SHA256,
+        22, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
+            "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
+        13, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c",
+        10, "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9",
+        32, "077709362C2E32DF0DDC3F0DC47BBA6390B6C73BB50F9C3122EC844A"
+            "D7C2B3E5",
+        42, "3CB25F25FAACD57A90434F64D0362F2A2D2D0A90CF1A5A4C5DB02D56"
+            "ECC4C5BF34007208D5B887185865"
+    },
+    {   /* RFC 5869 A.2. Test Case 2 */
+        SHA256,
+        80, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d"
+            "\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b"
+            "\x1c\x1d\x1e\x1f\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29"
+            "\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34\x35\x36\x37"
+            "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40\x41\x42\x43\x44\x45"
+            "\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f",
+        80, "\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d"
+            "\x6e\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b"
+            "\x7c\x7d\x7e\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89"
+            "\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97"
+            "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5"
+            "\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf",
+        80, "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd"
+            "\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb"
+            "\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9"
+            "\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"
+            "\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5"
+            "\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
+        32, "06A6B88C5853361A06104C9CEB35B45C"
+            "EF760014904671014A193F40C15FC244",
+        82, "B11E398DC80327A1C8E7F78C596A4934"
+            "4F012EDA2D4EFAD8A050CC4C19AFA97C"
+            "59045A99CAC7827271CB41C65E590E09"
+            "DA3275600C2F09B8367793A9ACA3DB71"
+            "CC30C58179EC3E87C14C01D5C1F3434F"
+            "1D87"
+    },
+    {   /* RFC 5869 A.3. Test Case 3 */
+        SHA256,
+        22, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
+            "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
+        0, "",
+        0, "",
+        32, "19EF24A32C717B167F33A91D6F648BDF"
+            "96596776AFDB6377AC434C1C293CCB04",
+        42, "8DA4E775A563C18F715F802A063C5A31"
+            "B8A11F5C5EE1879EC3454E5F3C738D2D"
+            "9D201395FAA4B61A96C8"
+    },
+    {   /* RFC 5869 A.4. Test Case 4 */
+        SHA1,
+        11, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
+        13, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c",
+        10, "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9",
+        20, "9B6C18C432A7BF8F0E71C8EB88F4B30BAA2BA243",
+        42, "085A01EA1B10F36933068B56EFA5AD81"
+            "A4F14B822F5B091568A9CDD4F155FDA2"
+            "C22E422478D305F3F896"
+    },
+    {   /* RFC 5869 A.5. Test Case 5 */
+        SHA1,
+        80, "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d"
+            "\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b"
+            "\x1c\x1d\x1e\x1f\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29"
+            "\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34\x35\x36\x37"
+            "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40\x41\x42\x43\x44\x45"
+            "\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f",
+        80, "\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6A\x6B\x6C\x6D"
+            "\x6E\x6F\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7A\x7B"
+            "\x7C\x7D\x7E\x7F\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89"
+            "\x8A\x8B\x8C\x8D\x8E\x8F\x90\x91\x92\x93\x94\x95\x96\x97"
+            "\x98\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA0\xA1\xA2\xA3\xA4\xA5"
+            "\xA6\xA7\xA8\xA9\xAA\xAB\xAC\xAD\xAE\xAF",
+        80, "\xB0\xB1\xB2\xB3\xB4\xB5\xB6\xB7\xB8\xB9\xBA\xBB\xBC\xBD"
+            "\xBE\xBF\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB"
+            "\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9"
+            "\xDA\xDB\xDC\xDD\xDE\xDF\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7"
+            "\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5"
+            "\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF",
+        20, "8ADAE09A2A307059478D309B26C4115A224CFAF6",
+        82, "0BD770A74D1160F7C9F12CD5912A06EB"
+            "FF6ADCAE899D92191FE4305673BA2FFE"
+            "8FA3F1A4E5AD79F3F334B3B202B2173C"
+            "486EA37CE3D397ED034C7F9DFEB15C5E"
+            "927336D0441F4C4300E2CFF0D0900B52"
+            "D3B4"
+    },
+    {   /* RFC 5869 A.6. Test Case 6 */
+        SHA1,
+        22, "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
+            "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
+        0, "",
+        0, "",
+        20, "DA8C8A73C7FA77288EC6F5E7C297786AA0D32D01",
+        42, "0AC1AF7002B3D761D1E55298DA9D0506"
+            "B9AE52057220A306E07B6B87E8DF21D0"
+            "EA00033DE03984D34918"
+    },
+    {   /* RFC 5869 A.7. Test Case 7. */
+        SHA1,
+        22, "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"
+            "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",
+        0, 0,
+        0, "",
+        20, "2ADCCADA18779E7C2077AD2EB19D3F3E731385DD",
+        42, "2C91117204D745F3500D636A62F64F0A"
+            "B3BAE548AA53D423B0D1F27EBBA6F5E5"
+            "673A081D70CCE7ACFC48"
+    }
+};
+
+/*
+ * Check the hash value against the expected string, expressed in hex
+ */
+static const char hexdigits[ ] = "0123456789ABCDEF";
+int checkmatch(const unsigned char *hashvalue,
+  const char *hexstr, int hashsize)
+{
+  int i;
+  for (i = 0; i < hashsize; ++i) {
+    if (*hexstr++ != hexdigits[(hashvalue[i] >> 4) & 0xF])
+      return 0;
+    if (*hexstr++ != hexdigits[hashvalue[i] & 0xF]) return 0;
+  }
+  return 1;
+}
+
+/*
+ * Print the string, converting non-printable characters to "."
+ */
+void printstr(const char *str, int len)
+{
+  for ( ; len-- > 0; str++)
+    putchar(isprint((unsigned char)*str) ? *str : '.');
+}
+
+/*
+ * Print the string, converting all characters to hex "## ".
+ */
+void printxstr(const char *str, int len)
+{
+  char *sep = "";
+  for ( ; len-- > 0; str++) {
+    printf("%s%c%c", sep, hexdigits[(*str >> 4) & 0xF],
+      hexdigits[*str & 0xF]);
+    sep = " ";
+  }
+}
+
+/*
+ * Print a usage message.
+ */
+void usage(const char *argv0)
+{
+  fprintf(stderr,
+    "Usage:\n"
+    "Common options: [-h hash] [-w|-x|-6] [-H]\n"
+    "Hash a string:\n"
+      "\t%s [-S expectedresult] -s hashstr [-k key] "
+           "[-i info -L okm-len]\n"
+    "Hash a file:\n"
+      "\t%s [-S expectedresult] -f file [-k key] "
+           "[-i info -L okm-len]\n"
+    "Hash a file, ignoring whitespace:\n"
+      "\t%s [-S expectedresult] -F file [-k key] "
+           "[-i info -L okm-len]\n"
+    "Additional bits to add in: [-B bitcount -b bits]\n"
+    "(If -k,-i&-L are used, run HKDF-SHA###.\n"
+    " If -k is used, but not -i&-L, run HMAC-SHA###.\n"
+    " Otherwise, run SHA###.)\n"
+    "Standard tests:\n"
+      "\t%s [-m | -d] [-l loopcount] [-t test#] [-e]\n"
+      "\t\t[-r randomseed] [-R randomloop-count] "
+        "[-p] [-P|-X]\n"
+    "-h\thash to test: "
+      "0|SHA1, 1|SHA224, 2|SHA256, 3|SHA384, 4|SHA512\n"
+    "-m\tperform hmac standard tests\n"
+    "-k\tkey for hmac test\n"
+    "-d\tperform hkdf standard tests\n"
+    "-t\ttest case to run, 1-10\n"
+    "-l\thow many times to run the test\n"
+    "-e\ttest error returns\n"
+    "-p\tdo not print results\n"
+    "-P\tdo not print PASSED/FAILED\n"
+    "-X\tprint FAILED, but not PASSED\n"
+    "-r\tseed for random test\n"
+    "-R\thow many times to run random test\n"
+    "-s\tstring to hash\n"
+    "-S\texpected result of hashed string, in hex\n"
+    "-w\toutput hash in raw format\n"
+    "-x\toutput hash in hex format\n"
+    "-6\toutput hash in base64 format\n"
+    "-B\t# extra bits to add in after string or file input\n"
+    "-b\textra bits to add (high order bits of #, 0# or 0x#)\n"
+    "-H\tinput hashstr or randomseed is in hex\n"
+    , argv0, argv0, argv0, argv0);
+  exit(1);
+}
+
+/*
+ * Print the results and PASS/FAIL.
+ */
+void printResult(uint8_t *Message_Digest, int hashsize,
+    const char *hashname, const char *testtype, const char *testname,
+    const char *resultarray, int printResults, int printPassFail)
+{
+  int i, k;
+  if (printResults == PRINTTEXT) {
+    printf("\nhashsize=%d\n", hashsize);
+    putchar('\t');
+    for (i = 0; i < hashsize; ++i) {
+      putchar(hexdigits[(Message_Digest[i] >> 4) & 0xF]);
+      putchar(hexdigits[Message_Digest[i] & 0xF]);
+      putchar(' ');
+    }
+    putchar('\n');
+  } else if (printResults == PRINTRAW) {
+    fwrite(Message_Digest, 1, hashsize, stdout);
+  } else if (printResults == PRINTHEX) {
+    for (i = 0; i < hashsize; ++i) {
+      putchar(hexdigits[(Message_Digest[i] >> 4) & 0xF]);
+      putchar(hexdigits[Message_Digest[i] & 0xF]);
+    }
+    putchar('\n');
+  } else if (printResults == PRINTBASE64) {
+    unsigned char b;
+    char *sm = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+               "0123456789+/";
+    for (i = 0; i < hashsize; i += 3) {
+      putchar(sm[Message_Digest[i] >> 2]);
+      b = (Message_Digest[i] & 0x03) << 4;
+      if (i+1 < hashsize) b |= Message_Digest[i+1] >> 4;
+      putchar(sm[b]);
+      if (i+1 < hashsize) {
+        b = (Message_Digest[i+1] & 0x0f) << 2;
+        if (i+2 < hashsize) b |= Message_Digest[i+2] >> 6;
+        putchar(sm[b]);
+      } else putchar('=');
+      if (i+2 < hashsize) putchar(sm[Message_Digest[i+2] & 0x3f]);
+      else putchar('=');
+    }
+    putchar('\n');
+  }
+
+  if (printResults && resultarray) {
+    printf("    Should match:\n\t");
+    for (i = 0, k = 0; i < hashsize; i++, k += 2) {
+      putchar(resultarray[k]);
+      putchar(resultarray[k+1]);
+      putchar(' ');
+    }
+    putchar('\n');
+  }
+
+  if (printPassFail && resultarray) {
+    int ret = checkmatch(Message_Digest, resultarray, hashsize);
+    if ((printPassFail == PRINTPASSFAIL) || !ret)
+      printf("%s %s %s: %s\n", hashname, testtype, testname,
+        ret ? "PASSED" : "FAILED");
+  }
+}
+
+/*
+ * Exercise a hash series of functions.  The input is the testarray,
+ * repeated repeatcount times, followed by the extrabits.  If the
+ * result is known, it is in resultarray in uppercase hex.
+ */
+int hash(int testno, int loopno, int hashno,
+  const char *testarray, int length, long repeatcount,
+  int numberExtrabits, int extrabits, const unsigned char *keyarray,
+  int keylen, const unsigned char *info, int infolen, int okmlen,
+  const char *resultarray, int hashsize, int printResults,
+  int printPassFail)
+{
+  USHAContext sha;
+  HMACContext hmac;
+  HKDFContext hkdf;
+  int err, i;
+  uint8_t Message_Digest_Buf[USHAMaxHashSize];
+  uint8_t *Message_Digest = Message_Digest_Buf;
+  char buf[20];
+
+  if (printResults == PRINTTEXT) {
+    printf("\nTest %d: Iteration %d, Repeat %ld\n\t'", testno+1,
+      loopno, repeatcount);
+    printstr(testarray, length);
+    printf("'\n\t'");
+    printxstr(testarray, length);
+    printf("'\n");
+    printf("    Length=%d bytes (%d bits), ", length, length * 8);
+    printf("ExtraBits %d: %2.2x\n", numberExtrabits, extrabits);
+  }
+
+  if (info) Message_Digest = malloc(okmlen);
+  memset(&sha, '\343', sizeof(sha)); /* force bad data into struct */
+  memset(&hmac, '\343', sizeof(hmac));
+  memset(&hkdf, '\343', sizeof(hkdf));
+
+  err = info ? hkdfReset(&hkdf, hashes[hashno].whichSha,
+                             keyarray, keylen) :
+        keyarray ? hmacReset(&hmac, hashes[hashno].whichSha,
+                             keyarray, keylen) :
+                   USHAReset(&sha, hashes[hashno].whichSha);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hash(): %sReset Error %d.\n",
+            info ? "hkdf" : keyarray ? "hmac" : "sha", err);
+    return err;
+  }
+
+  for (i = 0; i < repeatcount; ++i) {
+    err = info ? hkdfInput(&hkdf, (const uint8_t *)testarray, length) :
+          keyarray ? hmacInput(&hmac, (const uint8_t *) testarray,
+                               length) :
+                     USHAInput(&sha, (const uint8_t *) testarray,
+                               length);
+    if (err != shaSuccess) {
+      fprintf(stderr, "hash(): %sInput Error %d.\n",
+              info ? "hkdf" : keyarray ? "hmac" : "sha", err);
+      return err;
+    }
+  }
+
+  if (numberExtrabits > 0) {
+    err = info ? hkdfFinalBits(&hkdf, extrabits, numberExtrabits) :
+          keyarray ? hmacFinalBits(&hmac, (uint8_t) extrabits,
+                                   numberExtrabits) :
+                     USHAFinalBits(&sha, (uint8_t) extrabits,
+                                   numberExtrabits);
+    if (err != shaSuccess) {
+      fprintf(stderr, "hash(): %sFinalBits Error %d.\n",
+              info ? "hkdf" : keyarray ? "hmac" : "sha", err);
+      return err;
+    }
+  }
+
+  err = info ? hkdfResult(&hkdf, 0, info, infolen,
+                          Message_Digest, okmlen) :
+        keyarray ? hmacResult(&hmac, Message_Digest) :
+                   USHAResult(&sha, Message_Digest);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hash(): %s Result Error %d, could not compute "
+      "message digest.\n",
+      info ? "hkdf" : keyarray ? "hmac" : "sha", err);
+    return err;
+  }
+
+  sprintf(buf, "%d", testno+1);
+  printResult(Message_Digest, info ? okmlen : hashsize,
+    hashes[hashno].name, info ? "hkdf standard test" :
+    keyarray ? "hmac standard test" : "sha standard test", buf,
+    resultarray, printResults, printPassFail);
+
+  return err;
+}
+
+/*
+ * Exercise an HKDF series.  The input is the testarray,
+ * repeated repeatcount times, followed by the extrabits.  If the
+ * result is known, it is in resultarray in uppercase hex.
+ */
+int hashHkdf(int testno, int loopno, int hashno,
+  int printResults, int printPassFail)
+{
+  int err;
+  unsigned char prk[USHAMaxHashSize+1];
+  uint8_t okm[255 * USHAMaxHashSize+1];
+  char buf[24];
+
+  if (printResults == PRINTTEXT) {
+    printf("\nTest %d: Iteration %d\n\tSALT\t'", testno+1, loopno);
+    printxstr(hkdfhashes[testno].saltarray,
+      hkdfhashes[testno].saltlength);
+    printf("'\n\tIKM\t'");
+    printxstr(hkdfhashes[testno].ikmarray,
+      hkdfhashes[testno].ikmlength);
+    printf("'\n\tINFO\t'");
+    printxstr(hkdfhashes[testno].infoarray,
+      hkdfhashes[testno].infolength);
+    printf("'\n");
+    printf("    L=%d bytes\n", hkdfhashes[testno].okmlength);
+  }
+
+  /* Run hkdf() against the test vectors */
+  err = hkdf(hkdfhashes[testno].whichSha,
+             (const uint8_t *) hkdfhashes[testno].saltarray,
+             hkdfhashes[testno].saltlength,
+             (const uint8_t *) hkdfhashes[testno].ikmarray,
+             hkdfhashes[testno].ikmlength,
+             (const uint8_t *) hkdfhashes[testno].infoarray,
+             hkdfhashes[testno].infolength, okm,
+             hkdfhashes[testno].okmlength);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hashHkdf(): hkdf Error %d.\n", err);
+    return err;
+  }
+  sprintf(buf, "hkdf %d", testno+1);
+  printResult(okm, hkdfhashes[testno].okmlength,
+    USHAHashName(hkdfhashes[testno].whichSha), "hkdf standard test",
+    buf, hkdfhashes[testno].okmarray, printResults, printPassFail);
+
+  /* Now run hkdfExtract() by itself against the test vectors */
+  /* to verify the intermediate results. */
+  err = hkdfExtract(hkdfhashes[testno].whichSha,
+                    (const uint8_t *) hkdfhashes[testno].saltarray,
+                    hkdfhashes[testno].saltlength,
+                    (const uint8_t *) hkdfhashes[testno].ikmarray,
+                    hkdfhashes[testno].ikmlength, prk);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hashHkdf(): hkdfExtract Error %d.\n", err);
+    return err;
+  }
+  sprintf(buf, "hkdfExtract %d", testno+1);
+  printResult(prk, USHAHashSize(hkdfhashes[testno].whichSha),
+    USHAHashName(hkdfhashes[testno].whichSha), "hkdf standard test",
+    buf, hkdfhashes[testno].prkarray, printResults, printPassFail);
+
+  /* Now run hkdfExpand() by itself against the test vectors */
+  /* using the intermediate results from hkdfExtract. */
+  err = hkdfExpand(hkdfhashes[testno].whichSha, prk,
+    USHAHashSize(hkdfhashes[testno].whichSha),
+    (const uint8_t *)hkdfhashes[testno].infoarray,
+    hkdfhashes[testno].infolength, okm, hkdfhashes[testno].okmlength);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hashHkdf(): hkdfExpand Error %d.\n", err);
+    return err;
+  }
+  sprintf(buf, "hkdfExpand %d", testno+1);
+  printResult(okm, hkdfhashes[testno].okmlength,
+    USHAHashName(hkdfhashes[testno].whichSha), "hkdf standard test",
+    buf, hkdfhashes[testno].okmarray, printResults, printPassFail);
+
+  return err;
+}
+
+/*
+ * Exercise a hash series of functions.  The input is a filename.
+ * If the result is known, it is in resultarray in uppercase hex.
+ */
+int hashfile(int hashno, const char *hashfilename, int bits,
+  int bitcount, int skipSpaces, const unsigned char *keyarray,
+  int keylen, const unsigned char *info, int infolen, int okmlen,
+  const char *resultarray, int hashsize,
+  int printResults, int printPassFail)
+{
+  USHAContext sha;
+  HMACContext hmac;
+  HKDFContext hkdf;
+  int err, nread, c;
+  unsigned char buf[4096];
+  uint8_t Message_Digest_Buf[USHAMaxHashSize];
+  uint8_t *Message_Digest = Message_Digest_Buf;
+  unsigned char cc;
+  FILE *hashfp = (strcmp(hashfilename, "-") == 0) ? stdin :
+    fopen(hashfilename, "r");
+
+  if (!hashfp) {
+    fprintf(stderr, "cannot open file '%s'\n", hashfilename);
+    return shaStateError;
+  }
+
+  if (info) Message_Digest = malloc(okmlen);
+  memset(&sha, '\343', sizeof(sha)); /* force bad data into struct */
+  memset(&hmac, '\343', sizeof(hmac));
+  memset(&hkdf, '\343', sizeof(hkdf));
+  err = info ? hkdfReset(&hkdf, hashes[hashno].whichSha,
+                             keyarray, keylen) :
+        keyarray ? hmacReset(&hmac, hashes[hashno].whichSha,
+                             keyarray, keylen) :
+                   USHAReset(&sha, hashes[hashno].whichSha);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hashfile(): %sReset Error %d.\n",
+            info ? "hkdf" : keyarray ? "hmac" : "sha", err);
+    return err;
+  }
+
+  if (skipSpaces)
+    while ((c = getc(hashfp)) != EOF) {
+      if (!isspace(c)) {
+        cc = (unsigned char)c;
+        err = info ? hkdfInput(&hkdf, &cc, 1) :
+              keyarray ? hmacInput(&hmac, &cc, 1) :
+                         USHAInput(&sha, &cc, 1);
+        if (err != shaSuccess) {
+          fprintf(stderr, "hashfile(): %sInput Error %d.\n",
+                  info ? "hkdf" : keyarray ? "hmac" : "sha", err);
+          if (hashfp != stdin) fclose(hashfp);
+          return err;
+        }
+      }
+    }
+  else
+    while ((nread = fread(buf, 1, sizeof(buf), hashfp)) > 0) {
+      err = info ? hkdfInput(&hkdf, buf, nread) :
+            keyarray ? hmacInput(&hmac, buf, nread) :
+                       USHAInput(&sha, buf, nread);
+      if (err != shaSuccess) {
+        fprintf(stderr, "hashfile(): %s Error %d.\n",
+                info ? "hkdf" : keyarray ? "hmacInput" :
+                "shaInput", err);
+        if (hashfp != stdin) fclose(hashfp);
+        return err;
+      }
+    }
+
+  if (bitcount > 0)
+    err = info ? hkdfFinalBits(&hkdf, bits, bitcount) :
+          keyarray ? hmacFinalBits(&hmac, bits, bitcount) :
+                   USHAFinalBits(&sha, bits, bitcount);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hashfile(): %s Error %d.\n",
+            info ? "hkdf" : keyarray ? "hmacFinalBits" :
+            "shaFinalBits", err);
+    if (hashfp != stdin) fclose(hashfp);
+    return err;
+  }
+
+  err = info ? hkdfResult(&hkdf, 0, info, infolen,
+                          Message_Digest, okmlen) :
+        keyarray ? hmacResult(&hmac, Message_Digest) :
+                   USHAResult(&sha, Message_Digest);
+  if (err != shaSuccess) {
+    fprintf(stderr, "hashfile(): %s Error %d.\n",
+            info ? "hkdf" : keyarray ? "hmacResult" :
+            "shaResult", err);
+    if (hashfp != stdin) fclose(hashfp);
+    return err;
+  }
+
+  printResult(Message_Digest, info ? okmlen : hashsize,
+    hashes[hashno].name, "file", hashfilename, resultarray,
+    printResults, printPassFail);
+
+  if (hashfp != stdin) fclose(hashfp);
+  if (info) free(Message_Digest);
+  return err;
+}
+
+/*
+ * Exercise a hash series of functions through multiple permutations.
+ * The input is an initial seed.  That seed is replicated 3 times.
+ * For 1000 rounds, the previous three results are used as the input.
+ * This result is then checked, and used to seed the next cycle.
+ * If the result is known, it is in resultarrays in uppercase hex.
+ */
+void randomtest(int hashno, const char *seed, int hashsize,
+    const char **resultarrays, int randomcount,
+    int printResults, int printPassFail)
+{
+  int i, j; char buf[20];
+  unsigned char SEED[USHAMaxHashSize], MD[1003][USHAMaxHashSize];
+
+  /* INPUT: Seed - A random seed n bits long */
+  memcpy(SEED, seed, hashsize);
+  if (printResults == PRINTTEXT) {
+    printf("%s random test seed= '", hashes[hashno].name);
+    printxstr(seed, hashsize);
+    printf("'\n");
+  }
+
+  for (j = 0; j < randomcount; j++) {
+    /* MD0 = MD1 = MD2 = Seed; */
+    memcpy(MD[0], SEED, hashsize);
+    memcpy(MD[1], SEED, hashsize);
+    memcpy(MD[2], SEED, hashsize);
+    for (i=3; i<1003; i++) {
+      /* Mi = MDi-3 || MDi-2 || MDi-1; */
+      USHAContext Mi;
+      memset(&Mi, '\343', sizeof(Mi)); /* force bad data into struct */
+      USHAReset(&Mi, hashes[hashno].whichSha);
+      USHAInput(&Mi, MD[i-3], hashsize);
+      USHAInput(&Mi, MD[i-2], hashsize);
+      USHAInput(&Mi, MD[i-1], hashsize);
+      /* MDi = SHA(Mi); */
+      USHAResult(&Mi, MD[i]);
+    }
+
+    /* MDj = Seed = MDi; */
+    memcpy(SEED, MD[i-1], hashsize);
+
+    /* OUTPUT: MDj */
+    sprintf(buf, "%d", j);
+    printResult(SEED, hashsize, hashes[hashno].name, "random test",
+      buf, resultarrays ? resultarrays[j] : 0, printResults,
+      (j < RANDOMCOUNT) ? printPassFail : 0);
+  }
+}
+
+/*
+ * Look up a hash name.
+ */
+int findhash(const char *argv0, const char *opt)
+{
+  int i;
+  const char *names[HASHCOUNT][2] = {
+    { "0", "sha1" }, { "1", "sha224" }, { "2", "sha256" },
+    { "3", "sha384" }, { "4", "sha512" }
+  };
+  for (i = 0; i < HASHCOUNT; i++)
+    if ((strcmp(opt, names[i][0]) == 0) ||
+        (scasecmp(opt, names[i][1]) == 0))
+      return i;
+
+  fprintf(stderr, "%s: Unknown hash name: '%s'\n", argv0, opt);
+  usage(argv0);
+  return 0;
+}
+
+/*
+ * Run some tests that should invoke errors.
+ */
+void testErrors(int hashnolow, int hashnohigh, int printResults,
+    int printPassFail)
+{
+  USHAContext usha;
+  uint8_t Message_Digest[USHAMaxHashSize];
+  int hashno, err;
+
+  for (hashno = hashnolow; hashno <= hashnohigh; hashno++) {
+    memset(&usha, '\343', sizeof(usha)); /* force bad data */
+    USHAReset(&usha, hashno);
+    USHAResult(&usha, Message_Digest);
+    err = USHAInput(&usha, (const unsigned char *)"foo", 3);
+    if (printResults == PRINTTEXT)
+      printf ("\nError %d. Should be %d.\n", err, shaStateError);
+    if ((printPassFail == PRINTPASSFAIL) ||
+        ((printPassFail == PRINTFAIL) && (err != shaStateError)))
+      printf("%s se: %s\n", hashes[hashno].name,
+        (err == shaStateError) ? "PASSED" : "FAILED");
+
+    err = USHAFinalBits(&usha, 0x80, 3);
+    if (printResults == PRINTTEXT)
+      printf ("\nError %d. Should be %d.\n", err, shaStateError);
+    if ((printPassFail == PRINTPASSFAIL) ||
+        ((printPassFail == PRINTFAIL) && (err != shaStateError)))
+      printf("%s se: %s\n", hashes[hashno].name,
+        (err == shaStateError) ? "PASSED" : "FAILED");
+
+    err = USHAReset(0, hashes[hashno].whichSha);
+    if (printResults == PRINTTEXT)
+       printf("\nError %d. Should be %d.\n", err, shaNull);
+    if ((printPassFail == PRINTPASSFAIL) ||
+        ((printPassFail == PRINTFAIL) && (err != shaNull)))
+       printf("%s usha null: %s\n", hashes[hashno].name,
+        (err == shaNull) ? "PASSED" : "FAILED");
+
+    switch (hashno) {
+      case SHA1: err = SHA1Reset(0); break;
+      case SHA224: err = SHA224Reset(0); break;
+      case SHA256: err = SHA256Reset(0); break;
+      case SHA384: err = SHA384Reset(0); break;
+      case SHA512: err = SHA512Reset(0); break;
+    }
+    if (printResults == PRINTTEXT)
+       printf("\nError %d. Should be %d.\n", err, shaNull);
+    if ((printPassFail == PRINTPASSFAIL) ||
+        ((printPassFail == PRINTFAIL) && (err != shaNull)))
+       printf("%s sha null: %s\n", hashes[hashno].name,
+        (err == shaNull) ? "PASSED" : "FAILED");
+  }
+}
+
+/* replace a hex string in place with its value */
+int unhexStr(char *hexstr)
+{
+  char *o = hexstr;
+  int len = 0, nibble1 = 0, nibble2 = 0;
+  if (!hexstr) return 0;
+  for ( ; *hexstr; hexstr++) {
+    if (isalpha((int)(unsigned char)(*hexstr))) {
+      nibble1 = tolower((int)(unsigned char)(*hexstr)) - 'a' + 10;
+    } else if (isdigit((int)(unsigned char)(*hexstr))) {
+      nibble1 = *hexstr - '0';
+    } else {
+      printf("\nError: bad hex character '%c'\n", *hexstr);
+    }
+    if (!*++hexstr) break;
+    if (isalpha((int)(unsigned char)(*hexstr))) {
+      nibble2 = tolower((int)(unsigned char)(*hexstr)) - 'a' + 10;
+    } else if (isdigit((int)(unsigned char)(*hexstr))) {
+      nibble2 = *hexstr - '0';
+    } else {
+      printf("\nError: bad hex character '%c'\n", *hexstr);
+    }
+    *o++ = (char)((nibble1 << 4) | nibble2);
+    len++;
+  }
+  return len;
+}
+
+int main(int argc, char **argv)
+{
+  int i, err;
+  int loopno, loopnohigh = 1;
+  int hashno, hashnolow = 0, hashnohigh = HASHCOUNT - 1;
+  int testno, testnolow = 0, testnohigh;
+  int ntestnohigh = 0;
+  int printResults = PRINTTEXT;
+  int printPassFail = 1;
+  int checkErrors = 0;
+  char *hashstr = 0;
+  int hashlen = 0;
+  const char *resultstr = 0;
+  char *randomseedstr = 0;
+  int runHmacTests = 0;
+  int runHkdfTests = 0;
+  char *hmacKey = 0;
+  int hmaclen = 0;
+  char *info = 0;
+  int infolen = 0, okmlen = 0;
+  int randomcount = RANDOMCOUNT;
+  const char *hashfilename = 0;
+  const char *hashFilename = 0;
+  int extrabits = 0, numberExtrabits = 0;
+  int strIsHex = 0;
+
+  if ('A' != 0x41) {
+    fprintf(stderr, "%s: these tests require ASCII\n", argv[0]);
+  }
+
+  while ((i = getopt(argc, argv,
+                      "6b:B:def:F:h:i:Hk:l:L:mpPr:R:s:S:t:wxX")) != -1)
+    switch (i) {
+      case 'b': extrabits = strtol(optarg, 0, 0); break;
+      case 'B': numberExtrabits = atoi(optarg); break;
+      case 'd': runHkdfTests = 1; break;
+      case 'e': checkErrors = 1; break;
+      case 'f': hashfilename = optarg; break;
+      case 'F': hashFilename = optarg; break;
+      case 'h': hashnolow = hashnohigh = findhash(argv[0], optarg);
+        break;
+      case 'H': strIsHex = 1; break;
+      case 'i': info = optarg; infolen = strlen(optarg); break;
+      case 'k': hmacKey = optarg; hmaclen = strlen(optarg); break;
+      case 'l': loopnohigh = atoi(optarg); break;
+      case 'L': okmlen = strtol(optarg, 0, 0); break;
+      case 'm': runHmacTests = 1; break;
+      case 'P': printPassFail = 0; break;
+      case 'p': printResults = PRINTNONE; break;
+      case 'R': randomcount = atoi(optarg); break;
+      case 'r': randomseedstr = optarg; break;
+      case 's': hashstr = optarg; hashlen = strlen(hashstr); break;
+      case 'S': resultstr = optarg; break;
+      case 't': testnolow = ntestnohigh = atoi(optarg) - 1; break;
+      case 'w': printResults = PRINTRAW; break;
+      case 'x': printResults = PRINTHEX; break;
+      case 'X': printPassFail = 2; break;
+      case '6': printResults = PRINTBASE64; break;
+      default: usage(argv[0]);
+      }
+
+  if (strIsHex) {
+    hashlen = unhexStr(hashstr);
+    unhexStr(randomseedstr);
+    hmaclen = unhexStr(hmacKey);
+    infolen = unhexStr(info);
+  }
+  testnohigh = (ntestnohigh != 0) ? ntestnohigh:
+               runHmacTests ? (HMACTESTCOUNT-1) :
+               runHkdfTests ? (HKDFTESTCOUNT-1) :
+               (TESTCOUNT-1);
+  if ((testnolow < 0) ||
+      (testnohigh >= (runHmacTests ? HMACTESTCOUNT : TESTCOUNT)) ||
+      (hashnolow < 0) || (hashnohigh >= HASHCOUNT) ||
+      (hashstr && (testnolow == testnohigh)) ||
+      (randomcount < 0) ||
+      (resultstr && (!hashstr && !hashfilename && !hashFilename)) ||
+      ((runHmacTests || hmacKey) && randomseedstr) ||
+      (hashfilename && hashFilename) ||
+      (info && ((infolen <= 0) || (okmlen <= 0))) ||
+      (info && !hmacKey))
+    usage(argv[0]);
+
+  /*
+   *  Perform SHA/HMAC tests
+   */
+  for (hashno = hashnolow; hashno <= hashnohigh; ++hashno) {
+    if (printResults == PRINTTEXT)
+      printf("Hash %s\n", hashes[hashno].name);
+    err = shaSuccess;
+
+    for (loopno = 1; (loopno <= loopnohigh) && (err == shaSuccess);
+         ++loopno) {
+      if (hashstr)
+        err = hash(0, loopno, hashno, hashstr, hashlen, 1,
+          numberExtrabits, extrabits, (const unsigned char *)hmacKey,
+          hmaclen, (const uint8_t *) info, infolen, okmlen, resultstr,
+          hashes[hashno].hashsize, printResults, printPassFail);
+
+      else if (randomseedstr)
+        randomtest(hashno, randomseedstr, hashes[hashno].hashsize, 0,
+          randomcount, printResults, printPassFail);
+
+      else if (hashfilename)
+        err = hashfile(hashno, hashfilename, extrabits,
+                       numberExtrabits, 0,
+                       (const unsigned char *)hmacKey, hmaclen,
+                       (const uint8_t *) info, infolen, okmlen,
+                       resultstr, hashes[hashno].hashsize,
+                       printResults, printPassFail);
+
+      else if (hashFilename)
+        err = hashfile(hashno, hashFilename, extrabits,
+                       numberExtrabits, 1,
+                       (const unsigned char *)hmacKey, hmaclen,
+                       (const uint8_t *) info, infolen, okmlen,
+                       resultstr, hashes[hashno].hashsize,
+                       printResults, printPassFail);
+
+      else /* standard tests */ {
+        for (testno = testnolow;
+             (testno <= testnohigh) && (err == shaSuccess); ++testno) {
+          if (runHmacTests) {
+            err = hash(testno, loopno, hashno,
+                       hmachashes[testno].dataarray[hashno] ?
+                       hmachashes[testno].dataarray[hashno] :
+                       hmachashes[testno].dataarray[1] ?
+                       hmachashes[testno].dataarray[1] :
+                       hmachashes[testno].dataarray[0],
+                       hmachashes[testno].datalength[hashno] ?
+                       hmachashes[testno].datalength[hashno] :
+                       hmachashes[testno].datalength[1] ?
+                       hmachashes[testno].datalength[1] :
+                       hmachashes[testno].datalength[0],
+                       1, 0, 0,
+                       (const unsigned char *)(
+                        hmachashes[testno].keyarray[hashno] ?
+                        hmachashes[testno].keyarray[hashno] :
+                        hmachashes[testno].keyarray[1] ?
+                        hmachashes[testno].keyarray[1] :
+                        hmachashes[testno].keyarray[0]),
+                       hmachashes[testno].keylength[hashno] ?
+                       hmachashes[testno].keylength[hashno] :
+                       hmachashes[testno].keylength[1] ?
+                       hmachashes[testno].keylength[1] :
+                       hmachashes[testno].keylength[0],
+                       0, 0, 0,
+                       hmachashes[testno].resultarray[hashno],
+                       hmachashes[testno].resultlength[hashno],
+                       printResults, printPassFail);
+          } else if (runHkdfTests) {
+            err = hashHkdf(testno, loopno, hashno,
+                       printResults, printPassFail);
+          } else { /* sha tests */
+            err = hash(testno, loopno, hashno,
+                       hashes[hashno].tests[testno].testarray,
+                       hashes[hashno].tests[testno].length,
+                       hashes[hashno].tests[testno].repeatcount,
+                       hashes[hashno].tests[testno].numberExtrabits,
+                       hashes[hashno].tests[testno].extrabits,
+                       0, 0, 0, 0, 0,
+                       hashes[hashno].tests[testno].resultarray,
+                       hashes[hashno].hashsize,
+                       printResults, printPassFail);
+          }
+        }
+        if (!runHmacTests && !runHkdfTests) {
+          randomtest(hashno, hashes[hashno].randomtest,
+            hashes[hashno].hashsize, hashes[hashno].randomresults,
+            RANDOMCOUNT, printResults, printPassFail);
+        }
+      }
+    }
+  }
+
+  /* Test some error returns */
+  if (checkErrors) {
+    testErrors(hashnolow, hashnohigh, printResults, printPassFail);
+  }
+
+  return 0;
+}
+
+/*
+ * Compare two strings, case independently.
+ * Equivalent to strcasecmp() found on some systems.
+ */
+int scasecmp(const char *s1, const char *s2)
+{
+  for (;;) {
+    char u1 = tolower((int)(unsigned char)(*s1++));
+    char u2 = tolower((int)(unsigned char)(*s2++));
+    if (u1 != u2)
+      return u1 - u2;
+    if (u1 == '\0')
+      return 0;
+   }
+}
+
diff --git a/components/homekit/hkdf-sha/upstream/usha.c b/components/homekit/hkdf-sha/upstream/usha.c
new file mode 100644
index 0000000..08d857d
--- /dev/null
+++ b/components/homekit/hkdf-sha/upstream/usha.c
@@ -0,0 +1,281 @@
+/**************************** usha.c ***************************/
+/***************** See RFC 6234 for details. *******************/
+/* Copyright (c) 2011 IETF Trust and the persons identified as */
+/* authors of the code.  All rights reserved.                  */
+/* See sha.h for terms of use and redistribution.              */
+
+/*
+ *  Description:
+ *     This file implements a unified interface to the SHA algorithms.
+ */
+
+#include "sha.h"
+
+/*
+ *  USHAReset
+ *
+ *  Description:
+ *      This function will initialize the SHA Context in preparation
+ *      for computing a new SHA message digest.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The context to reset.
+ *      whichSha: [in]
+ *          Selects which SHA reset to call
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int USHAReset(USHAContext *context, enum SHAversion whichSha)
+{
+  if (!context) return shaNull;
+  context->whichSha = whichSha;
+  switch (whichSha) {
+    case SHA1:   return SHA1Reset((SHA1Context*)&context->ctx);
+    case SHA224: return SHA224Reset((SHA224Context*)&context->ctx);
+    case SHA256: return SHA256Reset((SHA256Context*)&context->ctx);
+    case SHA384: return SHA384Reset((SHA384Context*)&context->ctx);
+    case SHA512: return SHA512Reset((SHA512Context*)&context->ctx);
+    default: return shaBadParam;
+  }
+}
+
+/*
+ *  USHAInput
+ *
+ *  Description:
+ *      This function accepts an array of octets as the next portion
+ *      of the message.
+ *
+ *  Parameters:
+ *      context: [in/out]
+ *          The SHA context to update.
+ *      message_array: [in]
+ *          An array of octets representing the next portion of
+ *          the message.
+ *      length: [in]
+ *          The length of the message in message_array.
+ *
+ *  Returns:
+ *      sha Error Code.
+ *
+ */
+int USHAInput(USHAContext *context,
+              const uint8_t *bytes, unsigned int bytecount)
+{
+  if (!context) return shaNull;
+  switch (context->whichSha) {
+    case SHA1:
+      return SHA1Input((SHA1Context*)&context->ctx, bytes,
+                       bytecount);
+    case SHA224:
+      return SHA224Input((SHA224Context*)&context->ctx, bytes,
+          bytecount);
+    case SHA256:
+      return SHA256Input((SHA256Context*)&context->ctx, bytes,
+          bytecount);
+    case SHA384:
+      return SHA384Input((SHA384Context*)&context->ctx, bytes,
+          bytecount);
+    case SHA512:
+      return SHA512Input((SHA512Context*)&context->ctx, bytes,
+          bytecount);
+    default: return shaBadParam;
+  }
+}
+
+/*
+ * USHAFinalBits
+ *
+ * Description:
+ *   This function will add in any final bits of the message.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The SHA context to update.
+ *   message_bits: [in]
+ *     The final bits of the message, in the upper portion of the
+ *     byte.  (Use 0b###00000 instead of 0b00000### to input the
+ *     three bits ###.)
+ *   length: [in]
+ *     The number of bits in message_bits, between 1 and 7.
+ *
+ * Returns:
+ *   sha Error Code.
+ */
+int USHAFinalBits(USHAContext *context,
+                  uint8_t bits, unsigned int bit_count)
+{
+  if (!context) return shaNull;
+  switch (context->whichSha) {
+    case SHA1:
+      return SHA1FinalBits((SHA1Context*)&context->ctx, bits,
+                           bit_count);
+    case SHA224:
+      return SHA224FinalBits((SHA224Context*)&context->ctx, bits,
+          bit_count);
+    case SHA256:
+      return SHA256FinalBits((SHA256Context*)&context->ctx, bits,
+          bit_count);
+    case SHA384:
+      return SHA384FinalBits((SHA384Context*)&context->ctx, bits,
+          bit_count);
+    case SHA512:
+      return SHA512FinalBits((SHA512Context*)&context->ctx, bits,
+          bit_count);
+    default: return shaBadParam;
+  }
+}
+
+/*
+ * USHAResult
+ *
+ * Description:
+ *   This function will return the message digest of the appropriate
+ *   bit size, as returned by USHAHashSizeBits(whichSHA) for the
+ *   'whichSHA' value used in the preceeding call to USHAReset,
+ *   into the Message_Digest array provided by the caller.
+ *
+ * Parameters:
+ *   context: [in/out]
+ *     The context to use to calculate the SHA-1 hash.
+ *   Message_Digest: [out]
+ *     Where the digest is returned.
+ *
+ * Returns:
+ *   sha Error Code.
+ *
+ */
+int USHAResult(USHAContext *context,
+               uint8_t Message_Digest[USHAMaxHashSize])
+{
+  if (!context) return shaNull;
+  switch (context->whichSha) {
+    case SHA1:
+      return SHA1Result((SHA1Context*)&context->ctx, Message_Digest);
+    case SHA224:
+      return SHA224Result((SHA224Context*)&context->ctx,
+                          Message_Digest);
+    case SHA256:
+      return SHA256Result((SHA256Context*)&context->ctx,
+                          Message_Digest);
+    case SHA384:
+      return SHA384Result((SHA384Context*)&context->ctx,
+                          Message_Digest);
+    case SHA512:
+      return SHA512Result((SHA512Context*)&context->ctx,
+                          Message_Digest);
+    default: return shaBadParam;
+  }
+}
+
+/*
+ * USHABlockSize
+ *
+ * Description:
+ *   This function will return the blocksize for the given SHA
+ *   algorithm.
+ *
+ * Parameters:
+ *   whichSha:
+ *     which SHA algorithm to query
+ *
+ * Returns:
+ *   block size
+ *
+ */
+int USHABlockSize(enum SHAversion whichSha)
+{
+  switch (whichSha) {
+    case SHA1:   return SHA1_Message_Block_Size;
+    case SHA224: return SHA224_Message_Block_Size;
+    case SHA256: return SHA256_Message_Block_Size;
+    case SHA384: return SHA384_Message_Block_Size;
+    default:
+    case SHA512: return SHA512_Message_Block_Size;
+  }
+}
+
+/*
+ * USHAHashSize
+ *
+ * Description:
+ *   This function will return the hashsize for the given SHA
+ *   algorithm.
+ *
+ * Parameters:
+ *   whichSha:
+ *     which SHA algorithm to query
+ *
+ * Returns:
+ *   hash size
+ *
+ */
+int USHAHashSize(enum SHAversion whichSha)
+{
+  switch (whichSha) {
+    case SHA1:   return SHA1HashSize;
+    case SHA224: return SHA224HashSize;
+    case SHA256: return SHA256HashSize;
+    case SHA384: return SHA384HashSize;
+    default:
+    case SHA512: return SHA512HashSize;
+  }
+}
+
+/*
+ * USHAHashSizeBits
+ *
+ * Description:
+ *   This function will return the hashsize for the given SHA
+ *   algorithm, expressed in bits.
+ *
+ * Parameters:
+ *   whichSha:
+ *     which SHA algorithm to query
+ *
+ * Returns:
+ *   hash size in bits
+ *
+ */
+int USHAHashSizeBits(enum SHAversion whichSha)
+{
+  switch (whichSha) {
+    case SHA1:   return SHA1HashSizeBits;
+    case SHA224: return SHA224HashSizeBits;
+    case SHA256: return SHA256HashSizeBits;
+    case SHA384: return SHA384HashSizeBits;
+    default:
+    case SHA512: return SHA512HashSizeBits;
+  }
+}
+
+/*
+ * USHAHashName
+ *
+ * Description:
+ *   This function will return the name of the given SHA algorithm
+ *   as a string.
+ *
+ * Parameters:
+ *   whichSha:
+ *     which SHA algorithm to query
+ *
+ * Returns:
+ *   character string with the name in it
+ *
+ */
+const char *USHAHashName(enum SHAversion whichSha)
+{
+  switch (whichSha) {
+    case SHA1:   return "SHA1";
+    case SHA224: return "SHA224";
+    case SHA256: return "SHA256";
+    case SHA384: return "SHA384";
+    default:
+    case SHA512: return "SHA512";
+  }
+}
+
diff --git a/components/homekit/json_generator/CMakeLists.txt b/components/homekit/json_generator/CMakeLists.txt
new file mode 100644
index 0000000..496d11b
--- /dev/null
+++ b/components/homekit/json_generator/CMakeLists.txt
@@ -0,0 +1,3 @@
+idf_component_register(SRCS "upstream/json_generator.c"
+                    INCLUDE_DIRS "upstream"
+                    )
diff --git a/components/homekit/json_generator/component.mk b/components/homekit/json_generator/component.mk
new file mode 100644
index 0000000..b7dfc68
--- /dev/null
+++ b/components/homekit/json_generator/component.mk
@@ -0,0 +1,3 @@
+COMPONENT_OBJS := upstream/json_generator.o
+COMPONENT_SRCDIRS := upstream
+COMPONENT_ADD_INCLUDEDIRS := upstream
diff --git a/components/homekit/json_generator/upstream b/components/homekit/json_generator/upstream
new file mode 160000
index 0000000..f508fc2
--- /dev/null
+++ b/components/homekit/json_generator/upstream
@@ -0,0 +1 @@
+Subproject commit f508fc2eb29b3790a9871e493934956f133d8a8f
diff --git a/components/homekit/json_parser/CMakeLists.txt b/components/homekit/json_parser/CMakeLists.txt
new file mode 100644
index 0000000..fa95a21
--- /dev/null
+++ b/components/homekit/json_parser/CMakeLists.txt
@@ -0,0 +1,3 @@
+idf_component_register(SRCS "upstream/src/json_parser.c"
+                    INCLUDE_DIRS "upstream/include" "upstream"
+                    )
diff --git a/components/homekit/json_parser/component.mk b/components/homekit/json_parser/component.mk
new file mode 100644
index 0000000..614beb3
--- /dev/null
+++ b/components/homekit/json_parser/component.mk
@@ -0,0 +1,2 @@
+COMPONENT_SRCDIRS := upstream/src
+COMPONENT_ADD_INCLUDEDIRS := upstream/include upstream
diff --git a/components/homekit/json_parser/upstream b/components/homekit/json_parser/upstream
new file mode 160000
index 0000000..d049e71
--- /dev/null
+++ b/components/homekit/json_parser/upstream
@@ -0,0 +1 @@
+Subproject commit d049e7103f667c53a45bee5d27b7c15cb13b48c7
diff --git a/components/homekit/mu_srp/CMakeLists.txt b/components/homekit/mu_srp/CMakeLists.txt
new file mode 100644
index 0000000..fdbbdba
--- /dev/null
+++ b/components/homekit/mu_srp/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(COMPONENT_ADD_INCLUDEDIRS .)
+
+# Edit following two lines to set component requirements (see docs)
+set(COMPONENT_REQUIRES )
+set(COMPONENT_PRIV_REQUIRES hkdf-sha mbedtls)
+
+set(COMPONENT_SRCS ./mu_srp.c)
+
+register_component()
diff --git a/components/homekit/mu_srp/LICENSE b/components/homekit/mu_srp/LICENSE
new file mode 100644
index 0000000..d9a10c0
--- /dev/null
+++ b/components/homekit/mu_srp/LICENSE
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/components/homekit/mu_srp/component.mk b/components/homekit/mu_srp/component.mk
new file mode 100644
index 0000000..3896959
--- /dev/null
+++ b/components/homekit/mu_srp/component.mk
@@ -0,0 +1,3 @@
+# Empty
+COMPONENT_SRCDIRS := .
+COMPONENT_ADD_INCLUDEDIRS := .
diff --git a/components/homekit/mu_srp/mu_bignum.h b/components/homekit/mu_srp/mu_bignum.h
new file mode 100644
index 0000000..d33ac87
--- /dev/null
+++ b/components/homekit/mu_srp/mu_bignum.h
@@ -0,0 +1,192 @@
+#ifndef _MU_BIGNUM_H_
+#define _MU_BIGNUM_H_
+
+#define BIGNUM_MBEDTLS
+
+#ifdef BIGNUM_OPENSSL
+#include <openssl/bn.h>
+
+
+typedef BIGNUM mu_bn_t;
+typedef BN_CTX mu_bn_ctx_t;
+
+
+static inline mu_bn_t *mu_bn_new_from_hex(const char *hex)
+{
+     mu_bn_t *a = BN_new();
+     if (a)
+	  BN_hex2bn(&a, hex);
+     return a;
+}
+
+static inline mu_bn_t *mu_bn_new_from_bin(const char *str, int str_len)
+{
+  return BN_bin2bn((unsigned char *)str, str_len, NULL);
+}
+
+static inline mu_bn_t *mu_bn_new()
+{
+     return BN_new();
+}
+
+static inline void mu_bn_free(mu_bn_t *bn)
+{
+     return BN_free(bn);
+}
+
+static inline mu_bn_ctx_t *mu_bn_ctx_new()
+{
+     return BN_CTX_new();
+}
+
+static inline void mu_bn_ctx_free(mu_bn_ctx_t *ctx)
+{
+     return BN_CTX_free(ctx);
+}
+
+static inline unsigned int mu_bn_sizeof(mu_bn_t *bn)
+{
+     return BN_num_bytes(bn);
+}
+
+
+static inline char *mu_bn_to_bin(mu_bn_t *bn, int *len)
+{
+	*len = mu_bn_sizeof(bn);
+	char *p = malloc(*len);
+	if (p) {
+		BN_bn2bin(bn, (unsigned char *)p);
+	}
+	return p;
+}
+
+static inline int mu_bn_get_rand(mu_bn_t *bn, int bits, int top, int bottom)
+{
+	return BN_rand(bn, bits, top, bottom);
+}
+
+static inline int mu_bn_a_exp_b_mod_c(mu_bn_t *result, mu_bn_t *a, mu_bn_t *b, mu_bn_t *c, mu_bn_ctx_t *ctx)
+{
+	return BN_mod_exp(result, a, b, c, ctx);
+}
+
+static inline int mu_bn_a_mul_b_mod_c(mu_bn_t *result, mu_bn_t *a, mu_bn_t *b, mu_bn_t *c, mu_bn_ctx_t *ctx)
+{
+	return BN_mod_mul(result, a, b, c, ctx);
+}
+
+static inline int mu_bn_a_add_b_mod_c(mu_bn_t *result, mu_bn_t *a, mu_bn_t *b, mu_bn_t *c, mu_bn_ctx_t *ctx)
+{
+	if (BN_add(result, a, b) != 1)
+		return 1;
+	return BN_mod(result, result, c, ctx);
+}
+#endif /* BIGNUM_OPENSSL */
+
+
+#ifdef BIGNUM_MBEDTLS
+#include <mbedtls/bignum.h>
+#include <esp_system.h>
+typedef mbedtls_mpi mu_bn_t;
+typedef mu_bn_t mu_bn_ctx_t;
+
+static inline mu_bn_t *mu_bn_new()
+{
+    mu_bn_t *a = malloc(sizeof (mu_bn_t));
+    if (!a)
+        return NULL;
+    mbedtls_mpi_init(a);
+    return a;
+}
+static inline mu_bn_t *mu_bn_new_from_hex(const char *hex)
+{
+    mu_bn_t *a = mu_bn_new();
+    if (!a)
+        return NULL;
+
+    mbedtls_mpi_read_string(a, 16, hex);
+    return a;
+}
+
+static inline mu_bn_t *mu_bn_new_from_bin(const char *str, int str_len)
+{
+
+    mu_bn_t *a = mu_bn_new();
+    if (!a) {
+        return NULL;
+    }
+    mbedtls_mpi_read_binary(a, (unsigned char *)str, str_len);
+    return a;
+}
+
+
+static inline void mu_bn_free(mu_bn_t *bn)
+{
+    if (bn) {
+        mbedtls_mpi_free(bn);
+        free(bn);
+    }
+}
+
+static inline mu_bn_ctx_t *mu_bn_ctx_new()
+{
+    mu_bn_t *bn = mu_bn_new();
+    return ( mu_bn_ctx_t *)bn;
+}
+
+static inline void mu_bn_ctx_free(mu_bn_ctx_t *ctx)
+{
+    mu_bn_free((mu_bn_t *)ctx);
+}
+
+static inline unsigned int mu_bn_sizeof(mu_bn_t *bn)
+{
+    return mbedtls_mpi_size(bn);
+}
+
+
+static inline char *mu_bn_to_bin(mu_bn_t *bn, int *len)
+{
+	*len = mu_bn_sizeof(bn);
+	char *p = malloc(*len);
+	if (p) {
+        mbedtls_mpi_write_binary(bn, (unsigned char *)p, *len);
+	}
+	return p;
+}
+
+static inline int mu_get_random(void *ctx, unsigned char *data, size_t len)
+{
+    esp_fill_random(data, len);
+    return 0;
+}
+static inline int mu_bn_get_rand(mu_bn_t *bn, int bits, int top, int bottom)
+{
+
+    return mbedtls_mpi_fill_random(bn, bits / 8,  mu_get_random, NULL);
+}
+
+static inline int mu_bn_a_exp_b_mod_c(mu_bn_t *result, mu_bn_t *a, mu_bn_t *b, mu_bn_t *c, mu_bn_ctx_t *ctx)
+{
+    return mbedtls_mpi_exp_mod(result, a, b, c, (mu_bn_t *) ctx);
+}
+
+static inline int mu_bn_a_mul_b_mod_c(mu_bn_t *result, mu_bn_t *a, mu_bn_t *b, mu_bn_t *c, mu_bn_ctx_t *ctx)
+{
+    return esp_mpi_mul_mpi_mod(result, a, b, c);
+}
+
+static inline int mu_bn_a_add_b_mod_c(mu_bn_t *result, mu_bn_t *a, mu_bn_t *b, mu_bn_t *c, mu_bn_ctx_t *ctx)
+{
+    int     res;
+    mbedtls_mpi  t;
+    mbedtls_mpi_init(&t);
+    res = mbedtls_mpi_add_mpi(&t, a, b);
+    if (res == 0) {
+        res = mbedtls_mpi_mod_mpi(result, &t, c);
+    }
+    mbedtls_mpi_free(&t);
+    return res;
+}
+#endif /* BIGNUM_MBEDTLS */
+#endif /* ! _MU_BIGNUM_H_ */
diff --git a/components/homekit/mu_srp/mu_srp.c b/components/homekit/mu_srp/mu_srp.c
new file mode 100644
index 0000000..7a14b93
--- /dev/null
+++ b/components/homekit/mu_srp/mu_srp.c
@@ -0,0 +1,489 @@
+#include <string.h>
+#include "hkdf-sha.h"
+#include "mu_bignum.h"
+#include "mu_srp.h"
+
+#ifdef SRP_DEBUG
+#include <stdio.h>
+#define srp_print   printf
+static void hex_dbg(char *name, void *buf, int buf_len)
+{
+	char *p = (char *)buf;
+	int i;
+	srp_print("%s (%d): ", name, buf_len);
+	for (i = 0; i < buf_len; i++) {
+		if (i % 16 == 0)
+			srp_print("\r\n");
+		srp_print("%02x ", (unsigned)(unsigned char)p[i]);
+	}
+	srp_print("\r\n");
+}
+
+static void hex_dbg_bn(char *name, mu_bn_t *bn)
+{
+	int len;
+	char *str = mu_bn_to_bin(bn, &len);
+	if (str) {
+		hex_dbg(name, str, len);
+		free(str);
+	}
+}
+#else
+#define srp_print(...)
+#define hex_dbg(...)
+#define hex_dbg_bn(...)
+#endif
+
+static inline void SHA512_hash(const uint8_t *bytes, unsigned int byte_count,
+		     uint8_t digest[SHA512HashSize])
+{
+	SHA512Context ctx;
+	SHA512Reset(&ctx);
+	SHA512Input(&ctx, bytes, byte_count);
+	SHA512Result(&ctx, digest);
+}
+
+/************************* SRP Stuff */
+char N_3072[] = {
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x0F, 0xDA, 0xA2, 0x21, 0x68, 0xC2,
+	0x34, 0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1, 0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67,
+	0xCC, 0x74, 0x02, 0x0B, 0xBE, 0xA6, 0x3B, 0x13, 0x9B, 0x22, 0x51, 0x4A, 0x08, 0x79, 0x8E,
+	0x34, 0x04, 0xDD, 0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B, 0x30, 0x2B, 0x0A, 0x6D,
+	0xF2, 0x5F, 0x14, 0x37, 0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45, 0xE4, 0x85, 0xB5,
+	0x76, 0x62, 0x5E, 0x7E, 0xC6, 0xF4, 0x4C, 0x42, 0xE9, 0xA6, 0x37, 0xED, 0x6B, 0x0B, 0xFF,
+	0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED, 0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5, 0xAE,
+	0x9F, 0x24, 0x11, 0x7C, 0x4B, 0x1F, 0xE6, 0x49, 0x28, 0x66, 0x51, 0xEC, 0xE4, 0x5B, 0x3D,
+	0xC2, 0x00, 0x7C, 0xB8, 0xA1, 0x63, 0xBF, 0x05, 0x98, 0xDA, 0x48, 0x36, 0x1C, 0x55, 0xD3,
+	0x9A, 0x69, 0x16, 0x3F, 0xA8, 0xFD, 0x24, 0xCF, 0x5F, 0x83, 0x65, 0x5D, 0x23, 0xDC, 0xA3,
+	0xAD, 0x96, 0x1C, 0x62, 0xF3, 0x56, 0x20, 0x85, 0x52, 0xBB, 0x9E, 0xD5, 0x29, 0x07, 0x70,
+	0x96, 0x96, 0x6D, 0x67, 0x0C, 0x35, 0x4E, 0x4A, 0xBC, 0x98, 0x04, 0xF1, 0x74, 0x6C, 0x08,
+	0xCA, 0x18, 0x21, 0x7C, 0x32, 0x90, 0x5E, 0x46, 0x2E, 0x36, 0xCE, 0x3B, 0xE3, 0x9E, 0x77,
+	0x2C, 0x18, 0x0E, 0x86, 0x03, 0x9B, 0x27, 0x83, 0xA2, 0xEC, 0x07, 0xA2, 0x8F, 0xB5, 0xC5,
+	0x5D, 0xF0, 0x6F, 0x4C, 0x52, 0xC9, 0xDE, 0x2B, 0xCB, 0xF6, 0x95, 0x58, 0x17, 0x18, 0x39,
+	0x95, 0x49, 0x7C, 0xEA, 0x95, 0x6A, 0xE5, 0x15, 0xD2, 0x26, 0x18, 0x98, 0xFA, 0x05, 0x10,
+	0x15, 0x72, 0x8E, 0x5A, 0x8A, 0xAA, 0xC4, 0x2D, 0xAD, 0x33, 0x17, 0x0D, 0x04, 0x50, 0x7A,
+	0x33, 0xA8, 0x55, 0x21, 0xAB, 0xDF, 0x1C, 0xBA, 0x64, 0xEC, 0xFB, 0x85, 0x04, 0x58, 0xDB,
+	0xEF, 0x0A, 0x8A, 0xEA, 0x71, 0x57, 0x5D, 0x06, 0x0C, 0x7D, 0xB3, 0x97, 0x0F, 0x85, 0xA6,
+	0xE1, 0xE4, 0xC7, 0xAB, 0xF5, 0xAE, 0x8C, 0xDB, 0x09, 0x33, 0xD7, 0x1E, 0x8C, 0x94, 0xE0,
+	0x4A, 0x25, 0x61, 0x9D, 0xCE, 0xE3, 0xD2, 0x26, 0x1A, 0xD2, 0xEE, 0x6B, 0xF1, 0x2F, 0xFA,
+	0x06, 0xD9, 0x8A, 0x08, 0x64, 0xD8, 0x76, 0x02, 0x73, 0x3E, 0xC8, 0x6A, 0x64, 0x52, 0x1F,
+	0x2B, 0x18, 0x17, 0x7B, 0x20, 0x0C, 0xBB, 0xE1, 0x17, 0x57, 0x7A, 0x61, 0x5D, 0x6C, 0x77,
+	0x09, 0x88, 0xC0, 0xBA, 0xD9, 0x46, 0xE2, 0x08, 0xE2, 0x4F, 0xA0, 0x74, 0xE5, 0xAB, 0x31,
+	0x43, 0xDB, 0x5B, 0xFC, 0xE0, 0xFD, 0x10, 0x8E, 0x4B, 0x82, 0xD1, 0x20, 0xA9, 0x3A, 0xD2,
+	0xCA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+char g_3072[] = { 5 };
+
+
+int mu_srp_init(mu_srp_handle_t *hd, mu_ng_type_t ng)
+{
+	if (hd->allocated)
+		mu_srp_free(hd);
+
+	memset(hd, 0, sizeof(*hd));
+	hd->allocated = 1;
+
+	hd->ctx = mu_bn_ctx_new();
+	if (! hd->ctx)
+		goto error;
+	if (ng != MU_NG_3072)
+		goto error;
+
+	hd->n = mu_bn_new_from_bin(N_3072, sizeof(N_3072));
+	hd->bytes_n = N_3072;
+	hd->len_n = sizeof(N_3072);
+	if (! hd->n)
+		goto error;
+
+	hd->g = mu_bn_new_from_bin(g_3072, sizeof(g_3072));
+	hd->bytes_g = g_3072;
+	hd->len_g = sizeof(g_3072);
+	if (! hd->g)
+		goto error;
+	hd->type = ng;
+	return 0;
+ error:
+	mu_srp_free(hd);
+	return -1;
+}
+
+void mu_srp_free(mu_srp_handle_t *hd)
+{
+	if (hd->allocated != 1)
+		return;
+
+	if (hd->ctx)
+		mu_bn_ctx_free(hd->ctx);
+	if (hd->n)
+		mu_bn_free(hd->n);
+	if (hd->g)
+		mu_bn_free(hd->g);
+	if (hd->s)
+		mu_bn_free(hd->s);
+	if (hd->bytes_s)
+		free(hd->bytes_s);
+	if (hd->v)
+		mu_bn_free(hd->v);
+	if (hd->B)
+		mu_bn_free(hd->B);
+	if (hd->bytes_B)
+		free(hd->bytes_B);
+	if (hd->b)
+		mu_bn_free(hd->b);
+	if (hd->A)
+		mu_bn_free(hd->A);
+	if (hd->bytes_A)
+		free(hd->bytes_A);
+	if (hd->session_key)
+		free(hd->session_key);
+	memset(hd, 0, sizeof(*hd));
+}
+
+static mu_bn_t *calculate_x(char *bytes_salt, int salt_len, const char *username, const char *pass, int pass_len)
+{
+	unsigned char digest[SHA512HashSize];
+	SHA512Context ctx;
+	srp_print("username:%s:\npass:%s:\npass_len:%d:\n", username, pass, pass_len);
+	hex_dbg("salt", bytes_salt, salt_len);
+	SHA512Reset(&ctx);
+	SHA512Input(&ctx, (unsigned char *)username, strlen(username));
+	SHA512Input(&ctx, (unsigned char *)":", 1);
+	SHA512Input(&ctx, (unsigned char *)pass, pass_len);
+	SHA512Result(&ctx, digest);
+	
+	SHA512Reset(&ctx);
+	SHA512Input(&ctx, (unsigned char *)bytes_salt, salt_len);
+	SHA512Input(&ctx, digest, sizeof(digest));
+	SHA512Result(&ctx, digest);
+
+	hex_dbg("Digest", digest, sizeof(digest));
+	return mu_bn_new_from_bin((char *)digest, sizeof(digest));
+}
+
+static mu_bn_t *calculate_padded_hash(mu_srp_handle_t *hd, char *a, int len_a, char *b, int len_b)
+{
+	unsigned char digest[SHA512HashSize];
+	SHA512Context ctx;
+	int pad_len;
+	char *s = NULL;
+
+	if (len_a > len_b) {
+		pad_len = hd->len_n - len_b;
+	} else {
+		pad_len = hd->len_n - len_a;
+	}
+
+    if (pad_len) {
+        s = malloc(pad_len);
+        if (s) {
+            memset(s, 0, pad_len);
+        }
+    }
+
+	SHA512Reset(&ctx);
+	/* PAD (a) */
+	if (s && (len_a != hd->len_n)) {
+		SHA512Input(&ctx, (unsigned char *)s, hd->len_n - len_a);
+	}
+
+	SHA512Input(&ctx, (unsigned char *)a, len_a);
+
+	/* PAD (b) */
+	if (s && (len_b != hd->len_n)) {
+		SHA512Input(&ctx, (unsigned char *)s, hd->len_n - len_b);
+	}
+
+	SHA512Input(&ctx, (unsigned char *)b, len_b);
+
+	SHA512Result(&ctx, digest);
+
+    if (s) {
+        free(s);
+    }
+
+	hex_dbg("value", digest, sizeof(digest));
+	return mu_bn_new_from_bin((char *)digest, sizeof(digest));
+}
+
+/* k = SHA (N, PAD(g))
+ *
+ * https://tools.ietf.org/html/draft-ietf-tls-srp-08
+ */
+static mu_bn_t *calculate_k(mu_srp_handle_t *hd)
+{
+	srp_print("k-->");
+	return calculate_padded_hash(hd, hd->bytes_n, hd->len_n, hd->bytes_g, hd->len_g);
+}
+
+static mu_bn_t *calculate_u(mu_srp_handle_t *hd, char *A, int len_A)
+{
+	srp_print("u-->");
+	return calculate_padded_hash(hd, A, len_A, hd->bytes_B, hd->len_B);
+}
+
+int __mu_srp_srv_pubkey(mu_srp_handle_t *hd, char **bytes_B, int *len_B)
+{
+	mu_bn_t *k = calculate_k(hd);
+	mu_bn_t *kv = NULL;
+	mu_bn_t *gb = NULL;
+	if (!k)
+		goto error;
+
+	hd->b = mu_bn_new();
+	if (!hd->b)
+		goto error;
+	mu_bn_get_rand(hd->b, 256, -1, 0);
+	hex_dbg_bn("b", hd->b);
+
+	/* B = kv + g^b */
+	kv = mu_bn_new();
+	gb = mu_bn_new();
+	hd->B = mu_bn_new();
+	if (!kv || !gb || ! hd->B)
+		goto error;
+	mu_bn_a_mul_b_mod_c(kv, k, hd->v, hd->n, hd->ctx);
+	mu_bn_a_exp_b_mod_c(gb, hd->g, hd->b, hd->n, hd->ctx);
+	mu_bn_a_add_b_mod_c(hd->B, kv, gb, hd->n, hd->ctx);
+	hd->bytes_B = mu_bn_to_bin(hd->B, len_B);
+	hd->len_B = *len_B;
+	*bytes_B = hd->bytes_B;
+
+	mu_bn_free(k);
+	mu_bn_free(kv);
+	mu_bn_free(gb);
+	return 0;
+ error:
+	if (k)
+		mu_bn_free(k);
+	if (kv)
+		mu_bn_free(kv);
+	if (gb)
+		mu_bn_free(gb);
+	if (hd->B) {
+		mu_bn_free(hd->B);
+		hd->B = NULL;
+	}
+	if (hd->b) {
+		mu_bn_free(hd->b);
+		hd->b = NULL;
+	}
+	return -1;
+	
+}
+
+int mu_srp_srv_pubkey(mu_srp_handle_t *hd, const char *username, const char *pass, int pass_len, int salt_len,
+		      char **bytes_B, int *len_B, char **bytes_salt)
+{
+	/* Get Salt */
+	int str_salt_len;
+	mu_bn_t *x = NULL;
+	hd->s = mu_bn_new();
+	if (! hd->s)
+		goto error;
+	mu_bn_get_rand(hd->s, 8 * salt_len, -1, 0);
+	*bytes_salt = mu_bn_to_bin(hd->s, &str_salt_len);
+	if (! *bytes_salt)
+		goto error;
+	hd->bytes_s = *bytes_salt;
+	hd->len_s = salt_len;
+	hex_dbg("Salt", *bytes_salt, str_salt_len);
+
+	/* Calculate X which is simply a hash for all these things */
+	x = calculate_x(*bytes_salt, str_salt_len, username, pass, pass_len);
+	if (! x)
+		goto error;
+	hex_dbg_bn("x", x);
+	
+	/* v = g^x % N */
+	hd->v = mu_bn_new();
+	if (! hd->v)
+		goto error;
+	mu_bn_a_exp_b_mod_c(hd->v, hd->g, x, hd->n, hd->ctx);
+	hex_dbg_bn("Verifier", hd->v);
+
+	if (__mu_srp_srv_pubkey(hd, bytes_B, len_B) < 0 )
+		goto error;
+
+	mu_bn_free(x);
+	return 0;
+
+error:
+	if (hd->s) {
+		mu_bn_free(hd->s);
+		hd->s = NULL;
+	}
+	if (*bytes_salt) {
+		free(*bytes_salt);
+		*bytes_salt = NULL;
+		hd->bytes_s = NULL;
+		hd->len_s = 0;
+	}
+	if (x) {
+		mu_bn_free(x);
+		x = NULL;
+	}
+	if (hd->v) {
+		mu_bn_free(hd->v);
+		hd->v = NULL;
+	}
+	return -1;
+}
+
+int mu_srp_srv_pubkey_from_salt_verifier(mu_srp_handle_t *hd, char **bytes_B, int *len_B)
+{
+    return __mu_srp_srv_pubkey(hd, bytes_B, len_B);
+}
+
+int mu_srp_set_salt_verifier(mu_srp_handle_t *hd, const char *salt, int salt_len,
+        const char *verifier, int verifier_len)
+{
+    hd->bytes_s = malloc(salt_len);
+    if (!hd->bytes_s) {
+        goto error;
+    }
+    memcpy(hd->bytes_s, salt, salt_len);
+    hd->len_s = salt_len;
+
+    hd->s = mu_bn_new_from_bin(salt, salt_len);
+    if (!hd->s) {
+        goto error;
+    }
+
+	hd->v = mu_bn_new_from_bin(verifier, verifier_len);
+    if (!hd->v) {
+        goto error;
+    }
+    return 0;
+
+error:
+    if (hd->bytes_s) {
+        free(hd->bytes_s);
+        hd->bytes_s = NULL;
+        hd->len_s = 0;
+    }
+    if (hd->s) {
+		mu_bn_free(hd->s);
+		hd->s = NULL;
+    }
+	if (hd->v) {
+		mu_bn_free(hd->v);
+		hd->v = NULL;
+	}
+	return -1;
+}
+
+int mu_srp_get_session_key(mu_srp_handle_t *hd, char *bytes_A, int len_A, char **bytes_key, int *len_key)
+{
+	mu_bn_t *u, *vu, *avu, *S;
+	char *bytes_S;
+	int len_S;
+
+	u = vu = avu = S = NULL;
+	bytes_S = NULL;
+
+	hd->bytes_A = malloc(len_A);
+	if (! hd->bytes_A)
+		goto error;
+	memcpy(hd->bytes_A, bytes_A, len_A);
+	hd->len_A = len_A;
+
+	hd->A = mu_bn_new_from_bin(bytes_A, len_A);
+	if (! hd->A)
+		goto error;
+	u = calculate_u(hd, bytes_A, len_A);
+	if (! u)
+		goto error;
+
+	/* S = (A v^u)^b */
+	vu = mu_bn_new();
+	avu = mu_bn_new();
+	S = mu_bn_new();
+	if (!vu || !avu || !S )
+		goto error;
+
+	mu_bn_a_exp_b_mod_c(vu, hd->v, u, hd->n, hd->ctx);
+	mu_bn_a_mul_b_mod_c(avu, hd->A, vu, hd->n, hd->ctx);
+	mu_bn_a_exp_b_mod_c(S, avu, hd->b, hd->n, hd->ctx);
+	hex_dbg_bn("S", S);
+
+	bytes_S = mu_bn_to_bin(S, &len_S);
+	hd->session_key = malloc(SHA512HashSize);
+	if (!hd->session_key || ! bytes_S)
+		goto error;
+
+	SHA512_hash((unsigned char *)bytes_S, len_S, (unsigned char *)hd->session_key);
+	*bytes_key = hd->session_key;
+	*len_key = SHA512HashSize;
+	
+	free(bytes_S);
+	mu_bn_free(vu);
+	mu_bn_free(avu);
+	mu_bn_free(S);
+	mu_bn_free(u);
+	return 0;
+ error:
+	if (bytes_S)
+		free(bytes_S);
+	if (vu)
+		mu_bn_free(vu);
+	if (avu)
+		mu_bn_free(avu);
+	if (S)
+		mu_bn_free(S);
+	if (u)
+		mu_bn_free(u);
+	if (hd->session_key) {
+		free(hd->session_key);
+		hd->session_key = NULL;
+	}
+	if (hd->A) {
+		mu_bn_free(hd->A);
+		hd->A = NULL;
+	}
+	if (hd->bytes_A) {
+		free(hd->bytes_A);
+		hd->bytes_A = NULL;
+	}
+	return -1;
+}
+
+int mu_srp_exchange_proofs(mu_srp_handle_t *hd, char *username, char *bytes_user_proof, char *bytes_host_proof)
+{
+	/* First calculate M */
+	unsigned char hash_n[SHA512HashSize];
+	unsigned char hash_g[SHA512HashSize];
+	unsigned char hash_n_xor_g[SHA512HashSize];
+	int i;
+	SHA512_hash((unsigned char *)hd->bytes_n, hd->len_n, (unsigned char *)hash_n);
+	SHA512_hash((unsigned char *)hd->bytes_g, hd->len_g, (unsigned char *)hash_g);
+	for (i = 0; i < SHA512HashSize; i++)
+		hash_n_xor_g[i] = hash_n[i] ^ hash_g[i];
+
+	unsigned char hash_I[SHA512HashSize];
+	SHA512_hash((unsigned char *)username, strlen(username), (unsigned char *)hash_I);
+	
+	SHA512Context ctx;
+	unsigned char digest[SHA512HashSize];
+	SHA512Reset(&ctx);
+	SHA512Input(&ctx, hash_n_xor_g, SHA512HashSize);
+	SHA512Input(&ctx, hash_I, SHA512HashSize);
+	SHA512Input(&ctx, (unsigned char *)hd->bytes_s, hd->len_s);
+	SHA512Input(&ctx, (unsigned char *)hd->bytes_A, hd->len_A);
+	SHA512Input(&ctx, (unsigned char *)hd->bytes_B, hd->len_B);
+	SHA512Input(&ctx, (unsigned char *)hd->session_key, SHA512HashSize);
+	SHA512Result(&ctx, digest);
+
+	hex_dbg("M", digest, sizeof(digest));
+	if (memcmp(bytes_user_proof, digest, SHA512HashSize) != 0)
+		return false;
+	/* M is now validated, let's proceed to H(AMK) */
+	SHA512Reset(&ctx);
+	SHA512Input(&ctx, (unsigned char *)hd->bytes_A, hd->len_A);
+	SHA512Input(&ctx, digest, SHA512HashSize);
+	SHA512Input(&ctx, (unsigned char *)hd->session_key, SHA512HashSize);
+	SHA512Result(&ctx, (unsigned char *)bytes_host_proof);
+	hex_dbg("AMK", bytes_host_proof, SHA512HashSize);
+
+	return true;
+}
+/************************* SRP Stuff Ends */
diff --git a/components/homekit/mu_srp/mu_srp.h b/components/homekit/mu_srp/mu_srp.h
new file mode 100644
index 0000000..8463ea3
--- /dev/null
+++ b/components/homekit/mu_srp/mu_srp.h
@@ -0,0 +1,91 @@
+#ifndef _MU_SRP_H_
+#define _MU_SRP_H_
+
+#include <stdbool.h>
+#include "mu_bignum.h"
+
+typedef enum {
+	MU_NG_3072 = 0,
+} mu_ng_type_t;
+
+typedef struct mu_srp_handle {
+	int allocated;
+	mu_ng_type_t type;
+	mu_bn_ctx_t *ctx;
+
+	/* N
+	 * the bytes_n simply points to the static array
+	 */
+	mu_bn_t *n;
+	char    *bytes_n;
+	int      len_n;
+
+	/* g
+	 * the bytes_g simply points to the static array
+	 */
+	mu_bn_t *g;
+	char    *bytes_g;
+	int      len_g;
+
+	/* Salt */
+	mu_bn_t *s;
+	char    *bytes_s;
+	int      len_s;
+	/* Verifier */
+	mu_bn_t *v;
+	/* B */
+	mu_bn_t *B;
+	char    *bytes_B;
+	int      len_B;
+	/* b */
+	mu_bn_t *b;
+	/* A */
+	mu_bn_t *A;
+	char    *bytes_A;
+	int      len_A;
+	/* K - session key*/
+	char *session_key;
+} mu_srp_handle_t;
+
+int mu_srp_init(mu_srp_handle_t *hd, mu_ng_type_t ng);
+
+void mu_srp_free(mu_srp_handle_t *hd);
+/* Returns B (pub key) and salt
+ *
+ * *bytes_B MUST NOT BE FREED BY THE CALLER
+ * *bytes_salt MUST NOT BE FREE BY THE CALLER
+ *
+ */
+int mu_srp_srv_pubkey(mu_srp_handle_t *hd, const char *username, const char *pass, int pass_len, int salt_len,
+		      char **bytes_B, int *len_B, char **bytes_salt);
+
+/* Set the Salt and Verifier pre-generated for a given password.
+ * This should be used only if the actual password is not available.
+ * The public key can then be generated using mu_srp_srv_pubkey_from_salt_verifier()
+ * and not mu_srp_srv_pubkey()
+ */
+int mu_srp_set_salt_verifier(mu_srp_handle_t *hd, const char *salt, int salt_len,
+            const char *verifier, int verifier_len);
+
+/* Returns B (pub key) when the salt and verifier are set using mu_srp_set_salt_verifier()
+ *
+ * *bytes_B MUST NOT BE FREED BY THE CALLER
+ */
+int mu_srp_srv_pubkey_from_salt_verifier(mu_srp_handle_t *hd, char **bytes_B, int *len_B);
+
+/* Returns bytes_key
+ * *bytes_key MUST NOT BE FREED BY THE CALLER
+ */
+int mu_srp_get_session_key(mu_srp_handle_t *hd, char *bytes_A, int len_A, char **bytes_key, int *len_key);
+
+/* Exchange proofs
+ * Returns 1 if user's proof is ok. Also 1 when is returned, bytes_host_proof contains our proof.
+ *
+ * bytes_user_proof is parameter in
+ * bytes_host_proof is parameter out (should be SHA512_DIGEST_LENGTH) bytes in size
+ */
+int mu_srp_exchange_proofs(mu_srp_handle_t *hd, char *username, char *bytes_user_proof, char *bytes_host_proof);
+
+
+
+#endif /* ! _MU_SRP_H_ */
diff --git a/components/led/CMakeLists.txt b/components/led/CMakeLists.txt
new file mode 100644
index 0000000..ef87421
--- /dev/null
+++ b/components/led/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(COMPONENT_ADD_INCLUDEDIRS ./led/include)
+
+# Edit following two lines to set component requirements (see docs)
+set(COMPONENT_REQUIRES )
+set(COMPONENT_PRIV_REQUIRES )
+
+set(COMPONENT_SRCS ./led/led.c)
+
+register_component()
diff --git a/components/led/Kconfig b/components/led/Kconfig
new file mode 100644
index 0000000..3eac73d
--- /dev/null
+++ b/components/led/Kconfig
@@ -0,0 +1,212 @@
+menu "LED"
+    config STATUS_LED_QUICK_BLINK_FREQ
+        int "Quick blink frequency(Hz)"
+        range 1 20
+        default 5
+    config STATUS_LED_SLOW_BLINK_FREQ
+        int "Slow blink frequency(Hz)"
+        range 1 20
+        default 1
+    
+    choice STATUS_LED_SPEED_MODE_CHOICE
+        bool "LEDC speed mode"
+        default USE_LEDC_HIGHSPEED_MODE
+        config USE_LEDC_HIGHSPEED_MODE
+            bool "Select LEDC high-speed mode for status LED"
+        config USE_LEDC_LOWSPEED_MODE
+            bool "Select LEDC low-speed mode for status LED" 
+    endchoice
+    config STATUS_LED_SPEED_MODE
+        int
+        default 0 if USE_LEDC_HIGHSPEED_MODE
+        default 1 if USE_LEDC_LOWSPEED_MODE
+        
+    # -------------- led quick blink config ---------------
+        
+    choice STATUS_LED_QUICK_BLINK_CHANNEL_CHOICE
+        bool  "Status LED quick blink channel"
+        default STATUS_LED_QUICK_BLINK_CHANNEL_0
+        
+        config STATUS_LED_QUICK_BLINK_CHANNEL_0
+            bool "channel 0"
+        config STATUS_LED_QUICK_BLINK_CHANNEL_1
+            bool "channel 1"
+        config STATUS_LED_QUICK_BLINK_CHANNEL_2
+            bool "channel 2"                
+        config STATUS_LED_QUICK_BLINK_CHANNEL_3
+            bool "channel 3"                
+        config STATUS_LED_QUICK_BLINK_CHANNEL_4
+            bool "channel 4"                
+        config STATUS_LED_QUICK_BLINK_CHANNEL_5
+            bool "channel 5"
+        config STATUS_LED_QUICK_BLINK_CHANNEL_6
+            bool "channel 6"                
+        config STATUS_LED_QUICK_BLINK_CHANNEL_7
+            bool "channel 7" 
+        config STATUS_LED_QUICK_BLINK_CHANNEL_DEF
+            bool "channel default(0)"                                 
+    endchoice
+    config STATUS_LED_QUICK_BLINK_CHANNEL
+        int 
+        default 0 if STATUS_LED_QUICK_BLINK_CHANNEL_0
+        default 1 if STATUS_LED_QUICK_BLINK_CHANNEL_1
+        default 2 if STATUS_LED_QUICK_BLINK_CHANNEL_2
+        default 3 if STATUS_LED_QUICK_BLINK_CHANNEL_3
+        default 4 if STATUS_LED_QUICK_BLINK_CHANNEL_4
+        default 5 if STATUS_LED_QUICK_BLINK_CHANNEL_5
+        default 6 if STATUS_LED_QUICK_BLINK_CHANNEL_6
+        default 7 if STATUS_LED_QUICK_BLINK_CHANNEL_7
+        default 0 if STATUS_LED_QUICK_BLINK_CHANNEL_DEF
+    
+    choice STATUS_LED_QUICK_BLINK_TIMER_CHOICE
+        bool  "Status LED quick blink timer"
+        default STATUS_LED_QUICK_BLINK_TIMER_0
+        
+        config STATUS_LED_QUICK_BLINK_TIMER_0
+            bool "TIMER 0"
+        config STATUS_LED_QUICK_BLINK_TIMER_1
+            bool "TIMER 1"
+        config STATUS_LED_QUICK_BLINK_TIMER_2
+            bool "TIMER 2"                
+        config STATUS_LED_QUICK_BLINK_TIMER_3
+            bool "TIMER 3"       
+        config STATUS_LED_QUICK_BLINK_TIMER_DEF
+            bool "TIMER default(0)"                                            
+    endchoice
+    config STATUS_LED_QUICK_BLINK_TIMER
+        int 
+        default 0 if STATUS_LED_QUICK_BLINK_TIMER_0
+        default 1 if STATUS_LED_QUICK_BLINK_TIMER_1
+        default 2 if STATUS_LED_QUICK_BLINK_TIMER_2
+        default 3 if STATUS_LED_QUICK_BLINK_TIMER_3
+        default 0 if STATUS_LED_QUICK_BLINK_TIMER_DEF
+    
+    
+        
+    # --------------- led slow blink config ----------------
+    
+    choice STATUS_LED_SLOW_BLINK_CHANNEL_CHOICE
+        bool  "Status LED slow blink channel"
+        default STATUS_LED_SLOW_BLINK_CHANNEL_1
+        
+        config STATUS_LED_SLOW_BLINK_CHANNEL_0
+            bool "channel 0"
+        config STATUS_LED_SLOW_BLINK_CHANNEL_1
+            bool "channel 1"
+        config STATUS_LED_SLOW_BLINK_CHANNEL_2
+            bool "channel 2"                
+        config STATUS_LED_SLOW_BLINK_CHANNEL_3
+            bool "channel 3"                
+        config STATUS_LED_SLOW_BLINK_CHANNEL_4
+            bool "channel 4"                
+        config STATUS_LED_SLOW_BLINK_CHANNEL_5
+            bool "channel 5"
+        config STATUS_LED_SLOW_BLINK_CHANNEL_6
+            bool "channel 6"                
+        config STATUS_LED_SLOW_BLINK_CHANNEL_7
+            bool "channel 7"  
+        config STATUS_LED_SLOW_BLINK_CHANNEL_DEF
+            bool "channel default(1)"                                                  
+    endchoice
+    config STATUS_LED_SLOW_BLINK_CHANNEL
+        int 
+        default 0 if STATUS_LED_SLOW_BLINK_CHANNEL_0
+        default 1 if STATUS_LED_SLOW_BLINK_CHANNEL_1
+        default 2 if STATUS_LED_SLOW_BLINK_CHANNEL_2
+        default 3 if STATUS_LED_SLOW_BLINK_CHANNEL_3
+        default 4 if STATUS_LED_SLOW_BLINK_CHANNEL_4
+        default 5 if STATUS_LED_SLOW_BLINK_CHANNEL_5
+        default 6 if STATUS_LED_SLOW_BLINK_CHANNEL_6
+        default 7 if STATUS_LED_SLOW_BLINK_CHANNEL_7   
+        default 1 if STATUS_LED_SLOW_BLINK_CHANNEL_DEF
+         
+    choice STATUS_LED_SLOW_BLINK_TIMER_CHOICE
+        bool  "Status LED slow blink timer"
+        default STATUS_LED_SLOW_BLINK_TIMER_1
+        
+        config STATUS_LED_SLOW_BLINK_TIMER_0
+            bool "TIMER 0"
+        config STATUS_LED_SLOW_BLINK_TIMER_1
+            bool "TIMER 1"
+        config STATUS_LED_SLOW_BLINK_TIMER_2
+            bool "TIMER 2"                
+        config STATUS_LED_SLOW_BLINK_TIMER_3
+            bool "TIMER 3"     
+        config STATUS_LED_SLOW_BLINK_TIMER_DEF
+            bool "TIMER default(1)"                                              
+    endchoice
+    config STATUS_LED_SLOW_BLINK_TIMER
+        int 
+        default 0 if STATUS_LED_SLOW_BLINK_TIMER_0
+        default 1 if STATUS_LED_SLOW_BLINK_TIMER_1
+        default 2 if STATUS_LED_SLOW_BLINK_TIMER_2
+        default 3 if STATUS_LED_SLOW_BLINK_TIMER_3   
+        default 1 if STATUS_LED_SLOW_BLINK_TIMER_DEF   
+        
+                 
+    # ---------------- led night mode config ------------------
+    
+    config STATUS_LED_NIGHT_MODE_ENABLE
+        bool "Status LED night mode enable"
+        default y
+        
+        choice STATUS_LED_NIGHT_MODE_CHANNEL_CHOICE
+            bool  "Status LED night mode channel"
+            default STATUS_LED_NIGHT_MODE_CHANNEL_2
+            depends on STATUS_LED_NIGHT_MODE_ENABLE
+            
+            config STATUS_LED_NIGHT_MODE_CHANNEL_0
+                bool "channel 0"
+            config STATUS_LED_NIGHT_MODE_CHANNEL_1
+                bool "channel 1"
+            config STATUS_LED_NIGHT_MODE_CHANNEL_2
+                bool "channel 2"                
+            config STATUS_LED_NIGHT_MODE_CHANNEL_3
+                bool "channel 3"                
+            config STATUS_LED_NIGHT_MODE_CHANNEL_4
+                bool "channel 4"                
+            config STATUS_LED_NIGHT_MODE_CHANNEL_5
+                bool "channel 5"
+            config STATUS_LED_NIGHT_MODE_CHANNEL_6
+                bool "channel 6"                
+            config STATUS_LED_NIGHT_MODE_CHANNEL_7
+                bool "channel 7"      
+            config STATUS_LED_NIGHT_MODE_CHANNEL_DEF
+                bool "channel default(2)"                                                  
+        endchoice
+        config STATUS_LED_NIGHT_MODE_CHANNEL
+            int 
+            default 0 if STATUS_LED_NIGHT_MODE_CHANNEL_0
+            default 1 if STATUS_LED_NIGHT_MODE_CHANNEL_1
+            default 2 if STATUS_LED_NIGHT_MODE_CHANNEL_2
+            default 3 if STATUS_LED_NIGHT_MODE_CHANNEL_3
+            default 4 if STATUS_LED_NIGHT_MODE_CHANNEL_4
+            default 5 if STATUS_LED_NIGHT_MODE_CHANNEL_5
+            default 6 if STATUS_LED_NIGHT_MODE_CHANNEL_6
+            default 7 if STATUS_LED_NIGHT_MODE_CHANNEL_7  
+            default 2 if STATUS_LED_NIGHT_MODE_CHANNEL_DEF
+        
+        choice STATUS_LED_NIGHT_MODE_TIMER_CHOICE
+            bool  "Status LED night mode timer"
+            default STATUS_LED_NIGHT_MODE_TIMER_2
+            depends on STATUS_LED_NIGHT_MODE_ENABLE
+            
+            config STATUS_LED_NIGHT_MODE_TIMER_0
+                bool "TIMER 0"
+            config STATUS_LED_NIGHT_MODE_TIMER_1
+                bool "TIMER 1"
+            config STATUS_LED_NIGHT_MODE_TIMER_2
+                bool "TIMER 2"                
+            config STATUS_LED_NIGHT_MODE_TIMER_3
+                bool "TIMER 3"    
+            config STATUS_LED_NIGHT_MODE_TIMER_DEF
+                bool "TIMER default(2)"                                                   
+        endchoice
+        config STATUS_LED_NIGHT_MODE_TIMER
+            int 
+            default 0 if STATUS_LED_NIGHT_MODE_TIMER_0
+            default 1 if STATUS_LED_NIGHT_MODE_TIMER_1
+            default 2 if STATUS_LED_NIGHT_MODE_TIMER_2
+            default 3 if STATUS_LED_NIGHT_MODE_TIMER_3  
+            default 2 if STATUS_LED_NIGHT_MODE_TIMER_DEF  
+endmenu  
diff --git a/components/led/component.mk b/components/led/component.mk
new file mode 100644
index 0000000..4402e84
--- /dev/null
+++ b/components/led/component.mk
@@ -0,0 +1,2 @@
+COMPONENT_ADD_INCLUDEDIRS := ./led/include
+COMPONENT_SRCDIRS := ./led
diff --git a/components/led/led/component.mk b/components/led/led/component.mk
new file mode 100644
index 0000000..a98f634
--- /dev/null
+++ b/components/led/led/component.mk
@@ -0,0 +1,4 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/components/led/led/include/iot_led.h b/components/led/led/include/iot_led.h
new file mode 100644
index 0000000..7e6189d
--- /dev/null
+++ b/components/led/led/include/iot_led.h
@@ -0,0 +1,157 @@
+/*
+  * ESPRESSIF MIT License
+  *
+  * Copyright (c) 2017 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+  *
+  * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+  * it is 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 _IOT_LED_H_
+#define _IOT_LED_H_
+#include <sdkconfig.h>
+#include <esp_err.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef enum {
+    LED_DARK_LOW = 0,       /**< choose this parameter if the led is dark when the level of gpio is low */
+    LED_DARK_HIGH = 1,      /**< choose this parameter if the led is dark when the level of gpio is high */
+} led_dark_level_t;
+
+typedef enum {
+    LED_OFF,
+    LED_ON,
+    LED_QUICK_BLINK,
+    LED_SLOW_BLINK,
+} led_status_t;
+
+typedef enum {
+    LED_NORMAL_MODE,        /**< led normal */
+    LED_NIGHT_MODE,         /**< led night mode, always turn off led */ 
+} led_mode_t;
+
+typedef void* led_handle_t;
+
+
+/**
+  * @brief  led initialize.
+  * @return
+  *     - ESP_OK: succeed
+  *     - others: fail
+  */
+esp_err_t iot_led_setup();
+
+/**
+ * @brief led blink frequency update
+ * @param quick_blink_freq quick blink frequency
+ * @param slow_blink_freq slow blink frequency
+ * @return
+ *     - ESP_OK: success
+ *     - others: fail
+ */
+esp_err_t iot_led_update_blink_freq(int quick_blink_freq, int slow_blink_freq);
+
+/**
+  * @brief  create new led.
+  *
+  * @param  io_num
+  * @param  dark_level on whick level the led is dark
+  *
+  * @return the handle of the led
+  */
+led_handle_t iot_led_create(uint8_t io_num, led_dark_level_t dark_level);
+
+/**
+  * @brief  free the memory of led
+  *
+  * @param  led_handle
+  *
+  * @return
+  *     - ESP_OK: succeed
+  *     - others: fail
+  */
+esp_err_t iot_led_delete(led_handle_t led_handle);
+
+/**
+  * @brief  set state of led
+  *
+  * @param  led_handle
+  * @param  state refer to enum led_status_t
+  *
+  * @return
+  *     - ESP_OK: succeed
+  *     - others: fail
+  */
+esp_err_t iot_led_state_write(led_handle_t led_handle, led_status_t state);
+
+/**
+  * @brief  set mode of led
+  *
+  * @param  led_handle
+  * @param  mode refer to enum led_mode_t
+  *
+  * @return
+  *     - ESP_OK: succeed
+  *     - others: fail
+  */
+esp_err_t iot_led_mode_write(led_handle_t led_handle, led_mode_t mode);
+
+/**
+  * @brief  set duty of night mode, all the leds share the same duty
+  *
+  * @param  duty value from 0~100
+  *
+  * @return
+  *     - ESP_OK: succeed
+  *     - others: fail
+  */
+esp_err_t iot_led_night_duty_write(uint8_t duty);
+
+/**
+  * @brief  get state of led
+  *
+  * @param  led_handle
+  *
+  * @return state of led
+  */
+led_status_t iot_led_state_read(led_handle_t led_handle);
+
+/**
+  * @brief  get mode of led
+  *
+  * @param  led_handle
+  *
+  * @return mode of led
+  */
+led_mode_t iot_led_mode_read(led_handle_t led_handle);
+
+/**
+  * @brief  get duty of night mode
+  *
+  * @return duty of night mode
+  */
+uint8_t iot_led_night_duty_read();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/components/led/led/led.c b/components/led/led/led.c
new file mode 100644
index 0000000..30f7f47
--- /dev/null
+++ b/components/led/led/led.c
@@ -0,0 +1,224 @@
+/*
+  * ESPRESSIF MIT License
+  *
+  * Copyright (c) 2017 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+  *
+  * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+  * it is 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 <sdkconfig.h>
+#include <driver/ledc.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <esp_log.h>
+#include <iot_led.h>
+
+#define QUICK_BLINK_FREQ            CONFIG_STATUS_LED_QUICK_BLINK_FREQ     /*!< default 5 */
+#define SLOW_BLINK_FREQ             CONFIG_STATUS_LED_SLOW_BLINK_FREQ      /*!< default 1 */
+#define LED_SPEED_MODE              CONFIG_STATUS_LED_SPEED_MODE           /*!< default LEDC_HIGH_SPEED_MODE */
+
+#define LED_QUICK_BLINK_CHANNEL     CONFIG_STATUS_LED_QUICK_BLINK_CHANNEL  /*!< default 0 */
+#define LED_SLOW_BLINK_CHANNEL      CONFIG_STATUS_LED_SLOW_BLINK_CHANNEL   /*!< default 1 */
+#define LED_NIGHT_MODE_CHANNEL      CONFIG_STATUS_LED_NIGHT_MODE_CHANNEL   /*!< default 2 */
+
+
+#define LED_QUICK_BLINK_TIMER       CONFIG_STATUS_LED_QUICK_BLINK_TIMER    /*!< default 0 */
+#define LED_SLOW_BLINK_TIMER        CONFIG_STATUS_LED_SLOW_BLINK_TIMER     /*!< default 1 */
+#define LED_NORMAL_TIMER            CONFIG_STATUS_LED_NIGHT_MODE_TIMER     /*!< default 2 */
+
+#define LED_LONG_BRIGHT_FRE         5000
+#define LED_TIMER_BIT               LEDC_TIMER_13_BIT
+#define LED_BRIGHT_DUTY             ((1 << LED_TIMER_BIT) - 1)
+#define LED_SLOW_BLINK_DUTY         (LED_BRIGHT_DUTY / 2)
+#define LED_QUICK_BLINK_DUTY        (LED_BRIGHT_DUTY / 2)
+#define IOT_CHECK(tag, a, ret)  if(!(a)) {                                 \
+        ESP_LOGE(tag,"%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__);      \
+        return (ret);                                                      \
+        }
+
+#define ERR_ASSERT(tag, param)      IOT_CHECK(tag, (param) == ESP_OK, ESP_FAIL)
+#define POINT_ASSERT(tag, param)    IOT_CHECK(tag, (param) != NULL, ESP_FAIL)
+#define RES_ASSERT(tag, res, ret)   IOT_CHECK(tag, (res) != pdFALSE, ret)
+
+static const char* TAG = "LED";
+static uint8_t g_night_duty = 0;
+static bool g_init_flg = false;
+typedef struct {
+    uint8_t io_num;
+    led_status_t state;
+    led_dark_level_t dark_level;
+    led_mode_t mode;
+    uint8_t night_duty;
+} led_dev_t;
+
+static esp_err_t led_ledctimer_set(ledc_timer_t timer_num, uint32_t freq_hz, ledc_mode_t speed_mode)
+{
+    ledc_timer_config_t ledc_timer = {
+       // .bit_num = LED_TIMER_BIT,
+        .freq_hz = freq_hz,
+        .speed_mode = speed_mode,
+        .timer_num = timer_num
+    };
+    ERR_ASSERT(TAG, ledc_timer_config(&ledc_timer)); 
+    return ESP_OK;
+}
+
+static esp_err_t gpio_ledc_bind(ledc_timer_t timer_num, ledc_channel_t channel, int gpio_num,
+                                   uint32_t duty, ledc_mode_t speed_mode)
+{
+    ledc_channel_config_t ledc_channel = {
+        .channel = channel,
+        .duty = duty,
+        .gpio_num = gpio_num,
+        .intr_type = LEDC_INTR_FADE_END,
+        .speed_mode = speed_mode,
+        .timer_sel = timer_num
+    };
+    ERR_ASSERT(TAG, ledc_channel_config(&ledc_channel));
+    return ESP_OK;
+}
+
+static esp_err_t led_level_set(led_handle_t led_handle, uint8_t level)
+{
+    led_dev_t* led_dev = (led_dev_t*) led_handle;
+    if ((level & 0x01) ^ led_dev->dark_level) {
+        if (led_dev->mode == LED_NIGHT_MODE) {
+            ERR_ASSERT(TAG, gpio_ledc_bind(LED_NORMAL_TIMER, LED_NIGHT_MODE_CHANNEL, led_dev->io_num, 
+                        g_night_duty * LED_BRIGHT_DUTY / 100, LED_SPEED_MODE));
+        }
+        else {
+            gpio_set_level(led_dev->io_num, ~(led_dev->dark_level));
+            gpio_matrix_out(led_dev->io_num, SIG_GPIO_OUT_IDX, 0, 0);
+        }
+    }
+    else {
+        gpio_set_level(led_dev->io_num, led_dev->dark_level);
+        gpio_matrix_out(led_dev->io_num, SIG_GPIO_OUT_IDX, 0, 0);
+    }
+    return ESP_OK;
+}
+
+static esp_err_t led_quick_blink(led_handle_t led_handle)
+{
+    led_dev_t* led_dev = (led_dev_t*) led_handle;
+    ERR_ASSERT(TAG, gpio_ledc_bind(LED_QUICK_BLINK_TIMER, LED_QUICK_BLINK_CHANNEL, led_dev->io_num, LED_QUICK_BLINK_DUTY, LED_SPEED_MODE));
+    return ESP_OK;
+}
+
+static esp_err_t led_slow_blink(led_handle_t led_handle)
+{
+    led_dev_t* led_dev = (led_dev_t*) led_handle;
+    ERR_ASSERT(TAG, gpio_ledc_bind(LED_SLOW_BLINK_TIMER, LED_SLOW_BLINK_CHANNEL, led_dev->io_num, LED_SLOW_BLINK_DUTY, LED_SPEED_MODE));
+    return ESP_OK;
+}
+
+esp_err_t iot_led_update_blink_freq(int quick_blink_freq, int slow_blink_freq)
+{
+    ERR_ASSERT(TAG, led_ledctimer_set(LED_QUICK_BLINK_TIMER, quick_blink_freq, LED_SPEED_MODE));
+    ERR_ASSERT(TAG, led_ledctimer_set(LED_SLOW_BLINK_TIMER, slow_blink_freq, LED_SPEED_MODE));
+    return ESP_OK;
+}
+
+esp_err_t iot_led_setup()
+{
+    ERR_ASSERT(TAG, led_ledctimer_set(LED_NORMAL_TIMER, LED_LONG_BRIGHT_FRE, LED_SPEED_MODE));
+    iot_led_update_blink_freq(QUICK_BLINK_FREQ, SLOW_BLINK_FREQ);
+    return ESP_OK;
+}
+
+led_handle_t iot_led_create(uint8_t io_num, led_dark_level_t dark_level)
+{
+    if(!g_init_flg) {
+        iot_led_setup();
+        g_init_flg = true;
+    }
+    led_dev_t *led_p = (led_dev_t*)calloc(1, sizeof(led_dev_t));
+    led_p->io_num = io_num;
+    led_p->dark_level = dark_level;
+    led_p->state = LED_OFF;
+    led_p->mode = LED_NORMAL_MODE;
+    iot_led_state_write(led_p, LED_OFF);
+    return (led_handle_t) led_p;
+}
+
+esp_err_t iot_led_delete(led_handle_t led_handle)
+{
+    POINT_ASSERT(TAG, led_handle);
+    free(led_handle);
+    return ESP_OK;
+}
+
+esp_err_t iot_led_state_write(led_handle_t led_handle, led_status_t state)
+{
+    led_dev_t* led_dev = (led_dev_t*) led_handle;
+    POINT_ASSERT(TAG, led_dev);
+    switch (state) {
+        case LED_OFF:
+            led_level_set(led_handle, 0);
+            break;
+        case LED_ON:
+            led_level_set(led_handle, 1);
+            break;
+        case LED_QUICK_BLINK:
+            led_quick_blink(led_handle);
+            break;
+        case LED_SLOW_BLINK:
+            led_slow_blink(led_handle);
+            break;
+        default:
+            break;
+    }
+    led_dev->state = state;
+    return ESP_OK;
+}
+
+esp_err_t iot_led_mode_write(led_handle_t led_handle, led_mode_t mode)
+{
+    led_dev_t* led_dev = (led_dev_t*) led_handle;
+    POINT_ASSERT(TAG, led_dev);
+    led_dev->mode = mode;
+    iot_led_state_write(led_handle, led_dev->state);
+    return ESP_OK;
+}
+
+esp_err_t iot_led_night_duty_write(uint8_t duty)
+{
+    IOT_CHECK(TAG, duty <= 100, ESP_FAIL);
+    g_night_duty = duty;
+    return ESP_OK;
+}
+
+uint8_t iot_led_night_duty_read()
+{
+    return g_night_duty;
+}
+
+led_status_t iot_led_state_read(led_handle_t led_handle)
+{
+    led_dev_t* led_dev = (led_dev_t*) led_handle;
+    return led_dev->state;
+}
+
+led_mode_t iot_led_mode_read(led_handle_t led_handle)
+{
+    led_dev_t* led_dev = (led_dev_t*) led_handle;
+    return led_dev->mode;
+}
+
+
diff --git a/examples/aws-iot/CMakeLists.txt b/examples/aws-iot/CMakeLists.txt
new file mode 100644
index 0000000..b27e59a
--- /dev/null
+++ b/examples/aws-iot/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+# (Automatically converted from project Makefile by convert_to_cmake.py.)
+
+# The following lines of boilerplate have to be in your project's CMakeLists
+# in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+if(DEFINED ENV{HOMEKIT_PATH})
+  set(HOMEKIT_PATH $ENV{HOMEKIT_PATH})
+else()
+  set(HOMEKIT_PATH ${CMAKE_CURRENT_LIST_DIR}/../..)
+endif(DEFINED ENV{HOMEKIT_PATH})
+
+if(NOT DEFINED ENV{AWS_IOT_PATH})
+    message(FATAL_ERROR "Please set AWS_IOT_PATH to esp-aws-iot repo")
+endif(NOT DEFINED ENV{AWS_IOT_PATH})
+
+set(EXTRA_COMPONENT_DIRS ${HOMEKIT_PATH}/components ${HOMEKIT_PATH}/components/homekit $ENV{AWS_IOT_PATH}/../ ${CMAKE_CURRENT_LIST_DIR}/../common)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(aws-iot)
diff --git a/examples/aws-iot/Makefile b/examples/aws-iot/Makefile
new file mode 100755
index 0000000..40bbcf5
--- /dev/null
+++ b/examples/aws-iot/Makefile
@@ -0,0 +1,19 @@
+#
+# This is a project Makefile. It is assumed the directory this Makefile resides in is a
+# project subdirectory.
+#
+ifeq ($(AWS_IOT_PATH),)
+    $(error Please set AWS_IOT_PATH to esp-aws-iot repo)
+endif
+
+HOMEKIT_PATH ?= $(abspath $(shell pwd)/../..)
+COMMON_COMPONENT_PATH ?= $(abspath $(shell pwd)/../common)
+
+PROJECT_NAME := aws-iot
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/homekit
+EXTRA_COMPONENT_DIRS += $(AWS_IOT_PATH)/../
+EXTRA_COMPONENT_DIRS += $(COMMON_COMPONENT_PATH)
+
+include $(IDF_PATH)/make/project.mk
+
diff --git a/examples/aws-iot/README_EN.md b/examples/aws-iot/README_EN.md
new file mode 100755
index 0000000..3c19844
--- /dev/null
+++ b/examples/aws-iot/README_EN.md
@@ -0,0 +1,48 @@
+# Homekit AWS-IoT Integration
+
+This example demonstrates the secure **AWS-IoT** communication for **HomeKit Accessories**.
+
+## 1. Setup
+ - Create a thing and generate certificates for the device from **AWS-IoT** and activate them for the thing.
+ - Download and place the Certificate and Private Key in the **main/certs** directory in your project, renaming them as **device.crt** and **device.key**. The AWS-IoT root CA certificate has already been placed as server.crt in the same folder. This is the RSA 2048 bit key: Amazon Root CA 1 taken from [here](https://docs.aws.amazon.com/iot/latest/developerguide/managing-device-certs.html#server-authentication).
+ - Attach an appropriate policy to the certificates to enable the accessing this thing.
+ - Set the AWS IoT endpoint in `CONFIG_AWS_IOT_MQTT_HOST`. This can be found under Settings tab of the IoT Core section on AWS Dashboard. The value will be something like `xxxxxxxxxxxxx-ats.iot.us-east-1.amazonaws.com`
+ - Set/change the Client ID using `CONFIG_AWS_EXAMPLE_CLIENT_ID` and also choose if you want to use Thing-Shadow or Publish-Subscribe.
+ - If you choose Publish-Subscribe, set/change the Publish/Subscribe topics using `CONFIG_AWS_EXAMPLE_PUBLISH_TOPIC` and `CONFIG_AWS_EXAMPLE_SUBSCRIBE_TOPIC` respectively.
+ - Build and Flash your firmware after making these changes.
+
+
+> **Note:** Although the certificates are embedded into the firmware in this example, in production the certificates would normally be stored in NVS as binary blobs.
+
+## 2. Testing
+ - This code enables the accessory to report any local changes to AWS-IoT and also accept change requests from it.
+
+### Thing-Shadow
+ - If you are using Thing-Shadow, you can view the values reported by the accessory using the AWS Dashboard and going to IoT Core -> Manage -> Things -> \<Thing Name\> -> Shadow.
+ - The shadow document looks something like this:
+
+```
+{
+     "desired": {
+         "on": false,
+         "brightness": 28
+     },
+     "reported": {
+         "on": false,
+         "brightness": 28
+     }
+}
+```
+
+ - The reported values reflect the current state of the accessory.
+ - If you want to request any changes, change the values in the "desired" object and save the new JSON document.
+
+### Publish-Subscribe
+ - Use the AWS IoT Core "Test" tab and subscribe to the topic to which the device is programmed to publish, in order to observe state changes.
+ - To change the values from AWS-IoT, publish the following JSON to the topic subscribed by the device. 
+```
+{
+    "on":false,
+    "brightness":50
+}
+```
\ No newline at end of file
diff --git a/examples/aws-iot/aws-iot_factory.bin b/examples/aws-iot/aws-iot_factory.bin
new file mode 100644
index 0000000..c800e11
Binary files /dev/null and b/examples/aws-iot/aws-iot_factory.bin differ
diff --git a/examples/aws-iot/main/CMakeLists.txt b/examples/aws-iot/main/CMakeLists.txt
new file mode 100644
index 0000000..4d0ed0c
--- /dev/null
+++ b/examples/aws-iot/main/CMakeLists.txt
@@ -0,0 +1,6 @@
+idf_component_register(SRCS ./app_main.c ./hap_aws_iot_pub_sub.c ./hap_aws_iot_thing_shadow.c
+                        INCLUDE_DIRS ".")
+
+target_add_binary_data(${COMPONENT_TARGET} "certs/server.crt" TEXT)
+target_add_binary_data(${COMPONENT_TARGET} "certs/device.crt" TEXT)
+target_add_binary_data(${COMPONENT_TARGET} "certs/device.key" TEXT)
diff --git a/examples/aws-iot/main/Kconfig.projbuild b/examples/aws-iot/main/Kconfig.projbuild
new file mode 100644
index 0000000..cf7afb3
--- /dev/null
+++ b/examples/aws-iot/main/Kconfig.projbuild
@@ -0,0 +1,67 @@
+menu "AWS-IoT Example Configuration"
+
+    config EXAMPLE_USE_HARDCODED_SETUP_CODE
+        bool "Use hard-coded setup code"
+        default y
+        help
+            HomeKit does not recommend having the setup code programmed in the accessory as is.
+            Instead, it expects setup info (salt-verifier pair) generated for the given setup code.
+            Use this option only for testing purposes. For production, the setup info should be
+            used.
+
+    config EXAMPLE_SETUP_CODE
+        string "HomeKit Setup Code"
+        default "111-22-333"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup code to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+    config EXAMPLE_SETUP_ID
+        string "HomeKit Setup Id"
+        default "ES32"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup id to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+    config EXAMPLE_AWS_CLIENT_ID
+        string "Client Id"
+        default "MyClient"
+        help
+            The Client Id to be used for AWS-IoT MQTT connection
+
+    choice EXAMPLE_AWS_COMMUNICATION_MECHANISM
+        bool "AWS IoT Communication mechanism"
+        default EXAMPLE_AWS_THING_SHADOW
+        help
+            AWS IoT can use plain MQTT publish/subscribe or the AWS proprietary Thing/Shadow
+            for communicating with the AWS IoT MQTT broker. Choose the option you want to use.
+
+        config EXAMPLE_AWS_THING_SHADOW
+            bool "Thing-Shadow"
+        config EXAMPLE_AWS_PUB_SUB
+            bool "Publish-Subscribe"
+    endchoice
+
+    config EXAMPLE_AWS_COMMUNICATION_MECHANISM
+        int
+        default 1 if EXAMPLE_AWS_THING_SHADOW
+        default 2 if EXAMPLE_AWS_PUB_SUB
+
+    menu "Publish-Subscribe"
+        depends on EXAMPLE_AWS_PUB_SUB
+
+        config EXAMPLE_AWS_PUBLISH_TOPIC
+            string "MQTT Publish Topic"
+            default "device/publish"
+            help
+                The MQTT topic to which the accessory should publish the state changes
+
+        config EXAMPLE_AWS_SUBSCRIBE_TOPIC
+            string "MQTT Subscribe Topic"
+            default "device/subscribe"
+            help
+                The MQTT topic on which the accessory will receive state change messages from
+                the cloud
+
+    endmenu # Publish-Subscribe
+endmenu
diff --git a/examples/aws-iot/main/app_main.c b/examples/aws-iot/main/app_main.c
new file mode 100755
index 0000000..0faf123
--- /dev/null
+++ b/examples/aws-iot/main/app_main.c
@@ -0,0 +1,228 @@
+/* Homekit - AWS-Iot Example
+
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <esp_log.h>
+#include <esp_event.h>
+#include <esp_wifi.h>
+
+#include <hap.h>
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+#include <hap_fw_upgrade.h>
+
+#include <iot_button.h>
+
+#include <app_wifi.h>
+#include <app_hap_setup_payload.h>
+#include "hap_aws_iot.h"
+static const char *TAG = "AWS-IOT-Example";
+
+#define PROV_PASSWORD    "11122333"
+
+#define CLOUD_TASK_PRIORITY  1
+#define CLOUD_TASK_STACKSIZE 4 * 1024
+#define CLOUD_TASK_NAME      "hap_cloud"
+
+#define ESP_INTR_FLAG_DEFAULT 0
+
+/* Reset network credentials if button is pressed for more than 3 seconds and then released */
+#define RESET_NETWORK_BUTTON_TIMEOUT        3
+
+/* Reset to factory if button is pressed and held for more than 10 seconds */
+#define RESET_TO_FACTORY_BUTTON_TIMEOUT     10
+
+/* The button "Boot" will be used as the Reset button for the example */
+#define RESET_GPIO  GPIO_NUM_0
+/**
+ * @brief The network reset button callback handler.
+ * Useful for testing the Wi-Fi re-configuration feature of WAC2
+ */
+static void reset_network_handler(void* arg)
+{
+    hap_reset_network();
+}
+/**
+ * @brief The factory reset button callback handler.
+ */
+static void reset_to_factory_handler(void* arg)
+{
+    hap_reset_to_factory();
+}
+
+/**
+ * The Reset button  GPIO initialisation function.
+ * Same button will be used for resetting Wi-Fi network as well as for reset to factory based on
+ * the time for which the button is pressed.
+ */
+static void reset_key_init(uint32_t key_gpio_pin)
+{
+    button_handle_t handle = iot_button_create(key_gpio_pin, BUTTON_ACTIVE_LOW);
+    iot_button_add_on_release_cb(handle, RESET_NETWORK_BUTTON_TIMEOUT, reset_network_handler, NULL);
+    iot_button_add_on_press_cb(handle, RESET_TO_FACTORY_BUTTON_TIMEOUT, reset_to_factory_handler, NULL);
+}
+
+/* Mandatory identify routine for the accessory.
+ * In a real accessory, something like LED blink should be implemented
+ * got visual identification
+ */
+static int lightbulb_identify(hap_acc_t *ha)
+{
+    ESP_LOGI(TAG, "Accessory identified");
+    return HAP_SUCCESS;
+}
+
+/* A dummy callback for handling a write on the characteristic of Lightbulb.
+ * In an actual accessory, this should control the hardware
+ */
+static int lightbulb_write(hap_write_data_t write_data[], int count,
+        void *serv_priv, void *write_priv)
+{
+    ESP_LOGI(TAG, "Lightbulb Write called with %d chars", count);
+    int i, ret = HAP_SUCCESS;
+    hap_write_data_t *write;
+    for (i = 0; i < count; i++) {
+        write = &write_data[i];
+        /* Setting a default error value */
+        *(write->status) = HAP_STATUS_VAL_INVALID;
+        if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_UUID_ON)) {
+            ESP_LOGI(TAG, "Received Write for Light %s", write->val.b ? "On" : "Off");
+            /* Take action on hardware and report to AWS IoT */
+            hap_aws_iot_report_on_char(write->val.b);
+            *(write->status) = HAP_STATUS_SUCCESS;
+        } else if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_UUID_BRIGHTNESS)) {
+            ESP_LOGI(TAG, "Received Write for Light Brightness %d", write->val.i);
+            /* Take action on hardware and report to AWS IoT */
+            hap_aws_iot_report_brightness_char(write->val.i);
+            *(write->status) = HAP_STATUS_SUCCESS;
+        } else {
+            *(write->status) = HAP_STATUS_RES_ABSENT;
+        }
+
+        /* If the characteristic write was successful, update it in hap core
+         */
+        if (*(write->status) == HAP_STATUS_SUCCESS) {
+            hap_char_update_val(write->hc, &(write->val));
+        } else {
+            /* Else, set the return value appropriately to report error */
+            ret = HAP_FAIL;
+        }
+    }
+    return ret;
+}
+static void aws_iot_ip_event_cb(void* arg, esp_event_base_t event_base, int event_id, void* event_data)
+{
+    if (event_id == IP_EVENT_STA_GOT_IP) {
+            /* Starts the AWS-IOT main loop */
+        hap_aws_iot_start();
+    }
+}
+
+/*The main thread for handling the Lightbulb Accessory */
+static void lightbulb_thread_entry(void *p)
+{
+    hap_acc_t *accessory;
+    hap_serv_t *service;
+
+    /* Initialize the MFi core */
+    hap_init(HAP_TRANSPORT_WIFI);
+
+    /* Initialise the mandatory parameters for Accessory which will be added as
+     * the mandatory services internally
+     */
+    hap_acc_cfg_t cfg = {
+        .name = "Esp-AWS-IOT",
+        .manufacturer = "Espressif",
+        .model = "EspLightbulb",
+        .serial_num = "001122334455",
+        .fw_rev = "0.9.0",
+        .hw_rev = NULL,
+        .pv = "1.1.0",
+        .identify_routine = lightbulb_identify,
+        .cid = HAP_CID_LIGHTING,
+    };
+    /* Create accessory object */
+    accessory = hap_acc_create(&cfg);
+
+    /* Add a dummy Product Data */
+    uint8_t product_data[] = {'E','S','P','3','2','H','A','P'};
+    hap_acc_add_product_data(accessory, product_data, sizeof(product_data));
+
+    /* Create the Lightbulb Service. Include the "name" since this is a user visible service  */
+    service = hap_serv_lightbulb_create(false);
+    hap_serv_add_char(service, hap_char_name_create("My Lightbulb"));
+    hap_serv_add_char(service, hap_char_brightness_create(50));
+
+    /* Set the write callback for the service */
+    hap_serv_set_write_cb(service, lightbulb_write);
+
+    /* Add the Lightbulb Service to the Accessory Object */
+    hap_acc_add_serv(accessory, service);
+
+    /* Add the Accessory to the HomeKit Database */
+    hap_add_accessory(accessory);
+
+    /* Register a network reset GPIO. This will be useful to test the Network Re-configuration
+     * feature of WAC2. If the network configuration of a paired accessory is reset, as per
+     * WAC2, the iOS can reconfigure it automatically.
+     */
+    reset_key_init(RESET_GPIO);
+
+    /* Query the controller count (just for information) */
+    ESP_LOGI(TAG, "Accessory is paired with %d controllers",
+                hap_get_paired_controller_count());
+
+    esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, aws_iot_ip_event_cb, NULL);
+
+    /* TODO: Do the actual hardware initialization here */
+
+    /* For production accessories, the setup code shouldn't be programmed on to
+     * the device. Instead, the setup info, derived from the setup code must
+     * be used. Use the factory_nvs_gen utility to generate this data and then
+     * flash it into the factory NVS partition.
+     *
+     * By default, the setup ID and setup info will be read from the factory_nvs
+     * Flash partition and so, is not required to set here explicitly.
+     *
+     * However, for testing purpose, this can be overridden by using hap_set_setup_code()
+     * and hap_set_setup_id() APIs, as has been done here.
+     */
+#ifdef CONFIG_EXAMPLE_USE_HARDCODED_SETUP_CODE
+    /* Unique Setup code of the format xxx-xx-xxx. Default: 111-22-333 */
+    hap_set_setup_code(CONFIG_EXAMPLE_SETUP_CODE);
+    /* Unique four character Setup Id. Default: ES32 */
+    hap_set_setup_id(CONFIG_EXAMPLE_SETUP_ID);
+#ifdef CONFIG_APP_WIFI_USE_WAC_PROVISIONING
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, true, cfg.cid);
+#else
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, false, cfg.cid);
+#endif
+#endif
+
+    /* Enable Hardware MFi authentication (applicable only for MFi variant of SDK) */
+    hap_enable_mfi_auth(HAP_MFI_AUTH_HW);
+
+    /* Initialize Wi-Fi */
+    app_wifi_init();
+
+    /* After all the initializations are done, start the HAP core */
+    hap_start();
+    /* Start Wi-Fi */
+    app_wifi_start(portMAX_DELAY);
+    /* The task ends here. The read/write callbacks will be invoked by the HAP Framework */
+    vTaskDelete(NULL);
+}
+
+void app_main()
+{
+    xTaskCreate(lightbulb_thread_entry, CLOUD_TASK_NAME, CLOUD_TASK_STACKSIZE, NULL, CLOUD_TASK_PRIORITY, NULL);
+}
diff --git a/examples/aws-iot/main/certs/server.crt b/examples/aws-iot/main/certs/server.crt
new file mode 100644
index 0000000..a6f3e92
--- /dev/null
+++ b/examples/aws-iot/main/certs/server.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsF
+ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6
+b24gUm9vdCBDQSAxMB4XDTE1MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTEL
+MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv
+b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj
+ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM
+9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw
+IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6
+VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L
+93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm
+jgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3DQEBCwUA
+A4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDI
+U5PMCCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUs
+N+gDS63pYaACbvXy8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vv
+o/ufQJVtMVT8QtPHRh8jrdkPSHCa2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU
+5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2xJNDd2ZhwLnoQdeXeGADbkpy
+rqXRfboQnoZsG4q5WTP468SQvvG5
+-----END CERTIFICATE-----
diff --git a/examples/aws-iot/main/component.mk b/examples/aws-iot/main/component.mk
new file mode 100644
index 0000000..32c16af
--- /dev/null
+++ b/examples/aws-iot/main/component.mk
@@ -0,0 +1,8 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
+
+# Certificate files. certificate.pem.crt & private.pem.key must be downloaded
+# from AWS, see README for details.
+COMPONENT_EMBED_TXTFILES := certs/server.crt certs/device.crt certs/device.key
diff --git a/examples/aws-iot/main/hap_aws_iot.h b/examples/aws-iot/main/hap_aws_iot.h
new file mode 100644
index 0000000..b939ab4
--- /dev/null
+++ b/examples/aws-iot/main/hap_aws_iot.h
@@ -0,0 +1,19 @@
+/* MFI Firmware update Example
+
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+
+#ifndef _HAP_AWS_IOT_H_
+#define _HAP_AWS_IOT_H_
+
+#include <stdint.h>
+void hap_aws_iot_report_on_char(bool val);
+void hap_aws_iot_report_brightness_char(int val);
+esp_err_t hap_aws_iot_start(void);
+void hap_aws_iot_stop(void);
+
+#endif /* _HAP_AWS_IOT_H_ */
diff --git a/examples/aws-iot/main/hap_aws_iot_pub_sub.c b/examples/aws-iot/main/hap_aws_iot_pub_sub.c
new file mode 100644
index 0000000..0a2699a
--- /dev/null
+++ b/examples/aws-iot/main/hap_aws_iot_pub_sub.c
@@ -0,0 +1,242 @@
+/* AWS-IOT Homekit Lightbulb Example
+
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+#include <sdkconfig.h>
+#ifdef CONFIG_EXAMPLE_AWS_PUB_SUB
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#include "esp_system.h"
+#include "esp_log.h"
+
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/queue.h"
+#include "aws_iot_config.h"
+#include "aws_iot_log.h"
+#include "aws_iot_version.h"
+#include "aws_iot_mqtt_client_interface.h"
+
+#include <json_parser.h>
+
+#include "hap.h"
+#include "hap_apple_servs.h"
+#include "hap_apple_chars.h"
+#include "hap_aws_iot.h"
+
+#define AWS_JSON_KEY_ON         "on"
+#define AWS_JSON_KEY_BRIGHTNESS "brightness"
+
+extern const uint8_t server_cert[] asm("_binary_server_crt_start");
+extern const uint8_t device_cert[] asm("_binary_device_crt_start");
+extern const uint8_t device_key[] asm("_binary_device_key_start");
+
+#define AWS_IOT_TASK_PRIORITY  5
+#define AWS_IOT_TASK_STACKSIZE 12 * 1024
+#define AWS_IOT_TASK_NAME      "aws_iot_task"
+
+#define AWS_IOT_QUEUE_SIZE  8
+
+static const char *TAG = "HAP-AWS-IOT";
+
+static QueueHandle_t aws_iot_queue;
+static bool aws_iot_stop;
+static bool aws_iot_started;
+
+/* Sends the message to the shared queue */
+static void aws_iot_send_message(char * out)
+{
+    char *jsondata = strdup(out);
+    if (jsondata) {
+        if(aws_iot_queue) {
+            xQueueSend(aws_iot_queue, &jsondata, 0);
+        } else {
+            ESP_LOGE(TAG, "AWS Queue not created. Not reporting to AWS");
+            free(jsondata);
+        }
+    }
+}
+
+void hap_aws_iot_report_on_char(bool val)
+{
+    char buf[128];
+    snprintf(buf, sizeof(buf), "{\"%s\":%s}", AWS_JSON_KEY_ON, val ? "true" : "false");
+    aws_iot_send_message(buf);
+}
+
+void hap_aws_iot_report_brightness_char(int val)
+{
+    char buf[128];
+    snprintf(buf, sizeof(buf), "{\"%s\":%d}", AWS_JSON_KEY_BRIGHTNESS, val);
+    aws_iot_send_message(buf);
+}
+
+static void set_char_value(const char* char_uuid, hap_val_t *val)
+{
+    hap_serv_t *hs = hap_acc_get_serv_by_uuid(hap_get_first_acc(), HAP_SERV_UUID_LIGHTBULB);
+    if (hs) {
+        hap_char_t *hc =  hap_serv_get_char_by_uuid(hs, char_uuid);
+        if (hc) {
+            hap_char_update_val(hc, val);
+        }
+    }
+}
+
+static void aws_iot_subscribe_cb(AWS_IoT_Client *pClient, char *topicName, uint16_t topicNameLen,
+                                    IoT_Publish_Message_Params *params, void *pData)
+{
+    if (!topicName)
+        return;
+    ESP_LOGI(TAG, "Subscribe callback %.*s", topicNameLen, topicName);
+
+    if (!params) {
+        ESP_LOGE(TAG, "No data received");
+        return;
+    }
+    ESP_LOGI(TAG, "Received Data: %.*s", params->payloadLen, (char *)params->payload);
+
+    hap_val_t val;
+    jparse_ctx_t jctx;
+
+    if (!json_parse_start(&jctx, (char *)params->payload, params->payloadLen)) {
+        if(!json_obj_get_bool(&jctx, AWS_JSON_KEY_ON, &val.b))
+            set_char_value(HAP_CHAR_UUID_ON, &val);
+
+        if(!json_obj_get_int(&jctx, AWS_JSON_KEY_BRIGHTNESS, &val.i))
+            set_char_value(HAP_CHAR_UUID_BRIGHTNESS, &val);
+    }
+    json_parse_end(&jctx);
+}
+
+/* Task function created for main loop */
+static void aws_iot_task(void *p)
+{
+    AWS_IoT_Client aws_client;
+    IoT_Error_t rc = FAILURE;
+
+    IoT_Client_Init_Params mqttInitParams = iotClientInitParamsDefault;
+    IoT_Client_Connect_Params connectParams = iotClientConnectParamsDefault;
+
+    ESP_LOGI(TAG, "AWS IoT SDK Version %d.%d.%d-%s", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_TAG);
+
+    mqttInitParams.enableAutoReconnect = true;
+    ESP_LOGI(TAG, "Server %s, Port %d", CONFIG_AWS_IOT_MQTT_HOST, CONFIG_AWS_IOT_MQTT_PORT);
+    mqttInitParams.pHostURL = CONFIG_AWS_IOT_MQTT_HOST;
+    mqttInitParams.port = CONFIG_AWS_IOT_MQTT_PORT;
+
+    mqttInitParams.pRootCALocation = (const char *)server_cert;
+    mqttInitParams.pDeviceCertLocation = (const char *)device_cert;
+    mqttInitParams.pDevicePrivateKeyLocation = (const char *)device_key;
+
+    mqttInitParams.mqttCommandTimeout_ms = 20000;
+    mqttInitParams.tlsHandshakeTimeout_ms = 5000;
+    mqttInitParams.isSSLHostnameVerify = true;
+    mqttInitParams.disconnectHandler = NULL;
+
+    rc = aws_iot_mqtt_init(&aws_client, &mqttInitParams);
+    if (SUCCESS != rc) {
+        ESP_LOGE(TAG, "aws_iot_mqtt_init returned error : %d ", rc);
+        goto err;
+    }
+
+    connectParams.keepAliveIntervalInSec = 10;
+    connectParams.isCleanSession = true;
+    connectParams.MQTTVersion = MQTT_3_1_1;
+    connectParams.pClientID = CONFIG_EXAMPLE_AWS_CLIENT_ID;
+    connectParams.clientIDLen = strlen(CONFIG_EXAMPLE_AWS_CLIENT_ID);
+    connectParams.isWillMsgPresent = false;
+
+    ESP_LOGI(TAG, "Connecting to AWS.");
+    do {
+        rc = aws_iot_mqtt_connect(&aws_client, &connectParams);
+        if (SUCCESS != rc) {
+            ESP_LOGE(TAG, "Error(%d) connecting to %s: %d", rc, mqttInitParams.pHostURL, mqttInitParams.port);
+            ESP_LOGI(TAG, "Please check the device key/certificate, server certificate, endpoint URL and Port");
+            vTaskDelay(1000 / portTICK_RATE_MS);
+        }
+    } while (SUCCESS != rc);
+    ESP_LOGI(TAG, "AWS connected successfully.");
+    rc = aws_iot_mqtt_subscribe(&aws_client, CONFIG_EXAMPLE_AWS_SUBSCRIBE_TOPIC, strlen(CONFIG_EXAMPLE_AWS_SUBSCRIBE_TOPIC),
+            QOS0, aws_iot_subscribe_cb, NULL);
+    if (SUCCESS != rc) {
+        ESP_LOGW(TAG, "Error in subscribing to topic : %d ", rc);
+    }
+
+    while((NETWORK_ATTEMPTING_RECONNECT == rc || NETWORK_RECONNECTED == rc || SUCCESS == rc) && !aws_iot_stop) {
+
+        //Max time the yield function will wait for read messagesa
+        rc = aws_iot_mqtt_yield(&aws_client, 100);
+        /* Check for the stop command once after yield */
+        if (aws_iot_stop) {
+            break;
+        }
+        if(NETWORK_ATTEMPTING_RECONNECT == rc) {
+            // If the client is attempting to reconnect we will skip the rest of the loop.
+            continue;
+        }
+        /* Read all data from queue and publish to cloud */
+        BaseType_t ret;
+        do {
+            char *payload;
+            ret = xQueueReceive(aws_iot_queue, &payload, 0);
+            if (ret == pdFAIL) {
+                break;
+            }
+            IoT_Publish_Message_Params paramsQOS1;
+            paramsQOS1.qos = QOS1;
+            paramsQOS1.payload = (void *) payload;
+            paramsQOS1.isRetained = 0;
+            paramsQOS1.payloadLen = strlen(payload);
+            ESP_LOGI(TAG, "Sending data: %s", payload);
+            rc = aws_iot_mqtt_publish(&aws_client, CONFIG_EXAMPLE_AWS_PUBLISH_TOPIC, strlen(CONFIG_EXAMPLE_AWS_PUBLISH_TOPIC), &paramsQOS1);
+            if(rc) {
+                ESP_LOGE(TAG, "Error publishing the data.");
+            }
+            free(payload);
+        } while (ret == pdPASS);
+    }
+err:
+    ESP_LOGI(TAG, "Stopping AWS-IOT Task");
+    vQueueDelete(aws_iot_queue);
+    aws_iot_queue = NULL;
+    aws_iot_stop = false;
+    aws_iot_started = false;
+    vTaskDelete(NULL);
+}
+
+esp_err_t hap_aws_iot_start(void)
+{
+    if (aws_iot_started) {
+        ESP_LOGW(TAG, "AWS IoT client already running");
+        return ESP_OK;
+    }
+    ESP_LOGI(TAG, "Starting AWS IoT client");
+    aws_iot_queue = xQueueCreate(AWS_IOT_QUEUE_SIZE, sizeof(char *));
+    if (!aws_iot_queue) {
+        ESP_LOGE(TAG, "Queue Creation Failed");
+        return -ENOMEM;
+    }
+
+    if (xTaskCreate(&aws_iot_task, "aws_iot_task", AWS_IOT_TASK_STACKSIZE, NULL, AWS_IOT_TASK_PRIORITY, NULL) != pdPASS) {
+        ESP_LOGE(TAG, "Couldn't create cloud task");
+        vQueueDelete(aws_iot_queue);
+        aws_iot_queue = NULL;
+        return -ENOMEM;
+    }
+    aws_iot_started = true;
+    return ESP_OK;
+}
+
+void hap_aws_iot_stop(void)
+{
+    if (aws_iot_started) {
+        aws_iot_stop = true;
+    }
+}
+#endif /* CONFIG_EXAMPLE_AWS_PUB_SUB */
diff --git a/examples/aws-iot/main/hap_aws_iot_thing_shadow.c b/examples/aws-iot/main/hap_aws_iot_thing_shadow.c
new file mode 100644
index 0000000..43fa279
--- /dev/null
+++ b/examples/aws-iot/main/hap_aws_iot_thing_shadow.c
@@ -0,0 +1,338 @@
+/* AWS-IOT Homekit Lightbulb Example
+
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+#include <sdkconfig.h>
+
+#ifdef CONFIG_EXAMPLE_AWS_THING_SHADOW
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#include "esp_system.h"
+#include "esp_log.h"
+
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "aws_iot_config.h"
+#include "aws_iot_log.h"
+#include "aws_iot_version.h"
+#include "aws_iot_mqtt_client_interface.h"
+#include <aws_iot_shadow_interface.h>
+
+#include "hap.h"
+#include "hap_apple_chars.h"
+#include "hap_apple_servs.h"
+#include "hap_aws_iot.h"
+
+#define AWS_JSON_KEY_ON         "on"
+#define AWS_JSON_KEY_BRIGHTNESS "brightness"
+
+extern const uint8_t server_cert[] asm("_binary_server_crt_start");
+extern const uint8_t device_cert[] asm("_binary_device_crt_start");
+extern const uint8_t device_key[] asm("_binary_device_key_start");
+
+#define AWS_IOT_TASK_PRIORITY  5
+#define AWS_IOT_TASK_STACKSIZE 12 * 1024
+#define AWS_IOT_TASK_NAME      "aws_iot_task"
+
+#define AWS_IOT_QUEUE_SIZE  8
+
+static const char *TAG = "HAP-AWS-IOT";
+
+static bool aws_iot_stop;
+static bool aws_iot_started;
+static bool aws_iot_report_change;
+
+void hap_aws_iot_report_on_char(bool val)
+{
+    ESP_LOGI(TAG, "On value changed to %s. Will be reported to cloud", val? "true":"false");
+}
+
+void hap_aws_iot_report_brightness_char(int val)
+{    
+    ESP_LOGI(TAG, "Brightness value changed to %d. Will be reported to cloud", val);
+}
+static bool hap_get_on_char_val()
+{
+    hap_serv_t *hs = hap_acc_get_serv_by_uuid(hap_get_first_acc(), HAP_SERV_UUID_LIGHTBULB);
+    if (hs) {
+        hap_char_t *hc =  hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_ON);
+        if (hc) {
+            const hap_val_t *val = hap_char_get_val(hc);
+            return val->b;
+        }
+    }
+    ESP_LOGE(TAG, "Could not find the ON characteristic. Reporting a dummy value");
+    return false;
+}
+static int hap_get_brightness_char_val()
+{
+    hap_serv_t *hs = hap_acc_get_serv_by_uuid(hap_get_first_acc(), HAP_SERV_UUID_LIGHTBULB);
+    if (hs) {
+        hap_char_t *hc =  hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_BRIGHTNESS);
+        if (hc) {
+            const hap_val_t *val = hap_char_get_val(hc);
+            return val->i;
+        }
+    }
+    ESP_LOGE(TAG, "Could not find the Brightness characteristic. Reporting a dummy value");
+    return 0;
+}
+
+static void set_char_value(const char* char_uuid, hap_val_t *val) 
+{
+    hap_serv_t *hs = hap_acc_get_serv_by_uuid(hap_get_first_acc(), HAP_SERV_UUID_LIGHTBULB);
+    if (hs) {
+        hap_char_t *hc =  hap_serv_get_char_by_uuid(hs, char_uuid);
+        if (hc) {
+            hap_char_update_val(hc, val);
+        }
+    }
+}
+
+void onState_callback(const char *pJsonString, uint32_t JsonStringDataLen, jsonStruct_t *pContext) {
+    IOT_UNUSED(pJsonString);
+    IOT_UNUSED(JsonStringDataLen);
+
+    if(pContext) {
+        hap_val_t val = {
+            .b = *(bool *)pContext->pData,
+        };
+        set_char_value(HAP_CHAR_UUID_ON, &val);
+    }
+    aws_iot_report_change = true;
+}
+
+void brightness_callback(const char *pJsonString, uint32_t JsonStringDataLen, jsonStruct_t *pContext) {
+    IOT_UNUSED(pJsonString);
+    IOT_UNUSED(JsonStringDataLen);
+
+    if(pContext) {
+        hap_val_t val = {
+            .i = *(int *)pContext->pData,
+        };
+        set_char_value(HAP_CHAR_UUID_BRIGHTNESS, &val);
+    }
+    aws_iot_report_change = true;
+}
+
+static bool shadowUpdateInProgress;
+
+void ShadowUpdateStatusCallback(const char *pThingName, ShadowActions_t action, Shadow_Ack_Status_t status,
+                                const char *pReceivedJsonDocument, void *pContextData) {
+    IOT_UNUSED(pThingName);
+    IOT_UNUSED(action);
+    IOT_UNUSED(pReceivedJsonDocument);
+    IOT_UNUSED(pContextData);
+
+    shadowUpdateInProgress = false;
+
+    if(SHADOW_ACK_TIMEOUT == status) {
+        ESP_LOGE(TAG, "Update timed out");
+    } else if(SHADOW_ACK_REJECTED == status) {
+        ESP_LOGE(TAG, "Update rejected");
+    } else if(SHADOW_ACK_ACCEPTED == status) {
+        ESP_LOGI(TAG, "Update accepted");
+    }
+}
+
+IoT_Error_t aws_iot_shadow_update_reported(AWS_IoT_Client *aws_client, jsonStruct_t *firstHandler, jsonStruct_t *secondHandler)
+{
+    char JsonDocumentBuffer[200];
+    size_t sizeOfJsonDocumentBuffer = sizeof(JsonDocumentBuffer) / sizeof(JsonDocumentBuffer[0]);
+    IoT_Error_t rc = aws_iot_shadow_init_json_document(JsonDocumentBuffer, sizeOfJsonDocumentBuffer);
+    if(SUCCESS != rc) {
+        return rc;
+    }
+    rc = aws_iot_shadow_add_reported(JsonDocumentBuffer, sizeOfJsonDocumentBuffer, 2, firstHandler, secondHandler);
+    if(SUCCESS != rc) {
+        return rc;
+    }
+    rc = aws_iot_finalize_json_document(JsonDocumentBuffer, sizeOfJsonDocumentBuffer);
+    if(SUCCESS != rc) {
+        return rc;
+    }
+    ESP_LOGI(TAG, "Update Shadow: %s", JsonDocumentBuffer);
+    rc = aws_iot_shadow_update(aws_client, CONFIG_EXAMPLE_AWS_CLIENT_ID, JsonDocumentBuffer,
+            ShadowUpdateStatusCallback, NULL, 4, true);
+    shadowUpdateInProgress = true;
+    return rc;
+}
+/* While updating desired, we will also update the reported, so that there is no delta */
+IoT_Error_t aws_iot_shadow_update_desired(AWS_IoT_Client *aws_client, jsonStruct_t *firstHandler, jsonStruct_t *secondHandler)
+{
+    char JsonDocumentBuffer[200];
+    size_t sizeOfJsonDocumentBuffer = sizeof(JsonDocumentBuffer) / sizeof(JsonDocumentBuffer[0]);
+    IoT_Error_t rc = aws_iot_shadow_init_json_document(JsonDocumentBuffer, sizeOfJsonDocumentBuffer);
+    if(SUCCESS != rc) {
+        return rc;
+    }
+    if (firstHandler && secondHandler) {
+        aws_iot_shadow_add_desired(JsonDocumentBuffer, sizeOfJsonDocumentBuffer, 2, firstHandler, secondHandler);
+        /* Checking only second call is enough as the JSON overflow can be detected here as well */
+        rc = aws_iot_shadow_add_reported(JsonDocumentBuffer, sizeOfJsonDocumentBuffer, 2, firstHandler, secondHandler);
+        if(SUCCESS != rc) {
+            return rc;
+        }
+    } else if (firstHandler) {
+        aws_iot_shadow_add_desired(JsonDocumentBuffer, sizeOfJsonDocumentBuffer, 1, firstHandler);
+        rc = aws_iot_shadow_add_reported(JsonDocumentBuffer, sizeOfJsonDocumentBuffer, 1, firstHandler);
+        if(SUCCESS != rc) {
+            return rc;
+        }
+    } else if (secondHandler) {
+        aws_iot_shadow_add_desired(JsonDocumentBuffer, sizeOfJsonDocumentBuffer, 1, secondHandler);
+        rc = aws_iot_shadow_add_reported(JsonDocumentBuffer, sizeOfJsonDocumentBuffer, 1, secondHandler);
+        if(SUCCESS != rc) {
+            return rc;
+        }
+    }
+    rc = aws_iot_finalize_json_document(JsonDocumentBuffer, sizeOfJsonDocumentBuffer);
+    if(SUCCESS != rc) {
+        return rc;
+    }
+    ESP_LOGI(TAG, "Update Shadow: %s", JsonDocumentBuffer);
+    rc = aws_iot_shadow_update(aws_client, CONFIG_EXAMPLE_AWS_CLIENT_ID, JsonDocumentBuffer,
+            ShadowUpdateStatusCallback, NULL, 4, true);
+    shadowUpdateInProgress = true;
+    return rc;
+}
+/* Task function created for main loop */
+static void aws_iot_task(void *p)
+{
+    AWS_IoT_Client aws_client;
+    IoT_Error_t rc = FAILURE;
+
+    ShadowInitParameters_t sp = ShadowInitParametersDefault;
+    ESP_LOGI(TAG, "AWS IoT SDK Version %d.%d.%d-%s", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_TAG);
+    ESP_LOGI(TAG, "Server %s, Port %d", CONFIG_AWS_IOT_MQTT_HOST, CONFIG_AWS_IOT_MQTT_PORT);
+    sp.pHost = CONFIG_AWS_IOT_MQTT_HOST;
+    sp.port = CONFIG_AWS_IOT_MQTT_PORT;
+    sp.pRootCA = (const char *)server_cert;
+    sp.pClientCRT = (const char *)device_cert;
+    sp.pClientKey = (const char *)device_key;
+    sp.enableAutoReconnect = true;
+    sp.disconnectHandler = NULL;
+
+    ESP_LOGI(TAG, "Shadow Init");
+    rc = aws_iot_shadow_init(&aws_client, &sp);
+    if(SUCCESS != rc) {
+        ESP_LOGE(TAG, "aws_iot_shadow_init returned error %d, aborting...", rc);
+        goto err;
+    }
+    ShadowConnectParameters_t scp = ShadowConnectParametersDefault;
+    /* Thing name and Client ID can be different, Using same, just for convenience */
+    scp.pMyThingName = CONFIG_EXAMPLE_AWS_CLIENT_ID;
+    scp.pMqttClientId = CONFIG_EXAMPLE_AWS_CLIENT_ID;
+    scp.mqttClientIdLen = (uint16_t) strlen(CONFIG_EXAMPLE_AWS_CLIENT_ID);
+
+    ESP_LOGI(TAG, "Connecting to AWS.");
+    do {
+        rc = aws_iot_shadow_connect(&aws_client, &scp);
+        if (SUCCESS != rc) {
+            ESP_LOGE(TAG, "Error(%d) connecting to %s: %d", rc, sp.pHost, sp.port);
+            ESP_LOGI(TAG, "Please check the device key/certificate, server certificate, endpoint URL and Port");
+            vTaskDelay(1000 / portTICK_RATE_MS);
+        }
+    } while (SUCCESS != rc);
+    ESP_LOGI(TAG, "AWS connected successfully.");
+
+    bool on_state = hap_get_on_char_val();
+    jsonStruct_t onHandler;
+    onHandler.cb = onState_callback;
+    onHandler.pData = &on_state;
+    onHandler.pKey = AWS_JSON_KEY_ON;
+    onHandler.type = SHADOW_JSON_BOOL;
+    onHandler.dataLength = sizeof(bool);
+
+    int brightness = hap_get_brightness_char_val();
+    jsonStruct_t brightnessHandler;
+    brightnessHandler.cb = brightness_callback;
+    brightnessHandler.pKey = AWS_JSON_KEY_BRIGHTNESS;
+    brightnessHandler.pData = &brightness;
+    brightnessHandler.type = SHADOW_JSON_INT32;
+    brightnessHandler.dataLength = sizeof(int32_t);
+
+    rc = aws_iot_shadow_register_delta(&aws_client, &onHandler);
+    if (SUCCESS != rc) {
+        ESP_LOGE(TAG, "Shadow Register Delta Error for %s", AWS_JSON_KEY_ON);
+    }
+    rc = aws_iot_shadow_register_delta(&aws_client, &brightnessHandler);
+    if (SUCCESS != rc) {
+        ESP_LOGE(TAG, "Shadow Register Delta Error for %s", AWS_JSON_KEY_BRIGHTNESS);
+    }
+
+    /* Report the initial values once */
+    rc = aws_iot_shadow_update_reported(&aws_client, &onHandler, &brightnessHandler);
+    while((NETWORK_ATTEMPTING_RECONNECT == rc || NETWORK_RECONNECTED == rc || SUCCESS == rc) && !aws_iot_stop) {
+        rc = aws_iot_shadow_yield(&aws_client, 200);
+        if(NETWORK_ATTEMPTING_RECONNECT == rc || shadowUpdateInProgress) {
+            rc = aws_iot_shadow_yield(&aws_client, 10);
+            // If the client is attempting to reconnect, or waiting on a shadow update, we skip the rest of the loop
+            continue;
+        }
+        /* Check for the stop command once after yield */
+        if (aws_iot_stop) {
+            break;
+        }
+
+        /* Check for any local changes and report accordingly */
+        jsonStruct_t *firstHandler = NULL;
+        jsonStruct_t *secondHandler = NULL;
+
+        if (on_state != hap_get_on_char_val()) {
+            on_state = hap_get_on_char_val();
+            firstHandler = &onHandler;
+        }
+        if (brightness != hap_get_brightness_char_val()) {
+            brightness = hap_get_brightness_char_val();
+            secondHandler = &brightnessHandler;
+        }
+        if (firstHandler || secondHandler) {
+            rc = aws_iot_shadow_update_desired(&aws_client, firstHandler, secondHandler);
+            aws_iot_report_change = false;
+            continue;
+        }
+
+        /* If there are no local changes, check if there is any change (triggered from cloud)
+         * pending for reporting */
+        if (aws_iot_report_change) {
+            rc = aws_iot_shadow_update_reported(&aws_client, &onHandler, &brightnessHandler);
+            aws_iot_report_change = false;
+        }
+    }
+err:
+    ESP_LOGI(TAG, "Stopping AWS-IOT Task");
+    aws_iot_stop = false;
+    aws_iot_started = false;
+    vTaskDelete(NULL);
+}
+
+esp_err_t hap_aws_iot_start(void)
+{
+    if (aws_iot_started) {
+        ESP_LOGW(TAG, "AWS IoT client already running");
+        return ESP_OK;
+    }
+
+    ESP_LOGI(TAG, "Starting AWS IoT client");
+    if (xTaskCreate(&aws_iot_task, "aws_iot_task", AWS_IOT_TASK_STACKSIZE, NULL, AWS_IOT_TASK_PRIORITY, NULL) != pdPASS) {
+        ESP_LOGE(TAG, "Couldn't create cloud task");
+        return -ENOMEM;
+    }
+    aws_iot_started = true;
+    return ESP_OK;
+}
+
+void hap_aws_iot_stop(void)
+{
+    if (aws_iot_started) {
+        aws_iot_stop = true;
+    }
+}
+#endif /* CONFIG_EXAMPLE_AWS_THING_SHADOW */
diff --git a/examples/aws-iot/partitions_hap.csv b/examples/aws-iot/partitions_hap.csv
new file mode 100644
index 0000000..f42e062
--- /dev/null
+++ b/examples/aws-iot/partitions_hap.csv
@@ -0,0 +1,10 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
+sec_cert,  0x3F, ,0xd000,    0x3000, ,  # Never mark this as an encrypted partition
+nvs,      data, nvs,     0x10000,   0x6000,
+otadata,  data, ota,     ,          0x2000
+phy_init, data, phy,     ,          0x1000,
+ota_0,    app,  ota_0,   0x20000,   1600K,
+ota_1,    app,  ota_1,   ,          1600K,
+factory_nvs, data,   nvs,     0x340000,  0x6000
+nvs_keys, data, nvs_keys,0x346000,  0x1000
diff --git a/examples/aws-iot/sdkconfig.defaults b/examples/aws-iot/sdkconfig.defaults
new file mode 100644
index 0000000..96f651f
--- /dev/null
+++ b/examples/aws-iot/sdkconfig.defaults
@@ -0,0 +1,20 @@
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_hap.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
+CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=n
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=n
+CONFIG_FREERTOS_ASSERT_DISABLE=y
+CONFIG_LWIP_MAX_SOCKETS=16
+CONFIG_LWIP_SO_REUSE=y
+CONFIG_LWIP_MAX_ACTIVE_TCP=12
+CONFIG_LWIP_MAX_LISTENING_TCP=12
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=10
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_HARDWARE_SHA=n
+CONFIG_ESP_TASK_WDT=n
+CONFIG_LWIP_AUTOIP=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_AWS_IOT_SDK=y
+CONFIG_LWIP_AUTOIP_RATE_LIMIT_INTERVAL=60
+CONFIG_MP_BLOB_SUPPORT=y
diff --git a/examples/bridge/CMakeLists.txt b/examples/bridge/CMakeLists.txt
new file mode 100644
index 0000000..9deb0ae
--- /dev/null
+++ b/examples/bridge/CMakeLists.txt
@@ -0,0 +1,14 @@
+# The following lines of boilerplate have to be in your project's CMakeLists
+# in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+if(DEFINED ENV{HOMEKIT_PATH})
+  set(HOMEKIT_PATH $ENV{HOMEKIT_PATH})
+else()
+  set(HOMEKIT_PATH ${CMAKE_CURRENT_LIST_DIR}/../..)
+endif(DEFINED ENV{HOMEKIT_PATH})
+
+set(EXTRA_COMPONENT_DIRS ${HOMEKIT_PATH}/components ${HOMEKIT_PATH}/components/homekit ${CMAKE_CURRENT_LIST_DIR}/../common)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(bridge)
diff --git a/examples/bridge/Makefile b/examples/bridge/Makefile
new file mode 100755
index 0000000..882b42b
--- /dev/null
+++ b/examples/bridge/Makefile
@@ -0,0 +1,15 @@
+#
+# This is a project Makefile. It is assumed the directory this Makefile resides in is a
+# project subdirectory.
+#
+
+HOMEKIT_PATH ?= $(abspath $(shell pwd)/../..)
+COMMON_COMPONENT_PATH ?= $(abspath $(shell pwd)/../common)
+
+PROJECT_NAME := bridge
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/homekit
+EXTRA_COMPONENT_DIRS += $(COMMON_COMPONENT_PATH)
+
+include $(IDF_PATH)/make/project.mk
+
diff --git a/examples/bridge/main/CMakeLists.txt b/examples/bridge/main/CMakeLists.txt
new file mode 100644
index 0000000..7fb6738
--- /dev/null
+++ b/examples/bridge/main/CMakeLists.txt
@@ -0,0 +1 @@
+idf_component_register(SRCS ./app_main.c)
diff --git a/examples/bridge/main/Kconfig.projbuild b/examples/bridge/main/Kconfig.projbuild
new file mode 100644
index 0000000..6f3e3fe
--- /dev/null
+++ b/examples/bridge/main/Kconfig.projbuild
@@ -0,0 +1,26 @@
+menu "Example Configuration"
+
+    config EXAMPLE_USE_HARDCODED_SETUP_CODE
+        bool "Use hard-coded setup code"
+        default y
+        help
+            HomeKit does not recommend having the setup code programmed in the accessory as is.
+            Instead, it expects setup info (salt-verifier pair) generated for the given setup code.
+            Use this option only for testing purposes. For production, the setup info should be
+            used.
+
+    config EXAMPLE_SETUP_CODE
+        string "HomeKit Setup Code"
+        default "111-22-333"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup code to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+    config EXAMPLE_SETUP_ID
+        string "HomeKit Setup Id"
+        default "ES32"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup id to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+endmenu
diff --git a/examples/bridge/main/app_main.c b/examples/bridge/main/app_main.c
new file mode 100644
index 0000000..d3c5b54
--- /dev/null
+++ b/examples/bridge/main/app_main.c
@@ -0,0 +1,261 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2018 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+
+/* HomeKit Bridge Example
+*/
+
+#include <stdio.h>
+#include <string.h>
+
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <esp_log.h>
+
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+
+#include <iot_button.h>
+
+#include <app_wifi.h>
+#include <app_hap_setup_payload.h>
+
+static const char *TAG = "HAP Bridge";
+
+#define BRIDGE_TASK_PRIORITY  1
+#define BRIDGE_TASK_STACKSIZE 4 * 1024
+#define BRIDGE_TASK_NAME      "hap_bridge"
+
+#define NUM_BRIDGED_ACCESSORIES 3
+
+/* Reset network credentials if button is pressed for more than 3 seconds and then released */
+#define RESET_NETWORK_BUTTON_TIMEOUT        3
+
+/* Reset to factory if button is pressed and held for more than 10 seconds */
+#define RESET_TO_FACTORY_BUTTON_TIMEOUT     10
+
+/* The button "Boot" will be used as the Reset button for the example */
+#define RESET_GPIO  GPIO_NUM_0
+/**
+ * @brief The network reset button callback handler.
+ * Useful for testing the Wi-Fi re-configuration feature of WAC2
+ */
+static void reset_network_handler(void* arg)
+{
+    hap_reset_network();
+}
+/**
+ * @brief The factory reset button callback handler.
+ */
+static void reset_to_factory_handler(void* arg)
+{
+    hap_reset_to_factory();
+}
+
+/**
+ * The Reset button  GPIO initialisation function.
+ * Same button will be used for resetting Wi-Fi network as well as for reset to factory based on
+ * the time for which the button is pressed.
+ */
+static void reset_key_init(uint32_t key_gpio_pin)
+{
+    button_handle_t handle = iot_button_create(key_gpio_pin, BUTTON_ACTIVE_LOW);
+    iot_button_add_on_release_cb(handle, RESET_NETWORK_BUTTON_TIMEOUT, reset_network_handler, NULL);
+    iot_button_add_on_press_cb(handle, RESET_TO_FACTORY_BUTTON_TIMEOUT, reset_to_factory_handler, NULL);
+}
+
+/* Mandatory identify routine for the accessory (bridge)
+ * In a real accessory, something like LED blink should be implemented
+ * got visual identification
+ */
+static int bridge_identify(hap_acc_t *ha)
+{
+    ESP_LOGI(TAG, "Bridge identified");
+    return HAP_SUCCESS;
+}
+
+/* Mandatory identify routine for the bridged accessory
+ * In a real bridge, the actual accessory must be sent some request to
+ * identify itself visually
+ */
+static int accessory_identify(hap_acc_t *ha)
+{
+    hap_serv_t *hs = hap_acc_get_serv_by_uuid(ha, HAP_SERV_UUID_ACCESSORY_INFORMATION);
+    hap_char_t *hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_NAME);
+    const hap_val_t *val = hap_char_get_val(hc);
+    char *name = val->s;
+
+    ESP_LOGI(TAG, "Bridged Accessory %s identified", name);
+    return HAP_SUCCESS;
+}
+
+/* A dummy callback for handling a write on the "On" characteristic of Fan.
+ * In an actual accessory, this should control the hardware
+ */
+static int fan_on(bool value)
+{
+    ESP_LOGI(TAG, "Received Write. Fan %s", value ? "On" : "Off");
+    /* TODO: Control Actual Hardware */
+    return 0;
+}
+
+/* A dummy callback for handling a write on the "On" characteristic of Fan.
+ * In an actual accessory, this should control the hardware
+ */
+static int fan_write(hap_write_data_t write_data[], int count,
+        void *serv_priv, void *write_priv)
+{
+    ESP_LOGI(TAG, "Write called for Accessory %s", (char *)serv_priv);
+    int i, ret = HAP_SUCCESS;
+    hap_write_data_t *write;
+    for (i = 0; i < count; i++) {
+        write = &write_data[i];
+        if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_UUID_ON)) {
+            fan_on(write->val.b);
+            hap_char_update_val(write->hc, &(write->val));
+            *(write->status) = HAP_STATUS_SUCCESS;
+        } else {
+            *(write->status) = HAP_STATUS_RES_ABSENT;
+        }
+    }
+    return ret;
+}
+
+/*The main thread for handling the Bridge Accessory */
+static void bridge_thread_entry(void *p)
+{
+    hap_acc_t *accessory;
+    hap_serv_t *service;
+
+    /* Initialize the HAP core */
+    hap_init(HAP_TRANSPORT_WIFI);
+
+    /* Initialise the mandatory parameters for Accessory which will be added as
+     * the mandatory services internally
+     */
+    hap_acc_cfg_t cfg = {
+        .name = "Esp-Bridge",
+        .manufacturer = "Espressif",
+        .model = "EspBridge01",
+        .serial_num = "001122334455",
+        .fw_rev = "0.9.0",
+        .hw_rev = NULL,
+        .pv = "1.1.0",
+        .identify_routine = bridge_identify,
+        .cid = HAP_CID_BRIDGE,
+    };
+    /* Create accessory object */
+    accessory = hap_acc_create(&cfg);
+
+    /* Add a dummy Product Data */
+    uint8_t product_data[] = {'E','S','P','3','2','H','A','P'};
+    hap_acc_add_product_data(accessory, product_data, sizeof(product_data));
+
+    /* Add the Accessory to the HomeKit Database */
+    hap_add_accessory(accessory);
+
+    /* Create and add the Accessory to the Bridge object*/
+    for (uint8_t i = 0; i < NUM_BRIDGED_ACCESSORIES; i++) {
+        char accessory_name[12] = {0};
+        sprintf(accessory_name, "ESP-Fan-%d", i);
+
+        hap_acc_cfg_t bridge_cfg = {
+            .name = accessory_name,
+            .manufacturer = "Espressif",
+            .model = "EspFan01",
+            .serial_num = "abcdefg",
+            .fw_rev = "0.9.0",
+            .hw_rev = NULL,
+            .pv = "1.1.0",
+            .identify_routine = accessory_identify,
+            .cid = HAP_CID_BRIDGE,
+        };
+        /* Create accessory object */
+        accessory = hap_acc_create(&bridge_cfg);
+
+        /* Create the Fan Service. Include the "name" since this is a user visible service  */
+        service = hap_serv_fan_create(false);
+        hap_serv_add_char(service, hap_char_name_create(accessory_name));
+
+        /* Set the Accessory name as the Private data for the service,
+         * so that the correct accessory can be identified in the
+         * write callback
+         */
+        hap_serv_set_priv(service, strdup(accessory_name));
+
+        /* Set the write callback for the service */
+        hap_serv_set_write_cb(service, fan_write);
+ 
+        /* Add the Fan Service to the Accessory Object */
+        hap_acc_add_serv(accessory, service);
+
+        /* Add the Accessory to the HomeKit Database */
+        hap_add_bridged_accessory(accessory, hap_get_unique_aid(accessory_name));
+    }
+
+    /* Register a common button for reset Wi-Fi network and reset to factory.
+     */
+    reset_key_init(RESET_GPIO);
+
+    /* For production accessories, the setup code shouldn't be programmed on to
+     * the device. Instead, the setup info, derived from the setup code must
+     * be used. Use the factory_nvs_gen utility to generate this data and then
+     * flash it into the factory NVS partition.
+     *
+     * By default, the setup ID and setup info will be read from the factory_nvs
+     * Flash partition and so, is not required to set here explicitly.
+     *
+     * However, for testing purpose, this can be overridden by using hap_set_setup_code()
+     * and hap_set_setup_id() APIs, as has been done here.
+     */
+#ifdef CONFIG_EXAMPLE_USE_HARDCODED_SETUP_CODE
+    /* Unique Setup code of the format xxx-xx-xxx. Default: 111-22-333 */
+    hap_set_setup_code(CONFIG_EXAMPLE_SETUP_CODE);
+    /* Unique four character Setup Id. Default: ES32 */
+    hap_set_setup_id(CONFIG_EXAMPLE_SETUP_ID);
+#ifdef CONFIG_APP_WIFI_USE_WAC_PROVISIONING
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, true, cfg.cid);
+#else
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, false, cfg.cid);
+#endif
+#endif
+
+    /* Enable Hardware MFi authentication (applicable only for MFi variant of SDK) */
+    hap_enable_mfi_auth(HAP_MFI_AUTH_HW);
+
+    /* Initialize Wi-Fi */
+    app_wifi_init();
+
+    /* After all the initializations are done, start the HAP core */
+    hap_start();
+    /* Start Wi-Fi */
+    app_wifi_start(portMAX_DELAY);
+    /* The task ends here. The read/write callbacks will be invoked by the HAP Framework */
+    vTaskDelete(NULL);
+}
+
+void app_main()
+{
+    xTaskCreate(bridge_thread_entry, BRIDGE_TASK_NAME, BRIDGE_TASK_STACKSIZE, NULL, BRIDGE_TASK_PRIORITY, NULL);
+}
+
diff --git a/examples/bridge/main/component.mk b/examples/bridge/main/component.mk
new file mode 100644
index 0000000..a98f634
--- /dev/null
+++ b/examples/bridge/main/component.mk
@@ -0,0 +1,4 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bridge/partitions_hap.csv b/examples/bridge/partitions_hap.csv
new file mode 100644
index 0000000..f42e062
--- /dev/null
+++ b/examples/bridge/partitions_hap.csv
@@ -0,0 +1,10 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
+sec_cert,  0x3F, ,0xd000,    0x3000, ,  # Never mark this as an encrypted partition
+nvs,      data, nvs,     0x10000,   0x6000,
+otadata,  data, ota,     ,          0x2000
+phy_init, data, phy,     ,          0x1000,
+ota_0,    app,  ota_0,   0x20000,   1600K,
+ota_1,    app,  ota_1,   ,          1600K,
+factory_nvs, data,   nvs,     0x340000,  0x6000
+nvs_keys, data, nvs_keys,0x346000,  0x1000
diff --git a/examples/bridge/sdkconfig.defaults b/examples/bridge/sdkconfig.defaults
new file mode 100644
index 0000000..e0468d8
--- /dev/null
+++ b/examples/bridge/sdkconfig.defaults
@@ -0,0 +1,19 @@
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_hap.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
+CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=n
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=n
+CONFIG_FREERTOS_ASSERT_DISABLE=y
+CONFIG_LWIP_MAX_SOCKETS=16
+CONFIG_LWIP_SO_REUSE=y
+CONFIG_LWIP_MAX_ACTIVE_TCP=12
+CONFIG_LWIP_MAX_LISTENING_TCP=12
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=10
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_HARDWARE_SHA=n
+CONFIG_ESP_TASK_WDT=n
+CONFIG_LWIP_AUTOIP=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_LWIP_AUTOIP_RATE_LIMIT_INTERVAL=60
+CONFIG_MP_BLOB_SUPPORT=y
diff --git a/examples/common/app_hap_setup_payload/CMakeLists.txt b/examples/common/app_hap_setup_payload/CMakeLists.txt
new file mode 100644
index 0000000..dac0b2b
--- /dev/null
+++ b/examples/common/app_hap_setup_payload/CMakeLists.txt
@@ -0,0 +1,3 @@
+idf_component_register(SRCS "app_hap_setup_payload.c"
+                    INCLUDE_DIRS "."
+                    REQUIRES qrcode esp_hap_core)
diff --git a/examples/common/app_hap_setup_payload/app_hap_setup_payload.c b/examples/common/app_hap_setup_payload/app_hap_setup_payload.c
new file mode 100644
index 0000000..f7eda97
--- /dev/null
+++ b/examples/common/app_hap_setup_payload/app_hap_setup_payload.c
@@ -0,0 +1,29 @@
+/*
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+#include <esp_err.h>
+#include <esp_log.h>
+#include <hap.h>
+#include <qrcode.h>
+
+static const char *TAG = "app_hap_setup_payload";
+
+#define QRCODE_BASE_URL     "https://api.qrserver.com/v1/create-qr-code/"
+
+esp_err_t app_hap_setup_payload(char *setup_code, char *setup_id, bool wac_support, hap_cid_t cid)
+{
+    char *setup_payload =  esp_hap_get_setup_payload(setup_code, setup_id, wac_support, cid);
+    if (setup_payload) {
+        ESP_LOGI(TAG, "-----QR Code for HomeKit-----");
+        ESP_LOGI(TAG, "Scan this QR code from the Home app on iOS");
+        qrcode_display(setup_payload);
+        ESP_LOGI(TAG, "If QR code is not visible, copy paste the below URL in a browser.\n%s?data=%s", QRCODE_BASE_URL, setup_payload);
+        free(setup_payload);
+        return ESP_OK;
+    }
+    return ESP_FAIL;
+}
diff --git a/examples/common/app_hap_setup_payload/app_hap_setup_payload.h b/examples/common/app_hap_setup_payload/app_hap_setup_payload.h
new file mode 100644
index 0000000..9319a27
--- /dev/null
+++ b/examples/common/app_hap_setup_payload/app_hap_setup_payload.h
@@ -0,0 +1,24 @@
+/*
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+#pragma once
+#include <esp_err.h>
+#include <hap.h>
+
+/** Show the HAP Setup payload
+ *
+ * This shows the setup paylod in a QR code
+ *
+ * @param[in] setup_code NULL terminated setup code. Eg. "111-22-333"
+ * @param[in] setup_id NULL terminated setup id. Eg. "ES32"
+ * @param[in] wac_support Boolean indicating if WAC provisioning is supported.
+ * @param[in] cid Accessory category identifier.
+ *
+ * @return ESP_OK on success.
+ * @return ESP_FAIL on failure.
+ */
+esp_err_t app_hap_setup_payload(char *setup_code, char *setup_id, bool wac_support, hap_cid_t cid);
diff --git a/examples/common/app_hap_setup_payload/component.mk b/examples/common/app_hap_setup_payload/component.mk
new file mode 100644
index 0000000..2ec0e78
--- /dev/null
+++ b/examples/common/app_hap_setup_payload/component.mk
@@ -0,0 +1,2 @@
+COMPONENT_ADD_INCLUDEDIRS := .
+COMPONENT_SRCDIRS := .
diff --git a/examples/common/app_wifi/CMakeLists.txt b/examples/common/app_wifi/CMakeLists.txt
new file mode 100644
index 0000000..8e5b0f5
--- /dev/null
+++ b/examples/common/app_wifi/CMakeLists.txt
@@ -0,0 +1,3 @@
+idf_component_register(SRCS "app_wifi.c"
+                    INCLUDE_DIRS "."
+                    REQUIRES wifi_provisioning qrcode esp_hap_core esp_hap_platform)
diff --git a/examples/common/app_wifi/Kconfig.projbuild b/examples/common/app_wifi/Kconfig.projbuild
new file mode 100644
index 0000000..396a7eb
--- /dev/null
+++ b/examples/common/app_wifi/Kconfig.projbuild
@@ -0,0 +1,85 @@
+menu "App Wi-Fi"
+
+    choice APP_WIFI_CRED_SOURCE
+        bool "Source of Wi-Fi Credentials"
+        default APP_WIFI_USE_PROVISIONING
+        help
+            Wi-Fi credentials can either be hard-coded or provided using Provisioning.
+
+        config APP_WIFI_USE_PROVISIONING
+            bool "Use Provisioning"
+        config APP_WIFI_USE_HARDCODED
+            bool "Use Hardcoded"
+    endchoice
+
+    config APP_WIFI_CRED_SOURCE
+        int
+        default 1 if APP_WIFI_USE_PROVISIONING
+        default 2 if APP_WIFI_USE_HARDCODED
+
+
+    config APP_WIFI_SSID
+        string "WiFi SSID"
+        default "myssid"
+        depends on APP_WIFI_USE_HARDCODED
+        help
+            SSID (network name) for the example to connect to.
+
+    config APP_WIFI_PASSWORD
+        string "WiFi Password"
+        default "mypassword"
+        depends on APP_WIFI_USE_HARDCODED
+        help
+            WiFi password (WPA or WPA2) for the example to use.
+
+    choice APP_WIFI_PROVISIONING_TYPE
+        bool "Provisioning Type"
+        default APP_WIFI_USE_UNIFIED_PROVISIONING
+        depends on APP_WIFI_USE_PROVISIONING
+        help
+            The type of Provisioning to Use.
+
+        config APP_WIFI_USE_UNIFIED_PROVISIONING
+            bool "Unified Provisioning"
+        config APP_WIFI_USE_WAC_PROVISIONING
+            bool "Apple WAC Provisioning"
+            depends on HAP_MFI_ENABLE
+        config APP_WIFI_USE_BOTH_PROVISIONING
+            bool "Use Both"
+            depends on HAP_MFI_ENABLE
+    endchoice
+
+    config APP_WIFI_PROVISIONING_TYPE
+        int
+        default 1 if APP_WIFI_USE_UNIFIED_PROVISIONING
+        default 2 if APP_WIFI_USE_WAC_PROVISIONING
+        default 3 if APP_WIFI_USE_BOTH_PROVISIONING
+
+    config APP_WIFI_PROV_SHOW_QR
+        bool "Show provisioning QR code"
+        depends on APP_WIFI_USE_UNIFIED_PROVISIONING || APP_WIFI_USE_BOTH_PROVISIONING
+        default y
+        help
+            Show the QR code for provisioning.
+
+    choice APP_WIFI_PROV_TRANSPORT
+        bool "Provisioning Transport method"
+        default APP_WIFI_PROV_TRANSPORT_BLE
+        depends on APP_WIFI_USE_UNIFIED_PROVISIONING || APP_WIFI_USE_BOTH_PROVISIONING
+        help
+            Wi-Fi provisioning component offers both, SoftAP and BLE transports. Choose any one.
+
+        config APP_WIFI_PROV_TRANSPORT_SOFTAP
+            bool "Soft AP"
+        config APP_WIFI_PROV_TRANSPORT_BLE
+            bool "BLE"
+            select BT_ENABLED
+            depends on IDF_TARGET_ESP32
+    endchoice
+
+    config APP_WIFI_PROV_TRANSPORT
+        int
+        default 1 if APP_WIFI_PROV_TRANSPORT_SOFTAP
+        default 2 if APP_WIFI_PROV_TRANSPORT_BLE
+
+endmenu
diff --git a/examples/common/app_wifi/app_wifi.c b/examples/common/app_wifi/app_wifi.c
new file mode 100644
index 0000000..f50ba70
--- /dev/null
+++ b/examples/common/app_wifi/app_wifi.c
@@ -0,0 +1,433 @@
+/*
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+
+
+/*
+ * This supports 3 ways of connecting to the Wi-Fi Network
+ * 1. Hard coded credentials
+ * 2. Unified Provisioning
+ * 3. Apple Wi-Fi Accessory Configuration (WAC. Available only on MFi variant of the SDK)
+ *
+ * Unified Provisioning has 2 options
+ * 1. BLE Provisioning
+ * 2. SoftAP Provisioning
+ *
+ * Unified and WAC Provisioning can co-exist.
+ * If the SoftAP Unified Provisioning is being used, the same SoftAP interface
+ * will be used for WAC. However, if BLE Unified Provisioning is used, the HAP
+ * Helper functions for softAP start/stop will be used
+ */
+#include <string.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <freertos/event_groups.h>
+#include <esp_wifi.h>
+#include <esp_event.h>
+#include <esp_log.h>
+#include <esp_idf_version.h>
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 1, 0)
+// Features supported in 4.1+
+#define ESP_NETIF_SUPPORTED
+#endif
+
+#ifdef ESP_NETIF_SUPPORTED
+#include <esp_netif.h>
+#else
+#include <tcpip_adapter.h>
+#endif
+
+#include <wifi_provisioning/manager.h>
+
+#ifdef CONFIG_APP_WIFI_USE_BOTH_PROVISIONING
+#define USE_UNIFIED_PROVISIONING
+#define USE_WAC_PROVISIONING
+#endif
+
+#ifdef CONFIG_APP_WIFI_USE_UNIFIED_PROVISIONING
+#define USE_UNIFIED_PROVISIONING
+#endif
+
+#ifdef CONFIG_APP_WIFI_USE_WAC_PROVISIONING
+#define USE_WAC_PROVISIONING
+#endif
+
+#ifdef USE_UNIFIED_PROVISIONING
+#ifdef CONFIG_APP_WIFI_PROV_TRANSPORT_BLE
+#include <wifi_provisioning/scheme_ble.h>
+#else /* CONFIG_APP_WIFI_PROV_TRANSPORT_SOFTAP */
+#include <wifi_provisioning/scheme_softap.h>
+#include <hap_platform_httpd.h>
+#endif /* CONFIG_APP_WIFI_PROV_TRANSPORT_BLE */
+#include <qrcode.h>
+#endif /* USE_UNIFIED_PROVISIONING */
+
+#ifdef USE_WAC_PROVISIONING
+#include <hap_wac.h>
+#endif /* USE_WAC_PROVISIONING */
+
+#include <nvs.h>
+#include <nvs_flash.h>
+#include "app_wifi.h"
+
+static const char *TAG = "app_wifi";
+static const int WIFI_CONNECTED_EVENT = BIT0;
+static EventGroupHandle_t wifi_event_group;
+
+
+#ifdef USE_UNIFIED_PROVISIONING
+#define PROV_QR_VERSION "v1"
+
+#define PROV_TRANSPORT_SOFTAP   "softap"
+#define PROV_TRANSPORT_BLE      "ble"
+#define QRCODE_BASE_URL     "https://api.qrserver.com/v1/create-qr-code/"
+
+#define CREDENTIALS_NAMESPACE   "rmaker_creds"
+#define RANDOM_NVS_KEY          "random"
+
+static void app_wifi_print_qr(const char *name, const char *pop, const char *transport)
+{
+    if (!name || !pop || !transport) {
+        ESP_LOGW(TAG, "Cannot generate QR code payload. Data missing.");
+        return;
+    }
+    char payload[150];
+    snprintf(payload, sizeof(payload), "{\"ver\":\"%s\",\"name\":\"%s\"" \
+                    ",\"pop\":\"%s\",\"transport\":\"%s\"}",
+                    PROV_QR_VERSION, name, pop, transport);
+#ifdef CONFIG_APP_WIFI_PROV_SHOW_QR
+    ESP_LOGI(TAG, "-----QR Code for ESP Provisioning-----");
+    ESP_LOGI(TAG, "Scan this QR code from the phone app for Provisioning.");
+    qrcode_display(payload);
+#endif /* CONFIG_APP_WIFI_PROV_SHOW_QR */
+    ESP_LOGI(TAG, "If QR code is not visible, copy paste the below URL in a browser.\n%s?data=%s", QRCODE_BASE_URL, payload);
+}
+
+static void get_device_service_name(char *service_name, size_t max)
+{
+    uint8_t eth_mac[6];
+    const char *ssid_prefix = "PROV_";
+    esp_wifi_get_mac(WIFI_IF_STA, eth_mac);
+    snprintf(service_name, max, "%s%02X%02X%02X",
+             ssid_prefix, eth_mac[3], eth_mac[4], eth_mac[5]);
+}
+
+static esp_err_t get_device_pop(char *pop, size_t max)
+{
+    if (!pop || !max) {
+        return ESP_ERR_INVALID_ARG;
+    }
+
+        uint8_t eth_mac[6];
+        esp_err_t err = esp_wifi_get_mac(WIFI_IF_STA, eth_mac);
+        if (err == ESP_OK) {
+            snprintf(pop, max, "%02x%02x%02x%02x", eth_mac[2], eth_mac[3], eth_mac[4], eth_mac[5]);
+            return ESP_OK;
+        } else {
+            return err;
+        }
+}
+#endif /* USE_UNIFIED_PROVISIONING */
+
+#ifdef USE_WAC_PROVISIONING
+#ifdef CONFIG_APP_WIFI_PROV_TRANSPORT_SOFTAP
+static void app_wac_softap_start(char *ssid)
+{
+}
+#else
+static void app_wac_softap_start(char *ssid)
+{
+    hap_wifi_softap_start(ssid);
+}
+#endif /* ! CONFIG_APP_WIFI_PROV_TRANSPORT_SOFTAP */
+static void app_wac_softap_stop(void)
+{
+    hap_wifi_softap_stop();
+}
+static void app_wac_sta_connect(wifi_config_t *wifi_cfg)
+{
+#ifdef USE_UNIFIED_PROVISIONING
+    wifi_prov_mgr_configure_sta(wifi_cfg);
+#else
+    hap_wifi_sta_connect(wifi_cfg);
+#endif
+}
+#endif /* USE_WAC_PROVISIONING */
+
+/* Event handler for catching system events */
+static void event_handler(void* arg, esp_event_base_t event_base,
+                          int event_id, void* event_data)
+{
+    if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) {
+        esp_wifi_connect();
+    } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
+        ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
+        ESP_LOGI(TAG, "Connected with IP Address:" IPSTR, IP2STR(&event->ip_info.ip));
+        /* Signal main application to continue execution */
+        xEventGroupSetBits(wifi_event_group, WIFI_CONNECTED_EVENT);
+    } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) {
+        ESP_LOGI(TAG, "Disconnected. Connecting to the AP again...");
+        esp_wifi_connect();
+#ifdef USE_UNIFIED_PROVISIONING
+    } else if (event_base == WIFI_PROV_EVENT) {
+        switch (event_id) {
+            case WIFI_PROV_START:
+                ESP_LOGI(TAG, "Provisioning started");
+                break;
+            case WIFI_PROV_CRED_RECV: {
+                wifi_sta_config_t *wifi_sta_cfg = (wifi_sta_config_t *)event_data;
+                ESP_LOGI(TAG, "Received Wi-Fi credentials"
+                         "\n\tSSID     : %s\n\tPassword : %s",
+                         (const char *) wifi_sta_cfg->ssid,
+                         (const char *) wifi_sta_cfg->password);
+                break;
+            }
+            case WIFI_PROV_CRED_FAIL: {
+                wifi_prov_sta_fail_reason_t *reason = (wifi_prov_sta_fail_reason_t *)event_data;
+                ESP_LOGE(TAG, "Provisioning failed!\n\tReason : %s"
+                         "\n\tPlease reset to factory and retry provisioning",
+                         (*reason == WIFI_PROV_STA_AUTH_ERROR) ?
+                         "Wi-Fi station authentication failed" : "Wi-Fi access-point not found");
+                break;
+            }
+            case WIFI_PROV_CRED_SUCCESS:
+                ESP_LOGI(TAG, "Provisioning successful");
+                break;
+            case WIFI_PROV_END:
+#ifdef USE_WAC_PROVISIONING
+                hap_wac_stop();
+#endif
+                /* De-initialize manager once provisioning is finished */
+                wifi_prov_mgr_deinit();
+                break;
+            default:
+                break;
+        }
+#endif /* USE_UNIFIED_PROVISIONING */
+#ifdef USE_WAC_PROVISIONING
+    } else if (event_base == HAP_WAC_EVENT) {
+        switch (event_id) {
+            case HAP_WAC_EVENT_REQ_SOFTAP_START:
+                app_wac_softap_start((char *)event_data);
+                break;
+            case HAP_WAC_EVENT_REQ_SOFTAP_STOP:
+                app_wac_softap_stop();
+                break;
+            case HAP_WAC_EVENT_RECV_CRED:
+                app_wac_sta_connect((wifi_config_t *)event_data);
+                break;
+            case HAP_WAC_EVENT_STOPPED:
+                ESP_LOGI(TAG, "WAC Stopped");
+                break;
+            default:
+                break;
+        }
+#endif /* USE_WAC_PROVISIONING */
+    }
+}
+
+void app_wifi_init(void)
+{
+    /* Initialize TCP/IP */
+#ifdef ESP_NETIF_SUPPORTED
+    esp_netif_init();
+#else
+    tcpip_adapter_init();
+#endif
+
+    /* Initialize the event loop */
+    ESP_ERROR_CHECK(esp_event_loop_create_default());
+    wifi_event_group = xEventGroupCreate();
+
+    /* Register our event handler for Wi-Fi, IP and Provisioning related events */
+    ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL));
+    ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &event_handler, NULL));
+
+    /* Initialize Wi-Fi including netif with default config */
+#ifdef ESP_NETIF_SUPPORTED
+    esp_netif_create_default_wifi_sta();
+#endif
+    wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
+    ESP_ERROR_CHECK(esp_wifi_init(&cfg));
+}
+
+#ifdef CONFIG_APP_WIFI_USE_HARDCODED
+#define APP_WIFI_SSID   CONFIG_APP_WIFI_SSID
+#define APP_WIFI_PASS   CONFIG_APP_WIFI_PASSWORD
+esp_err_t app_wifi_start(TickType_t ticks_to_wait)
+{
+    wifi_config_t wifi_config = {
+        .sta = {
+            .ssid = APP_WIFI_SSID,
+            .password = APP_WIFI_PASS,
+            /* Setting a password implies station will connect to all security modes including WEP/WPA.
+             * However these modes are deprecated and not advisable to be used. Incase your Access point
+             * doesn't support WPA2, these mode can be enabled by commenting below line */
+	     .threshold.authmode = WIFI_AUTH_WPA2_PSK,
+
+            .pmf_cfg = {
+                .capable = true,
+                .required = false
+            },
+        },
+    };
+    ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
+    ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config) );
+    ESP_ERROR_CHECK(esp_wifi_start() );
+    /* Wait for Wi-Fi connection */
+    xEventGroupWaitBits(wifi_event_group, WIFI_CONNECTED_EVENT, false, true, ticks_to_wait);
+    return ESP_OK;
+    return ESP_OK;
+}
+#endif
+
+#ifdef CONFIG_APP_WIFI_USE_PROVISIONING
+static void wifi_init_sta()
+{
+    ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
+    ESP_ERROR_CHECK(esp_wifi_start());
+}
+
+esp_err_t app_wifi_start(TickType_t ticks_to_wait)
+{
+#ifdef USE_UNIFIED_PROVISIONING
+    /* Configuration for the provisioning manager */
+    wifi_prov_mgr_config_t config = {
+        /* What is the Provisioning Scheme that we want ?
+         * wifi_prov_scheme_softap or wifi_prov_scheme_ble */
+#ifdef CONFIG_APP_WIFI_PROV_TRANSPORT_BLE
+        .scheme = wifi_prov_scheme_ble,
+#else /* CONFIG_APP_WIFI_PROV_TRANSPORT_SOFTAP */
+        .scheme = wifi_prov_scheme_softap,
+#endif /* CONFIG_APP_WIFI_PROV_TRANSPORT_BLE */
+
+        /* Any default scheme specific event handler that you would
+         * like to choose. Since our example application requires
+         * neither BT nor BLE, we can choose to release the associated
+         * memory once provisioning is complete, or not needed
+         * (in case when device is already provisioned). Choosing
+         * appropriate scheme specific event handler allows the manager
+         * to take care of this automatically. This can be set to
+         * WIFI_PROV_EVENT_HANDLER_NONE when using wifi_prov_scheme_softap*/
+#ifdef CONFIG_APP_WIFI_PROV_TRANSPORT_BLE
+        .scheme_event_handler = WIFI_PROV_SCHEME_BLE_EVENT_HANDLER_FREE_BTDM
+#else /* CONFIG_APP_WIFI_PROV_TRANSPORT_SOFTAP */
+        .scheme_event_handler = WIFI_PROV_EVENT_HANDLER_NONE,
+#endif /* CONFIG_APP_WIFI_PROV_TRANSPORT_BLE */
+    };
+
+    /* Initialize provisioning manager with the
+     * configuration parameters set above */
+    ESP_ERROR_CHECK(wifi_prov_mgr_init(config));
+#endif /* USE_UNIFIED_PROVISIONING */
+
+    /* Let's find out if the device is provisioned */
+    bool provisioned = false;
+#ifdef USE_UNIFIED_PROVISIONING
+    ESP_ERROR_CHECK(wifi_prov_mgr_is_provisioned(&provisioned));
+#else
+    ESP_ERROR_CHECK(hap_wifi_is_provisioned(&provisioned));
+#endif
+
+    /* If device is not yet provisioned start provisioning service */
+    if (!provisioned) {
+        ESP_LOGI(TAG, "Starting provisioning");
+#ifdef ESP_NETIF_SUPPORTED
+#if defined(CONFIG_APP_WIFI_PROV_TRANSPORT_SOFTAP) || defined(USE_WAC_PROVISIONING)
+        esp_netif_create_default_wifi_ap();
+#endif
+#endif /* ESP_NETIF_SUPPORTED */
+#ifdef USE_UNIFIED_PROVISIONING
+        esp_event_handler_register(WIFI_PROV_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL);
+        /* What is the Device Service Name that we want
+         * This translates to :
+         *     - Wi-Fi SSID when scheme is wifi_prov_scheme_softap
+         *     - device name when scheme is wifi_prov_scheme_ble
+         */
+        char service_name[12];
+        get_device_service_name(service_name, sizeof(service_name));
+
+        /* What is the security level that we want (0 or 1):
+         *      - WIFI_PROV_SECURITY_0 is simply plain text communication.
+         *      - WIFI_PROV_SECURITY_1 is secure communication which consists of secure handshake
+         *          using X25519 key exchange and proof of possession (pop) and AES-CTR
+         *          for encryption/decryption of messages.
+         */
+        wifi_prov_security_t security = WIFI_PROV_SECURITY_1;
+
+        /* Do we want a proof-of-possession (ignored if Security 0 is selected):
+         *      - this should be a string with length > 0
+         *      - NULL if not used
+         */
+        char pop[9];
+        esp_err_t err = get_device_pop(pop, sizeof(pop));
+        if (err != ESP_OK) {
+            ESP_LOGE(TAG, "Error: %d. Failed to get PoP from NVS, Please perform Claiming.", err);
+            return err;
+        }
+
+        /* What is the service key (Wi-Fi password)
+         * NULL = Open network
+         * This is ignored when scheme is wifi_prov_scheme_ble
+         */
+        const char *service_key = NULL;
+
+#ifdef CONFIG_APP_WIFI_PROV_TRANSPORT_BLE
+        /* This step is only useful when scheme is wifi_prov_scheme_ble. This will
+         * set a custom 128 bit UUID which will be included in the BLE advertisement
+         * and will correspond to the primary GATT service that provides provisioning
+         * endpoints as GATT characteristics. Each GATT characteristic will be
+         * formed using the primary service UUID as base, with different auto assigned
+         * 12th and 13th bytes (assume counting starts from 0th byte). The client side
+         * applications must identify the endpoints by reading the User Characteristic
+         * Description descriptor (0x2901) for each characteristic, which contains the
+         * endpoint name of the characteristic */
+        uint8_t custom_service_uuid[] = {
+            /* This is a random uuid. This can be modified if you want to change the BLE uuid. */
+            /* 12th and 13th bit will be replaced by internal bits. */
+            0xb4, 0xdf, 0x5a, 0x1c, 0x3f, 0x6b, 0xf4, 0xbf,
+            0xea, 0x4a, 0x82, 0x03, 0x04, 0x90, 0x1a, 0x02,
+        };
+        err = wifi_prov_scheme_ble_set_service_uuid(custom_service_uuid);
+        if (err != ESP_OK) {
+            ESP_LOGE(TAG, "wifi_prov_scheme_ble_set_service_uuid failed %d", err);
+            return err;
+        }
+#endif /* CONFIG_APP_WIFI_PROV_TRANSPORT_BLE */
+#ifdef CONFIG_APP_WIFI_PROV_TRANSPORT_SOFTAP
+        wifi_prov_scheme_softap_set_httpd_handle(hap_platform_httpd_get_handle());
+#endif /* CONFIG_APP_WIFI_PROV_TRANSPORT_SOFTAP */
+
+        /* Start provisioning service */
+        ESP_ERROR_CHECK(wifi_prov_mgr_start_provisioning(security, pop, service_name, service_key));
+        /* Print QR code for provisioning */
+#ifdef CONFIG_APP_WIFI_PROV_TRANSPORT_BLE
+        app_wifi_print_qr(service_name, pop, PROV_TRANSPORT_BLE);
+#else /* CONFIG_APP_WIFI_PROV_TRANSPORT_SOFTAP */
+        app_wifi_print_qr(service_name, pop, PROV_TRANSPORT_SOFTAP);
+#endif /* CONFIG_APP_WIFI_PROV_TRANSPORT_BLE */
+        ESP_LOGI(TAG, "Provisioning Started. Name : %s, POP : %s", service_name, pop);
+#endif /* USE_UNIFIED_PROVISIONING */
+#ifdef USE_WAC_PROVISIONING
+        esp_event_handler_register(HAP_WAC_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL);
+        hap_wac_start();
+#endif /* USE_WAC_PROVISIONING */
+    } else {
+        ESP_LOGI(TAG, "Already provisioned, starting Wi-Fi STA");
+#ifdef USE_UNIFIED_PROVISIONING
+        /* We don't need the manager as device is already provisioned,
+         * so let's release it's resources */
+        wifi_prov_mgr_deinit();
+#endif /* USE_UNIFIED_PROVISIONING */
+        /* Start Wi-Fi station */
+        wifi_init_sta();
+    }
+    /* Wait for Wi-Fi connection */
+    xEventGroupWaitBits(wifi_event_group, WIFI_CONNECTED_EVENT, false, true, ticks_to_wait);
+    return ESP_OK;
+}
+#endif /* CONFIG_APP_WIFI_USE_PROVISIONING */
diff --git a/examples/common/app_wifi/app_wifi.h b/examples/common/app_wifi/app_wifi.h
new file mode 100644
index 0000000..23f01af
--- /dev/null
+++ b/examples/common/app_wifi/app_wifi.h
@@ -0,0 +1,12 @@
+/*
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+#pragma once
+#include <esp_err.h>
+
+void app_wifi_init(void);
+esp_err_t app_wifi_start(TickType_t ticks_to_wait);
diff --git a/examples/common/app_wifi/component.mk b/examples/common/app_wifi/component.mk
new file mode 100644
index 0000000..2ec0e78
--- /dev/null
+++ b/examples/common/app_wifi/component.mk
@@ -0,0 +1,2 @@
+COMPONENT_ADD_INCLUDEDIRS := .
+COMPONENT_SRCDIRS := .
diff --git a/examples/common/qrcode/CMakeLists.txt b/examples/common/qrcode/CMakeLists.txt
new file mode 100644
index 0000000..8c50a1a
--- /dev/null
+++ b/examples/common/qrcode/CMakeLists.txt
@@ -0,0 +1,5 @@
+idf_component_register(SRCS ./src/qrcodegen.c ./src/qrcode.c
+                       INCLUDE_DIRS include
+                       REQUIRES
+                       PRIV_REQUIRES )
+
diff --git a/examples/common/qrcode/component.mk b/examples/common/qrcode/component.mk
new file mode 100644
index 0000000..e6cd797
--- /dev/null
+++ b/examples/common/qrcode/component.mk
@@ -0,0 +1,3 @@
+COMPONENT_ADD_INCLUDEDIRS := include
+COMPONENT_PRIV_INCLUDEDIRS := src
+COMPONENT_SRCDIRS := src
diff --git a/examples/common/qrcode/include/qrcode.h b/examples/common/qrcode/include/qrcode.h
new file mode 100644
index 0000000..94076ac
--- /dev/null
+++ b/examples/common/qrcode/include/qrcode.h
@@ -0,0 +1,40 @@
+// Copyright 2019 Espressif Systems (Shanghai) PTE LTD
+//
+// 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.
+#pragma once
+
+#include <esp_err.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+  * @brief  Generate and display QR Code on the console
+  *         Encodes the given string into a QR Code & displays it on the console
+  *
+  * @attention 1. Can successfully encode a UTF-8 string of up to 2953 bytes or an alphanumeric
+  *               string of up to 4296 characters or any digit string of up to 7089 characters
+  *
+  * @param  text  string to encode into a QR Code.
+  *
+  * @return
+  *    - ESP_OK: succeed
+  *    - ESP_FAIL: Failed to encode string into a QR Code
+  *    - ESP_ERR_NO_MEM: Failed to allocate buffer for given MAX_QRCODE_VERSION
+  */
+esp_err_t qrcode_display(const char *text);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/examples/common/qrcode/src/qrcode.c b/examples/common/qrcode/src/qrcode.c
new file mode 100644
index 0000000..ab5bda5
--- /dev/null
+++ b/examples/common/qrcode/src/qrcode.c
@@ -0,0 +1,101 @@
+// Copyright 2019 Espressif Systems (Shanghai) PTE LTD
+//
+// 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.
+
+#include <stdio.h>
+#include <esp_err.h>
+
+#include "qrcodegen.h"
+
+#define MAX_QRCODE_VERSION 5
+
+static const char *lt[] = {
+    /* 0 */ "  ",
+    /* 1 */ "\u2580 ",
+    /* 2 */ " \u2580",
+    /* 3 */ "\u2580\u2580",
+    /* 4 */ "\u2584 ",
+    /* 5 */ "\u2588 ",
+    /* 6 */ "\u2584\u2580",
+    /* 7 */ "\u2588\u2580",
+    /* 8 */ " \u2584",
+    /* 9 */ "\u2580\u2584",
+    /* 10 */ " \u2588",
+    /* 11 */ "\u2580\u2588",
+    /* 12 */ "\u2584\u2584",
+    /* 13 */ "\u2588\u2584",
+    /* 14 */ "\u2584\u2588",
+    /* 15 */ "\u2588\u2588",
+};
+
+void print_qr_char(unsigned char n)
+{
+    printf("%s", lt[n]);
+}
+
+extern void print_qr_char(unsigned char);
+static void printQr(const uint8_t qrcode[]) {
+    int size = qrcodegen_getSize(qrcode);
+    int border = 2;
+    unsigned char num = 0;
+
+    for (int y = -border; y < size + border; y+=2) {
+        for (int x = -border; x < size + border; x+=2) {
+            num = 0;
+            if (qrcodegen_getModule(qrcode, x, y)) {
+                num |= 1 << 0;
+            }
+            if ((x < size + border) && qrcodegen_getModule(qrcode, x+1, y)) {
+                num |= 1 << 1;
+            }
+            if ((y < size + border) && qrcodegen_getModule(qrcode, x, y+1)) {
+                num |= 1 << 2;
+            }
+            if ((x < size + border) && (y < size + border) && qrcodegen_getModule(qrcode, x+1, y+1)) {
+                num |= 1 << 3;
+            }
+            print_qr_char(num);
+        }
+        printf("\n");
+    }
+    printf("\n");
+}
+
+esp_err_t qrcode_display(const char *text)
+{
+	enum qrcodegen_Ecc errCorLvl = qrcodegen_Ecc_LOW;
+    uint8_t *qrcode, *tempBuffer;
+    esp_err_t err = ESP_FAIL;
+
+    qrcode = calloc(1, qrcodegen_BUFFER_LEN_FOR_VERSION(MAX_QRCODE_VERSION));
+    if (!qrcode)
+        return ESP_ERR_NO_MEM;
+
+    tempBuffer = calloc(1, qrcodegen_BUFFER_LEN_FOR_VERSION(MAX_QRCODE_VERSION));
+    if (!tempBuffer) {
+        free(qrcode);
+        return ESP_ERR_NO_MEM;
+    }
+
+	// Make and print the QR Code symbol
+	bool ok = qrcodegen_encodeText(text, tempBuffer, qrcode, errCorLvl,
+		qrcodegen_VERSION_MIN, MAX_QRCODE_VERSION, qrcodegen_Mask_AUTO, true);
+	if (ok) {
+		printQr(qrcode);
+        err = ESP_OK;
+    }
+
+    free(qrcode);
+    free(tempBuffer);
+    return err;
+}
diff --git a/examples/common/qrcode/src/qrcodegen.c b/examples/common/qrcode/src/qrcodegen.c
new file mode 100644
index 0000000..9fce6b0
--- /dev/null
+++ b/examples/common/qrcode/src/qrcodegen.c
@@ -0,0 +1,1022 @@
+/*
+ * QR Code generator library (C)
+ *
+ * Copyright (c) Project Nayuki. (MIT License)
+ * https://www.nayuki.io/page/qr-code-generator-library
+ *
+ * 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 <assert.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include "qrcodegen.h"
+
+#ifndef QRCODEGEN_TEST
+	#define testable static  // Keep functions private
+#else
+	#define testable  // Expose private functions
+#endif
+
+
+/*---- Forward declarations for private functions ----*/
+
+// Regarding all public and private functions defined in this source file:
+// - They require all pointer/array arguments to be not null unless the array length is zero.
+// - They only read input scalar/array arguments, write to output pointer/array
+//   arguments, and return scalar values; they are "pure" functions.
+// - They don't read mutable global variables or write to any global variables.
+// - They don't perform I/O, read the clock, print to console, etc.
+// - They allocate a small and constant amount of stack memory.
+// - They don't allocate or free any memory on the heap.
+// - They don't recurse or mutually recurse. All the code
+//   could be inlined into the top-level public functions.
+// - They run in at most quadratic time with respect to input arguments.
+//   Most functions run in linear time, and some in constant time.
+//   There are no unbounded loops or non-obvious termination conditions.
+// - They are completely thread-safe if the caller does not give the
+//   same writable buffer to concurrent calls to these functions.
+
+testable void appendBitsToBuffer(unsigned int val, int numBits, uint8_t buffer[], int *bitLen);
+
+testable void addEccAndInterleave(uint8_t data[], int version, enum qrcodegen_Ecc ecl, uint8_t result[]);
+testable int getNumDataCodewords(int version, enum qrcodegen_Ecc ecl);
+testable int getNumRawDataModules(int ver);
+
+testable void reedSolomonComputeDivisor(int degree, uint8_t result[]);
+testable void reedSolomonComputeRemainder(const uint8_t data[], int dataLen,
+	const uint8_t generator[], int degree, uint8_t result[]);
+testable uint8_t reedSolomonMultiply(uint8_t x, uint8_t y);
+
+testable void initializeFunctionModules(int version, uint8_t qrcode[]);
+static void drawWhiteFunctionModules(uint8_t qrcode[], int version);
+static void drawFormatBits(enum qrcodegen_Ecc ecl, enum qrcodegen_Mask mask, uint8_t qrcode[]);
+testable int getAlignmentPatternPositions(int version, uint8_t result[7]);
+static void fillRectangle(int left, int top, int width, int height, uint8_t qrcode[]);
+
+static void drawCodewords(const uint8_t data[], int dataLen, uint8_t qrcode[]);
+static void applyMask(const uint8_t functionModules[], uint8_t qrcode[], enum qrcodegen_Mask mask);
+static long getPenaltyScore(const uint8_t qrcode[]);
+static int finderPenaltyCountPatterns(const int runHistory[7], int qrsize);
+static int finderPenaltyTerminateAndCount(bool currentRunColor, int currentRunLength, int runHistory[7], int qrsize);
+static void finderPenaltyAddHistory(int currentRunLength, int runHistory[7]);
+
+testable bool getModule(const uint8_t qrcode[], int x, int y);
+testable void setModule(uint8_t qrcode[], int x, int y, bool isBlack);
+testable void setModuleBounded(uint8_t qrcode[], int x, int y, bool isBlack);
+static bool getBit(int x, int i);
+
+testable int calcSegmentBitLength(enum qrcodegen_Mode mode, size_t numChars);
+testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int version);
+static int numCharCountBits(enum qrcodegen_Mode mode, int version);
+
+
+
+/*---- Private tables of constants ----*/
+
+// The set of all legal characters in alphanumeric mode, where each character
+// value maps to the index in the string. For checking text and encoding segments.
+static const char *ALPHANUMERIC_CHARSET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:";
+
+// For generating error correction codes.
+testable const int8_t ECC_CODEWORDS_PER_BLOCK[4][41] = {
+	// Version: (note that index 0 is for padding, and is set to an illegal value)
+	//0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40    Error correction level
+	{-1,  7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26, 30, 22, 24, 28, 30, 28, 28, 28, 28, 30, 30, 26, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},  // Low
+	{-1, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22, 24, 24, 28, 28, 26, 26, 26, 26, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28},  // Medium
+	{-1, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24, 20, 30, 24, 28, 28, 26, 30, 28, 30, 30, 30, 30, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},  // Quartile
+	{-1, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22, 24, 24, 30, 28, 28, 26, 28, 30, 24, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30},  // High
+};
+
+#define qrcodegen_REED_SOLOMON_DEGREE_MAX 30  // Based on the table above
+
+// For generating error correction codes.
+testable const int8_t NUM_ERROR_CORRECTION_BLOCKS[4][41] = {
+	// Version: (note that index 0 is for padding, and is set to an illegal value)
+	//0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40    Error correction level
+	{-1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4,  4,  4,  4,  4,  6,  6,  6,  6,  7,  8,  8,  9,  9, 10, 12, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25},  // Low
+	{-1, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5,  5,  8,  9,  9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49},  // Medium
+	{-1, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8,  8, 10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68},  // Quartile
+	{-1, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81},  // High
+};
+
+// For automatic mask pattern selection.
+static const int PENALTY_N1 =  3;
+static const int PENALTY_N2 =  3;
+static const int PENALTY_N3 = 40;
+static const int PENALTY_N4 = 10;
+
+
+
+/*---- High-level QR Code encoding functions ----*/
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[],
+		enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl) {
+
+	size_t textLen = strlen(text);
+	if (textLen == 0)
+		return qrcodegen_encodeSegmentsAdvanced(NULL, 0, ecl, minVersion, maxVersion, mask, boostEcl, tempBuffer, qrcode);
+	size_t bufLen = (size_t)qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion);
+
+	struct qrcodegen_Segment seg;
+	if (qrcodegen_isNumeric(text)) {
+		if (qrcodegen_calcSegmentBufferSize(qrcodegen_Mode_NUMERIC, textLen) > bufLen)
+			goto fail;
+		seg = qrcodegen_makeNumeric(text, tempBuffer);
+	} else if (qrcodegen_isAlphanumeric(text)) {
+		if (qrcodegen_calcSegmentBufferSize(qrcodegen_Mode_ALPHANUMERIC, textLen) > bufLen)
+			goto fail;
+		seg = qrcodegen_makeAlphanumeric(text, tempBuffer);
+	} else {
+		if (textLen > bufLen)
+			goto fail;
+		for (size_t i = 0; i < textLen; i++)
+			tempBuffer[i] = (uint8_t)text[i];
+		seg.mode = qrcodegen_Mode_BYTE;
+		seg.bitLength = calcSegmentBitLength(seg.mode, textLen);
+		if (seg.bitLength == -1)
+			goto fail;
+		seg.numChars = (int)textLen;
+		seg.data = tempBuffer;
+	}
+	return qrcodegen_encodeSegmentsAdvanced(&seg, 1, ecl, minVersion, maxVersion, mask, boostEcl, tempBuffer, qrcode);
+
+fail:
+	qrcode[0] = 0;  // Set size to invalid value for safety
+	return false;
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[],
+		enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl) {
+
+	struct qrcodegen_Segment seg;
+	seg.mode = qrcodegen_Mode_BYTE;
+	seg.bitLength = calcSegmentBitLength(seg.mode, dataLen);
+	if (seg.bitLength == -1) {
+		qrcode[0] = 0;  // Set size to invalid value for safety
+		return false;
+	}
+	seg.numChars = (int)dataLen;
+	seg.data = dataAndTemp;
+	return qrcodegen_encodeSegmentsAdvanced(&seg, 1, ecl, minVersion, maxVersion, mask, boostEcl, dataAndTemp, qrcode);
+}
+
+
+// Appends the given number of low-order bits of the given value to the given byte-based
+// bit buffer, increasing the bit length. Requires 0 <= numBits <= 16 and val < 2^numBits.
+testable void appendBitsToBuffer(unsigned int val, int numBits, uint8_t buffer[], int *bitLen) {
+	assert(0 <= numBits && numBits <= 16 && (unsigned long)val >> numBits == 0);
+	for (int i = numBits - 1; i >= 0; i--, (*bitLen)++)
+		buffer[*bitLen >> 3] |= ((val >> i) & 1) << (7 - (*bitLen & 7));
+}
+
+
+
+/*---- Low-level QR Code encoding functions ----*/
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len,
+		enum qrcodegen_Ecc ecl, uint8_t tempBuffer[], uint8_t qrcode[]) {
+	return qrcodegen_encodeSegmentsAdvanced(segs, len, ecl,
+		qrcodegen_VERSION_MIN, qrcodegen_VERSION_MAX, qrcodegen_Mask_AUTO, true, tempBuffer, qrcode);
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl,
+		int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl, uint8_t tempBuffer[], uint8_t qrcode[]) {
+	assert(segs != NULL || len == 0);
+	assert(qrcodegen_VERSION_MIN <= minVersion && minVersion <= maxVersion && maxVersion <= qrcodegen_VERSION_MAX);
+	assert(0 <= (int)ecl && (int)ecl <= 3 && -1 <= (int)mask && (int)mask <= 7);
+
+	// Find the minimal version number to use
+	int version, dataUsedBits;
+	for (version = minVersion; ; version++) {
+		int dataCapacityBits = getNumDataCodewords(version, ecl) * 8;  // Number of data bits available
+		dataUsedBits = getTotalBits(segs, len, version);
+		if (dataUsedBits != -1 && dataUsedBits <= dataCapacityBits)
+			break;  // This version number is found to be suitable
+		if (version >= maxVersion) {  // All versions in the range could not fit the given data
+			qrcode[0] = 0;  // Set size to invalid value for safety
+			return false;
+		}
+	}
+	assert(dataUsedBits != -1);
+
+	// Increase the error correction level while the data still fits in the current version number
+	for (int i = (int)qrcodegen_Ecc_MEDIUM; i <= (int)qrcodegen_Ecc_HIGH; i++) {  // From low to high
+		if (boostEcl && dataUsedBits <= getNumDataCodewords(version, (enum qrcodegen_Ecc)i) * 8)
+			ecl = (enum qrcodegen_Ecc)i;
+	}
+
+	// Concatenate all segments to create the data bit string
+	memset(qrcode, 0, (size_t)qrcodegen_BUFFER_LEN_FOR_VERSION(version) * sizeof(qrcode[0]));
+	int bitLen = 0;
+	for (size_t i = 0; i < len; i++) {
+		const struct qrcodegen_Segment *seg = &segs[i];
+		appendBitsToBuffer((unsigned int)seg->mode, 4, qrcode, &bitLen);
+		appendBitsToBuffer((unsigned int)seg->numChars, numCharCountBits(seg->mode, version), qrcode, &bitLen);
+		for (int j = 0; j < seg->bitLength; j++) {
+			int bit = (seg->data[j >> 3] >> (7 - (j & 7))) & 1;
+			appendBitsToBuffer((unsigned int)bit, 1, qrcode, &bitLen);
+		}
+	}
+	assert(bitLen == dataUsedBits);
+
+	// Add terminator and pad up to a byte if applicable
+	int dataCapacityBits = getNumDataCodewords(version, ecl) * 8;
+	assert(bitLen <= dataCapacityBits);
+	int terminatorBits = dataCapacityBits - bitLen;
+	if (terminatorBits > 4)
+		terminatorBits = 4;
+	appendBitsToBuffer(0, terminatorBits, qrcode, &bitLen);
+	appendBitsToBuffer(0, (8 - bitLen % 8) % 8, qrcode, &bitLen);
+	assert(bitLen % 8 == 0);
+
+	// Pad with alternating bytes until data capacity is reached
+	for (uint8_t padByte = 0xEC; bitLen < dataCapacityBits; padByte ^= 0xEC ^ 0x11)
+		appendBitsToBuffer(padByte, 8, qrcode, &bitLen);
+
+	// Draw function and data codeword modules
+	addEccAndInterleave(qrcode, version, ecl, tempBuffer);
+	initializeFunctionModules(version, qrcode);
+	drawCodewords(tempBuffer, getNumRawDataModules(version) / 8, qrcode);
+	drawWhiteFunctionModules(qrcode, version);
+	initializeFunctionModules(version, tempBuffer);
+
+	// Handle masking
+	if (mask == qrcodegen_Mask_AUTO) {  // Automatically choose best mask
+		long minPenalty = LONG_MAX;
+		for (int i = 0; i < 8; i++) {
+			enum qrcodegen_Mask msk = (enum qrcodegen_Mask)i;
+			applyMask(tempBuffer, qrcode, msk);
+			drawFormatBits(ecl, msk, qrcode);
+			long penalty = getPenaltyScore(qrcode);
+			if (penalty < minPenalty) {
+				mask = msk;
+				minPenalty = penalty;
+			}
+			applyMask(tempBuffer, qrcode, msk);  // Undoes the mask due to XOR
+		}
+	}
+	assert(0 <= (int)mask && (int)mask <= 7);
+	applyMask(tempBuffer, qrcode, mask);
+	drawFormatBits(ecl, mask, qrcode);
+	return true;
+}
+
+
+
+/*---- Error correction code generation functions ----*/
+
+// Appends error correction bytes to each block of the given data array, then interleaves
+// bytes from the blocks and stores them in the result array. data[0 : dataLen] contains
+// the input data. data[dataLen : rawCodewords] is used as a temporary work area and will
+// be clobbered by this function. The final answer is stored in result[0 : rawCodewords].
+testable void addEccAndInterleave(uint8_t data[], int version, enum qrcodegen_Ecc ecl, uint8_t result[]) {
+	// Calculate parameter numbers
+	assert(0 <= (int)ecl && (int)ecl < 4 && qrcodegen_VERSION_MIN <= version && version <= qrcodegen_VERSION_MAX);
+	int numBlocks = NUM_ERROR_CORRECTION_BLOCKS[(int)ecl][version];
+	int blockEccLen = ECC_CODEWORDS_PER_BLOCK  [(int)ecl][version];
+	int rawCodewords = getNumRawDataModules(version) / 8;
+	int dataLen = getNumDataCodewords(version, ecl);
+	int numShortBlocks = numBlocks - rawCodewords % numBlocks;
+	int shortBlockDataLen = rawCodewords / numBlocks - blockEccLen;
+
+	// Split data into blocks, calculate ECC, and interleave
+	// (not concatenate) the bytes into a single sequence
+	uint8_t rsdiv[qrcodegen_REED_SOLOMON_DEGREE_MAX];
+	reedSolomonComputeDivisor(blockEccLen, rsdiv);
+	const uint8_t *dat = data;
+	for (int i = 0; i < numBlocks; i++) {
+		int datLen = shortBlockDataLen + (i < numShortBlocks ? 0 : 1);
+		uint8_t *ecc = &data[dataLen];  // Temporary storage
+		reedSolomonComputeRemainder(dat, datLen, rsdiv, blockEccLen, ecc);
+		for (int j = 0, k = i; j < datLen; j++, k += numBlocks) {  // Copy data
+			if (j == shortBlockDataLen)
+				k -= numShortBlocks;
+			result[k] = dat[j];
+		}
+		for (int j = 0, k = dataLen + i; j < blockEccLen; j++, k += numBlocks)  // Copy ECC
+			result[k] = ecc[j];
+		dat += datLen;
+	}
+}
+
+
+// Returns the number of 8-bit codewords that can be used for storing data (not ECC),
+// for the given version number and error correction level. The result is in the range [9, 2956].
+testable int getNumDataCodewords(int version, enum qrcodegen_Ecc ecl) {
+	int v = version, e = (int)ecl;
+	assert(0 <= e && e < 4);
+	return getNumRawDataModules(v) / 8
+		- ECC_CODEWORDS_PER_BLOCK    [e][v]
+		* NUM_ERROR_CORRECTION_BLOCKS[e][v];
+}
+
+
+// Returns the number of data bits that can be stored in a QR Code of the given version number, after
+// all function modules are excluded. This includes remainder bits, so it might not be a multiple of 8.
+// The result is in the range [208, 29648]. This could be implemented as a 40-entry lookup table.
+testable int getNumRawDataModules(int ver) {
+	assert(qrcodegen_VERSION_MIN <= ver && ver <= qrcodegen_VERSION_MAX);
+	int result = (16 * ver + 128) * ver + 64;
+	if (ver >= 2) {
+		int numAlign = ver / 7 + 2;
+		result -= (25 * numAlign - 10) * numAlign - 55;
+		if (ver >= 7)
+			result -= 36;
+	}
+	assert(208 <= result && result <= 29648);
+	return result;
+}
+
+
+
+/*---- Reed-Solomon ECC generator functions ----*/
+
+// Computes a Reed-Solomon ECC generator polynomial for the given degree, storing in result[0 : degree].
+// This could be implemented as a lookup table over all possible parameter values, instead of as an algorithm.
+testable void reedSolomonComputeDivisor(int degree, uint8_t result[]) {
+	assert(1 <= degree && degree <= qrcodegen_REED_SOLOMON_DEGREE_MAX);
+	// Polynomial coefficients are stored from highest to lowest power, excluding the leading term which is always 1.
+	// For example the polynomial x^3 + 255x^2 + 8x + 93 is stored as the uint8 array {255, 8, 93}.
+	memset(result, 0, (size_t)degree * sizeof(result[0]));
+	result[degree - 1] = 1;  // Start off with the monomial x^0
+
+	// Compute the product polynomial (x - r^0) * (x - r^1) * (x - r^2) * ... * (x - r^{degree-1}),
+	// drop the highest monomial term which is always 1x^degree.
+	// Note that r = 0x02, which is a generator element of this field GF(2^8/0x11D).
+	uint8_t root = 1;
+	for (int i = 0; i < degree; i++) {
+		// Multiply the current product by (x - r^i)
+		for (int j = 0; j < degree; j++) {
+			result[j] = reedSolomonMultiply(result[j], root);
+			if (j + 1 < degree)
+				result[j] ^= result[j + 1];
+		}
+		root = reedSolomonMultiply(root, 0x02);
+	}
+}
+
+
+// Computes the Reed-Solomon error correction codeword for the given data and divisor polynomials.
+// The remainder when data[0 : dataLen] is divided by divisor[0 : degree] is stored in result[0 : degree].
+// All polynomials are in big endian, and the generator has an implicit leading 1 term.
+testable void reedSolomonComputeRemainder(const uint8_t data[], int dataLen,
+		const uint8_t generator[], int degree, uint8_t result[]) {
+	assert(1 <= degree && degree <= qrcodegen_REED_SOLOMON_DEGREE_MAX);
+	memset(result, 0, (size_t)degree * sizeof(result[0]));
+	for (int i = 0; i < dataLen; i++) {  // Polynomial division
+		uint8_t factor = data[i] ^ result[0];
+		memmove(&result[0], &result[1], (size_t)(degree - 1) * sizeof(result[0]));
+		result[degree - 1] = 0;
+		for (int j = 0; j < degree; j++)
+			result[j] ^= reedSolomonMultiply(generator[j], factor);
+	}
+}
+
+#undef qrcodegen_REED_SOLOMON_DEGREE_MAX
+
+
+// Returns the product of the two given field elements modulo GF(2^8/0x11D).
+// All inputs are valid. This could be implemented as a 256*256 lookup table.
+testable uint8_t reedSolomonMultiply(uint8_t x, uint8_t y) {
+	// Russian peasant multiplication
+	uint8_t z = 0;
+	for (int i = 7; i >= 0; i--) {
+		z = (uint8_t)((z << 1) ^ ((z >> 7) * 0x11D));
+		z ^= ((y >> i) & 1) * x;
+	}
+	return z;
+}
+
+
+
+/*---- Drawing function modules ----*/
+
+// Clears the given QR Code grid with white modules for the given
+// version's size, then marks every function module as black.
+testable void initializeFunctionModules(int version, uint8_t qrcode[]) {
+	// Initialize QR Code
+	int qrsize = version * 4 + 17;
+	memset(qrcode, 0, (size_t)((qrsize * qrsize + 7) / 8 + 1) * sizeof(qrcode[0]));
+	qrcode[0] = (uint8_t)qrsize;
+
+	// Fill horizontal and vertical timing patterns
+	fillRectangle(6, 0, 1, qrsize, qrcode);
+	fillRectangle(0, 6, qrsize, 1, qrcode);
+
+	// Fill 3 finder patterns (all corners except bottom right) and format bits
+	fillRectangle(0, 0, 9, 9, qrcode);
+	fillRectangle(qrsize - 8, 0, 8, 9, qrcode);
+	fillRectangle(0, qrsize - 8, 9, 8, qrcode);
+
+	// Fill numerous alignment patterns
+	uint8_t alignPatPos[7];
+	int numAlign = getAlignmentPatternPositions(version, alignPatPos);
+	for (int i = 0; i < numAlign; i++) {
+		for (int j = 0; j < numAlign; j++) {
+			// Don't draw on the three finder corners
+			if (!((i == 0 && j == 0) || (i == 0 && j == numAlign - 1) || (i == numAlign - 1 && j == 0)))
+				fillRectangle(alignPatPos[i] - 2, alignPatPos[j] - 2, 5, 5, qrcode);
+		}
+	}
+
+	// Fill version blocks
+	if (version >= 7) {
+		fillRectangle(qrsize - 11, 0, 3, 6, qrcode);
+		fillRectangle(0, qrsize - 11, 6, 3, qrcode);
+	}
+}
+
+
+// Draws white function modules and possibly some black modules onto the given QR Code, without changing
+// non-function modules. This does not draw the format bits. This requires all function modules to be previously
+// marked black (namely by initializeFunctionModules()), because this may skip redrawing black function modules.
+static void drawWhiteFunctionModules(uint8_t qrcode[], int version) {
+	// Draw horizontal and vertical timing patterns
+	int qrsize = qrcodegen_getSize(qrcode);
+	for (int i = 7; i < qrsize - 7; i += 2) {
+		setModule(qrcode, 6, i, false);
+		setModule(qrcode, i, 6, false);
+	}
+
+	// Draw 3 finder patterns (all corners except bottom right; overwrites some timing modules)
+	for (int dy = -4; dy <= 4; dy++) {
+		for (int dx = -4; dx <= 4; dx++) {
+			int dist = abs(dx);
+			if (abs(dy) > dist)
+				dist = abs(dy);
+			if (dist == 2 || dist == 4) {
+				setModuleBounded(qrcode, 3 + dx, 3 + dy, false);
+				setModuleBounded(qrcode, qrsize - 4 + dx, 3 + dy, false);
+				setModuleBounded(qrcode, 3 + dx, qrsize - 4 + dy, false);
+			}
+		}
+	}
+
+	// Draw numerous alignment patterns
+	uint8_t alignPatPos[7];
+	int numAlign = getAlignmentPatternPositions(version, alignPatPos);
+	for (int i = 0; i < numAlign; i++) {
+		for (int j = 0; j < numAlign; j++) {
+			if ((i == 0 && j == 0) || (i == 0 && j == numAlign - 1) || (i == numAlign - 1 && j == 0))
+				continue;  // Don't draw on the three finder corners
+			for (int dy = -1; dy <= 1; dy++) {
+				for (int dx = -1; dx <= 1; dx++)
+					setModule(qrcode, alignPatPos[i] + dx, alignPatPos[j] + dy, dx == 0 && dy == 0);
+			}
+		}
+	}
+
+	// Draw version blocks
+	if (version >= 7) {
+		// Calculate error correction code and pack bits
+		int rem = version;  // version is uint6, in the range [7, 40]
+		for (int i = 0; i < 12; i++)
+			rem = (rem << 1) ^ ((rem >> 11) * 0x1F25);
+		long bits = (long)version << 12 | rem;  // uint18
+		assert(bits >> 18 == 0);
+
+		// Draw two copies
+		for (int i = 0; i < 6; i++) {
+			for (int j = 0; j < 3; j++) {
+				int k = qrsize - 11 + j;
+				setModule(qrcode, k, i, (bits & 1) != 0);
+				setModule(qrcode, i, k, (bits & 1) != 0);
+				bits >>= 1;
+			}
+		}
+	}
+}
+
+
+// Draws two copies of the format bits (with its own error correction code) based
+// on the given mask and error correction level. This always draws all modules of
+// the format bits, unlike drawWhiteFunctionModules() which might skip black modules.
+static void drawFormatBits(enum qrcodegen_Ecc ecl, enum qrcodegen_Mask mask, uint8_t qrcode[]) {
+	// Calculate error correction code and pack bits
+	assert(0 <= (int)mask && (int)mask <= 7);
+	static const int table[] = {1, 0, 3, 2};
+	int data = table[(int)ecl] << 3 | (int)mask;  // errCorrLvl is uint2, mask is uint3
+	int rem = data;
+	for (int i = 0; i < 10; i++)
+		rem = (rem << 1) ^ ((rem >> 9) * 0x537);
+	int bits = (data << 10 | rem) ^ 0x5412;  // uint15
+	assert(bits >> 15 == 0);
+
+	// Draw first copy
+	for (int i = 0; i <= 5; i++)
+		setModule(qrcode, 8, i, getBit(bits, i));
+	setModule(qrcode, 8, 7, getBit(bits, 6));
+	setModule(qrcode, 8, 8, getBit(bits, 7));
+	setModule(qrcode, 7, 8, getBit(bits, 8));
+	for (int i = 9; i < 15; i++)
+		setModule(qrcode, 14 - i, 8, getBit(bits, i));
+
+	// Draw second copy
+	int qrsize = qrcodegen_getSize(qrcode);
+	for (int i = 0; i < 8; i++)
+		setModule(qrcode, qrsize - 1 - i, 8, getBit(bits, i));
+	for (int i = 8; i < 15; i++)
+		setModule(qrcode, 8, qrsize - 15 + i, getBit(bits, i));
+	setModule(qrcode, 8, qrsize - 8, true);  // Always black
+}
+
+
+// Calculates and stores an ascending list of positions of alignment patterns
+// for this version number, returning the length of the list (in the range [0,7]).
+// Each position is in the range [0,177), and are used on both the x and y axes.
+// This could be implemented as lookup table of 40 variable-length lists of unsigned bytes.
+testable int getAlignmentPatternPositions(int version, uint8_t result[7]) {
+	if (version == 1)
+		return 0;
+	int numAlign = version / 7 + 2;
+	int step = (version == 32) ? 26 :
+		(version*4 + numAlign*2 + 1) / (numAlign*2 - 2) * 2;
+	for (int i = numAlign - 1, pos = version * 4 + 10; i >= 1; i--, pos -= step)
+		result[i] = (uint8_t)pos;
+	result[0] = 6;
+	return numAlign;
+}
+
+
+// Sets every pixel in the range [left : left + width] * [top : top + height] to black.
+static void fillRectangle(int left, int top, int width, int height, uint8_t qrcode[]) {
+	for (int dy = 0; dy < height; dy++) {
+		for (int dx = 0; dx < width; dx++)
+			setModule(qrcode, left + dx, top + dy, true);
+	}
+}
+
+
+
+/*---- Drawing data modules and masking ----*/
+
+// Draws the raw codewords (including data and ECC) onto the given QR Code. This requires the initial state of
+// the QR Code to be black at function modules and white at codeword modules (including unused remainder bits).
+static void drawCodewords(const uint8_t data[], int dataLen, uint8_t qrcode[]) {
+	int qrsize = qrcodegen_getSize(qrcode);
+	int i = 0;  // Bit index into the data
+	// Do the funny zigzag scan
+	for (int right = qrsize - 1; right >= 1; right -= 2) {  // Index of right column in each column pair
+		if (right == 6)
+			right = 5;
+		for (int vert = 0; vert < qrsize; vert++) {  // Vertical counter
+			for (int j = 0; j < 2; j++) {
+				int x = right - j;  // Actual x coordinate
+				bool upward = ((right + 1) & 2) == 0;
+				int y = upward ? qrsize - 1 - vert : vert;  // Actual y coordinate
+				if (!getModule(qrcode, x, y) && i < dataLen * 8) {
+					bool black = getBit(data[i >> 3], 7 - (i & 7));
+					setModule(qrcode, x, y, black);
+					i++;
+				}
+				// If this QR Code has any remainder bits (0 to 7), they were assigned as
+				// 0/false/white by the constructor and are left unchanged by this method
+			}
+		}
+	}
+	assert(i == dataLen * 8);
+}
+
+
+// XORs the codeword modules in this QR Code with the given mask pattern.
+// The function modules must be marked and the codeword bits must be drawn
+// before masking. Due to the arithmetic of XOR, calling applyMask() with
+// the same mask value a second time will undo the mask. A final well-formed
+// QR Code needs exactly one (not zero, two, etc.) mask applied.
+static void applyMask(const uint8_t functionModules[], uint8_t qrcode[], enum qrcodegen_Mask mask) {
+	assert(0 <= (int)mask && (int)mask <= 7);  // Disallows qrcodegen_Mask_AUTO
+	int qrsize = qrcodegen_getSize(qrcode);
+	for (int y = 0; y < qrsize; y++) {
+		for (int x = 0; x < qrsize; x++) {
+			if (getModule(functionModules, x, y))
+				continue;
+			bool invert;
+			switch ((int)mask) {
+				case 0:  invert = (x + y) % 2 == 0;                    break;
+				case 1:  invert = y % 2 == 0;                          break;
+				case 2:  invert = x % 3 == 0;                          break;
+				case 3:  invert = (x + y) % 3 == 0;                    break;
+				case 4:  invert = (x / 3 + y / 2) % 2 == 0;            break;
+				case 5:  invert = x * y % 2 + x * y % 3 == 0;          break;
+				case 6:  invert = (x * y % 2 + x * y % 3) % 2 == 0;    break;
+				case 7:  invert = ((x + y) % 2 + x * y % 3) % 2 == 0;  break;
+				default:  assert(false);  return;
+			}
+			bool val = getModule(qrcode, x, y);
+			setModule(qrcode, x, y, val ^ invert);
+		}
+	}
+}
+
+
+// Calculates and returns the penalty score based on state of the given QR Code's current modules.
+// This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score.
+static long getPenaltyScore(const uint8_t qrcode[]) {
+	int qrsize = qrcodegen_getSize(qrcode);
+	long result = 0;
+
+	// Adjacent modules in row having same color, and finder-like patterns
+	for (int y = 0; y < qrsize; y++) {
+		bool runColor = false;
+		int runX = 0;
+		int runHistory[7] = {0};
+		int padRun = qrsize;  // Add white border to initial run
+		for (int x = 0; x < qrsize; x++) {
+			if (getModule(qrcode, x, y) == runColor) {
+				runX++;
+				if (runX == 5)
+					result += PENALTY_N1;
+				else if (runX > 5)
+					result++;
+			} else {
+				finderPenaltyAddHistory(runX + padRun, runHistory);
+				padRun = 0;
+				if (!runColor)
+					result += finderPenaltyCountPatterns(runHistory, qrsize) * PENALTY_N3;
+				runColor = getModule(qrcode, x, y);
+				runX = 1;
+			}
+		}
+		result += finderPenaltyTerminateAndCount(runColor, runX + padRun, runHistory, qrsize) * PENALTY_N3;
+	}
+	// Adjacent modules in column having same color, and finder-like patterns
+	for (int x = 0; x < qrsize; x++) {
+		bool runColor = false;
+		int runY = 0;
+		int runHistory[7] = {0};
+		int padRun = qrsize;  // Add white border to initial run
+		for (int y = 0; y < qrsize; y++) {
+			if (getModule(qrcode, x, y) == runColor) {
+				runY++;
+				if (runY == 5)
+					result += PENALTY_N1;
+				else if (runY > 5)
+					result++;
+			} else {
+				finderPenaltyAddHistory(runY + padRun, runHistory);
+				padRun = 0;
+				if (!runColor)
+					result += finderPenaltyCountPatterns(runHistory, qrsize) * PENALTY_N3;
+				runColor = getModule(qrcode, x, y);
+				runY = 1;
+			}
+		}
+		result += finderPenaltyTerminateAndCount(runColor, runY + padRun, runHistory, qrsize) * PENALTY_N3;
+	}
+
+	// 2*2 blocks of modules having same color
+	for (int y = 0; y < qrsize - 1; y++) {
+		for (int x = 0; x < qrsize - 1; x++) {
+			bool  color = getModule(qrcode, x, y);
+			if (  color == getModule(qrcode, x + 1, y) &&
+			      color == getModule(qrcode, x, y + 1) &&
+			      color == getModule(qrcode, x + 1, y + 1))
+				result += PENALTY_N2;
+		}
+	}
+
+	// Balance of black and white modules
+	int black = 0;
+	for (int y = 0; y < qrsize; y++) {
+		for (int x = 0; x < qrsize; x++) {
+			if (getModule(qrcode, x, y))
+				black++;
+		}
+	}
+	int total = qrsize * qrsize;  // Note that size is odd, so black/total != 1/2
+	// Compute the smallest integer k >= 0 such that (45-5k)% <= black/total <= (55+5k)%
+	int k = (int)((labs(black * 20L - total * 10L) + total - 1) / total) - 1;
+	result += k * PENALTY_N4;
+	return result;
+}
+
+
+// Can only be called immediately after a white run is added, and
+// returns either 0, 1, or 2. A helper function for getPenaltyScore().
+static int finderPenaltyCountPatterns(const int runHistory[7], int qrsize) {
+	int n = runHistory[1];
+	assert(n <= qrsize * 3);
+	bool core = n > 0 && runHistory[2] == n && runHistory[3] == n * 3 && runHistory[4] == n && runHistory[5] == n;
+	// The maximum QR Code size is 177, hence the black run length n <= 177.
+	// Arithmetic is promoted to int, so n*4 will not overflow.
+	return (core && runHistory[0] >= n * 4 && runHistory[6] >= n ? 1 : 0)
+	     + (core && runHistory[6] >= n * 4 && runHistory[0] >= n ? 1 : 0);
+}
+
+
+// Must be called at the end of a line (row or column) of modules. A helper function for getPenaltyScore().
+static int finderPenaltyTerminateAndCount(bool currentRunColor, int currentRunLength, int runHistory[7], int qrsize) {
+	if (currentRunColor) {  // Terminate black run
+		finderPenaltyAddHistory(currentRunLength, runHistory);
+		currentRunLength = 0;
+	}
+	currentRunLength += qrsize;  // Add white border to final run
+	finderPenaltyAddHistory(currentRunLength, runHistory);
+	return finderPenaltyCountPatterns(runHistory, qrsize);
+}
+
+
+// Pushes the given value to the front and drops the last value. A helper function for getPenaltyScore().
+static void finderPenaltyAddHistory(int currentRunLength, int runHistory[7]) {
+	memmove(&runHistory[1], &runHistory[0], 6 * sizeof(runHistory[0]));
+	runHistory[0] = currentRunLength;
+}
+
+
+
+/*---- Basic QR Code information ----*/
+
+// Public function - see documentation comment in header file.
+int qrcodegen_getSize(const uint8_t qrcode[]) {
+	assert(qrcode != NULL);
+	int result = qrcode[0];
+	assert((qrcodegen_VERSION_MIN * 4 + 17) <= result
+		&& result <= (qrcodegen_VERSION_MAX * 4 + 17));
+	return result;
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y) {
+	assert(qrcode != NULL);
+	int qrsize = qrcode[0];
+	return (0 <= x && x < qrsize && 0 <= y && y < qrsize) && getModule(qrcode, x, y);
+}
+
+
+// Gets the module at the given coordinates, which must be in bounds.
+testable bool getModule(const uint8_t qrcode[], int x, int y) {
+	int qrsize = qrcode[0];
+	assert(21 <= qrsize && qrsize <= 177 && 0 <= x && x < qrsize && 0 <= y && y < qrsize);
+	int index = y * qrsize + x;
+	return getBit(qrcode[(index >> 3) + 1], index & 7);
+}
+
+
+// Sets the module at the given coordinates, which must be in bounds.
+testable void setModule(uint8_t qrcode[], int x, int y, bool isBlack) {
+	int qrsize = qrcode[0];
+	assert(21 <= qrsize && qrsize <= 177 && 0 <= x && x < qrsize && 0 <= y && y < qrsize);
+	int index = y * qrsize + x;
+	int bitIndex = index & 7;
+	int byteIndex = (index >> 3) + 1;
+	if (isBlack)
+		qrcode[byteIndex] |= 1 << bitIndex;
+	else
+		qrcode[byteIndex] &= (1 << bitIndex) ^ 0xFF;
+}
+
+
+// Sets the module at the given coordinates, doing nothing if out of bounds.
+testable void setModuleBounded(uint8_t qrcode[], int x, int y, bool isBlack) {
+	int qrsize = qrcode[0];
+	if (0 <= x && x < qrsize && 0 <= y && y < qrsize)
+		setModule(qrcode, x, y, isBlack);
+}
+
+
+// Returns true iff the i'th bit of x is set to 1. Requires x >= 0 and 0 <= i <= 14.
+static bool getBit(int x, int i) {
+	return ((x >> i) & 1) != 0;
+}
+
+
+
+/*---- Segment handling ----*/
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_isAlphanumeric(const char *text) {
+	assert(text != NULL);
+	for (; *text != '\0'; text++) {
+		if (strchr(ALPHANUMERIC_CHARSET, *text) == NULL)
+			return false;
+	}
+	return true;
+}
+
+
+// Public function - see documentation comment in header file.
+bool qrcodegen_isNumeric(const char *text) {
+	assert(text != NULL);
+	for (; *text != '\0'; text++) {
+		if (*text < '0' || *text > '9')
+			return false;
+	}
+	return true;
+}
+
+
+// Public function - see documentation comment in header file.
+size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars) {
+	int temp = calcSegmentBitLength(mode, numChars);
+	if (temp == -1)
+		return SIZE_MAX;
+	assert(0 <= temp && temp <= INT16_MAX);
+	return ((size_t)temp + 7) / 8;
+}
+
+
+// Returns the number of data bits needed to represent a segment
+// containing the given number of characters using the given mode. Notes:
+// - Returns -1 on failure, i.e. numChars > INT16_MAX or
+//   the number of needed bits exceeds INT16_MAX (i.e. 32767).
+// - Otherwise, all valid results are in the range [0, INT16_MAX].
+// - For byte mode, numChars measures the number of bytes, not Unicode code points.
+// - For ECI mode, numChars must be 0, and the worst-case number of bits is returned.
+//   An actual ECI segment can have shorter data. For non-ECI modes, the result is exact.
+testable int calcSegmentBitLength(enum qrcodegen_Mode mode, size_t numChars) {
+	// All calculations are designed to avoid overflow on all platforms
+	if (numChars > (unsigned int)INT16_MAX)
+		return -1;
+	long result = (long)numChars;
+	if (mode == qrcodegen_Mode_NUMERIC)
+		result = (result * 10 + 2) / 3;  // ceil(10/3 * n)
+	else if (mode == qrcodegen_Mode_ALPHANUMERIC)
+		result = (result * 11 + 1) / 2;  // ceil(11/2 * n)
+	else if (mode == qrcodegen_Mode_BYTE)
+		result *= 8;
+	else if (mode == qrcodegen_Mode_KANJI)
+		result *= 13;
+	else if (mode == qrcodegen_Mode_ECI && numChars == 0)
+		result = 3 * 8;
+	else {  // Invalid argument
+		assert(false);
+		return -1;
+	}
+	assert(result >= 0);
+	if (result > INT16_MAX)
+		return -1;
+	return (int)result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]) {
+	assert(data != NULL || len == 0);
+	struct qrcodegen_Segment result;
+	result.mode = qrcodegen_Mode_BYTE;
+	result.bitLength = calcSegmentBitLength(result.mode, len);
+	assert(result.bitLength != -1);
+	result.numChars = (int)len;
+	if (len > 0)
+		memcpy(buf, data, len * sizeof(buf[0]));
+	result.data = buf;
+	return result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]) {
+	assert(digits != NULL);
+	struct qrcodegen_Segment result;
+	size_t len = strlen(digits);
+	result.mode = qrcodegen_Mode_NUMERIC;
+	int bitLen = calcSegmentBitLength(result.mode, len);
+	assert(bitLen != -1);
+	result.numChars = (int)len;
+	if (bitLen > 0)
+		memset(buf, 0, ((size_t)bitLen + 7) / 8 * sizeof(buf[0]));
+	result.bitLength = 0;
+
+	unsigned int accumData = 0;
+	int accumCount = 0;
+	for (; *digits != '\0'; digits++) {
+		char c = *digits;
+		assert('0' <= c && c <= '9');
+		accumData = accumData * 10 + (unsigned int)(c - '0');
+		accumCount++;
+		if (accumCount == 3) {
+			appendBitsToBuffer(accumData, 10, buf, &result.bitLength);
+			accumData = 0;
+			accumCount = 0;
+		}
+	}
+	if (accumCount > 0)  // 1 or 2 digits remaining
+		appendBitsToBuffer(accumData, accumCount * 3 + 1, buf, &result.bitLength);
+	assert(result.bitLength == bitLen);
+	result.data = buf;
+	return result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]) {
+	assert(text != NULL);
+	struct qrcodegen_Segment result;
+	size_t len = strlen(text);
+	result.mode = qrcodegen_Mode_ALPHANUMERIC;
+	int bitLen = calcSegmentBitLength(result.mode, len);
+	assert(bitLen != -1);
+	result.numChars = (int)len;
+	if (bitLen > 0)
+		memset(buf, 0, ((size_t)bitLen + 7) / 8 * sizeof(buf[0]));
+	result.bitLength = 0;
+
+	unsigned int accumData = 0;
+	int accumCount = 0;
+	for (; *text != '\0'; text++) {
+		const char *temp = strchr(ALPHANUMERIC_CHARSET, *text);
+		assert(temp != NULL);
+		accumData = accumData * 45 + (unsigned int)(temp - ALPHANUMERIC_CHARSET);
+		accumCount++;
+		if (accumCount == 2) {
+			appendBitsToBuffer(accumData, 11, buf, &result.bitLength);
+			accumData = 0;
+			accumCount = 0;
+		}
+	}
+	if (accumCount > 0)  // 1 character remaining
+		appendBitsToBuffer(accumData, 6, buf, &result.bitLength);
+	assert(result.bitLength == bitLen);
+	result.data = buf;
+	return result;
+}
+
+
+// Public function - see documentation comment in header file.
+struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]) {
+	struct qrcodegen_Segment result;
+	result.mode = qrcodegen_Mode_ECI;
+	result.numChars = 0;
+	result.bitLength = 0;
+	if (assignVal < 0)
+		assert(false);
+	else if (assignVal < (1 << 7)) {
+		memset(buf, 0, 1 * sizeof(buf[0]));
+		appendBitsToBuffer((unsigned int)assignVal, 8, buf, &result.bitLength);
+	} else if (assignVal < (1 << 14)) {
+		memset(buf, 0, 2 * sizeof(buf[0]));
+		appendBitsToBuffer(2, 2, buf, &result.bitLength);
+		appendBitsToBuffer((unsigned int)assignVal, 14, buf, &result.bitLength);
+	} else if (assignVal < 1000000L) {
+		memset(buf, 0, 3 * sizeof(buf[0]));
+		appendBitsToBuffer(6, 3, buf, &result.bitLength);
+		appendBitsToBuffer((unsigned int)(assignVal >> 10), 11, buf, &result.bitLength);
+		appendBitsToBuffer((unsigned int)(assignVal & 0x3FF), 10, buf, &result.bitLength);
+	} else
+		assert(false);
+	result.data = buf;
+	return result;
+}
+
+
+// Calculates the number of bits needed to encode the given segments at the given version.
+// Returns a non-negative number if successful. Otherwise returns -1 if a segment has too
+// many characters to fit its length field, or the total bits exceeds INT16_MAX.
+testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int version) {
+	assert(segs != NULL || len == 0);
+	long result = 0;
+	for (size_t i = 0; i < len; i++) {
+		int numChars  = segs[i].numChars;
+		int bitLength = segs[i].bitLength;
+		assert(0 <= numChars  && numChars  <= INT16_MAX);
+		assert(0 <= bitLength && bitLength <= INT16_MAX);
+		int ccbits = numCharCountBits(segs[i].mode, version);
+		assert(0 <= ccbits && ccbits <= 16);
+		if (numChars >= (1L << ccbits))
+			return -1;  // The segment's length doesn't fit the field's bit width
+		result += 4L + ccbits + bitLength;
+		if (result > INT16_MAX)
+			return -1;  // The sum might overflow an int type
+	}
+	assert(0 <= result && result <= INT16_MAX);
+	return (int)result;
+}
+
+
+// Returns the bit width of the character count field for a segment in the given mode
+// in a QR Code at the given version number. The result is in the range [0, 16].
+static int numCharCountBits(enum qrcodegen_Mode mode, int version) {
+	assert(qrcodegen_VERSION_MIN <= version && version <= qrcodegen_VERSION_MAX);
+	int i = (version + 7) / 17;
+	switch (mode) {
+		case qrcodegen_Mode_NUMERIC     : { static const int temp[] = {10, 12, 14}; return temp[i]; }
+		case qrcodegen_Mode_ALPHANUMERIC: { static const int temp[] = { 9, 11, 13}; return temp[i]; }
+		case qrcodegen_Mode_BYTE        : { static const int temp[] = { 8, 16, 16}; return temp[i]; }
+		case qrcodegen_Mode_KANJI       : { static const int temp[] = { 8, 10, 12}; return temp[i]; }
+		case qrcodegen_Mode_ECI         : return 0;
+		default:  assert(false);  return -1;  // Dummy value
+	}
+}
diff --git a/examples/common/qrcode/src/qrcodegen.h b/examples/common/qrcode/src/qrcodegen.h
new file mode 100644
index 0000000..f76be20
--- /dev/null
+++ b/examples/common/qrcode/src/qrcodegen.h
@@ -0,0 +1,311 @@
+/*
+ * QR Code generator library (C)
+ *
+ * Copyright (c) Project Nayuki. (MIT License)
+ * https://www.nayuki.io/page/qr-code-generator-library
+ *
+ * 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.
+ */
+
+#pragma once
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+ * This library creates QR Code symbols, which is a type of two-dimension barcode.
+ * Invented by Denso Wave and described in the ISO/IEC 18004 standard.
+ * A QR Code structure is an immutable square grid of black and white cells.
+ * The library provides functions to create a QR Code from text or binary data.
+ * The library covers the QR Code Model 2 specification, supporting all versions (sizes)
+ * from 1 to 40, all 4 error correction levels, and 4 character encoding modes.
+ *
+ * Ways to create a QR Code object:
+ * - High level: Take the payload data and call qrcodegen_encodeText() or qrcodegen_encodeBinary().
+ * - Low level: Custom-make the list of segments and call
+ *   qrcodegen_encodeSegments() or qrcodegen_encodeSegmentsAdvanced().
+ * (Note that all ways require supplying the desired error correction level and various byte buffers.)
+ */
+
+
+/*---- Enum and struct types----*/
+
+/*
+ * The error correction level in a QR Code symbol.
+ */
+enum qrcodegen_Ecc {
+	// Must be declared in ascending order of error protection
+	// so that an internal qrcodegen function works properly
+	qrcodegen_Ecc_LOW = 0 ,  // The QR Code can tolerate about  7% erroneous codewords
+	qrcodegen_Ecc_MEDIUM  ,  // The QR Code can tolerate about 15% erroneous codewords
+	qrcodegen_Ecc_QUARTILE,  // The QR Code can tolerate about 25% erroneous codewords
+	qrcodegen_Ecc_HIGH    ,  // The QR Code can tolerate about 30% erroneous codewords
+};
+
+
+/*
+ * The mask pattern used in a QR Code symbol.
+ */
+enum qrcodegen_Mask {
+	// A special value to tell the QR Code encoder to
+	// automatically select an appropriate mask pattern
+	qrcodegen_Mask_AUTO = -1,
+	// The eight actual mask patterns
+	qrcodegen_Mask_0 = 0,
+	qrcodegen_Mask_1,
+	qrcodegen_Mask_2,
+	qrcodegen_Mask_3,
+	qrcodegen_Mask_4,
+	qrcodegen_Mask_5,
+	qrcodegen_Mask_6,
+	qrcodegen_Mask_7,
+};
+
+
+/*
+ * Describes how a segment's data bits are interpreted.
+ */
+enum qrcodegen_Mode {
+	qrcodegen_Mode_NUMERIC      = 0x1,
+	qrcodegen_Mode_ALPHANUMERIC = 0x2,
+	qrcodegen_Mode_BYTE         = 0x4,
+	qrcodegen_Mode_KANJI        = 0x8,
+	qrcodegen_Mode_ECI          = 0x7,
+};
+
+
+/*
+ * A segment of character/binary/control data in a QR Code symbol.
+ * The mid-level way to create a segment is to take the payload data
+ * and call a factory function such as qrcodegen_makeNumeric().
+ * The low-level way to create a segment is to custom-make the bit buffer
+ * and initialize a qrcodegen_Segment struct with appropriate values.
+ * Even in the most favorable conditions, a QR Code can only hold 7089 characters of data.
+ * Any segment longer than this is meaningless for the purpose of generating QR Codes.
+ * Moreover, the maximum allowed bit length is 32767 because
+ * the largest QR Code (version 40) has 31329 modules.
+ */
+struct qrcodegen_Segment {
+	// The mode indicator of this segment.
+	enum qrcodegen_Mode mode;
+
+	// The length of this segment's unencoded data. Measured in characters for
+	// numeric/alphanumeric/kanji mode, bytes for byte mode, and 0 for ECI mode.
+	// Always zero or positive. Not the same as the data's bit length.
+	int numChars;
+
+	// The data bits of this segment, packed in bitwise big endian.
+	// Can be null if the bit length is zero.
+	uint8_t *data;
+
+	// The number of valid data bits used in the buffer. Requires
+	// 0 <= bitLength <= 32767, and bitLength <= (capacity of data array) * 8.
+	// The character count (numChars) must agree with the mode and the bit buffer length.
+	int bitLength;
+};
+
+
+
+/*---- Macro constants and functions ----*/
+
+#define qrcodegen_VERSION_MIN   1  // The minimum version number supported in the QR Code Model 2 standard
+#define qrcodegen_VERSION_MAX  40  // The maximum version number supported in the QR Code Model 2 standard
+
+// Calculates the number of bytes needed to store any QR Code up to and including the given version number,
+// as a compile-time constant. For example, 'uint8_t buffer[qrcodegen_BUFFER_LEN_FOR_VERSION(25)];'
+// can store any single QR Code from version 1 to 25 (inclusive). The result fits in an int (or int16).
+// Requires qrcodegen_VERSION_MIN <= n <= qrcodegen_VERSION_MAX.
+#define qrcodegen_BUFFER_LEN_FOR_VERSION(n)  ((((n) * 4 + 17) * ((n) * 4 + 17) + 7) / 8 + 1)
+
+// The worst-case number of bytes needed to store one QR Code, up to and including
+// version 40. This value equals 3918, which is just under 4 kilobytes.
+// Use this more convenient value to avoid calculating tighter memory bounds for buffers.
+#define qrcodegen_BUFFER_LEN_MAX  qrcodegen_BUFFER_LEN_FOR_VERSION(qrcodegen_VERSION_MAX)
+
+
+
+/*---- Functions (high level) to generate QR Codes ----*/
+
+/*
+ * Encodes the given text string to a QR Code, returning true if encoding succeeded.
+ * If the data is too long to fit in any version in the given range
+ * at the given ECC level, then false is returned.
+ * - The input text must be encoded in UTF-8 and contain no NULs.
+ * - The variables ecl and mask must correspond to enum constant values.
+ * - Requires 1 <= minVersion <= maxVersion <= 40.
+ * - The arrays tempBuffer and qrcode must each have a length
+ *   of at least qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion).
+ * - After the function returns, tempBuffer contains no useful data.
+ * - If successful, the resulting QR Code may use numeric,
+ *   alphanumeric, or byte mode to encode the text.
+ * - In the most optimistic case, a QR Code at version 40 with low ECC
+ *   can hold any UTF-8 string up to 2953 bytes, or any alphanumeric string
+ *   up to 4296 characters, or any digit string up to 7089 characters.
+ *   These numbers represent the hard upper limit of the QR Code standard.
+ * - Please consult the QR Code specification for information on
+ *   data capacities per version, ECC level, and text encoding mode.
+ */
+bool qrcodegen_encodeText(const char *text, uint8_t tempBuffer[], uint8_t qrcode[],
+	enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl);
+
+
+/*
+ * Encodes the given binary data to a QR Code, returning true if encoding succeeded.
+ * If the data is too long to fit in any version in the given range
+ * at the given ECC level, then false is returned.
+ * - The input array range dataAndTemp[0 : dataLen] should normally be
+ *   valid UTF-8 text, but is not required by the QR Code standard.
+ * - The variables ecl and mask must correspond to enum constant values.
+ * - Requires 1 <= minVersion <= maxVersion <= 40.
+ * - The arrays dataAndTemp and qrcode must each have a length
+ *   of at least qrcodegen_BUFFER_LEN_FOR_VERSION(maxVersion).
+ * - After the function returns, the contents of dataAndTemp may have changed,
+ *   and does not represent useful data anymore.
+ * - If successful, the resulting QR Code will use byte mode to encode the data.
+ * - In the most optimistic case, a QR Code at version 40 with low ECC can hold any byte
+ *   sequence up to length 2953. This is the hard upper limit of the QR Code standard.
+ * - Please consult the QR Code specification for information on
+ *   data capacities per version, ECC level, and text encoding mode.
+ */
+bool qrcodegen_encodeBinary(uint8_t dataAndTemp[], size_t dataLen, uint8_t qrcode[],
+	enum qrcodegen_Ecc ecl, int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl);
+
+
+/*---- Functions (low level) to generate QR Codes ----*/
+
+/*
+ * Renders a QR Code representing the given segments at the given error correction level.
+ * The smallest possible QR Code version is automatically chosen for the output. Returns true if
+ * QR Code creation succeeded, or false if the data is too long to fit in any version. The ECC level
+ * of the result may be higher than the ecl argument if it can be done without increasing the version.
+ * This function allows the user to create a custom sequence of segments that switches
+ * between modes (such as alphanumeric and byte) to encode text in less space.
+ * This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary().
+ * To save memory, the segments' data buffers can alias/overlap tempBuffer, and will
+ * result in them being clobbered, but the QR Code output will still be correct.
+ * But the qrcode array must not overlap tempBuffer or any segment's data buffer.
+ */
+bool qrcodegen_encodeSegments(const struct qrcodegen_Segment segs[], size_t len,
+	enum qrcodegen_Ecc ecl, uint8_t tempBuffer[], uint8_t qrcode[]);
+
+
+/*
+ * Renders a QR Code representing the given segments with the given encoding parameters.
+ * Returns true if QR Code creation succeeded, or false if the data is too long to fit in the range of versions.
+ * The smallest possible QR Code version within the given range is automatically
+ * chosen for the output. Iff boostEcl is true, then the ECC level of the result
+ * may be higher than the ecl argument if it can be done without increasing the
+ * version. The mask is either between qrcodegen_Mask_0 to 7 to force that mask, or
+ * qrcodegen_Mask_AUTO to automatically choose an appropriate mask (which may be slow).
+ * This function allows the user to create a custom sequence of segments that switches
+ * between modes (such as alphanumeric and byte) to encode text in less space.
+ * This is a low-level API; the high-level API is qrcodegen_encodeText() and qrcodegen_encodeBinary().
+ * To save memory, the segments' data buffers can alias/overlap tempBuffer, and will
+ * result in them being clobbered, but the QR Code output will still be correct.
+ * But the qrcode array must not overlap tempBuffer or any segment's data buffer.
+ */
+bool qrcodegen_encodeSegmentsAdvanced(const struct qrcodegen_Segment segs[], size_t len, enum qrcodegen_Ecc ecl,
+	int minVersion, int maxVersion, enum qrcodegen_Mask mask, bool boostEcl, uint8_t tempBuffer[], uint8_t qrcode[]);
+
+
+/*
+ * Tests whether the given string can be encoded as a segment in alphanumeric mode.
+ * A string is encodable iff each character is in the following set: 0 to 9, A to Z
+ * (uppercase only), space, dollar, percent, asterisk, plus, hyphen, period, slash, colon.
+ */
+bool qrcodegen_isAlphanumeric(const char *text);
+
+
+/*
+ * Tests whether the given string can be encoded as a segment in numeric mode.
+ * A string is encodable iff each character is in the range 0 to 9.
+ */
+bool qrcodegen_isNumeric(const char *text);
+
+
+/*
+ * Returns the number of bytes (uint8_t) needed for the data buffer of a segment
+ * containing the given number of characters using the given mode. Notes:
+ * - Returns SIZE_MAX on failure, i.e. numChars > INT16_MAX or
+ *   the number of needed bits exceeds INT16_MAX (i.e. 32767).
+ * - Otherwise, all valid results are in the range [0, ceil(INT16_MAX / 8)], i.e. at most 4096.
+ * - It is okay for the user to allocate more bytes for the buffer than needed.
+ * - For byte mode, numChars measures the number of bytes, not Unicode code points.
+ * - For ECI mode, numChars must be 0, and the worst-case number of bytes is returned.
+ *   An actual ECI segment can have shorter data. For non-ECI modes, the result is exact.
+ */
+size_t qrcodegen_calcSegmentBufferSize(enum qrcodegen_Mode mode, size_t numChars);
+
+
+/*
+ * Returns a segment representing the given binary data encoded in
+ * byte mode. All input byte arrays are acceptable. Any text string
+ * can be converted to UTF-8 bytes and encoded as a byte mode segment.
+ */
+struct qrcodegen_Segment qrcodegen_makeBytes(const uint8_t data[], size_t len, uint8_t buf[]);
+
+
+/*
+ * Returns a segment representing the given string of decimal digits encoded in numeric mode.
+ */
+struct qrcodegen_Segment qrcodegen_makeNumeric(const char *digits, uint8_t buf[]);
+
+
+/*
+ * Returns a segment representing the given text string encoded in alphanumeric mode.
+ * The characters allowed are: 0 to 9, A to Z (uppercase only), space,
+ * dollar, percent, asterisk, plus, hyphen, period, slash, colon.
+ */
+struct qrcodegen_Segment qrcodegen_makeAlphanumeric(const char *text, uint8_t buf[]);
+
+
+/*
+ * Returns a segment representing an Extended Channel Interpretation
+ * (ECI) designator with the given assignment value.
+ */
+struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]);
+
+
+/*---- Functions to extract raw data from QR Codes ----*/
+
+/*
+ * Returns the side length of the given QR Code, assuming that encoding succeeded.
+ * The result is in the range [21, 177]. Note that the length of the array buffer
+ * is related to the side length - every 'uint8_t qrcode[]' must have length at least
+ * qrcodegen_BUFFER_LEN_FOR_VERSION(version), which equals ceil(size^2 / 8 + 1).
+ */
+int qrcodegen_getSize(const uint8_t qrcode[]);
+
+
+/*
+ * Returns the color of the module (pixel) at the given coordinates, which is false
+ * for white or true for black. The top left corner has the coordinates (x=0, y=0).
+ * If the given coordinates are out of bounds, then false (white) is returned.
+ */
+bool qrcodegen_getModule(const uint8_t qrcode[], int x, int y);
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/examples/data_tlv8/CMakeLists.txt b/examples/data_tlv8/CMakeLists.txt
new file mode 100644
index 0000000..4daa629
--- /dev/null
+++ b/examples/data_tlv8/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# (Automatically converted from project Makefile by convert_to_cmake.py.)
+
+# The following lines of boilerplate have to be in your project's CMakeLists
+# in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+if(DEFINED ENV{HOMEKIT_PATH})
+  set(HOMEKIT_PATH $ENV{HOMEKIT_PATH})
+else()
+  set(HOMEKIT_PATH ${CMAKE_CURRENT_LIST_DIR}/../..)
+endif(DEFINED ENV{HOMEKIT_PATH})
+
+set(EXTRA_COMPONENT_DIRS ${HOMEKIT_PATH}/components ${HOMEKIT_PATH}/components/homekit ${CMAKE_CURRENT_LIST_DIR}/../common)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(data_tlv8)
diff --git a/examples/data_tlv8/Makefile b/examples/data_tlv8/Makefile
new file mode 100755
index 0000000..9702e96
--- /dev/null
+++ b/examples/data_tlv8/Makefile
@@ -0,0 +1,15 @@
+#
+# This is a project Makefile. It is assumed the directory this Makefile resides in is a
+# project subdirectory.
+#
+
+HOMEKIT_PATH ?= $(abspath $(shell pwd)/../..)
+COMMON_COMPONENT_PATH ?= $(abspath $(shell pwd)/../common)
+
+PROJECT_NAME := data_tlv8
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/homekit
+EXTRA_COMPONENT_DIRS += $(COMMON_COMPONENT_PATH)
+
+include $(IDF_PATH)/make/project.mk
+
diff --git a/examples/data_tlv8/main/CMakeLists.txt b/examples/data_tlv8/main/CMakeLists.txt
new file mode 100644
index 0000000..7fb6738
--- /dev/null
+++ b/examples/data_tlv8/main/CMakeLists.txt
@@ -0,0 +1 @@
+idf_component_register(SRCS ./app_main.c)
diff --git a/examples/data_tlv8/main/Kconfig.projbuild b/examples/data_tlv8/main/Kconfig.projbuild
new file mode 100644
index 0000000..6f3e3fe
--- /dev/null
+++ b/examples/data_tlv8/main/Kconfig.projbuild
@@ -0,0 +1,26 @@
+menu "Example Configuration"
+
+    config EXAMPLE_USE_HARDCODED_SETUP_CODE
+        bool "Use hard-coded setup code"
+        default y
+        help
+            HomeKit does not recommend having the setup code programmed in the accessory as is.
+            Instead, it expects setup info (salt-verifier pair) generated for the given setup code.
+            Use this option only for testing purposes. For production, the setup info should be
+            used.
+
+    config EXAMPLE_SETUP_CODE
+        string "HomeKit Setup Code"
+        default "111-22-333"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup code to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+    config EXAMPLE_SETUP_ID
+        string "HomeKit Setup Id"
+        default "ES32"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup id to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+endmenu
diff --git a/examples/data_tlv8/main/app_main.c b/examples/data_tlv8/main/app_main.c
new file mode 100644
index 0000000..c0a1657
--- /dev/null
+++ b/examples/data_tlv8/main/app_main.c
@@ -0,0 +1,336 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2018 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+/* HomeKit Sensor Example with custom data/tlv8 characteristics
+*/
+#include <stdio.h>
+#include <string.h>
+
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <esp_log.h>
+
+#include <hap.h>
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+
+#include <iot_button.h>
+
+#include <app_wifi.h>
+#include <app_hap_setup_payload.h>
+
+static const char *TAG = "HAP Sensor";
+
+#define SENSOR_TASK_PRIORITY  1
+#define SENSOR_TASK_STACKSIZE 4 * 1024
+#define SENSOR_TASK_NAME      "hap_sensor"
+
+/* Reset network credentials if button is pressed for more than 3 seconds and then released */
+#define RESET_NETWORK_BUTTON_TIMEOUT        3
+
+/* Reset to factory if button is pressed and held for more than 10 seconds */
+#define RESET_TO_FACTORY_BUTTON_TIMEOUT     10
+
+/* The button "Boot" will be used as the Reset button for the example */
+#define RESET_GPIO  GPIO_NUM_0
+/**
+ * @brief The network reset button callback handler.
+ * Useful for testing the Wi-Fi re-configuration feature of WAC2
+ */
+static void reset_network_handler(void* arg)
+{
+    hap_reset_network();
+}
+/**
+ * @brief The factory reset button callback handler.
+ */
+static void reset_to_factory_handler(void* arg)
+{
+    hap_reset_to_factory();
+}
+
+/**
+ * The Reset button  GPIO initialisation function.
+ * Same button will be used for resetting Wi-Fi network as well as for reset to factory based on
+ * the time for which the button is pressed.
+ */
+static void reset_key_init(uint32_t key_gpio_pin)
+{
+    button_handle_t handle = iot_button_create(key_gpio_pin, BUTTON_ACTIVE_LOW);
+    iot_button_add_on_release_cb(handle, RESET_NETWORK_BUTTON_TIMEOUT, reset_network_handler, NULL);
+    iot_button_add_on_press_cb(handle, RESET_TO_FACTORY_BUTTON_TIMEOUT, reset_to_factory_handler, NULL);
+}
+
+
+/* Mandatory identify routine for the accessory.
+ * In a real accessory, something like LED blink should be implemented
+ * got visual identification
+ */
+static int sensor_identify(hap_acc_t *ha)
+{
+    ESP_LOGI(TAG, "Sensor identified");
+    return HAP_SUCCESS;
+}
+
+/* A dummy callback for handling a read on the "Temperature" characteristic of Sensor.
+ * In an actual accessory, this should read from the hardware
+ */
+static int sensor_read(hap_char_t *hc, hap_status_t *status_code, void *serv_priv, void *read_priv)
+{
+    if (!strcmp(hap_char_get_type_uuid(hc), HAP_CHAR_UUID_CURRENT_TEMPERATURE)) {
+        ESP_LOGI(TAG, "Received Read for Current Temperature");
+        const hap_val_t *cur_val = hap_char_get_val(hc);
+        ESP_LOGI(TAG, "Current Value: %f", cur_val->f);
+        /* We are setting a fummy value here, which is 1 more than the current value.
+         * If the value overflows max limit of 100, we reset it to 0
+         * TODO: Read from actual hardware
+         */
+        hap_val_t new_val;
+        new_val.f = cur_val->f + 1.0;
+        if (new_val.f > 100) {
+            new_val.f = 0;
+        }
+        ESP_LOGI(TAG, "Updated Value: %f", new_val.f);
+        hap_char_update_val(hc, &new_val);
+        *status_code = HAP_STATUS_SUCCESS;
+        return HAP_SUCCESS;
+    } else {
+        *status_code = HAP_STATUS_RES_ABSENT;
+    }
+    return HAP_FAIL;
+}
+
+/** Buffers to hold data/tlv8 values. The HomeKit core does not maintain a copy of
+ * the values. It will just keep the pointers.
+ */
+uint8_t mydata[128];
+uint8_t mytlv8[128];
+
+/** Custom UUIDs for the custom service and characteristics */
+#define APP_CUSTOM_SERV_UUID        "8517ab60-73bd-11e8-adc0-fa7ae01bbebc"
+#define APP_CUSTOM_CHAR_DATA_UUID   "8517ade0-73bd-11e8-adc0-fa7ae01bbebc"
+#define APP_CUSTOM_CHAR_TLV8_UUID   "8517af8e-73bd-11e8-adc0-fa7ae01bbebc"
+
+static void hex_dbg_print(char *name, unsigned char *buf, int buf_len)
+{
+	int i;
+	printf("%s: ", name);
+	for (i = 0; i < buf_len; i++) {
+		if (i % 16 == 0)
+			printf("\r\n");
+		printf("%02x ", buf[i]);
+	}
+	printf("\r\n");
+}
+
+/* Read routine for the custom data/tlv8 characteristics */
+static int custom_serv_read(hap_char_t *hc, hap_status_t *status, void *serv_priv, void *read_priv)
+{
+    int ret = HAP_SUCCESS;
+    if (!strcmp(hap_char_get_type_uuid(hc), APP_CUSTOM_CHAR_DATA_UUID)) {
+        const hap_val_t *cur_val = hap_char_get_val(hc);
+        hap_data_val_t data;
+        /* Changing the first byte of existing data, just to demonstrate a value change on read */
+        mydata[0] = 0xaa;
+        data.buf = mydata;
+        data.buflen = cur_val->d.buflen;
+        hap_val_t new_val = {
+            .d = data,
+        };
+        hex_dbg_print("Read data", data.buf, data.buflen);
+        hap_char_update_val(hc, &new_val);
+        *status = HAP_STATUS_SUCCESS;
+    } else if (!strcmp(hap_char_get_type_uuid(hc), APP_CUSTOM_CHAR_TLV8_UUID)) {
+        const hap_val_t *cur_val = hap_char_get_val(hc);
+        hap_tlv8_val_t tlv8;
+        /* Changing the last byte (if applicable) of existing tlv8, just to demonstrate a value change on read */
+        if (cur_val->t.buflen) {
+            mytlv8[cur_val->t.buflen - 1] = 0xcc;
+        }
+        tlv8.buf = mytlv8;
+        tlv8.buflen = cur_val->t.buflen;
+        hap_val_t new_val = {
+            .t = tlv8,
+        };
+        hex_dbg_print("Read tlv8", tlv8.buf, tlv8.buflen);
+        hap_char_update_val(hc, &new_val);
+        *status = HAP_STATUS_SUCCESS;
+    } else {
+        *status = HAP_STATUS_RES_ABSENT;
+        ret = HAP_FAIL;
+    }
+    return ret;
+}
+
+/* Write routine for the custom data/tlv8 characteristics */
+static int custom_serv_write(hap_write_data_t write_data[], int count,
+        void *serv_priv, void *write_priv)
+{
+    int i, ret = HAP_SUCCESS;
+    hap_write_data_t *write;
+    for (i = 0; i < count; i++) {
+        write = &write_data[i];
+        if (!strcmp(hap_char_get_type_uuid(write->hc), APP_CUSTOM_CHAR_DATA_UUID)) {
+            hex_dbg_print("Write data", write->val.d.buf, write->val.d.buflen);
+            /* Copy the received value to mydata and update */
+            memcpy(mydata, write->val.d.buf, write->val.d.buflen);
+            hap_val_t val;
+            val.d.buf = mydata;
+            val.d.buflen = write->val.d.buflen;
+            hap_char_update_val(write->hc, &val);
+        } else if (!strcmp(hap_char_get_type_uuid(write->hc), APP_CUSTOM_CHAR_TLV8_UUID)) {
+            hex_dbg_print("Write tlv8", write->val.t.buf, write->val.t.buflen);
+            /* Copy the received value to mytlv8 and update */
+            memcpy(mytlv8, write->val.t.buf, write->val.t.buflen); 
+            hap_val_t val;
+            val.t.buf = mytlv8;
+            val.t.buflen = write->val.t.buflen;
+            hap_char_update_val(write->hc, &val);
+        } else {
+            *(write->status) = HAP_STATUS_RES_ABSENT;
+            ret = HAP_FAIL;
+        }
+    }
+    return ret;
+}
+/* Create a custom service with data/tlv8 characteristics */
+hap_serv_t *custom_data_tlv8_serv_create()
+{
+    hap_serv_t *hs = hap_serv_create(APP_CUSTOM_SERV_UUID);
+    /* Initialising the characteristic with some dummy data */
+    uint8_t tmp[] = {0x0a, 0x0b, 0x0c, 0x0d};
+    hap_data_val_t d;
+    memcpy(mydata, tmp, sizeof(tmp));
+    d.buf = mydata;
+    d.buflen = sizeof(tmp);
+    hap_char_t *data = hap_char_data_create(APP_CUSTOM_CHAR_DATA_UUID, HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW, &d);
+    hap_serv_add_char(hs, data);
+
+    /* Initialising characteristic with NULL TLV8 */
+    hap_char_t *tlv8 = hap_char_tlv8_create(APP_CUSTOM_CHAR_TLV8_UUID, HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW, NULL);
+    hap_serv_add_char(hs, tlv8);
+
+    hap_serv_set_read_cb(hs, custom_serv_read);
+    hap_serv_set_write_cb(hs, custom_serv_write);
+    return hs;
+}
+
+/*The main thread for handling the Sensor Accessory */
+static void sensor_thread_entry(void *p)
+{
+    hap_acc_t *accessory;
+    hap_serv_t *service;
+
+    /* Initialize the HAP core */
+    hap_init(HAP_TRANSPORT_WIFI);
+
+    /* Initialise the mandatory parameters for Accessory which will be added as
+     * the mandatory services internally
+     */
+    hap_acc_cfg_t cfg = {
+        .name = "Esp-Temperature-Sensor",
+        .manufacturer = "Espressif",
+        .model = "EspSensor-T01",
+        .serial_num = "001122334455",
+        .fw_rev = "0.9.0",
+        .hw_rev = NULL,
+        .pv = "1.1.0",
+        .identify_routine = sensor_identify,
+        .cid = HAP_CID_SENSOR,
+    };
+    /* Create accessory object */
+    accessory = hap_acc_create(&cfg);
+
+    /* Add a dummy Product Data */
+    uint8_t product_data[] = {'E','S','P','3','2','H','A','P'};
+    hap_acc_add_product_data(accessory, product_data, sizeof(product_data));
+
+    /* Create the Sensor Service. Include the "name" since this is a user visible service  */
+    service = hap_serv_temperature_sensor_create(10);
+    hap_serv_add_char(service, hap_char_name_create("My Temperature Sensor"));
+
+    /* Set the read callback for the service */
+    hap_serv_set_read_cb(service, sensor_read);
+
+    /* Add the Sensor Service to the Accessory Object */
+    hap_acc_add_serv(accessory, service);
+
+    service = custom_data_tlv8_serv_create();
+    hap_acc_add_serv(accessory, service);
+
+    /* Add the Accessory to the HomeKit Database */
+    hap_add_accessory(accessory);
+
+    /* Use the setup_payload_gen tool to get the QR code for Accessory Setup.
+     * The payload below is for a Sensor with setup code 111-22-333 and setup id ES32
+     */
+    ESP_LOGI(TAG, "Use setup payload: \"X-HM://00AHJA6JHES32\" for Accessory Setup");
+
+    /* Register a common button for reset Wi-Fi network and reset to factory.
+     */
+    reset_key_init(RESET_GPIO);
+
+    /* For production accessories, the setup code shouldn't be programmed on to
+     * the device. Instead, the setup info, derived from the setup code must
+     * be used. Use the factory_nvs_gen utility to generate this data and then
+     * flash it into the factory NVS partition.
+     *
+     * By default, the setup ID and setup info will be read from the factory_nvs
+     * Flash partition and so, is not required to set here explicitly.
+     *
+     * However, for testing purpose, this can be overridden by using hap_set_setup_code()
+     * and hap_set_setup_id() APIs, as has been done here.
+     */
+#ifdef CONFIG_EXAMPLE_USE_HARDCODED_SETUP_CODE
+    /* Unique Setup code of the format xxx-xx-xxx. Default: 111-22-333 */
+    hap_set_setup_code(CONFIG_EXAMPLE_SETUP_CODE);
+    /* Unique four character Setup Id. Default: ES32 */
+    hap_set_setup_id(CONFIG_EXAMPLE_SETUP_ID);
+#ifdef CONFIG_APP_WIFI_USE_WAC_PROVISIONING
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, true, cfg.cid);
+#else
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, false, cfg.cid);
+#endif
+#endif
+
+    /* Enable Hardware MFi authentication (applicable only for MFi variant of SDK) */
+    hap_enable_mfi_auth(HAP_MFI_AUTH_HW);
+
+    /* Initialize Wi-Fi */
+    app_wifi_init();
+
+    /* After all the initializations are done, start the HAP core */
+    hap_start();
+    /* Start Wi-Fi */
+    app_wifi_start(portMAX_DELAY);
+    /* The task ends here. The read/write callbacks will be invoked by the HAP Framework */
+    vTaskDelete(NULL);
+
+}
+
+void app_main()
+{
+    /* Create the application thread */
+    xTaskCreate(sensor_thread_entry, SENSOR_TASK_NAME, SENSOR_TASK_STACKSIZE,
+                NULL, SENSOR_TASK_PRIORITY, NULL);
+}
diff --git a/examples/data_tlv8/main/component.mk b/examples/data_tlv8/main/component.mk
new file mode 100644
index 0000000..a98f634
--- /dev/null
+++ b/examples/data_tlv8/main/component.mk
@@ -0,0 +1,4 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/data_tlv8/partitions_hap.csv b/examples/data_tlv8/partitions_hap.csv
new file mode 100644
index 0000000..f42e062
--- /dev/null
+++ b/examples/data_tlv8/partitions_hap.csv
@@ -0,0 +1,10 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
+sec_cert,  0x3F, ,0xd000,    0x3000, ,  # Never mark this as an encrypted partition
+nvs,      data, nvs,     0x10000,   0x6000,
+otadata,  data, ota,     ,          0x2000
+phy_init, data, phy,     ,          0x1000,
+ota_0,    app,  ota_0,   0x20000,   1600K,
+ota_1,    app,  ota_1,   ,          1600K,
+factory_nvs, data,   nvs,     0x340000,  0x6000
+nvs_keys, data, nvs_keys,0x346000,  0x1000
diff --git a/examples/data_tlv8/sdkconfig.defaults b/examples/data_tlv8/sdkconfig.defaults
new file mode 100644
index 0000000..e0468d8
--- /dev/null
+++ b/examples/data_tlv8/sdkconfig.defaults
@@ -0,0 +1,19 @@
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_hap.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
+CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=n
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=n
+CONFIG_FREERTOS_ASSERT_DISABLE=y
+CONFIG_LWIP_MAX_SOCKETS=16
+CONFIG_LWIP_SO_REUSE=y
+CONFIG_LWIP_MAX_ACTIVE_TCP=12
+CONFIG_LWIP_MAX_LISTENING_TCP=12
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=10
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_HARDWARE_SHA=n
+CONFIG_ESP_TASK_WDT=n
+CONFIG_LWIP_AUTOIP=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_LWIP_AUTOIP_RATE_LIMIT_INTERVAL=60
+CONFIG_MP_BLOB_SUPPORT=y
diff --git a/examples/emulator/CMakeLists.txt b/examples/emulator/CMakeLists.txt
new file mode 100644
index 0000000..a5990fc
--- /dev/null
+++ b/examples/emulator/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# (Automatically converted from project Makefile by convert_to_cmake.py.)
+
+# The following lines of boilerplate have to be in your project's CMakeLists
+# in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+if(DEFINED ENV{HOMEKIT_PATH})
+  set(HOMEKIT_PATH $ENV{HOMEKIT_PATH})
+else()
+  set(HOMEKIT_PATH ${CMAKE_CURRENT_LIST_DIR}/../..)
+endif(DEFINED ENV{HOMEKIT_PATH})
+
+set(EXTRA_COMPONENT_DIRS ${HOMEKIT_PATH}/components ${HOMEKIT_PATH}/components/homekit ${CMAKE_CURRENT_LIST_DIR}/../common)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(emulator)
diff --git a/examples/emulator/Makefile b/examples/emulator/Makefile
new file mode 100755
index 0000000..acacfac
--- /dev/null
+++ b/examples/emulator/Makefile
@@ -0,0 +1,15 @@
+#
+# This is a project Makefile. It is assumed the directory this Makefile resides in is a
+# project subdirectory.
+#
+
+HOMEKIT_PATH ?= $(abspath $(shell pwd)/../..)
+COMMON_COMPONENT_PATH ?= $(abspath $(shell pwd)/../common)
+
+PROJECT_NAME := emulator
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/homekit
+EXTRA_COMPONENT_DIRS += $(COMMON_COMPONENT_PATH)
+
+include $(IDF_PATH)/make/project.mk
+
diff --git a/examples/emulator/README.md b/examples/emulator/README.md
new file mode 100644
index 0000000..b00a7af
--- /dev/null
+++ b/examples/emulator/README.md
@@ -0,0 +1,19 @@
+# HomeKit Emulator
+
+This is a test example which can be used to emulate many standard HomeKit accessories. Set it up as you would do for any of the other examples, Once it boots up, use the console to try out various options
+
+## Console
+
+The prompt `esp32>` would appear on the serial console. Enter `help` to see all the available commands & their usage in the emulator.
+
+### Available Commands
+
+- `profile-list` : Lists all the supported profiles by this homekit sdk.
+- `profile <profile-name>` : Entering a valid profile Id from the profile list will lead to the board emulating the accessory selected after rebooting.
+- `read-char <aid>(optional) <iid>(optional)`: Without any arguments it prints the _characteristics and services of all the accessories_. With an aid it prints all the _characteristics and services pertaining to the given accessory._ With an aid and an iid, it will print the _given characteristic or all characteristics from the given service_.
+- `write-char <aid> <iid> <value>` : Writes the value to the particular characteristic
+- `reset` : Factory resets the device erasing the pairing and provisioning information.
+- `reset-pairings` : Erases the pairing information from the device.
+- `reset-network`: Erases the network credentials from the device.
+- `reboot` : Reboots the accessory.
+- `auth <authid>` : Sets the authentication mechanism (None, Hardware or Software auth).
diff --git a/examples/emulator/emulator_factory.bin b/examples/emulator/emulator_factory.bin
new file mode 100644
index 0000000..c800e11
Binary files /dev/null and b/examples/emulator/emulator_factory.bin differ
diff --git a/examples/emulator/main/CMakeLists.txt b/examples/emulator/main/CMakeLists.txt
new file mode 100644
index 0000000..8b93cf6
--- /dev/null
+++ b/examples/emulator/main/CMakeLists.txt
@@ -0,0 +1,2 @@
+idf_component_register(SRCS ./app_main.c ./emulator.c ./cmd_register.c ./console_init.c
+                        INCLUDE_DIRS ".")
diff --git a/examples/emulator/main/Kconfig.projbuild b/examples/emulator/main/Kconfig.projbuild
new file mode 100644
index 0000000..6f3e3fe
--- /dev/null
+++ b/examples/emulator/main/Kconfig.projbuild
@@ -0,0 +1,26 @@
+menu "Example Configuration"
+
+    config EXAMPLE_USE_HARDCODED_SETUP_CODE
+        bool "Use hard-coded setup code"
+        default y
+        help
+            HomeKit does not recommend having the setup code programmed in the accessory as is.
+            Instead, it expects setup info (salt-verifier pair) generated for the given setup code.
+            Use this option only for testing purposes. For production, the setup info should be
+            used.
+
+    config EXAMPLE_SETUP_CODE
+        string "HomeKit Setup Code"
+        default "111-22-333"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup code to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+    config EXAMPLE_SETUP_ID
+        string "HomeKit Setup Id"
+        default "ES32"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup id to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+endmenu
diff --git a/examples/emulator/main/app_main.c b/examples/emulator/main/app_main.c
new file mode 100644
index 0000000..71d73cf
--- /dev/null
+++ b/examples/emulator/main/app_main.c
@@ -0,0 +1,323 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2018 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+
+/* HomeKit Emulator Example
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <esp_log.h>
+#include <esp_event.h>
+#include <esp_wifi.h>
+
+#include <hap.h>
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+#include <hap_fw_upgrade.h>
+
+#include <hap_bct_http_handlers.h>
+
+#include <iot_button.h>
+
+#include <app_wifi.h>
+#include <app_hap_setup_payload.h>
+
+#include "emulator.h"
+
+static const char *TAG = "HAP Emulator";
+
+/*  Required for server verification during OTA, PEM format as string  */
+char server_cert[] = {};
+
+#define HAP_ACC_TASK_PRIORITY  1
+#define HAP_ACC_TASK_STACKSIZE 4 * 1024
+#define HAP_ACC_TASK_NAME      "hap_emulator"
+
+/* Reset network credentials if button is pressed for more than 3 seconds and then released */
+#define RESET_NETWORK_BUTTON_TIMEOUT        3
+
+/* Reset to factory if button is pressed and held for more than 10 seconds */
+#define RESET_TO_FACTORY_BUTTON_TIMEOUT     10
+
+/* The button "Boot" will be used as the Reset button for the example */
+#define RESET_GPIO  GPIO_NUM_0
+/**
+ * @brief The network reset button callback handler.
+ * Useful for testing the Wi-Fi re-configuration feature of WAC2
+ */
+static void reset_network_handler(void* arg)
+{
+    hap_reset_network();
+}
+/**
+ * @brief The factory reset button callback handler.
+ */
+static void reset_to_factory_handler(void* arg)
+{
+    hap_reset_to_factory();
+}
+
+/**
+ * The Reset button  GPIO initialisation function.
+ * Same button will be used for resetting Wi-Fi network as well as for reset to factory based on
+ * the time for which the button is pressed.
+ */
+static void reset_key_init(uint32_t key_gpio_pin)
+{
+    button_handle_t handle = iot_button_create(key_gpio_pin, BUTTON_ACTIVE_LOW);
+    iot_button_add_on_release_cb(handle, RESET_NETWORK_BUTTON_TIMEOUT, reset_network_handler, NULL);
+    iot_button_add_on_press_cb(handle, RESET_TO_FACTORY_BUTTON_TIMEOUT, reset_to_factory_handler, NULL);
+}
+
+/*
+ * An optional HomeKit Event handler which can be used to track HomeKit
+ * specific events.
+ */
+void emulator_hap_event_handler(hap_event_t event, void *data)
+{
+    switch(event) {
+        case HAP_EVENT_PAIRING_STARTED :
+            ESP_LOGI(TAG, "Pairing Started");
+            break;
+        case HAP_EVENT_PAIRING_ABORTED :
+            ESP_LOGI(TAG, "Pairing Aborted");
+            break;
+        case HAP_EVENT_CTRL_PAIRED :
+            ESP_LOGI(TAG, "Controller %s Paired. Controller count: %d",
+                        (char *)data, hap_get_paired_controller_count());
+            break;
+        case HAP_EVENT_CTRL_UNPAIRED :
+            ESP_LOGI(TAG, "Controller %s Removed. Controller count: %d",
+                        (char *)data, hap_get_paired_controller_count());
+            break;
+        case HAP_EVENT_CTRL_CONNECTED :
+            ESP_LOGI(TAG, "Controller %s Connected", (char *)data);
+            break;
+        case HAP_EVENT_CTRL_DISCONNECTED :
+            ESP_LOGI(TAG, "Controller %s Disconnected", (char *)data);
+            break;
+        default:
+            ESP_LOGW(TAG, "Unknown HomeKit event: %d", event);
+            break;
+    }
+}
+
+static void hap_emulator_system_event_handler(void* arg, esp_event_base_t event_base, int event_id, void* event_data)
+{
+    if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
+        ip_event_got_ip_t* event = (ip_event_got_ip_t*) event_data;
+        printf("Got IP:" IPSTR "\n", IP2STR(&event->ip_info.ip));
+    } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) {
+        printf("Failed to connect to network/disconnected.\n");
+    }
+}
+
+static hap_emulator_profile_t *profile;
+/* Mandatory identify routine for the accessory.
+ * In a real accessory, something like LED blink should be implemented
+ * got visual identification
+ */
+static int emulator_identify(hap_acc_t *ha)
+{
+    ESP_LOGI(TAG, "%s identified", profile->name);
+    printf("%s identified\n", profile->name);
+    return HAP_SUCCESS;
+}
+
+
+static void emulator_thread_entry(void *p)
+{
+    hap_acc_t *accessory;
+    hap_serv_t *service;
+    hap_set_debug_level(HAP_DEBUG_LEVEL_ERR);
+    esp_log_level_set("wifi", 0);
+    
+    /* Configure HomeKit core to make the Accessory name (and thus the WAC SSID) unique,
+     * instead of the default configuration wherein only the WAC SSID is made unique.
+     */
+    hap_cfg_t hap_cfg;
+    hap_get_config(&hap_cfg);
+    hap_cfg.unique_param = UNIQUE_NAME;
+    hap_set_config(&hap_cfg);
+
+    /* Initialize the MFi core */
+    hap_init(HAP_TRANSPORT_WIFI);
+    /* Retrieve the profile before reboot */
+    profile = emulator_get_profile();
+
+    /* Initialise the mandatory parameters for Accessory which will be added as
+     * the mandatory services internally
+     */
+    hap_acc_cfg_t cfg = {
+        .name = profile->name,
+        .manufacturer = "Espressif",
+        .model = "MD-01",
+        .serial_num = "001122334455",
+        .fw_rev = "0.9.0",
+        .hw_rev = NULL,
+        .pv = "1.1.0",
+        .identify_routine = emulator_identify,
+        .cid = profile->cid,
+    };
+    /* Create accessory object */
+    accessory = hap_acc_create(&cfg);
+
+    /* Add a dummy Product Data */
+    uint8_t product_data[] = {'E','S','P','3','2','H','A','P'};
+    hap_acc_add_product_data(accessory, product_data, sizeof(product_data));
+
+    /* Create the appropriate Service. Include the "name" since this is a user visible service  */
+    service = profile->serv_create();
+    hap_serv_add_char(service, hap_char_name_create(profile->name));
+
+    /* Set the write callback for the service */
+    hap_serv_set_write_cb(service, emulator_write);
+
+    /* Add the Service to the Accessory Object */
+    hap_acc_add_serv(accessory, service);
+
+    /* Create the Firmware Upgrade HomeKit Custom Service.
+     * Please refer the FW Upgrade documentation under components/homekit/extras/include/hap_fw_upgrade.h
+     * and the top level README for more information.
+     */
+    hap_fw_upgrade_config_t ota_config = {
+        .server_cert_pem = server_cert,
+    };
+    service = hap_serv_fw_upgrade_create(&ota_config);
+
+    /* Add the service to the Accessory Object */
+    hap_acc_add_serv(accessory, service);
+
+    /* Add the Accessory to the HomeKit Database */
+    hap_add_accessory(accessory);
+
+    ESP_LOGI(TAG, "Starting %s", profile->name);
+
+    printf("\n---------------\n");
+    char setup_code[11] = {0};
+    size_t setup_code_size = sizeof(setup_code);
+    if (hap_factory_keystore_get("hap_setup", "setup_code", (uint8_t *)setup_code, &setup_code_size) == HAP_SUCCESS) {
+        printf("Setup Code : %s\n", setup_code);
+    }
+
+    int method;
+    size_t size = sizeof(method);
+    /* Methods -> 1: Hardware Authentication, 2: Software Authentication */
+    if(hap_factory_keystore_get("auth", "method", (uint8_t *)&method, &size) == HAP_SUCCESS) {
+        if (method == 1) {
+            hap_enable_mfi_auth(HAP_MFI_AUTH_HW);
+            printf("H/W Authentication\n");
+        } else if (method == 2) {
+            hap_enable_mfi_auth(HAP_MFI_AUTH_SW);
+            printf("S/W Authentication\n");
+        }
+    }
+
+    /* Register a common button for reset Wi-Fi network and reset to factory.
+     * The Wi-Fi reset will especially be useful to test the Network Re-configuration
+     * feature of WAC2. If the network configuration of a paired accessory is reset, as per
+     * WAC2, the iOS can reconfigure it automatically.
+     */
+    reset_key_init(RESET_GPIO);
+    
+    /* Fetches the brightness, hue, saturation values before power cycle characteristics from NVS */
+    emulator_get_characteristics();
+
+    /* Register an event handler for HomeKit specific events */
+    hap_register_event_handler(emulator_hap_event_handler);
+
+    /* Register system event handler */
+    esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_STA_DISCONNECTED, &hap_emulator_system_event_handler, NULL);
+    esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &hap_emulator_system_event_handler, NULL);
+
+    /* Query the controller count (just for information) */
+    ESP_LOGI(TAG, "Accessory is paired with %d controllers",
+                hap_get_paired_controller_count());
+
+    /* For production accessories, the setup code shouldn't be programmed on to
+     * the device. Instead, the setup info, derived from the setup code must
+     * be used. Use the factory_nvs_gen utility to generate this data and then
+     * flash it into the factory NVS partition.
+     *
+     * By default, the setup ID and setup info will be read from the factory_nvs
+     * Flash partition and so, is not required to set here explicitly.
+     *
+     * However, for testing purpose, this can be overridden by using hap_set_setup_code()
+     * and hap_set_setup_id() APIs, as has been done here.
+     */
+#ifdef CONFIG_EXAMPLE_USE_HARDCODED_SETUP_CODE
+    /* Unique Setup code of the format xxx-xx-xxx. Default: 111-22-333 */
+    hap_set_setup_code(CONFIG_EXAMPLE_SETUP_CODE);
+    /* Unique four character Setup Id. Default: ES32 */
+    hap_set_setup_id(CONFIG_EXAMPLE_SETUP_ID);
+#ifdef CONFIG_APP_WIFI_USE_WAC_PROVISIONING
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, true, cfg.cid);
+#else
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, false, cfg.cid);
+#endif
+#endif
+
+    /* Initialize Wi-Fi */
+    app_wifi_init();
+
+    /* After all the initializations are done, start the HAP core */
+    if (hap_start() != ESP_OK) {
+        printf("Failed to start HAP\n");
+    }
+    
+    /* Start Wi-Fi */
+    app_wifi_start(0);
+
+    /* state of HAP_CHAR_UUID_ON - Turned ON or OFF before reboot */
+    if(!emulator_get_state()) {
+        hap_val_t val;
+        val.b = true;
+        hap_serv_t *hs = hap_acc_get_first_serv(hap_get_first_acc());
+        while(!hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_ON))
+            hs = hap_serv_get_next(hs);
+        if(hs)
+            hap_char_update_val(hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_ON), &val);    
+    }
+    
+    /* Registering BCT handlers as this is a test accesory */
+    hap_bct_register_http_handlers();
+
+    emulator_show_profiles();
+    printf("Accessory has booted up as a %s.\n", profile->name);
+    printf("Enter \'help\' for options.\n");
+
+    /* Initializes the console input sequence */ 
+    console_init();
+
+    /* The task ends here. The read/write callbacks will be invoked by the HAP Framework */
+    vTaskDelete(NULL);
+}
+
+void app_main()
+{
+    xTaskCreate(emulator_thread_entry, HAP_ACC_TASK_NAME, HAP_ACC_TASK_STACKSIZE, NULL, HAP_ACC_TASK_PRIORITY, NULL);
+}
+
diff --git a/examples/emulator/main/cmd_register.c b/examples/emulator/main/cmd_register.c
new file mode 100644
index 0000000..68f7f3e
--- /dev/null
+++ b/examples/emulator/main/cmd_register.c
@@ -0,0 +1,260 @@
+/* Console example — various system commands
+
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include "esp_log.h"
+#include "esp_console.h"
+#include "esp_system.h"
+#include "argtable3/argtable3.h"
+#include "emulator.h"
+
+static void register_read();
+static void register_write();
+static void register_reset();
+static void register_profile();
+static void register_display_profiles();
+static void register_reset_pairings();
+static void register_auth();
+static void register_reset_wifi_credentials();
+static void register_reboot_accessory();
+
+void register_system()
+{
+    register_auth();
+    register_profile();
+    register_display_profiles();
+    register_reboot_accessory();
+    register_reset_wifi_credentials();
+    register_reset_pairings();
+    register_reset();
+    register_read();
+    register_write();
+}
+
+/* Reading from characteristic sequence */
+static int read_characteristic(int argc, char** argv)
+{
+    if(argc == 1) {
+        emulator_read_chars(0);
+    } else if(argc == 2) {
+        emulator_read_chars(1, atoi(argv[1]));
+    }  else if(argc == 3) {
+        emulator_read_chars(2, atoi(argv[1]),atoi(argv[2]));
+    } else {
+        printf("Invalid Usage.");
+        return ESP_ERR_INVALID_ARG;
+    }
+
+    return ESP_OK;
+}
+
+/* Register profile switch sequence */
+static int switch_profile(int argc, char** argv)
+{
+    if(argc == 2) {
+        printf("Changing profile. Rebooting.\n");
+        emulator_switch_profile(atoi(argv[1]));
+    } else {
+        printf("Invalid Usage.");
+        return ESP_ERR_INVALID_ARG;
+    }
+    return ESP_OK;
+}
+
+static void register_read()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "read-char",
+        .help = "Read the values of the charachteristics.\n Usage: read-char <aid> <iid>",
+        .hint = NULL,
+        .func = &read_characteristic,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+/* Writing to characteristic sequence */
+static int write_characteristic(int argc, char** argv)
+{
+    if(argc == 4) {
+        printf("Characteristic write.\n");
+        emulator_write_char(atoi(argv[1]),atoi(argv[2]),argv[3]);
+    } else {
+        printf("Invalid Usage.");
+        return ESP_ERR_INVALID_ARG;
+    }
+    return ESP_OK;
+}
+
+static void register_write()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "write-char",
+        .help = "Write values to the charachteristics.\n Usage: write-char <aid> <iid> <value>",
+        .hint = NULL,
+        .func = &write_characteristic,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+/* Factory reset sequence */
+static int reset(int argc, char** argv)
+{
+    if(argc == 1) {
+        printf("Factory Resetting. Rebooting.\n");
+        emulator_reset_to_factory();
+    } else {
+        printf("Invalid Usage.");
+        return ESP_ERR_INVALID_ARG;
+    }
+    return ESP_OK;
+}
+
+static void register_reset()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "reset",
+        .help = "Factory reset the device",
+        .hint = NULL,
+        .func = &reset,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+/* Reset pairings sequence */
+static int reset_pairings(int argc, char** argv)
+{
+    if(argc == 1) {
+        printf("Resetting the pairings. Rebooting.\n");
+        emulator_reset_pairings();
+    } else {
+        printf("Invalid Usage.");
+        return ESP_ERR_INVALID_ARG;
+    }
+    return ESP_OK;
+}
+
+static void register_reset_pairings()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "reset-pairings",
+        .help = "Reset the pairings of the device",
+        .hint = NULL,
+        .func = &reset_pairings,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+/* Reset network credentials sequence */
+static int reset_wifi_credentials(int argc, char** argv)
+{
+    if(argc == 1) {
+        printf("Resetting the network credentials. Rebooting\n");
+        emulator_reset_wifi_credentials();
+    } else {
+        printf("Invalid Usage.");
+        return ESP_ERR_INVALID_ARG;
+    }
+    return ESP_OK;
+}
+
+static void register_reset_wifi_credentials()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "reset-network",
+        .help = "Reset the wifi credentials.",
+        .hint = NULL,
+        .func = &reset_wifi_credentials,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+/* Reboot accessory sequence */
+static int reboot_accessory(int argc, char** argv)
+{
+    if(argc == 1) {
+        printf("Rebooting the accessory.\n");
+        emulator_reboot_accessory();
+    } else {
+        printf("Invalid Usage.");
+        return ESP_ERR_INVALID_ARG;
+    }
+    return ESP_OK;
+}
+
+static void register_reboot_accessory()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "reboot",
+        .help = "Reboot the accessory.",
+        .hint = NULL,
+        .func = &reboot_accessory,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+
+static void register_profile()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "profile",
+        .help = "Switch the profile of the device.\n Usage: profile <id>",
+        .hint = NULL,
+        .func = &switch_profile,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+/* Display the profiles sequence */
+static int display_profile(int argc, char** argv)
+{
+    if(argc == 1) {
+        emulator_show_profiles();
+    } else {
+        printf("Invalid Usage.");
+        return ESP_ERR_INVALID_ARG;
+    }
+    return ESP_OK;
+}
+
+static void register_display_profiles()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "profile-list",
+        .help = "Check the available profiles.",
+        .hint = NULL,
+        .func = &display_profile,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+/* Select the auth options */
+static int select_auth(int argc, char** argv)
+{
+    if(argc == 2) {
+        printf("Changing the auth option. Rebooting\n");
+        emulator_set_auth(atoi(argv[1]));
+    } else {
+        printf("Invalid Usage.");
+        return ESP_ERR_INVALID_ARG;
+    }
+    return ESP_OK;
+}
+
+static void register_auth()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "auth",
+        .help = "Select the auth option. 0. None 1. Hardware 2. Software\n Usage: auth <id>",
+        .hint = NULL,
+        .func = &select_auth,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
diff --git a/examples/emulator/main/component.mk b/examples/emulator/main/component.mk
new file mode 100644
index 0000000..a98f634
--- /dev/null
+++ b/examples/emulator/main/component.mk
@@ -0,0 +1,4 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/emulator/main/console_init.c b/examples/emulator/main/console_init.c
new file mode 100644
index 0000000..684544e
--- /dev/null
+++ b/examples/emulator/main/console_init.c
@@ -0,0 +1,125 @@
+/* Console example
+
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include "esp_system.h"
+#include "esp_log.h"
+#include "esp_console.h"
+#include "esp_vfs_dev.h"
+#include "driver/uart.h"
+#include "linenoise/linenoise.h"
+#include "argtable3/argtable3.h"
+#include "esp_vfs_fat.h"
+#include "emulator.h"
+
+static void initialize_console()
+{
+    /* Disable buffering on stdin and stdout */
+    setvbuf(stdin, NULL, _IONBF, 0);
+    setvbuf(stdout, NULL, _IONBF, 0);
+
+    /* Minicom, screen, idf_monitor send CR when ENTER key is pressed */
+    esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR);
+    /* Move the caret to the beginning of the next line on '\n' */
+    esp_vfs_dev_uart_set_tx_line_endings(ESP_LINE_ENDINGS_CRLF);
+
+    /* Install UART driver for interrupt-driven reads and writes */
+    ESP_ERROR_CHECK( uart_driver_install(CONFIG_ESP_CONSOLE_UART_NUM, 256, 0, 0, NULL, 0) );
+
+    /* Tell VFS to use UART driver */
+    esp_vfs_dev_uart_use_driver(CONFIG_ESP_CONSOLE_UART_NUM);
+
+    /* Initialize the console */
+    esp_console_config_t console_config = {
+            .max_cmdline_args = 8,
+            .max_cmdline_length = 256,
+#if CONFIG_LOG_COLORS
+            .hint_color = atoi(LOG_COLOR_CYAN)
+#endif
+    };
+    ESP_ERROR_CHECK( esp_console_init(&console_config) );
+
+    /* Configure linenoise line completion library */
+    /* Enable multiline editing. If not set, long commands will scroll within
+     * single line.
+     */
+    linenoiseSetMultiLine(1);
+
+    /* Tell linenoise where to get command completions and hints */
+    linenoiseSetCompletionCallback(&esp_console_get_completion);
+    linenoiseSetHintsCallback((linenoiseHintsCallback*) &esp_console_get_hint);
+
+    /* Set command history size */
+    linenoiseHistorySetMaxLen(100);
+}
+
+static void console_start()
+{
+    /* Prompt to be printed before each line.
+     * This can be customized, made dynamic, etc.
+     */
+    const char* prompt = LOG_COLOR_I "esp32> " LOG_RESET_COLOR;
+
+    /* Figure out if the terminal supports escape sequences */
+    int probe_status = linenoiseProbe();
+    if (probe_status) { /* zero indicates success */
+        printf("\n"
+               "Your terminal application does not support escape sequences.\n"
+               "Line editing and history features are disabled.\n"
+               "On Windows, try using Putty instead.\n");
+        linenoiseSetDumbMode(1);
+        #if CONFIG_LOG_COLORS
+                /* Since the terminal doesn't support escape sequences,
+                * don't use color codes in the prompt.
+                */
+                prompt = "esp32> ";
+        #endif //CONFIG_LOG_COLORS
+    }
+
+    /* Main loop */
+    while(true) {
+        /* Get a line using linenoise.
+         * The line is returned when ENTER is pressed.
+         */
+        char* line = linenoise(prompt);
+        if (line == NULL) { /* Ignore empty lines */
+            continue;
+        }
+        /* Add the command to the history */
+        linenoiseHistoryAdd(line);
+
+        /* Try to run the command */
+        int ret;
+        esp_err_t err = esp_console_run(line, &ret);
+        if (err == ESP_ERR_NOT_FOUND) {
+            printf("Unrecognized command\n");
+        } else if (err == ESP_ERR_INVALID_ARG) {
+            // command was empty
+        } else if (err == ESP_OK && ret != ESP_OK) {
+            ESP_LOGI("HAP Emulator", "Command returned non-zero error code: 0x%x\n", ret);
+        } else if (err != ESP_OK) {
+            printf("Internal error: 0x%x\n", err);
+        }
+        /* linenoise allocates line buffer on the heap, so need to free it */
+        linenoiseFree(line);
+    }
+}
+
+void console_init()
+{
+    initialize_console();
+
+    /* Register commands */
+    esp_console_register_help_command();
+    register_system();
+
+    /* Start Console */
+    console_start();
+}
diff --git a/examples/emulator/main/emulator.c b/examples/emulator/main/emulator.c
new file mode 100644
index 0000000..5e243c7
--- /dev/null
+++ b/examples/emulator/main/emulator.c
@@ -0,0 +1,631 @@
+#include <esp_log.h>
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+#include <string.h>
+#include "emulator.h"
+#include "nvs.h"
+
+int hap_factory_keystore_set(const char *name_space, const char *key, const uint8_t *val, size_t val_size);
+int hap_keystore_set(const char *name_space, const char *key, const uint8_t *val, const size_t val_len);
+int hap_keystore_get(const char *name_space, const char *key, uint8_t *val, size_t *val_size);
+
+int hap_keystore_get_u32(const char *name_space, const char  *key, uint32_t *buffer, char *entity_name)
+{
+    int ret = HAP_FAIL;
+    nvs_handle handle;
+    esp_err_t err = nvs_open(name_space, NVS_READONLY, &handle);
+    if (err != ESP_OK) {
+        ESP_LOGI("hap_keystore", "Error (%d) opening NVS handle for %s!", err, entity_name);
+        return HAP_FAIL;
+    } else {
+        err = nvs_get_u32(handle, key, buffer);
+        if (err == ESP_OK) {
+            ret = HAP_SUCCESS;
+        } else {
+            ESP_LOGI("hap_keystore", "Error getting %s data!", entity_name);
+        }
+        nvs_close(handle);
+    }
+    return ret;
+}
+
+int hap_keystore_set_u32(const char *name_space, const char *key, uint32_t buffer, char *entity_name)
+{
+    int ret = HAP_FAIL;
+    nvs_handle handle;
+    esp_err_t err = nvs_open(name_space, NVS_READWRITE, &handle);
+    if (err != ESP_OK) {
+        ESP_LOGI("hap_keystore", "Error (%d) opening NVS handle for %s!", err, entity_name);
+        return HAP_FAIL;
+    } else {
+        err = nvs_set_u32(handle, key, buffer);
+        if (err != ESP_OK) {
+            ESP_LOGI("hap_keystore", "Error loading %s data!", entity_name);
+            ret = HAP_FAIL;
+        } else {
+            nvs_commit(handle);
+            ret = HAP_SUCCESS;
+        }
+        nvs_close(handle);
+    }
+    return ret;
+}
+
+static int profile_num;
+
+static int hex_compare(unsigned char *buf, int buf_len)
+{
+    char auth_data[] = { 0x01, 0x02, 0x03 };
+    if(strlen(auth_data) == buf_len)
+        return memcmp(buf, auth_data ,buf_len);
+    return -1;
+}
+
+/* Char: Target Door State with tw(Timed Write) & aa(Addtional Authorization) */
+static hap_char_t *hap_char_target_door_state_create_with_tw_aa(uint8_t targ_door_state)
+{
+    hap_char_t *hc = hap_char_uint8_create(HAP_CHAR_UUID_TARGET_DOOR_STATE,
+                                           HAP_CHAR_PERM_PR | HAP_CHAR_PERM_PW | HAP_CHAR_PERM_EV | HAP_CHAR_PERM_AA | HAP_CHAR_PERM_TW, targ_door_state);
+    if (!hc) {
+        return NULL;
+    }
+
+    hap_char_int_set_constraints(hc, 0, 4, 1);
+
+    return hc;
+}
+
+/* Timed Write(tw)and Additional Auth(aa) Info simulation for Target Door state characteristic in Garage door opener */
+static hap_serv_t *hap_serv_garage_door_opener_create_with_tw_aa(uint8_t curr_door_state, uint8_t targ_door_state, bool obstr_detect)
+{
+    hap_serv_t *hs = hap_serv_create(HAP_SERV_UUID_GARAGE_DOOR_OPENER);
+    if (!hs) {
+        return NULL;
+    }
+    if (hap_serv_add_char(hs, hap_char_current_door_state_create(curr_door_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_target_door_state_create_with_tw_aa(targ_door_state)) != HAP_SUCCESS) {
+        goto err;
+    }
+    if (hap_serv_add_char(hs, hap_char_obstruction_detect_create(obstr_detect)) != HAP_SUCCESS) {
+        goto err;
+    }
+    return hs;
+err:
+    hap_serv_delete(hs);
+    return NULL;
+}
+
+/* Services Emulation Block */
+static hap_serv_t *hap_fan_create()
+{
+    hap_serv_t *hs = hap_serv_fan_create(false);
+    hap_serv_add_char(hs, hap_char_rotation_direction_create(0));
+    return hs;
+}
+
+static hap_serv_t *hap_switch_create()
+{
+    return hap_serv_switch_create(false);
+}
+
+static hap_serv_t *hap_lightbulb_create()
+{
+    hap_serv_t *hs = hap_serv_lightbulb_create(false);
+    hap_serv_add_char(hs, hap_char_brightness_create(50));
+    hap_serv_add_char(hs, hap_char_saturation_create(50));
+    hap_serv_add_char(hs, hap_char_hue_create(50));
+    return hs;
+}
+
+static hap_serv_t *hap_garage_door_opener_create()
+{
+    return hap_serv_garage_door_opener_create_with_tw_aa(0, 0 ,false);
+}
+
+static hap_serv_t *hap_lock_create()
+{
+    return hap_serv_lock_mechanism_create(0, 0);
+}
+
+static hap_serv_t *hap_lock_management_create()
+{
+    return hap_serv_lock_management_create(NULL, NULL);
+}
+
+static hap_serv_t *hap_outlet_create()
+{
+    return hap_serv_outlet_create(false, true);
+}
+
+static hap_serv_t *hap_thermostat_create()
+{
+    return hap_serv_thermostat_create(0, 0, 20.0, 25.0, 0);
+}
+
+static hap_serv_t *hap_leak_sensor_create()
+{
+    return hap_serv_leak_sensor_create(0);
+}
+
+static hap_serv_t *hap_air_quality_sensor_create()
+{
+    return hap_serv_air_quality_sensor_create(0);
+}
+
+static hap_serv_t *hap_carbon_monoxide_sensor_create()
+{
+    return hap_serv_carbon_monoxide_sensor_create(0);
+}
+
+static hap_serv_t *hap_contact_sensor_create()
+{
+    return hap_serv_contact_sensor_create(0);
+}
+
+static hap_serv_t *hap_humidity_sensor_create()
+{
+    return hap_serv_humidity_sensor_create(20.0);
+}
+
+static hap_serv_t *hap_light_sensor_create()
+{
+    return hap_serv_light_sensor_create(100.0);
+}
+
+static hap_serv_t *hap_motion_sensor_create()
+{
+    return hap_serv_motion_sensor_create(0);
+}
+
+static hap_serv_t *hap_occupancy_sensor_create()
+{
+    return hap_serv_occupancy_sensor_create(0);
+}
+
+static hap_serv_t *hap_temperature_sensor_create()
+{
+    return hap_serv_temperature_sensor_create(20.0);
+}
+
+static hap_serv_t *hap_smoke_sensor_create()
+{
+    return hap_serv_smoke_sensor_create(0);
+}
+
+static hap_serv_t *hap_door_create()
+{
+    return hap_serv_door_create(0, 10, 0);
+}
+
+static hap_serv_t *hap_window_create()
+{
+    return hap_serv_window_create(0, 10, 0);
+}
+
+static hap_serv_t *hap_window_covering_create()
+{
+    return hap_serv_window_covering_create(0, 10, 0);
+}
+
+static hap_serv_t *hap_security_system_create()
+{
+    return hap_serv_security_system_create(0, 0);
+}
+
+static hap_serv_t *hap_programmable_switch_create()
+{
+    return hap_serv_stateless_programmable_switch_create(0);
+}
+
+static hap_serv_t *hap_air_purifier_create()
+{
+    return hap_serv_air_purifier_create(0, 0, 0);
+}
+
+static hap_serv_t *hap_air_heater_create()
+{
+    hap_serv_t *hs = hap_serv_heater_cooler_create(0, 20.0, 1, 1);
+    hap_char_t *hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_CURRENT_HEATER_COOLER_STATE);
+    hap_char_int_set_constraints(hc, 0, 2, 1);
+
+    hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_TARGET_HEATER_COOLER_STATE);
+    hap_char_int_set_constraints(hc, 1, 1, 1);
+
+    hap_serv_add_char(hs, hap_char_heating_threshold_temperature_create(15.0));
+    return hs;
+}
+
+static hap_serv_t *hap_air_conditioner_create()
+{
+    hap_serv_t *hs = hap_serv_heater_cooler_create(0, 20.0, 0, 0);
+    hap_serv_add_char(hs, hap_char_heating_threshold_temperature_create(15.0));
+    hap_serv_add_char(hs, hap_char_cooling_threshold_temperature_create(25.0));
+    return hs;
+}
+
+static hap_serv_t *hap_humidifier_create()
+{
+    return hap_serv_humidifier_dehumidifier_create(0, 10, 0, 0);
+}
+
+static hap_serv_t *hap_dehumidifier_create()
+{
+    return hap_serv_humidifier_dehumidifier_create(0, 10, 0, 0);
+}
+
+static hap_serv_t *hap_battery_service_create()
+{
+    return hap_serv_battery_service_create(20, 0, 0);
+}
+
+static hap_serv_t *hap_carbon_dioxide_sensor_create()
+{
+    return hap_serv_carbon_dioxide_sensor_create(0);
+}
+
+/* List of services to be emulated */
+static hap_emulator_profile_t profiles[] = {
+    {HAP_CID_FAN, "Fan", hap_fan_create},
+    {HAP_CID_GARAGE_DOOR_OPENER, "Garage-Door-Opener", hap_garage_door_opener_create},
+    {HAP_CID_LIGHTING, "Lightbulb", hap_lightbulb_create},
+    {HAP_CID_LOCK, "Lock", hap_lock_create},
+    {HAP_CID_LOCK, "Lock-Management", hap_lock_management_create},
+    {HAP_CID_OUTLET, "Outlet", hap_outlet_create},
+    {HAP_CID_SWITCH, "Switch", hap_switch_create},
+    {HAP_CID_THERMOSTAT, "Thermostat", hap_thermostat_create},
+    {HAP_CID_SENSOR, "Leak-Sensor", hap_leak_sensor_create},
+    {HAP_CID_SENSOR, "Air-quality-Sensor", hap_air_quality_sensor_create},
+    {HAP_CID_SENSOR, "CO-Sensor", hap_carbon_monoxide_sensor_create},
+    {HAP_CID_SENSOR, "Contact-Sensor", hap_contact_sensor_create},
+    {HAP_CID_SENSOR, "Humidity-Sensor", hap_humidity_sensor_create},
+    {HAP_CID_SENSOR, "Light-Sensor", hap_light_sensor_create},
+    {HAP_CID_SENSOR, "Motion-Sensor", hap_motion_sensor_create},
+    {HAP_CID_SENSOR, "Occupancy-Sensor", hap_occupancy_sensor_create},
+    {HAP_CID_SENSOR, "Temperature-Sensor", hap_temperature_sensor_create},
+    {HAP_CID_SENSOR, "Smoke-Sensor", hap_smoke_sensor_create},
+    {HAP_CID_SENSOR, "CO2-Sensor", hap_carbon_dioxide_sensor_create},
+    {HAP_CID_SECURITY_SYSTEM, "Security-System", hap_security_system_create},
+    {HAP_CID_DOOR, "Door", hap_door_create},
+    {HAP_CID_WINDOW, "Window", hap_window_create},
+    {HAP_CID_WINDOW_COVERING, "Window-Covering", hap_window_covering_create},
+    {HAP_CID_PROGRAMMABLE_SWITCH, "Programmable-Switch", hap_programmable_switch_create},
+    {HAP_CID_AIR_PURIFIER, "Air-Purifier", hap_air_purifier_create},
+    {HAP_CID_HEATER, "Air-Heater", hap_air_heater_create},
+    {HAP_CID_AIR_CONDITIONER, "Air-Conditioner", hap_air_conditioner_create},
+    {HAP_CID_HUMIDIFIER, "Humidifier", hap_humidifier_create},
+    {HAP_CID_DEHUMIDIFIER, "Dehumidifier", hap_dehumidifier_create},
+    {HAP_CID_OTHER, "Battery", hap_battery_service_create},
+};
+
+/* Profile, Characteristics read, maniplation block */
+static int profile_cnt = sizeof(profiles)/sizeof(hap_emulator_profile_t);
+
+hap_emulator_profile_t *emulator_get_profile()
+{
+    size_t size = sizeof(profile_num);
+    if (hap_factory_keystore_get("emulator", "profile", (uint8_t *)&profile_num, &size) != HAP_SUCCESS) {
+        hap_factory_keystore_set("emulator", "profile", (uint8_t *)&profile_num, size);
+    }
+
+    return &profiles[profile_num];
+}
+
+int emulator_get_state()
+{
+    uint8_t state;
+    size_t size = sizeof(state);
+    if(hap_keystore_get("emulator", "state", (uint8_t *)&state, &size) == HAP_SUCCESS && state == 1) {
+        return HAP_SUCCESS;
+    } else
+        return HAP_FAIL;
+}
+
+void hap_set_value(char * uuid, hap_val_t *val) {
+    
+    hap_serv_t *hs = hap_acc_get_first_serv(hap_get_first_acc());
+        while(!hap_serv_get_char_by_uuid(hs, uuid))
+            hs = hap_serv_get_next(hs);
+        if(hs)
+            hap_char_update_val(hap_serv_get_char_by_uuid(hs, uuid), val); 
+}
+
+void emulator_get_characteristics()
+{   
+    uint8_t brightness;
+    size_t size = sizeof(brightness);
+    if(hap_keystore_get("emulator", "brightness", (uint8_t *)&brightness, &size) == HAP_SUCCESS)
+    {
+        hap_val_t val;
+        val.i = brightness;
+        hap_set_value(HAP_CHAR_UUID_BRIGHTNESS, &val);
+    }    
+    
+    uint32_t hue;
+    if(hap_keystore_get_u32("emulator", "hue", &hue, "hue") == HAP_SUCCESS) {
+        hap_val_t val;
+        val.u = hue;
+        hap_set_value(HAP_CHAR_UUID_HUE, &val);
+    }
+    
+    uint32_t saturation;
+    if(hap_keystore_get_u32("emulator", "saturation", &saturation, "saturation") == HAP_SUCCESS) {
+
+        hap_val_t val;
+        val.u = saturation;
+        hap_set_value(HAP_CHAR_UUID_SATURATION, &val);
+    }
+
+}
+
+void emulator_show_profiles()
+{
+    int i;
+    printf("List of homekit profiles.\n");
+    for (i = 0; i < profile_cnt; i++) {
+        printf("%d: %s\n", i, profiles[i].name);
+    }
+}
+
+int emulator_set_profile(int profile)
+{
+    if (profile >= profile_cnt || profile < 0) {
+        printf("Invalid profile %d\n", profile);
+        return -1;
+    }
+    profile_num = profile;
+    hap_factory_keystore_set("emulator", "profile", (uint8_t *)&profile_num, sizeof(profile_num));
+    return 0;
+}
+
+static char val[260];
+static char * emulator_print_value(hap_char_t *hc, const hap_val_t *cval)
+{
+    uint16_t perm = hap_char_get_perm(hc);
+    if (perm & HAP_CHAR_PERM_PR) {
+        hap_char_format_t format = hap_char_get_format(hc);
+	    switch (format) {
+		    case HAP_CHAR_FORMAT_BOOL : {
+                snprintf(val, sizeof(val), "%s", cval->b ? "true":"false");
+    			break;
+		    }
+		    case HAP_CHAR_FORMAT_UINT8:
+		    case HAP_CHAR_FORMAT_UINT16:
+		    case HAP_CHAR_FORMAT_UINT32:
+		    case HAP_CHAR_FORMAT_INT:
+                snprintf(val, sizeof(val), "%d", cval->i);
+                break;
+    		case HAP_CHAR_FORMAT_FLOAT :
+                snprintf(val, sizeof(val), "%f", cval->f);
+		    	break;
+    		case HAP_CHAR_FORMAT_STRING :
+                if (cval->s) {
+                    snprintf(val, sizeof(val), "%s", cval->s);
+                } else {
+                    snprintf(val, sizeof(val), "null");
+                }
+			    break;
+            default :
+                snprintf(val, sizeof(val), "unsupported");
+		}
+    } else {
+        snprintf(val, sizeof(val), "null");
+    }
+    return val;
+}
+
+int emulator_write(hap_write_data_t write_data[], int count,
+        void *serv_priv, void *write_priv)
+{
+    int i;
+    hap_write_data_t *write;
+    for (i = 0; i < count; i++) {
+        write = &write_data[i];
+        uint16_t perm = hap_char_get_perm(write->hc);
+        if(perm & HAP_CHAR_PERM_AA && hex_compare(write->auth_data.data, write->auth_data.len)) {
+            printf("Invalid Auth data\n");
+            continue;
+        }
+        int iid = hap_char_get_iid(write->hc);
+        int aid = hap_acc_get_aid(hap_serv_get_parent(hap_char_get_parent(write->hc)));
+        printf("Write aid = %d, iid = %d, val = %s\n", aid, iid, emulator_print_value(write->hc, &(write->val)));
+        hap_char_update_val(write->hc, &(write->val));
+        const char * uuid = hap_char_get_type_uuid(write->hc);
+        if (!strcmp(uuid, HAP_CHAR_UUID_ON))
+            hap_keystore_set("emulator", "state", (uint8_t *)&write->val.b, sizeof(uint8_t));
+        if (!strcmp(uuid, HAP_CHAR_UUID_BRIGHTNESS))
+            hap_keystore_set("emulator", "brightness", (uint8_t *)&write->val.i, sizeof(uint8_t));
+        if (!strcmp(uuid, HAP_CHAR_UUID_HUE))
+            hap_keystore_set_u32("emulator", "hue", write->val.u, "hue");
+        if (!strcmp(uuid, HAP_CHAR_UUID_SATURATION))
+            hap_keystore_set_u32("emulator", "saturation", write->val.u, "saturation");
+        *(write->status) = HAP_STATUS_SUCCESS;
+    }
+    return HAP_SUCCESS;
+}
+
+static void emulator_print_char(hap_char_t *hc)
+{
+    const hap_val_t *cval = hap_char_get_val(hc);
+    printf("C %d %s %s\n", hap_char_get_iid(hc),
+            hap_char_get_type_uuid(hc), emulator_print_value(hc, cval));
+}
+
+static void emulator_print_serv(hap_serv_t *hs)
+{
+    printf("S %d %s\n", hap_serv_get_iid(hs), hap_serv_get_type_uuid(hs));
+    hap_char_t *hc;
+    for (hc = hap_serv_get_first_char(hs); hc; hc = hap_char_get_next(hc)) {
+        emulator_print_char(hc);
+    }
+}
+
+static void emulator_print_acc(hap_acc_t *ha)
+{
+    printf("A %d\n", hap_acc_get_aid(ha));
+    hap_serv_t *hs;
+    for (hs = hap_acc_get_first_serv(ha); hs; hs = hap_serv_get_next(hs)) {
+        emulator_print_serv(hs);
+    }
+}
+
+static void emulator_print_all()
+{
+    printf("Accessory database\n");
+    hap_acc_t *ha;
+    for (ha = hap_get_first_acc(); ha; ha = hap_acc_get_next(ha)) {
+        emulator_print_acc(ha);
+    }
+}
+void emulator_read_chars(int num, ...)
+{
+    va_list valist;
+    va_start(valist, num);
+
+    if (num == 0) {
+        emulator_print_all();
+    } else {
+        hap_acc_t *ha = hap_acc_get_by_aid(va_arg(valist, int));
+        if (!ha) {
+            printf("Invalid aid\n");
+        } else {
+            if (num == 1) 
+            emulator_print_acc(ha);
+            else if (num == 2) {
+                hap_char_t *hc = hap_acc_get_char_by_iid(ha, va_arg(valist, int));
+                if (!hc) {
+                    printf("Invalid iid\n");
+                } else {
+                    emulator_print_char(hc);
+                }
+            }
+        }
+    }
+}
+
+void emulator_write_char(int aid, int iid, char *sval)
+{
+    if (!sval) {
+        printf("Invalid val\n");
+        return;
+    }
+    hap_acc_t *ha = hap_acc_get_by_aid(aid);
+    if (!ha) {
+        printf("Invalid aid\n");
+        return;
+    }
+    hap_char_t *hc = hap_acc_get_char_by_iid(ha, iid);
+    if (!hc) {
+        printf("Invalid iid\n");
+        return;
+    }
+    hap_char_format_t format = hap_char_get_format(hc);
+    hap_val_t val;
+    switch (format) {
+	    case HAP_CHAR_FORMAT_BOOL : {
+            if (!strcmp(sval, "true")) {
+                val.b = true;
+            } else if (!strcmp(sval, "false")) {
+                val.b = false;
+            } else {
+                printf("Invalid val %s\n", sval);
+                return;
+            }
+            const char * uuid = hap_char_get_type_uuid(hc);
+            if (!strcmp(uuid, HAP_CHAR_UUID_ON))
+                hap_keystore_set("emulator", "state", (uint8_t *)&val.b, sizeof(uint8_t));
+            hap_char_update_val(hc, &val);
+   			break;
+	    }
+	    case HAP_CHAR_FORMAT_UINT8:
+	    case HAP_CHAR_FORMAT_UINT16:
+	    case HAP_CHAR_FORMAT_UINT32:
+	    case HAP_CHAR_FORMAT_INT: {
+            char *start = sval;
+            char *end = sval + strlen(sval);
+            char *endptr;
+            int i = strtoul(start, &endptr, 10);
+            if (endptr == end) {
+                val.i = i;
+                hap_char_update_val(hc, &val);
+            } else {
+                printf("Invalid val %s\n", sval);
+                return;
+            }
+            break;
+        }
+   		case HAP_CHAR_FORMAT_FLOAT : {
+            char *start = sval;
+            char *end = sval + strlen(sval);
+            char *endptr;
+            float f = strtof(start, &endptr);
+            if (endptr == end) {
+                val.f = f;
+                hap_char_update_val(hc, &val);
+            } else {
+                printf("Invalid val %s\n", sval);
+                return;
+            }
+          	break;
+        }
+   		case HAP_CHAR_FORMAT_STRING :
+            val.s = sval;
+            hap_char_update_val(hc, &val);
+       	    break;
+        default :
+            printf("Format not supported\n"); 
+    }
+}
+
+void emulator_reset_to_factory() 
+{
+    hap_reset_to_factory();
+}
+
+void emulator_reset_pairings() 
+{
+    hap_reset_pairings();
+}
+
+void emulator_switch_profile(int profile) 
+{
+    int ret = emulator_set_profile(profile);
+    if(ret == -1) {
+    } else {
+        hap_reboot_accessory();
+    }
+}
+
+void emulator_set_wac(int method)
+{
+    if(method == 1 || method ==2) {
+        hap_factory_keystore_set("wac", "method", (uint8_t *)&method, sizeof(method));
+        hap_reboot_accessory();
+    }
+    else
+        printf("Invalid WAC Id.");
+}
+
+void emulator_set_auth(int method)
+{
+    int wac = 2;
+    if(method == 1 || method ==2) {
+        hap_factory_keystore_set("auth", "method", (uint8_t *)&method, sizeof(method));
+        printf("Enforcing WAC2\n");
+        hap_factory_keystore_set("wac", "method", (uint8_t *)&wac, sizeof(wac));
+        hap_reboot_accessory();
+    }
+    else
+        printf("Invalid Auth Id.");
+}
+
+void emulator_reset_wifi_credentials()
+{
+    hap_reset_network();
+}
+
+void emulator_reboot_accessory()
+{
+    hap_reboot_accessory();
+}
diff --git a/examples/emulator/main/emulator.h b/examples/emulator/main/emulator.h
new file mode 100644
index 0000000..00d3992
--- /dev/null
+++ b/examples/emulator/main/emulator.h
@@ -0,0 +1,28 @@
+#ifndef _EMULATOR_H_
+#define _EMULATOR_H_
+#include <hap.h>
+
+typedef struct {
+    hap_cid_t cid;
+    char *name;
+    hap_serv_t * (*serv_create) (void);
+} hap_emulator_profile_t;
+int emulator_write(hap_write_data_t write_data[], int count,
+        void *serv_priv, void *write_priv);
+hap_emulator_profile_t * emulator_get_profile();
+int emulator_get_state();
+void emulator_get_characteristics(); 
+void emulator_read_chars(int num, ...);
+void emulator_write_char(int aid, int iid, char *sval);
+void emulator_show_profiles();
+void emulator_reset_to_factory();
+void emulator_reset_pairings();
+void emulator_switch_profile(int profile);
+void emulator_set_wac();
+void emulator_set_auth();
+void emulator_reset_wifi_credentials();
+void emulator_reboot_accessory();
+void console_init();
+void register_system();
+
+#endif /* _EMULATOR_H_ */
diff --git a/examples/emulator/partitions_hap.csv b/examples/emulator/partitions_hap.csv
new file mode 100644
index 0000000..f42e062
--- /dev/null
+++ b/examples/emulator/partitions_hap.csv
@@ -0,0 +1,10 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
+sec_cert,  0x3F, ,0xd000,    0x3000, ,  # Never mark this as an encrypted partition
+nvs,      data, nvs,     0x10000,   0x6000,
+otadata,  data, ota,     ,          0x2000
+phy_init, data, phy,     ,          0x1000,
+ota_0,    app,  ota_0,   0x20000,   1600K,
+ota_1,    app,  ota_1,   ,          1600K,
+factory_nvs, data,   nvs,     0x340000,  0x6000
+nvs_keys, data, nvs_keys,0x346000,  0x1000
diff --git a/examples/emulator/sdkconfig.defaults b/examples/emulator/sdkconfig.defaults
new file mode 100644
index 0000000..da60a2e
--- /dev/null
+++ b/examples/emulator/sdkconfig.defaults
@@ -0,0 +1,21 @@
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_hap.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
+CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=n
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=n
+CONFIG_FREERTOS_ASSERT_DISABLE=y
+CONFIG_LWIP_MAX_SOCKETS=16
+CONFIG_LWIP_SO_REUSE=y
+CONFIG_LWIP_MAX_ACTIVE_TCP=12
+CONFIG_LWIP_MAX_LISTENING_TCP=12
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=10
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_HARDWARE_SHA=n
+CONFIG_ESP_TASK_WDT=n
+CONFIG_LWIP_AUTOIP=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_LWIP_AUTOIP_RATE_LIMIT_INTERVAL=60
+CONFIG_MP_BLOB_SUPPORT=y
+CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
+CONFIG_BOOTLOADER_LOG_LEVEL_ERROR=y
diff --git a/examples/ethernet_bridge/CMakeLists.txt b/examples/ethernet_bridge/CMakeLists.txt
new file mode 100644
index 0000000..561ddb0
--- /dev/null
+++ b/examples/ethernet_bridge/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# (Automatically converted from project Makefile by convert_to_cmake.py.)
+
+# The following lines of boilerplate have to be in your project's CMakeLists
+# in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+if(DEFINED ENV{HOMEKIT_PATH})
+  set(HOMEKIT_PATH $ENV{HOMEKIT_PATH})
+else()
+  set(HOMEKIT_PATH ${CMAKE_CURRENT_LIST_DIR}/../..)
+endif(DEFINED ENV{HOMEKIT_PATH})
+
+set(EXTRA_COMPONENT_DIRS ${HOMEKIT_PATH}/components ${HOMEKIT_PATH}/components/homekit ${CMAKE_CURRENT_LIST_DIR}/../common)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(ethernet_bridge)
diff --git a/examples/ethernet_bridge/Makefile b/examples/ethernet_bridge/Makefile
new file mode 100644
index 0000000..d29cbbc
--- /dev/null
+++ b/examples/ethernet_bridge/Makefile
@@ -0,0 +1,15 @@
+#
+# This is a project Makefile. It is assumed the directory this Makefile resides in is a
+# project subdirectory.
+#
+
+HOMEKIT_PATH ?= $(abspath $(shell pwd)/../..)
+COMMON_COMPONENT_PATH ?= $(abspath $(shell pwd)/../common)
+
+PROJECT_NAME := ethernet_bridge
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/homekit
+EXTRA_COMPONENT_DIRS += $(COMMON_COMPONENT_PATH)
+
+include $(IDF_PATH)/make/project.mk
+
diff --git a/examples/ethernet_bridge/main/CMakeLists.txt b/examples/ethernet_bridge/main/CMakeLists.txt
new file mode 100644
index 0000000..c8815c5
--- /dev/null
+++ b/examples/ethernet_bridge/main/CMakeLists.txt
@@ -0,0 +1,2 @@
+idf_component_register(SRCS ./app_main.c ./app_eth.c
+                        INCLUDE_DIRS ".")
diff --git a/examples/ethernet_bridge/main/Kconfig.projbuild b/examples/ethernet_bridge/main/Kconfig.projbuild
new file mode 100644
index 0000000..f844f48
--- /dev/null
+++ b/examples/ethernet_bridge/main/Kconfig.projbuild
@@ -0,0 +1,126 @@
+menu "Example Configuration"
+
+    config EXAMPLE_USE_HARDCODED_SETUP_CODE
+        bool "Use hard-coded setup code"
+        default y
+        help
+            HomeKit does not recommend having the setup code programmed in the accessory as is.
+            Instead, it expects setup info (salt-verifier pair) generated for the given setup code.
+            Use this option only for testing purposes. For production, the setup info should be
+            used.
+
+    config EXAMPLE_SETUP_CODE
+        string "HomeKit Setup Code"
+        default "111-22-333"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup code to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+    config EXAMPLE_SETUP_ID
+        string "HomeKit Setup Id"
+        default "ES32"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup id to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+endmenu
+
+menu "Ethernet Configuration"
+    choice EXAMPLE_USE_ETHERNET
+        prompt "Ethernet Type"
+        default EXAMPLE_USE_INTERNAL_ETHERNET if IDF_TARGET_ESP32
+        default EXAMPLE_USE_SPI_ETHERNET if !IDF_TARGET_ESP32
+        help
+            Select which kind of Ethernet will be used in the example.
+
+        config EXAMPLE_USE_INTERNAL_ETHERNET
+            depends on IDF_TARGET_ESP32
+            select ETH_USE_ESP32_EMAC
+            bool "Internal EMAC"
+            help
+                Select internal Ethernet MAC controller.
+
+        config EXAMPLE_USE_SPI_ETHERNET
+            bool "SPI Ethernet Module"
+            select ETH_USE_SPI_ETHERNET
+            help
+                Select external SPI-Ethernet module.
+    endchoice
+
+    if EXAMPLE_USE_INTERNAL_ETHERNET
+        choice EXAMPLE_ETH_PHY_MODEL
+            prompt "Ethernet PHY Device"
+            default EXAMPLE_ETH_PHY_IP101
+            help
+                Select the Ethernet PHY device to use in the example.
+
+            config EXAMPLE_ETH_PHY_IP101
+                bool "IP101"
+                help
+                    IP101 is a single port 10/100 MII/RMII/TP/Fiber Fast Ethernet Transceiver.
+                    Goto http://www.icplus.com.tw/pp-IP101G.html for more information about it.
+
+            config EXAMPLE_ETH_PHY_RTL8201
+                bool "RTL8201/SR8201"
+                help
+                    RTL8201F/SR8201F is a single port 10/100Mb Ethernet Transceiver with auto MDIX.
+                    Goto http://www.corechip-sz.com/productsview.asp?id=22 for more information about it.
+
+            config EXAMPLE_ETH_PHY_LAN8720
+                bool "LAN8720"
+                help
+                    LAN8720A is a small footprint RMII 10/100 Ethernet Transceiver with HP Auto-MDIX Support.
+                    Goto https://www.microchip.com/LAN8720A for more information about it.
+
+            config EXAMPLE_ETH_PHY_DP83848
+                bool "DP83848"
+                help
+                    DP83848 is a single port 10/100Mb/s Ethernet Physical Layer Transceiver.
+                    Goto http://www.ti.com/product/DP83848J for more information about it.
+        endchoice
+    endif
+
+    if EXAMPLE_USE_SPI_ETHERNET
+        config EXAMPLE_ETH_SPI_HOST
+            int "SPI Host Number"
+            range 0 2
+            default 1
+            help
+                Set the SPI host used to communicate with DM9051.
+
+        config EXAMPLE_ETH_SCLK_GPIO
+            int "SPI SCLK GPIO number"
+            range 0 33
+            default 19
+            help
+                Set the GPIO number used by SPI SCLK.
+
+        config EXAMPLE_ETH_MOSI_GPIO
+            int "SPI MOSI GPIO number"
+            range 0 33
+            default 23
+            help
+                Set the GPIO number used by SPI MOSI.
+
+        config EXAMPLE_ETH_MISO_GPIO
+            int "SPI MISO GPIO number"
+            range 0 33
+            default 25
+            help
+                Set the GPIO number used by SPI MISO.
+
+        config EXAMPLE_ETH_CS_GPIO
+            int "SPI CS GPIO number"
+            range 0 33
+            default 22
+            help
+                Set the GPIO number used by SPI CS.
+
+        config EXAMPLE_ETH_SPI_CLOCK_MHZ
+            int "SPI clock speed (MHz)"
+            range 20 80
+            default 20
+            help
+                Set the clock speed (MHz) of SPI interface.
+    endif
+endmenu
diff --git a/examples/ethernet_bridge/main/app_eth.c b/examples/ethernet_bridge/main/app_eth.c
new file mode 100644
index 0000000..7c5eb8e
--- /dev/null
+++ b/examples/ethernet_bridge/main/app_eth.c
@@ -0,0 +1,145 @@
+/*
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+#include <string.h>
+#include <esp_eth.h>
+#include <esp_event.h>
+#include <esp_log.h>
+#include <esp_idf_version.h>
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 1, 0)
+// Features supported in 4.1+
+#define ESP_NETIF_SUPPORTED
+#endif
+
+#ifdef ESP_NETIF_SUPPORTED
+#include <esp_netif.h>
+#else
+#include <tcpip_adapter.h>
+#endif
+
+static const char *TAG = "app_eth";
+
+/** Event handler for Ethernet events */
+static void eth_event_handler(void *arg, esp_event_base_t event_base,
+                              int32_t event_id, void *event_data)
+{
+    uint8_t mac_addr[6] = {0};
+    /* we can get the ethernet driver handle from event data */
+    esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data;
+
+    switch (event_id) {
+    case ETHERNET_EVENT_CONNECTED:
+        esp_eth_ioctl(eth_handle, ETH_CMD_G_MAC_ADDR, mac_addr);
+        ESP_LOGI(TAG, "Ethernet Link Up");
+        ESP_LOGI(TAG, "Ethernet HW Addr %02x:%02x:%02x:%02x:%02x:%02x",
+                 mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
+        break;
+    case ETHERNET_EVENT_DISCONNECTED:
+        ESP_LOGI(TAG, "Ethernet Link Down");
+        break;
+    case ETHERNET_EVENT_START:
+        ESP_LOGI(TAG, "Ethernet Started");
+        break;
+    case ETHERNET_EVENT_STOP:
+        ESP_LOGI(TAG, "Ethernet Stopped");
+        break;
+    default:
+        break;
+    }
+}
+
+/** Event handler for IP_EVENT_ETH_GOT_IP */
+static void got_ip_event_handler(void *arg, esp_event_base_t event_base,
+                                 int32_t event_id, void *event_data)
+{
+    ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data;
+#ifdef ESP_NETIF_SUPPORTED
+    const esp_netif_ip_info_t *ip_info = &event->ip_info;
+#else
+    const tcpip_adapter_ip_info_t *ip_info = &event->ip_info;
+#endif
+
+    ESP_LOGI(TAG, "Ethernet Got IP Address");
+    ESP_LOGI(TAG, "~~~~~~~~~~~");
+    ESP_LOGI(TAG, "ETHIP:" IPSTR, IP2STR(&ip_info->ip));
+    ESP_LOGI(TAG, "ETHMASK:" IPSTR, IP2STR(&ip_info->netmask));
+    ESP_LOGI(TAG, "ETHGW:" IPSTR, IP2STR(&ip_info->gw));
+    ESP_LOGI(TAG, "~~~~~~~~~~~");
+}
+#ifdef ESP_NETIF_SUPPORTED
+static esp_netif_t *eth_netif;
+#endif
+void app_ethernet_init(void)
+{
+    /* Initialize the event loop */
+    ESP_ERROR_CHECK(esp_event_loop_create_default());
+
+    /* Initialize TCP/IP */
+#ifdef ESP_NETIF_SUPPORTED
+    esp_netif_init();
+    esp_netif_config_t cfg = ESP_NETIF_DEFAULT_ETH();
+    eth_netif = esp_netif_new(&cfg);
+    // Set default handlers to process TCP/IP stuffs
+    ESP_ERROR_CHECK(esp_eth_set_default_handlers(eth_netif));
+#else
+    tcpip_adapter_init();
+    ESP_ERROR_CHECK(tcpip_adapter_set_default_eth_handlers());
+#endif
+
+    // Register user defined event handers
+    ESP_ERROR_CHECK(esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, &eth_event_handler, NULL));
+    ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_ETH_GOT_IP, &got_ip_event_handler, NULL));
+}
+esp_err_t app_ethernet_start(void)
+{
+    eth_mac_config_t mac_config = ETH_MAC_DEFAULT_CONFIG();
+    eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();
+#if CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET
+    esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&mac_config);
+#if CONFIG_EXAMPLE_ETH_PHY_IP101
+    esp_eth_phy_t *phy = esp_eth_phy_new_ip101(&phy_config);
+#elif CONFIG_EXAMPLE_ETH_PHY_RTL8201
+    esp_eth_phy_t *phy = esp_eth_phy_new_rtl8201(&phy_config);
+#elif CONFIG_EXAMPLE_ETH_PHY_LAN8720
+    esp_eth_phy_t *phy = esp_eth_phy_new_lan8720(&phy_config);
+#elif CONFIG_EXAMPLE_ETH_PHY_DP83848
+    esp_eth_phy_t *phy = esp_eth_phy_new_dp83848(&phy_config);
+#endif
+#elif CONFIG_EXAMPLE_USE_SPI_ETHERNET
+    gpio_install_isr_service(0);
+    spi_device_handle_t spi_handle = NULL;
+    spi_bus_config_t buscfg = {
+        .miso_io_num = CONFIG_EXAMPLE_ETH_MISO_GPIO,
+        .mosi_io_num = CONFIG_EXAMPLE_ETH_MOSI_GPIO,
+        .sclk_io_num = CONFIG_EXAMPLE_ETH_SCLK_GPIO,
+        .quadwp_io_num = -1,
+        .quadhd_io_num = -1,
+    };
+    ESP_ERROR_CHECK(spi_bus_initialize(CONFIG_EXAMPLE_ETH_SPI_HOST, &buscfg, 1));
+    spi_device_interface_config_t devcfg = {
+        .command_bits = 1,
+        .address_bits = 7,
+        .mode = 0,
+        .clock_speed_hz = CONFIG_EXAMPLE_ETH_SPI_CLOCK_MHZ * 1000 * 1000,
+        .spics_io_num = CONFIG_EXAMPLE_ETH_CS_GPIO,
+        .queue_size = 20
+    };
+    ESP_ERROR_CHECK(spi_bus_add_device(CONFIG_EXAMPLE_ETH_SPI_HOST, &devcfg, &spi_handle));
+    /* dm9051 ethernet driver is based on spi driver */
+    eth_dm9051_config_t dm9051_config = ETH_DM9051_DEFAULT_CONFIG(spi_handle);
+    esp_eth_mac_t *mac = esp_eth_mac_new_dm9051(&dm9051_config, &mac_config);
+    esp_eth_phy_t *phy = esp_eth_phy_new_dm9051(&phy_config);
+#endif
+    esp_eth_config_t config = ETH_DEFAULT_CONFIG(mac, phy);
+    esp_eth_handle_t eth_handle = NULL;
+    ESP_ERROR_CHECK(esp_eth_driver_install(&config, &eth_handle));
+#ifdef ESP_NETIF_SUPPORTED
+    ESP_ERROR_CHECK(esp_netif_attach(eth_netif, esp_eth_new_netif_glue(eth_handle)));
+#endif
+    return esp_eth_start(eth_handle);
+}
+
diff --git a/examples/ethernet_bridge/main/app_eth.h b/examples/ethernet_bridge/main/app_eth.h
new file mode 100644
index 0000000..bfbe05e
--- /dev/null
+++ b/examples/ethernet_bridge/main/app_eth.h
@@ -0,0 +1,12 @@
+/*
+   This example code is in the Public Domain (or CC0 licensed, at your option.)
+
+   Unless required by applicable law or agreed to in writing, this
+   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+   CONDITIONS OF ANY KIND, either express or implied.
+*/
+#pragma once
+#include <esp_err.h>
+
+void app_ethernet_init(void);
+esp_err_t app_ethernet_start(void);
diff --git a/examples/ethernet_bridge/main/app_main.c b/examples/ethernet_bridge/main/app_main.c
new file mode 100644
index 0000000..fbe5294
--- /dev/null
+++ b/examples/ethernet_bridge/main/app_main.c
@@ -0,0 +1,222 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2018 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+
+/* HomeKit Bridge Example
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <esp_log.h>
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+
+#include <app_hap_setup_payload.h>
+
+#include "app_eth.h"
+
+static const char *TAG = "HAP Ethernet Bridge";
+
+#define BRIDGE_TASK_PRIORITY  1
+#define BRIDGE_TASK_STACKSIZE 4 * 1024
+#define BRIDGE_TASK_NAME      "hap_eth_bridge"
+
+#define NUM_BRIDGED_ACCESSORIES 3
+
+/* Mandatory identify routine for the accessory (bridge)
+ * In a real accessory, something like LED blink should be implemented
+ * got visual identification
+ */
+static int bridge_identify(hap_acc_t *ha)
+{
+    ESP_LOGI(TAG, "Bridge identified");
+    return HAP_SUCCESS;
+}
+
+/* Mandatory identify routine for the bridged accessory
+ * In a real bridge, the actual accessory must be sent some request to
+ * identify itself visually
+ */
+static int accessory_identify(hap_acc_t *ha)
+{
+    hap_serv_t *hs = hap_acc_get_serv_by_uuid(ha, HAP_SERV_UUID_ACCESSORY_INFORMATION);
+    hap_char_t *hc = hap_serv_get_char_by_uuid(hs, HAP_CHAR_UUID_NAME);
+    const hap_val_t *val = hap_char_get_val(hc);
+    char *name = val->s;
+
+    ESP_LOGI(TAG, "Bridged Accessory %s identified", name);
+    return HAP_SUCCESS;
+}
+
+/* A dummy callback for handling a write on the "On" characteristic of Fan.
+ * In an actual accessory, this should control the hardware
+ */
+static int fan_on(bool value)
+{
+    ESP_LOGI(TAG, "Received Write. Fan %s", value ? "On" : "Off");
+    /* TODO: Control Actual Hardware */
+    return 0;
+}
+
+/* A dummy callback for handling a write on the "On" characteristic of Fan.
+ * In an actual accessory, this should control the hardware
+ */
+static int fan_write(hap_write_data_t write_data[], int count,
+        void *serv_priv, void *write_priv)
+{
+    ESP_LOGI(TAG, "Write called for Accessory %s", (char *)serv_priv);
+    int i, ret = HAP_SUCCESS;
+    hap_write_data_t *write;
+    for (i = 0; i < count; i++) {
+        write = &write_data[i];
+        if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_UUID_ON)) {
+            fan_on(write->val.b);
+            hap_char_update_val(write->hc, &(write->val));
+            *(write->status) = HAP_STATUS_SUCCESS;
+        } else {
+            *(write->status) = HAP_STATUS_RES_ABSENT;
+        }
+    }
+    return ret;
+}
+
+/*The main thread for handling the Bridge Accessory */
+static void bridge_thread_entry(void *p)
+{
+    hap_acc_t *accessory;
+    hap_serv_t *service;
+
+    /* Initialize the HAP core */
+    hap_init(HAP_TRANSPORT_ETHERNET);
+
+    /* Initialise the mandatory parameters for Accessory which will be added as
+     * the mandatory services internally
+     */
+    hap_acc_cfg_t cfg = {
+        .name = "Esp-Eth-Bridge",
+        .manufacturer = "Espressif",
+        .model = "EspBridge01",
+        .serial_num = "001122334455",
+        .fw_rev = "0.9.0",
+        .hw_rev = NULL,
+        .pv = "1.1.0",
+        .identify_routine = bridge_identify,
+        .cid = HAP_CID_BRIDGE,
+    };
+    /* Create accessory object */
+    accessory = hap_acc_create(&cfg);
+
+    /* Add the Accessory to the HomeKit Database */
+    hap_add_accessory(accessory);
+
+    /* Add a dummy Product Data */
+    uint8_t product_data[] = {'E','S','P','3','2','H','A','P'};
+    hap_acc_add_product_data(accessory, product_data, sizeof(product_data));
+
+    /* Create and add the Accessory to the Bridge object*/
+    for (uint8_t i = 0; i < NUM_BRIDGED_ACCESSORIES; i++) {
+        char accessory_name[14] = {0};
+        sprintf(accessory_name, "ESP-Fan-%d", i);
+
+        hap_acc_cfg_t bridge_cfg = {
+            .name = accessory_name,
+            .manufacturer = "Espressif",
+            .model = "EspFan01",
+            .serial_num = "abcdefg",
+            .fw_rev = "0.9.0",
+            .hw_rev = NULL,
+            .pv = "1.1.0",
+            .identify_routine = accessory_identify,
+            .cid = HAP_CID_BRIDGE,
+        };
+        /* Create accessory object */
+        accessory = hap_acc_create(&bridge_cfg);
+
+        /* Create the Fan Service. Include the "name" since this is a user visible service  */
+        service = hap_serv_fan_create(false);
+        hap_serv_add_char(service, hap_char_name_create(accessory_name));
+
+        /* Set the Accessory name as the Private data for the service,
+         * so that the correct accessory can be identified in the
+         * write callback
+         */
+        hap_serv_set_priv(service, strdup(accessory_name));
+
+        /* Set the write callback for the service */
+        hap_serv_set_write_cb(service, fan_write);
+ 
+        /* Add the Fan Service to the Accessory Object */
+        hap_acc_add_serv(accessory, service);
+
+        /* Add the Accessory to the HomeKit Database */
+        hap_add_bridged_accessory(accessory, hap_get_unique_aid(accessory_name));
+    }
+
+    /* TODO: Do the actual hardware initialization here */
+
+    /* For production accessories, the setup code shouldn't be programmed on to
+     * the device. Instead, the setup info, derived from the setup code must
+     * be used. Use the factory_nvs_gen utility to generate this data and then
+     * flash it into the factory NVS partition.
+     *
+     * By default, the setup ID and setup info will be read from the factory_nvs
+     * Flash partition and so, is not required to set here explicitly.
+     *
+     * However, for testing purpose, this can be overridden by using hap_set_setup_code()
+     * and hap_set_setup_id() APIs, as has been done here.
+     */
+#ifdef CONFIG_EXAMPLE_USE_HARDCODED_SETUP_CODE
+    /* Unique Setup code of the format xxx-xx-xxx. Default: 111-22-333 */
+    hap_set_setup_code(CONFIG_EXAMPLE_SETUP_CODE);
+    /* Unique four character Setup Id. Default: ES32 */
+    hap_set_setup_id(CONFIG_EXAMPLE_SETUP_ID);
+#ifdef CONFIG_APP_WIFI_USE_WAC_PROVISIONING
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, true, cfg.cid);
+#else
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, false, cfg.cid);
+#endif
+#endif
+
+    /* Enable Hardware MFi authentication (applicable only for MFi variant of SDK) */
+    hap_enable_mfi_auth(HAP_MFI_AUTH_HW);
+
+    /* Initialize Ethernet */
+    app_ethernet_init();
+
+    /* After all the initializations are done, start the HAP core */
+    hap_start();
+
+    /* Start Ethernet */
+    app_ethernet_start();
+
+    /* The task ends here. The read/write callbacks will be invoked by the HAP Framework */
+    vTaskDelete(NULL);
+}
+
+void app_main()
+{
+    xTaskCreate(bridge_thread_entry, BRIDGE_TASK_NAME, BRIDGE_TASK_STACKSIZE, NULL, BRIDGE_TASK_PRIORITY, NULL);
+}
+
diff --git a/examples/ethernet_bridge/main/component.mk b/examples/ethernet_bridge/main/component.mk
new file mode 100644
index 0000000..a98f634
--- /dev/null
+++ b/examples/ethernet_bridge/main/component.mk
@@ -0,0 +1,4 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/ethernet_bridge/partitions_hap.csv b/examples/ethernet_bridge/partitions_hap.csv
new file mode 100644
index 0000000..f42e062
--- /dev/null
+++ b/examples/ethernet_bridge/partitions_hap.csv
@@ -0,0 +1,10 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
+sec_cert,  0x3F, ,0xd000,    0x3000, ,  # Never mark this as an encrypted partition
+nvs,      data, nvs,     0x10000,   0x6000,
+otadata,  data, ota,     ,          0x2000
+phy_init, data, phy,     ,          0x1000,
+ota_0,    app,  ota_0,   0x20000,   1600K,
+ota_1,    app,  ota_1,   ,          1600K,
+factory_nvs, data,   nvs,     0x340000,  0x6000
+nvs_keys, data, nvs_keys,0x346000,  0x1000
diff --git a/examples/ethernet_bridge/sdkconfig.defaults b/examples/ethernet_bridge/sdkconfig.defaults
new file mode 100644
index 0000000..20ebd69
--- /dev/null
+++ b/examples/ethernet_bridge/sdkconfig.defaults
@@ -0,0 +1,21 @@
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_hap.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
+CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=n
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=n
+CONFIG_FREERTOS_ASSERT_DISABLE=y
+CONFIG_LWIP_MAX_SOCKETS=16
+CONFIG_LWIP_SO_REUSE=y
+CONFIG_LWIP_MAX_ACTIVE_TCP=12
+CONFIG_LWIP_MAX_LISTENING_TCP=12
+CONFIG_UDP_RECVMBOX_SIZE=10
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_HARDWARE_SHA=n
+CONFIG_TASK_WDT=n
+CONFIG_LWIP_AUTOIP=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_LWIP_AUTOIP_RATE_LIMIT_INTERVAL=60
+CONFIG_MP_BLOB_SUPPORT=y
+CONFIG_SDA_GPIO=13
+CONFIG_SCL_GPIO=15
diff --git a/examples/fan/CMakeLists.txt b/examples/fan/CMakeLists.txt
new file mode 100644
index 0000000..6a2fb34
--- /dev/null
+++ b/examples/fan/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# (Automatically converted from project Makefile by convert_to_cmake.py.)
+
+# The following lines of boilerplate have to be in your project's CMakeLists
+# in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+if(DEFINED ENV{HOMEKIT_PATH})
+  set(HOMEKIT_PATH $ENV{HOMEKIT_PATH})
+else()
+  set(HOMEKIT_PATH ${CMAKE_CURRENT_LIST_DIR}/../..)
+endif(DEFINED ENV{HOMEKIT_PATH})
+
+set(EXTRA_COMPONENT_DIRS ${HOMEKIT_PATH}/components ${HOMEKIT_PATH}/components/homekit ${CMAKE_CURRENT_LIST_DIR}/../common)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(fan)
diff --git a/examples/fan/Makefile b/examples/fan/Makefile
new file mode 100755
index 0000000..61ce4d9
--- /dev/null
+++ b/examples/fan/Makefile
@@ -0,0 +1,15 @@
+#
+# This is a project Makefile. It is assumed the directory this Makefile resides in is a
+# project subdirectory.
+#
+
+HOMEKIT_PATH ?= $(abspath $(shell pwd)/../..)
+COMMON_COMPONENT_PATH ?= $(abspath $(shell pwd)/../common)
+
+PROJECT_NAME := fan
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/homekit
+EXTRA_COMPONENT_DIRS += $(COMMON_COMPONENT_PATH)
+
+include $(IDF_PATH)/make/project.mk
+
diff --git a/examples/fan/fan_factory.bin b/examples/fan/fan_factory.bin
new file mode 100644
index 0000000..c800e11
Binary files /dev/null and b/examples/fan/fan_factory.bin differ
diff --git a/examples/fan/main/CMakeLists.txt b/examples/fan/main/CMakeLists.txt
new file mode 100644
index 0000000..7fb6738
--- /dev/null
+++ b/examples/fan/main/CMakeLists.txt
@@ -0,0 +1 @@
+idf_component_register(SRCS ./app_main.c)
diff --git a/examples/fan/main/Kconfig.projbuild b/examples/fan/main/Kconfig.projbuild
new file mode 100644
index 0000000..6f3e3fe
--- /dev/null
+++ b/examples/fan/main/Kconfig.projbuild
@@ -0,0 +1,26 @@
+menu "Example Configuration"
+
+    config EXAMPLE_USE_HARDCODED_SETUP_CODE
+        bool "Use hard-coded setup code"
+        default y
+        help
+            HomeKit does not recommend having the setup code programmed in the accessory as is.
+            Instead, it expects setup info (salt-verifier pair) generated for the given setup code.
+            Use this option only for testing purposes. For production, the setup info should be
+            used.
+
+    config EXAMPLE_SETUP_CODE
+        string "HomeKit Setup Code"
+        default "111-22-333"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup code to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+    config EXAMPLE_SETUP_ID
+        string "HomeKit Setup Id"
+        default "ES32"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup id to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+endmenu
diff --git a/examples/fan/main/app_main.c b/examples/fan/main/app_main.c
new file mode 100644
index 0000000..a9db856
--- /dev/null
+++ b/examples/fan/main/app_main.c
@@ -0,0 +1,325 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2018 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+
+/* HomeKit Fan Example
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <esp_event.h>
+#include <esp_log.h>
+
+#include <hap.h>
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+
+#include <hap_fw_upgrade.h>
+#include <iot_button.h>
+
+#include <app_wifi.h>
+#include <app_hap_setup_payload.h>
+
+/*  Required for server verification during OTA, PEM format as string  */
+char server_cert[] = {};
+
+static const char *TAG = "HAP Fan";
+
+#define FAN_TASK_PRIORITY  1
+#define FAN_TASK_STACKSIZE 4 * 1024
+#define FAN_TASK_NAME      "hap_fan"
+
+/* Reset network credentials if button is pressed for more than 3 seconds and then released */
+#define RESET_NETWORK_BUTTON_TIMEOUT        3
+
+/* Reset to factory if button is pressed and held for more than 10 seconds */
+#define RESET_TO_FACTORY_BUTTON_TIMEOUT     10
+
+/* The button "Boot" will be used as the Reset button for the example */
+#define RESET_GPIO  GPIO_NUM_0
+
+/**
+ * @brief The network reset button callback handler.
+ * Useful for testing the Wi-Fi re-configuration feature of WAC2
+ */
+static void reset_network_handler(void* arg)
+{
+    hap_reset_network();
+}
+/**
+ * @brief The factory reset button callback handler.
+ */
+static void reset_to_factory_handler(void* arg)
+{
+    hap_reset_to_factory();
+}
+
+/**
+ * The Reset button  GPIO initialisation function.
+ * Same button will be used for resetting Wi-Fi network as well as for reset to factory based on
+ * the time for which the button is pressed.
+ */
+static void reset_key_init(uint32_t key_gpio_pin)
+{
+    button_handle_t handle = iot_button_create(key_gpio_pin, BUTTON_ACTIVE_LOW);
+    iot_button_add_on_release_cb(handle, RESET_NETWORK_BUTTON_TIMEOUT, reset_network_handler, NULL);
+    iot_button_add_on_press_cb(handle, RESET_TO_FACTORY_BUTTON_TIMEOUT, reset_to_factory_handler, NULL);
+}
+
+/* Mandatory identify routine for the accessory.
+ * In a real accessory, something like LED blink should be implemented
+ * got visual identification
+ */
+static int fan_identify(hap_acc_t *ha)
+{
+    ESP_LOGI(TAG, "Accessory identified");
+    return HAP_SUCCESS;
+}
+
+/*
+ * An optional HomeKit Event handler which can be used to track HomeKit
+ * specific events.
+ */
+static void fan_hap_event_handler(void* arg, esp_event_base_t event_base, int event, void *data)
+{
+    switch(event) {
+        case HAP_EVENT_PAIRING_STARTED :
+            ESP_LOGI(TAG, "Pairing Started");
+            break;
+        case HAP_EVENT_PAIRING_ABORTED :
+            ESP_LOGI(TAG, "Pairing Aborted");
+            break;
+        case HAP_EVENT_CTRL_PAIRED :
+            ESP_LOGI(TAG, "Controller %s Paired. Controller count: %d",
+                        (char *)data, hap_get_paired_controller_count());
+            break;
+        case HAP_EVENT_CTRL_UNPAIRED :
+            ESP_LOGI(TAG, "Controller %s Removed. Controller count: %d",
+                        (char *)data, hap_get_paired_controller_count());
+            break;
+        case HAP_EVENT_CTRL_CONNECTED :
+            ESP_LOGI(TAG, "Controller %s Connected", (char *)data);
+            break;
+        case HAP_EVENT_CTRL_DISCONNECTED :
+            ESP_LOGI(TAG, "Controller %s Disconnected", (char *)data);
+            break;
+        case HAP_EVENT_ACC_REBOOTING : {
+            char *reason = (char *)data;
+            ESP_LOGI(TAG, "Accessory Rebooting (Reason: %s)",  reason ? reason : "null");
+            break;
+        }
+        default:
+            /* Silently ignore unknown events */
+            break;
+    }
+}
+
+/* A dummy callback for handling a read on the "Direction" characteristic of Fan.
+ * In an actual accessory, this should read from hardware.
+ * Read routines are generally not required as the value is available with th HAP core
+ * when it is updated from write routines. For external triggers (like fan switched on/off
+ * using physical button), accessories should explicitly call hap_char_update_val()
+ * instead of waiting for a read request.
+ */
+static int fan_read(hap_char_t *hc, hap_status_t *status_code, void *serv_priv, void *read_priv)
+{
+    if (hap_req_get_ctrl_id(read_priv)) {
+        ESP_LOGI(TAG, "Received read from %s", hap_req_get_ctrl_id(read_priv));
+    }
+    if (!strcmp(hap_char_get_type_uuid(hc), HAP_CHAR_UUID_ROTATION_DIRECTION)) {
+       /* Read the current value, toggle it and set the new value.
+        * A separate variable should be used for the new value, as the hap_char_get_val()
+        * API returns a const pointer
+        */
+        const hap_val_t *cur_val = hap_char_get_val(hc);
+
+        hap_val_t new_val;
+        if (cur_val->i == 1) {
+            new_val.i = 0;
+        } else {
+            new_val.i = 1;
+        }
+        hap_char_update_val(hc, &new_val);
+        *status_code = HAP_STATUS_SUCCESS;
+    }
+    return HAP_SUCCESS;
+}
+
+/* A dummy callback for handling a write on the "On" characteristic of Fan.
+ * In an actual accessory, this should control the hardware
+ */
+static int fan_write(hap_write_data_t write_data[], int count,
+        void *serv_priv, void *write_priv)
+{
+    if (hap_req_get_ctrl_id(write_priv)) {
+        ESP_LOGI(TAG, "Received write from %s", hap_req_get_ctrl_id(write_priv));
+    }
+    ESP_LOGI(TAG, "Fan Write called with %d chars", count);
+    int i, ret = HAP_SUCCESS;
+    hap_write_data_t *write;
+    for (i = 0; i < count; i++) {
+        write = &write_data[i];
+        if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_UUID_ON)) {
+            ESP_LOGI(TAG, "Received Write. Fan %s", write->val.b ? "On" : "Off");
+            /* TODO: Control Actual Hardware */
+            hap_char_update_val(write->hc, &(write->val));
+            *(write->status) = HAP_STATUS_SUCCESS;
+        } else if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_UUID_ROTATION_DIRECTION)) {
+            if (write->val.i > 1) {
+                *(write->status) = HAP_STATUS_VAL_INVALID;
+                ret = HAP_FAIL;
+            } else {
+                ESP_LOGI(TAG, "Received Write. Fan %s", write->val.i ? "AntiClockwise" : "Clockwise");
+                hap_char_update_val(write->hc, &(write->val));
+                *(write->status) = HAP_STATUS_SUCCESS;
+            }
+        } else {
+            *(write->status) = HAP_STATUS_RES_ABSENT;
+        }
+    }
+    return ret;
+}
+
+/*The main thread for handling the Fan Accessory */
+static void fan_thread_entry(void *p)
+{
+    hap_acc_t *accessory;
+    hap_serv_t *service;
+
+    /* Configure HomeKit core to make the Accessory name (and thus the WAC SSID) unique,
+     * instead of the default configuration wherein only the WAC SSID is made unique.
+     */
+    hap_cfg_t hap_cfg;
+    hap_get_config(&hap_cfg);
+    hap_cfg.unique_param = UNIQUE_NAME;
+    hap_set_config(&hap_cfg);
+
+    /* Initialize the HAP core */
+    hap_init(HAP_TRANSPORT_WIFI);
+
+    /* Initialise the mandatory parameters for Accessory which will be added as
+     * the mandatory services internally
+     */
+    hap_acc_cfg_t cfg = {
+        .name = "Esp-Fan",
+        .manufacturer = "Espressif",
+        .model = "EspFan01",
+        .serial_num = "001122334455",
+        .fw_rev = "0.9.0",
+        .hw_rev = NULL,
+        .pv = "1.1.0",
+        .identify_routine = fan_identify,
+        .cid = HAP_CID_FAN,
+    };
+    /* Create accessory object */
+    accessory = hap_acc_create(&cfg);
+
+    /* Add a dummy Product Data */
+    uint8_t product_data[] = {'E','S','P','3','2','H','A','P'};
+    hap_acc_add_product_data(accessory, product_data, sizeof(product_data));
+
+    /* Create the Fan Service. Include the "name" since this is a user visible service  */
+    service = hap_serv_fan_create(false);
+    hap_serv_add_char(service, hap_char_name_create("My Fan"));
+    hap_serv_add_char(service, hap_char_rotation_direction_create(0));
+
+    /* Set the write callback for the service */
+    hap_serv_set_write_cb(service, fan_write);
+
+    /* Set the read callback for the service (optional) */
+    hap_serv_set_read_cb(service, fan_read);
+
+    /* Add the Fan Service to the Accessory Object */
+    hap_acc_add_serv(accessory, service);
+
+    /* Create the Firmware Upgrade HomeKit Custom Service.
+     * Please refer the FW Upgrade documentation under components/homekit/extras/include/hap_fw_upgrade.h
+     * and the top level README for more information.
+     */
+    hap_fw_upgrade_config_t ota_config = {
+        .server_cert_pem = server_cert,
+    };
+    service = hap_serv_fw_upgrade_create(&ota_config);
+    /* Add the service to the Accessory Object */
+    hap_acc_add_serv(accessory, service);
+
+    /* Add the Accessory to the HomeKit Database */
+    hap_add_accessory(accessory);
+
+    /* Register a common button for reset Wi-Fi network and reset to factory.
+     */
+    reset_key_init(RESET_GPIO);
+
+    /* Register an event handler for HomeKit specific events */
+    esp_event_handler_register(HAP_EVENT, ESP_EVENT_ANY_ID, &fan_hap_event_handler, NULL);
+
+    /* Query the controller count (just for information) */
+    ESP_LOGI(TAG, "Accessory is paired with %d controllers",
+                hap_get_paired_controller_count());
+
+    /* TODO: Do the actual hardware initialization here */
+
+    /* For production accessories, the setup code shouldn't be programmed on to
+     * the device. Instead, the setup info, derived from the setup code must
+     * be used. Use the factory_nvs_gen utility to generate this data and then
+     * flash it into the factory NVS partition.
+     *
+     * By default, the setup ID and setup info will be read from the factory_nvs
+     * Flash partition and so, is not required to set here explicitly.
+     *
+     * However, for testing purpose, this can be overridden by using hap_set_setup_code()
+     * and hap_set_setup_id() APIs, as has been done here.
+     */
+#ifdef CONFIG_EXAMPLE_USE_HARDCODED_SETUP_CODE
+    /* Unique Setup code of the format xxx-xx-xxx. Default: 111-22-333 */
+    hap_set_setup_code(CONFIG_EXAMPLE_SETUP_CODE);
+    /* Unique four character Setup Id. Default: ES32 */
+    hap_set_setup_id(CONFIG_EXAMPLE_SETUP_ID);
+#ifdef CONFIG_APP_WIFI_USE_WAC_PROVISIONING
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, true, cfg.cid);
+#else
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, false, cfg.cid);
+#endif
+#endif
+
+    /* Enable Hardware MFi authentication (applicable only for MFi variant of SDK) */
+    hap_enable_mfi_auth(HAP_MFI_AUTH_HW);
+
+    /* Initialize Wi-Fi */
+    app_wifi_init();
+
+    /* After all the initializations are done, start the HAP core */
+    hap_start();
+    /* Start Wi-Fi */
+    app_wifi_start(portMAX_DELAY);
+    /* The task ends here. The read/write callbacks will be invoked by the HAP Framework */
+    vTaskDelete(NULL);
+}
+
+void app_main()
+{
+    xTaskCreate(fan_thread_entry, FAN_TASK_NAME, FAN_TASK_STACKSIZE, NULL, FAN_TASK_PRIORITY, NULL);
+}
+
diff --git a/examples/fan/main/component.mk b/examples/fan/main/component.mk
new file mode 100644
index 0000000..a98f634
--- /dev/null
+++ b/examples/fan/main/component.mk
@@ -0,0 +1,4 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/fan/partitions_hap.csv b/examples/fan/partitions_hap.csv
new file mode 100644
index 0000000..f42e062
--- /dev/null
+++ b/examples/fan/partitions_hap.csv
@@ -0,0 +1,10 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
+sec_cert,  0x3F, ,0xd000,    0x3000, ,  # Never mark this as an encrypted partition
+nvs,      data, nvs,     0x10000,   0x6000,
+otadata,  data, ota,     ,          0x2000
+phy_init, data, phy,     ,          0x1000,
+ota_0,    app,  ota_0,   0x20000,   1600K,
+ota_1,    app,  ota_1,   ,          1600K,
+factory_nvs, data,   nvs,     0x340000,  0x6000
+nvs_keys, data, nvs_keys,0x346000,  0x1000
diff --git a/examples/fan/sdkconfig.defaults b/examples/fan/sdkconfig.defaults
new file mode 100644
index 0000000..e0468d8
--- /dev/null
+++ b/examples/fan/sdkconfig.defaults
@@ -0,0 +1,19 @@
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_hap.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
+CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=n
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=n
+CONFIG_FREERTOS_ASSERT_DISABLE=y
+CONFIG_LWIP_MAX_SOCKETS=16
+CONFIG_LWIP_SO_REUSE=y
+CONFIG_LWIP_MAX_ACTIVE_TCP=12
+CONFIG_LWIP_MAX_LISTENING_TCP=12
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=10
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_HARDWARE_SHA=n
+CONFIG_ESP_TASK_WDT=n
+CONFIG_LWIP_AUTOIP=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_LWIP_AUTOIP_RATE_LIMIT_INTERVAL=60
+CONFIG_MP_BLOB_SUPPORT=y
diff --git a/examples/lightbulb/CMakeLists.txt b/examples/lightbulb/CMakeLists.txt
new file mode 100644
index 0000000..b5757b2
--- /dev/null
+++ b/examples/lightbulb/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# (Automatically converted from project Makefile by convert_to_cmake.py.)
+
+# The following lines of boilerplate have to be in your project's CMakeLists
+# in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+if(DEFINED ENV{HOMEKIT_PATH})
+  set(HOMEKIT_PATH $ENV{HOMEKIT_PATH})
+else()
+  set(HOMEKIT_PATH ${CMAKE_CURRENT_LIST_DIR}/../..)
+endif(DEFINED ENV{HOMEKIT_PATH})
+
+set(EXTRA_COMPONENT_DIRS ${HOMEKIT_PATH}/components ${HOMEKIT_PATH}/components/homekit ${CMAKE_CURRENT_LIST_DIR}/../common)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(lightbulb)
diff --git a/examples/lightbulb/Makefile b/examples/lightbulb/Makefile
new file mode 100755
index 0000000..75feaab
--- /dev/null
+++ b/examples/lightbulb/Makefile
@@ -0,0 +1,15 @@
+#
+# This is a project Makefile. It is assumed the directory this Makefile resides in is a
+# project subdirectory.
+#
+
+HOMEKIT_PATH ?= $(abspath $(shell pwd)/../..)
+COMMON_COMPONENT_PATH ?= $(abspath $(shell pwd)/../common)
+
+PROJECT_NAME := lightbulb
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/homekit
+EXTRA_COMPONENT_DIRS += $(COMMON_COMPONENT_PATH)
+
+include $(IDF_PATH)/make/project.mk
+
diff --git a/examples/lightbulb/main/CMakeLists.txt b/examples/lightbulb/main/CMakeLists.txt
new file mode 100644
index 0000000..cf89bbb
--- /dev/null
+++ b/examples/lightbulb/main/CMakeLists.txt
@@ -0,0 +1,2 @@
+idf_component_register(SRCS ./app_main.c ./lightbulb.c
+                        INCLUDE_DIRS ".")
diff --git a/examples/lightbulb/main/Kconfig.projbuild b/examples/lightbulb/main/Kconfig.projbuild
new file mode 100644
index 0000000..6f3e3fe
--- /dev/null
+++ b/examples/lightbulb/main/Kconfig.projbuild
@@ -0,0 +1,26 @@
+menu "Example Configuration"
+
+    config EXAMPLE_USE_HARDCODED_SETUP_CODE
+        bool "Use hard-coded setup code"
+        default y
+        help
+            HomeKit does not recommend having the setup code programmed in the accessory as is.
+            Instead, it expects setup info (salt-verifier pair) generated for the given setup code.
+            Use this option only for testing purposes. For production, the setup info should be
+            used.
+
+    config EXAMPLE_SETUP_CODE
+        string "HomeKit Setup Code"
+        default "111-22-333"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup code to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+    config EXAMPLE_SETUP_ID
+        string "HomeKit Setup Id"
+        default "ES32"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup id to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+endmenu
diff --git a/examples/lightbulb/main/app_main.c b/examples/lightbulb/main/app_main.c
new file mode 100644
index 0000000..d3def6c
--- /dev/null
+++ b/examples/lightbulb/main/app_main.c
@@ -0,0 +1,281 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2018 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+
+/* HomeKit Lightbulb Example
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <esp_log.h>
+
+#include <hap.h>
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+#include <hap_fw_upgrade.h>
+
+#include <iot_button.h>
+
+#include <app_wifi.h>
+#include <app_hap_setup_payload.h>
+
+#include "lightbulb.h"
+
+/* Comment out the below line to disable Firmware Upgrades */
+#define CONFIG_FIRMWARE_SERVICE
+
+static const char *TAG = "HAP lightbulb";
+
+#define LIGHTBULB_TASK_PRIORITY  1
+#define LIGHTBULB_TASK_STACKSIZE 4 * 1024
+#define LIGHTBULB_TASK_NAME      "hap_lightbulb"
+
+/* Reset network credentials if button is pressed for more than 3 seconds and then released */
+#define RESET_NETWORK_BUTTON_TIMEOUT        3
+
+/* Reset to factory if button is pressed and held for more than 10 seconds */
+#define RESET_TO_FACTORY_BUTTON_TIMEOUT     10
+
+/* The button "Boot" will be used as the Reset button for the example */
+#define RESET_GPIO  GPIO_NUM_0
+/**
+ * @brief The network reset button callback handler.
+ * Useful for testing the Wi-Fi re-configuration feature of WAC2
+ */
+static void reset_network_handler(void* arg)
+{
+    hap_reset_network();
+}
+/**
+ * @brief The factory reset button callback handler.
+ */
+static void reset_to_factory_handler(void* arg)
+{
+    hap_reset_to_factory();
+}
+
+/**
+ * The Reset button  GPIO initialisation function.
+ * Same button will be used for resetting Wi-Fi network as well as for reset to factory based on
+ * the time for which the button is pressed.
+ */
+static void reset_key_init(uint32_t key_gpio_pin)
+{
+    button_handle_t handle = iot_button_create(key_gpio_pin, BUTTON_ACTIVE_LOW);
+    iot_button_add_on_release_cb(handle, RESET_NETWORK_BUTTON_TIMEOUT, reset_network_handler, NULL);
+    iot_button_add_on_press_cb(handle, RESET_TO_FACTORY_BUTTON_TIMEOUT, reset_to_factory_handler, NULL);
+}
+
+/* Mandatory identify routine for the accessory.
+ * In a real accessory, something like LED blink should be implemented
+ * got visual identification
+ */
+static int light_identify(hap_acc_t *ha)
+{
+    ESP_LOGI(TAG, "Accessory identified");
+    return HAP_SUCCESS;
+}
+
+/* Callback for handling writes on the Light Bulb Service
+ */
+static int lightbulb_write(hap_write_data_t write_data[], int count,
+        void *serv_priv, void *write_priv)
+{
+    int i, ret = HAP_SUCCESS;
+    hap_write_data_t *write;
+    for (i = 0; i < count; i++) {
+        write = &write_data[i];
+        /* Setting a default error value */
+        *(write->status) = HAP_STATUS_VAL_INVALID;
+        if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_UUID_ON)) {
+            ESP_LOGI(TAG, "Received Write for Light %s", write->val.b ? "On" : "Off");
+            if (lightbulb_set_on(write->val.b) == 0) {
+                *(write->status) = HAP_STATUS_SUCCESS;
+            }
+        } else if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_UUID_BRIGHTNESS)) {
+            ESP_LOGI(TAG, "Received Write for Light Brightness %d", write->val.i);
+            if (lightbulb_set_brightness(write->val.i) == 0) {
+                *(write->status) = HAP_STATUS_SUCCESS;
+            }
+        } else if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_UUID_HUE)) {
+            ESP_LOGI(TAG, "Received Write for Light Hue %f", write->val.f);
+            if (lightbulb_set_hue(write->val.f) == 0) {
+                *(write->status) = HAP_STATUS_SUCCESS;
+            }
+        } else if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_UUID_SATURATION)) {
+            ESP_LOGI(TAG, "Received Write for Light Saturation %f", write->val.f);
+            if (lightbulb_set_saturation(write->val.f) == 0) {
+                *(write->status) = HAP_STATUS_SUCCESS;
+            }
+        } else {
+            *(write->status) = HAP_STATUS_RES_ABSENT;
+        }
+        /* If the characteristic write was successful, update it in hap core
+         */
+        if (*(write->status) == HAP_STATUS_SUCCESS) {
+            hap_char_update_val(write->hc, &(write->val));
+        } else {
+            /* Else, set the return value appropriately to report error */
+            ret = HAP_FAIL;
+        }
+    }
+    return ret;
+}
+
+/*The main thread for handling the Light Bulb Accessory */
+static void lightbulb_thread_entry(void *arg)
+{
+    hap_acc_t *accessory;
+    hap_serv_t *service;
+
+    /* Initialize the HAP core */
+    hap_init(HAP_TRANSPORT_WIFI);
+
+    /* Initialise the mandatory parameters for Accessory which will be added as
+     * the mandatory services internally
+     */
+    hap_acc_cfg_t cfg = {
+        .name = "Esp-Light",
+        .manufacturer = "Espressif",
+        .model = "EspLight01",
+        .serial_num = "abcdefg",
+        .fw_rev = "0.9.0",
+        .hw_rev = "1.0",
+        .pv = "1.1.0",
+        .identify_routine = light_identify,
+        .cid = HAP_CID_LIGHTING,
+    };
+
+    /* Create accessory object */
+    accessory = hap_acc_create(&cfg);
+    if (!accessory) {
+        ESP_LOGE(TAG, "Failed to create accessory");
+        goto light_err;
+    }
+
+    /* Add a dummy Product Data */
+    uint8_t product_data[] = {'E','S','P','3','2','H','A','P'};
+    hap_acc_add_product_data(accessory, product_data, sizeof(product_data));
+
+    /* Create the Light Bulb Service. Include the "name" since this is a user visible service  */
+    service = hap_serv_lightbulb_create(true);
+    if (!service) {
+        ESP_LOGE(TAG, "Failed to create LightBulb Service");
+        goto light_err;
+    }
+
+    /* Add the optional characteristic to the Light Bulb Service */
+    int ret = hap_serv_add_char(service, hap_char_name_create("My Light"));
+    ret |= hap_serv_add_char(service, hap_char_brightness_create(50));
+    ret |= hap_serv_add_char(service, hap_char_hue_create(180));
+    ret |= hap_serv_add_char(service, hap_char_saturation_create(100));
+    
+    if (ret != HAP_SUCCESS) {
+        ESP_LOGE(TAG, "Failed to add optional characteristics to LightBulb");
+        goto light_err;
+    }
+    /* Set the write callback for the service */
+    hap_serv_set_write_cb(service, lightbulb_write);
+    
+    /* Add the Light Bulb Service to the Accessory Object */
+    hap_acc_add_serv(accessory, service);
+
+#ifdef CONFIG_FIRMWARE_SERVICE
+    /*  Required for server verification during OTA, PEM format as string  */
+    static char server_cert[] = {};
+    hap_fw_upgrade_config_t ota_config = {
+        .server_cert_pem = server_cert,
+    };
+    /* Create and add the Firmware Upgrade Service, if enabled.
+     * Please refer the FW Upgrade documentation under components/homekit/extras/include/hap_fw_upgrade.h
+     * and the top level README for more information.
+     */
+    service = hap_serv_fw_upgrade_create(&ota_config);
+    if (!service) {
+        ESP_LOGE(TAG, "Failed to create Firmware Upgrade Service");
+        goto light_err;
+    }
+    hap_acc_add_serv(accessory, service);
+#endif
+
+    /* Add the Accessory to the HomeKit Database */
+    hap_add_accessory(accessory);
+
+    /* Initialize the Light Bulb Hardware */
+    lightbulb_init();
+
+    /* Register a common button for reset Wi-Fi network and reset to factory.
+     */
+    reset_key_init(RESET_GPIO);
+
+    /* TODO: Do the actual hardware initialization here */
+
+    /* For production accessories, the setup code shouldn't be programmed on to
+     * the device. Instead, the setup info, derived from the setup code must
+     * be used. Use the factory_nvs_gen utility to generate this data and then
+     * flash it into the factory NVS partition.
+     *
+     * By default, the setup ID and setup info will be read from the factory_nvs
+     * Flash partition and so, is not required to set here explicitly.
+     *
+     * However, for testing purpose, this can be overridden by using hap_set_setup_code()
+     * and hap_set_setup_id() APIs, as has been done here.
+     */
+#ifdef CONFIG_EXAMPLE_USE_HARDCODED_SETUP_CODE
+    /* Unique Setup code of the format xxx-xx-xxx. Default: 111-22-333 */
+    hap_set_setup_code(CONFIG_EXAMPLE_SETUP_CODE);
+    /* Unique four character Setup Id. Default: ES32 */
+    hap_set_setup_id(CONFIG_EXAMPLE_SETUP_ID);
+#ifdef CONFIG_APP_WIFI_USE_WAC_PROVISIONING
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, true, cfg.cid);
+#else
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, false, cfg.cid);
+#endif
+#endif
+
+    /* Enable Hardware MFi authentication (applicable only for MFi variant of SDK) */
+    hap_enable_mfi_auth(HAP_MFI_AUTH_HW);
+
+    /* Initialize Wi-Fi */
+    app_wifi_init();
+
+    /* After all the initializations are done, start the HAP core */
+    hap_start();
+    /* Start Wi-Fi */
+    app_wifi_start(portMAX_DELAY);
+
+    /* The task ends here. The read/write callbacks will be invoked by the HAP Framework */
+    vTaskDelete(NULL);
+
+light_err:
+    hap_acc_delete(accessory);
+    vTaskDelete(NULL);
+}
+
+void app_main()
+{
+    xTaskCreate(lightbulb_thread_entry, LIGHTBULB_TASK_NAME, LIGHTBULB_TASK_STACKSIZE,
+            NULL, LIGHTBULB_TASK_PRIORITY, NULL);
+}
diff --git a/examples/lightbulb/main/component.mk b/examples/lightbulb/main/component.mk
new file mode 100644
index 0000000..a98f634
--- /dev/null
+++ b/examples/lightbulb/main/component.mk
@@ -0,0 +1,4 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/lightbulb/main/lightbulb.c b/examples/lightbulb/main/lightbulb.c
new file mode 100644
index 0000000..c410855
--- /dev/null
+++ b/examples/lightbulb/main/lightbulb.c
@@ -0,0 +1,279 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2018 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+
+/* HomeKit Lightbulb Example Hardware Implementation
+*/
+
+#include <stdio.h>
+
+#include "driver/ledc.h"
+#include "esp_log.h"
+
+typedef struct rgb {
+    uint8_t r;  // 0-100 %
+    uint8_t g;  // 0-100 %
+    uint8_t b;  // 0-100 %
+} rgb_t;
+
+
+typedef struct hsp {
+    uint16_t h;  // 0-360
+    uint16_t s;  // 0-100
+    uint16_t b;  // 0-100
+} hsp_t;
+
+/* LED numbers below are for ESP-WROVER-KIT */
+/* Red LED */
+#define LEDC_IO_0 (0)
+/* Green LED */
+#define LEDC_IO_1 (2)
+/* Blued LED */
+#define LEDC_IO_2 (4)
+
+#define PWM_DEPTH (1023)
+#define PWM_TARGET_DUTY 8192
+
+static hsp_t s_hsb_val;
+static uint16_t s_brightness;
+static bool s_on = false;
+
+static const char *TAG = "lightbulb";
+
+/**
+ * @brief transform lightbulb's "RGB" and other parameter
+ */
+static void lightbulb_set_aim(uint32_t r, uint32_t g, uint32_t b, uint32_t cw, uint32_t ww, uint32_t period)
+{
+    ledc_set_duty(LEDC_HIGH_SPEED_MODE, LEDC_CHANNEL_0, r);
+    ledc_set_duty(LEDC_HIGH_SPEED_MODE, LEDC_CHANNEL_1, g);
+    ledc_set_duty(LEDC_HIGH_SPEED_MODE, LEDC_CHANNEL_2, b);
+    ledc_update_duty(LEDC_HIGH_SPEED_MODE, LEDC_CHANNEL_0);
+    ledc_update_duty(LEDC_HIGH_SPEED_MODE, LEDC_CHANNEL_1);
+    ledc_update_duty(LEDC_HIGH_SPEED_MODE, LEDC_CHANNEL_2);
+}
+
+/**
+ * @brief transform lightbulb's "HSV" to "RGB"
+ */
+static bool lightbulb_set_hsb2rgb(uint16_t h, uint16_t s, uint16_t v, rgb_t *rgb)
+{
+    bool res = true;
+    uint16_t hi, F, P, Q, T;
+
+    if (!rgb)
+        return false;
+
+    if (h > 360) return false;
+    if (s > 100) return false;
+    if (v > 100) return false;
+
+    hi = (h / 60) % 6;
+    F = 100 * h / 60 - 100 * hi;
+    P = v * (100 - s) / 100;
+    Q = v * (10000 - F * s) / 10000;
+    T = v * (10000 - s * (100 - F)) / 10000;
+
+    switch (hi) {
+    case 0:
+        rgb->r = v;
+        rgb->g = T;
+        rgb->b = P;
+        break;
+    case 1:
+        rgb->r = Q;
+        rgb->g = v;
+        rgb->b = P;
+        break;
+    case 2:
+        rgb->r = P;
+        rgb->g = v;
+        rgb->b = T;
+        break;
+    case 3:
+        rgb->r = P;
+        rgb->g = Q;
+        rgb->b = v;
+        break;
+    case 4:
+        rgb->r = T;
+        rgb->g = P;
+        rgb->b = v;
+        break;
+    case 5:
+        rgb->r = v;
+        rgb->g = P;
+        rgb->b = Q;
+        break;
+    default:
+        return false;
+    }
+    return res;
+}
+
+/**
+ * @brief set the lightbulb's "HSV"
+ */
+static bool lightbulb_set_aim_hsv(uint16_t h, uint16_t s, uint16_t v)
+{
+    rgb_t rgb_tmp;
+    bool ret = lightbulb_set_hsb2rgb(h, s, v, &rgb_tmp);
+
+    if (ret == false)
+        return false;
+
+    lightbulb_set_aim(rgb_tmp.r * PWM_TARGET_DUTY / 100, rgb_tmp.g * PWM_TARGET_DUTY / 100,
+            rgb_tmp.b * PWM_TARGET_DUTY / 100, (100 - s) * 5000 / 100, v * 2000 / 100, 1000);
+
+    return true;
+}
+
+/**
+ * @brief update the lightbulb's state
+ */
+static void lightbulb_update()
+{
+    lightbulb_set_aim_hsv(s_hsb_val.h, s_hsb_val.s, s_hsb_val.b);
+}
+
+
+/**
+ * @brief initialize the lightbulb lowlevel module
+ */
+void lightbulb_init(void)
+{
+    // enable ledc module
+    periph_module_enable(PERIPH_LEDC_MODULE);
+
+    // config the timer
+    ledc_timer_config_t ledc_timer = {
+        //set frequency of pwm
+        .freq_hz = 5000,
+        //timer mode,
+        .speed_mode = LEDC_HIGH_SPEED_MODE,
+        //timer index
+        .timer_num = LEDC_TIMER_0
+    };
+    ledc_timer_config(&ledc_timer);
+
+    //config the channel
+    ledc_channel_config_t ledc_channel = {
+        //set LEDC channel 0
+        .channel = LEDC_CHANNEL_0,
+        //set the duty for initialization.(duty range is 0 ~ ((2**bit_num)-1)
+        .duty = 100,
+        //GPIO number
+        .gpio_num = LEDC_IO_0,
+        //GPIO INTR TYPE, as an example, we enable fade_end interrupt here.
+        .intr_type = LEDC_INTR_FADE_END,
+        //set LEDC mode, from ledc_mode_t
+        .speed_mode = LEDC_HIGH_SPEED_MODE,
+        //set LEDC timer source, if different channel use one timer,
+        //the frequency and bit_num of these channels should be the same
+        .timer_sel = LEDC_TIMER_0
+    };
+    //set the configuration
+    ledc_channel_config(&ledc_channel);
+
+    //config ledc channel1
+    ledc_channel.channel = LEDC_CHANNEL_1;
+    ledc_channel.gpio_num = LEDC_IO_1;
+    ledc_channel_config(&ledc_channel);
+    //config ledc channel2
+    ledc_channel.channel = LEDC_CHANNEL_2;
+    ledc_channel.gpio_num = LEDC_IO_2;
+    ledc_channel_config(&ledc_channel);
+}
+
+/**
+ * @brief deinitialize the lightbulb's lowlevel module
+ */
+void lightbulb_deinit(void)
+{
+    ledc_stop(LEDC_HIGH_SPEED_MODE, LEDC_CHANNEL_0, 0);
+    ledc_stop(LEDC_HIGH_SPEED_MODE, LEDC_CHANNEL_1, 0);
+    ledc_stop(LEDC_HIGH_SPEED_MODE, LEDC_CHANNEL_2, 0);
+}
+
+/**
+ * @brief turn on/off the lowlevel lightbulb
+ */
+int lightbulb_set_on(bool value)
+{
+    ESP_LOGI(TAG, "lightbulb_set_on : %s", value == true ? "true" : "false");
+
+    if (value == true) {
+        s_hsb_val.b = s_brightness;
+        s_on = true;
+    } else {
+        s_brightness = s_hsb_val.b;
+        s_hsb_val.b = 0;
+        s_on = false;
+    }
+    lightbulb_update();
+
+    return 0;
+}
+
+/**
+ * @brief set the saturation of the lowlevel lightbulb
+ */
+int lightbulb_set_saturation(float value)
+{
+    ESP_LOGI(TAG, "lightbulb_set_saturation : %f", value);
+
+    s_hsb_val.s = value;
+    if (true == s_on)
+        lightbulb_update();
+
+    return 0;
+}
+
+/**
+ * @brief set the hue of the lowlevel lightbulb
+ */
+int lightbulb_set_hue(float value)
+{
+    ESP_LOGI(TAG, "lightbulb_set_hue : %f", value);
+
+    s_hsb_val.h = value;
+    if (true == s_on)
+        lightbulb_update();
+
+    return 0;
+}
+
+/**
+ * @brief set the brightness of the lowlevel lightbulb
+ */
+int lightbulb_set_brightness(int value)
+{
+    ESP_LOGI(TAG, "lightbulb_set_brightness : %d", value);
+
+    s_hsb_val.b = value;
+    s_brightness = s_hsb_val.b; 
+    if (true == s_on)
+        lightbulb_update();
+
+    return 0;
+}
diff --git a/examples/lightbulb/main/lightbulb.h b/examples/lightbulb/main/lightbulb.h
new file mode 100644
index 0000000..5d95cea
--- /dev/null
+++ b/examples/lightbulb/main/lightbulb.h
@@ -0,0 +1,91 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2018 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+
+/* HomeKit Lightbulb Example
+*/
+
+#ifndef _LIGHTBULB_H_
+#define _LIGHTBULB_H_
+
+/**
+ * @brief initialize the lightbulb lowlevel module
+ *
+ * @param none
+ *
+ * @return none
+ */
+void lightbulb_init(void);
+
+/**
+ * @brief deinitialize the lightbulb's lowlevel module
+ *
+ * @param none
+ *
+ * @return none
+ */
+void lightbulb_deinit(void);
+
+/**
+ * @brief turn on/off the lowlevel lightbulb
+ *
+ * @param value The "On" value
+ *
+ * @return none
+ */
+int lightbulb_set_on(bool value);
+
+/**
+ * @brief set the saturation of the lowlevel lightbulb
+ *
+ * @param value The Saturation value
+ *
+ * @return 
+ *     - 0 : OK
+ *     - others : fail
+ */
+int lightbulb_set_saturation(float value);
+
+/**
+ * @brief set the hue of the lowlevel lightbulb
+ *
+ * @param value The Hue value
+ *
+ * @return 
+ *     - 0 : OK
+ *     - others : fail
+ */
+int lightbulb_set_hue(float value);
+
+/**
+ * @brief set the brightness of the lowlevel lightbulb
+ *
+ * @param value The Brightness value
+ *
+ * @return 
+ *     - 0 : OK
+ *     - others : fail
+ */
+int lightbulb_set_brightness(int value);
+
+#endif /* _LIGHTBULB_H_ */
diff --git a/examples/lightbulb/partitions_hap.csv b/examples/lightbulb/partitions_hap.csv
new file mode 100644
index 0000000..f42e062
--- /dev/null
+++ b/examples/lightbulb/partitions_hap.csv
@@ -0,0 +1,10 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
+sec_cert,  0x3F, ,0xd000,    0x3000, ,  # Never mark this as an encrypted partition
+nvs,      data, nvs,     0x10000,   0x6000,
+otadata,  data, ota,     ,          0x2000
+phy_init, data, phy,     ,          0x1000,
+ota_0,    app,  ota_0,   0x20000,   1600K,
+ota_1,    app,  ota_1,   ,          1600K,
+factory_nvs, data,   nvs,     0x340000,  0x6000
+nvs_keys, data, nvs_keys,0x346000,  0x1000
diff --git a/examples/lightbulb/sdkconfig.defaults b/examples/lightbulb/sdkconfig.defaults
new file mode 100644
index 0000000..e0468d8
--- /dev/null
+++ b/examples/lightbulb/sdkconfig.defaults
@@ -0,0 +1,19 @@
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_hap.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
+CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=n
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=n
+CONFIG_FREERTOS_ASSERT_DISABLE=y
+CONFIG_LWIP_MAX_SOCKETS=16
+CONFIG_LWIP_SO_REUSE=y
+CONFIG_LWIP_MAX_ACTIVE_TCP=12
+CONFIG_LWIP_MAX_LISTENING_TCP=12
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=10
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_HARDWARE_SHA=n
+CONFIG_ESP_TASK_WDT=n
+CONFIG_LWIP_AUTOIP=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_LWIP_AUTOIP_RATE_LIMIT_INTERVAL=60
+CONFIG_MP_BLOB_SUPPORT=y
diff --git a/examples/smart_outlet/CMakeLists.txt b/examples/smart_outlet/CMakeLists.txt
new file mode 100644
index 0000000..950a8f8
--- /dev/null
+++ b/examples/smart_outlet/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+# (Automatically converted from project Makefile by convert_to_cmake.py.)
+
+# The following lines of boilerplate have to be in your project's CMakeLists
+# in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+if(DEFINED ENV{HOMEKIT_PATH})
+  set(HOMEKIT_PATH $ENV{HOMEKIT_PATH})
+else()
+  set(HOMEKIT_PATH ${CMAKE_CURRENT_LIST_DIR}/../..)
+endif(DEFINED ENV{HOMEKIT_PATH})
+
+set(EXTRA_COMPONENT_DIRS ${HOMEKIT_PATH}/components ${HOMEKIT_PATH}/components/homekit ${CMAKE_CURRENT_LIST_DIR}/../common)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(smart_outlet)
diff --git a/examples/smart_outlet/Makefile b/examples/smart_outlet/Makefile
new file mode 100755
index 0000000..da7b20b
--- /dev/null
+++ b/examples/smart_outlet/Makefile
@@ -0,0 +1,15 @@
+#
+# This is a project Makefile. It is assumed the directory this Makefile resides in is a
+# project subdirectory.
+#
+
+HOMEKIT_PATH ?= $(abspath $(shell pwd)/../..)
+COMMON_COMPONENT_PATH ?= $(abspath $(shell pwd)/../common)
+
+PROJECT_NAME := smart_outlet
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/
+EXTRA_COMPONENT_DIRS += $(HOMEKIT_PATH)/components/homekit
+EXTRA_COMPONENT_DIRS += $(COMMON_COMPONENT_PATH)
+
+include $(IDF_PATH)/make/project.mk
+
diff --git a/examples/smart_outlet/main/CMakeLists.txt b/examples/smart_outlet/main/CMakeLists.txt
new file mode 100644
index 0000000..7fb6738
--- /dev/null
+++ b/examples/smart_outlet/main/CMakeLists.txt
@@ -0,0 +1 @@
+idf_component_register(SRCS ./app_main.c)
diff --git a/examples/smart_outlet/main/Kconfig.projbuild b/examples/smart_outlet/main/Kconfig.projbuild
new file mode 100644
index 0000000..6f3e3fe
--- /dev/null
+++ b/examples/smart_outlet/main/Kconfig.projbuild
@@ -0,0 +1,26 @@
+menu "Example Configuration"
+
+    config EXAMPLE_USE_HARDCODED_SETUP_CODE
+        bool "Use hard-coded setup code"
+        default y
+        help
+            HomeKit does not recommend having the setup code programmed in the accessory as is.
+            Instead, it expects setup info (salt-verifier pair) generated for the given setup code.
+            Use this option only for testing purposes. For production, the setup info should be
+            used.
+
+    config EXAMPLE_SETUP_CODE
+        string "HomeKit Setup Code"
+        default "111-22-333"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup code to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+    config EXAMPLE_SETUP_ID
+        string "HomeKit Setup Id"
+        default "ES32"
+        depends on EXAMPLE_USE_HARDCODED_SETUP_CODE
+        help
+            Setup id to be used for HomeKot pairing, if hard-coded setup code is enabled.
+
+endmenu
diff --git a/examples/smart_outlet/main/app_main.c b/examples/smart_outlet/main/app_main.c
new file mode 100644
index 0000000..782e3fa
--- /dev/null
+++ b/examples/smart_outlet/main/app_main.c
@@ -0,0 +1,241 @@
+/*
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2018 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on ESPRESSIF SYSTEMS products only, in which case,
+ * it is 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.
+ *
+ */
+/* HomeKit Smart Outlet Example
+*/
+#include <stdio.h>
+#include <string.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+#include <freertos/queue.h>
+#include <esp_log.h>
+#include <driver/gpio.h>
+
+#include <hap.h>
+
+#include <hap_apple_servs.h>
+#include <hap_apple_chars.h>
+
+#include <app_wifi.h>
+#include <app_hap_setup_payload.h>
+
+static const char *TAG = "HAP outlet";
+
+#define SMART_OUTLET_TASK_PRIORITY  1
+#define SMART_OUTLET_TASK_STACKSIZE 4 * 1024
+#define SMART_OUTLET_TASK_NAME      "hap_outlet"
+
+#define OUTLET_IN_USE_GPIO GPIO_NUM_0
+
+#define ESP_INTR_FLAG_DEFAULT 0
+
+static xQueueHandle s_esp_evt_queue = NULL;
+/**
+ * @brief the recover outlet in use gpio interrupt function
+ */
+static void IRAM_ATTR outlet_in_use_isr(void* arg)
+{
+    uint32_t gpio_num = (uint32_t) arg;
+    xQueueSendFromISR(s_esp_evt_queue, &gpio_num, NULL);
+}
+
+/**
+ * Enable a GPIO Pin for Outlet in Use Detection
+ */
+static void outlet_in_use_key_init(uint32_t key_gpio_pin)
+{
+    gpio_config_t io_conf;
+    /* Interrupt for both the edges  */
+    io_conf.intr_type = GPIO_INTR_ANYEDGE;
+    /* Bit mask of the pins */
+    io_conf.pin_bit_mask = 1 << key_gpio_pin;
+    /* Set as input mode */
+    io_conf.mode = GPIO_MODE_INPUT;
+    /* Enable internal pull-up */
+    io_conf.pull_up_en = 1;
+    /* Disable internal pull-down */
+    io_conf.pull_down_en = 0;
+    /* Set the GPIO configuration */
+    gpio_config(&io_conf);
+
+    /* Install gpio isr service */
+    gpio_install_isr_service(ESP_INTR_FLAG_DEFAULT);
+    /* Hook isr handler for specified gpio pin */
+    gpio_isr_handler_add(key_gpio_pin, outlet_in_use_isr, (void*)key_gpio_pin);
+}
+
+/**
+ * Initialize the Smart Outlet Hardware.Here, we just enebale the Outlet-In-Use detection.
+ */
+void smart_outlet_hardware_init(gpio_num_t gpio_num)
+{
+    s_esp_evt_queue = xQueueCreate(2, sizeof(uint32_t));
+    if (s_esp_evt_queue != NULL) {
+        outlet_in_use_key_init(gpio_num);
+    }
+}
+
+/* Mandatory identify routine for the accessory.
+ * In a real accessory, something like LED blink should be implemented
+ * got visual identification
+ */
+static int outlet_identify(hap_acc_t *ha)
+{
+    ESP_LOGI(TAG, "Accessory identified");
+    return HAP_SUCCESS;
+}
+
+/* A dummy callback for handling a write on the "On" characteristic of Outlet.
+ * In an actual accessory, this should control the hardware
+ */
+static int outlet_write(hap_write_data_t write_data[], int count,
+        void *serv_priv, void *write_priv)
+{
+    int i, ret = HAP_SUCCESS;
+    hap_write_data_t *write;
+    for (i = 0; i < count; i++) {
+        write = &write_data[i];
+        if (!strcmp(hap_char_get_type_uuid(write->hc), HAP_CHAR_UUID_ON)) {
+            ESP_LOGI(TAG, "Received Write. Outlet %s", write->val.b ? "On" : "Off");
+            /* TODO: Control Actual Hardware */
+            hap_char_update_val(write->hc, &(write->val));
+            *(write->status) = HAP_STATUS_SUCCESS;
+        } else {
+            *(write->status) = HAP_STATUS_RES_ABSENT;
+        }
+    }
+    return ret;
+}
+
+/*The main thread for handling the Smart Outlet Accessory */
+static void smart_outlet_thread_entry(void *p)
+{
+    hap_acc_t *accessory;
+    hap_serv_t *service;
+
+    /* Initialize the HAP core */
+    hap_init(HAP_TRANSPORT_WIFI);
+
+    /* Initialise the mandatory parameters for Accessory which will be added as
+     * the mandatory services internally
+     */
+    hap_acc_cfg_t cfg = {
+        .name = "Esp-Smart-Outlet",
+        .manufacturer = "Espressif",
+        .model = "EspSmartOutlet01",
+        .serial_num = "001122334455",
+        .fw_rev = "0.9.0",
+        .hw_rev = NULL,
+        .pv = "1.1.0",
+        .identify_routine = outlet_identify,
+        .cid = HAP_CID_OUTLET,
+    };
+    /* Create accessory object */
+    accessory = hap_acc_create(&cfg);
+
+    /* Add a dummy Product Data */
+    uint8_t product_data[] = {'E','S','P','3','2','H','A','P'};
+    hap_acc_add_product_data(accessory, product_data, sizeof(product_data));
+
+    /* Create the Outlet Service. Include the "name" since this is a user visible service  */
+    service = hap_serv_outlet_create(false, false);
+    hap_serv_add_char(service, hap_char_name_create("My Smart Outlet"));
+
+    /* Get pointer to the outlet in use characteristic which we need to monitor for state changes */
+    hap_char_t *outlet_in_use = hap_serv_get_char_by_uuid(service, HAP_CHAR_UUID_OUTLET_IN_USE);
+
+    /* Set the write callback for the service */
+    hap_serv_set_write_cb(service, outlet_write);
+
+    /* Add the Outlet Service to the Accessory Object */
+    hap_acc_add_serv(accessory, service);
+
+    /* Add the Accessory to the HomeKit Database */
+    hap_add_accessory(accessory);
+
+    /* Initialize the appliance specific hardware. This enables out-in-use detection */
+    smart_outlet_hardware_init(OUTLET_IN_USE_GPIO);
+
+    /* For production accessories, the setup code shouldn't be programmed on to
+     * the device. Instead, the setup info, derived from the setup code must
+     * be used. Use the factory_nvs_gen utility to generate this data and then
+     * flash it into the factory NVS partition.
+     *
+     * By default, the setup ID and setup info will be read from the factory_nvs
+     * Flash partition and so, is not required to set here explicitly.
+     *
+     * However, for testing purpose, this can be overridden by using hap_set_setup_code()
+     * and hap_set_setup_id() APIs, as has been done here.
+     */
+#ifdef CONFIG_EXAMPLE_USE_HARDCODED_SETUP_CODE
+    /* Unique Setup code of the format xxx-xx-xxx. Default: 111-22-333 */
+    hap_set_setup_code(CONFIG_EXAMPLE_SETUP_CODE);
+    /* Unique four character Setup Id. Default: ES32 */
+    hap_set_setup_id(CONFIG_EXAMPLE_SETUP_ID);
+#ifdef CONFIG_APP_WIFI_USE_WAC_PROVISIONING
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, true, cfg.cid);
+#else
+    app_hap_setup_payload(CONFIG_EXAMPLE_SETUP_CODE, CONFIG_EXAMPLE_SETUP_ID, false, cfg.cid);
+#endif
+#endif
+
+    /* Enable Hardware MFi authentication (applicable only for MFi variant of SDK) */
+    hap_enable_mfi_auth(HAP_MFI_AUTH_HW);
+
+    /* Initialize Wi-Fi */
+    app_wifi_init();
+
+    /* After all the initializations are done, start the HAP core */
+    hap_start();
+    /* Start Wi-Fi */
+    app_wifi_start(portMAX_DELAY);
+
+    uint32_t io_num = OUTLET_IN_USE_GPIO;
+    hap_val_t appliance_value = {
+        .b = true,
+    };
+    /* Listen for Outlet-In-Use state change events. Other read/write functionality will be handled
+     * by the HAP Core.
+     * When the Outlet in Use GPIO goes low, it means Outlet is not in use.
+     * When the Outlet in Use GPIO goes high, it means Outlet is in use.
+     * Applications can define own logic as per their hardware.
+     */
+    while (1) {
+        if (xQueueReceive(s_esp_evt_queue, &io_num, portMAX_DELAY) == pdFALSE) {
+            ESP_LOGI(TAG, "Outlet-In-Use trigger FAIL");
+        } else {
+            appliance_value.b = gpio_get_level(io_num);
+            /* If any state change is detected, update the Outlet In Use characteristic value */
+            hap_char_update_val(outlet_in_use, &appliance_value);
+            ESP_LOGI(TAG, "Outlet-In-Use triggered [%d]", appliance_value.b);
+        }
+    }
+}
+
+void app_main()
+{
+    /* Create the application thread */
+    xTaskCreate(smart_outlet_thread_entry, SMART_OUTLET_TASK_NAME, SMART_OUTLET_TASK_STACKSIZE,
+                NULL, SMART_OUTLET_TASK_PRIORITY, NULL);
+}
+
diff --git a/examples/smart_outlet/main/component.mk b/examples/smart_outlet/main/component.mk
new file mode 100644
index 0000000..a98f634
--- /dev/null
+++ b/examples/smart_outlet/main/component.mk
@@ -0,0 +1,4 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/smart_outlet/partitions_hap.csv b/examples/smart_outlet/partitions_hap.csv
new file mode 100644
index 0000000..f42e062
--- /dev/null
+++ b/examples/smart_outlet/partitions_hap.csv
@@ -0,0 +1,10 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
+sec_cert,  0x3F, ,0xd000,    0x3000, ,  # Never mark this as an encrypted partition
+nvs,      data, nvs,     0x10000,   0x6000,
+otadata,  data, ota,     ,          0x2000
+phy_init, data, phy,     ,          0x1000,
+ota_0,    app,  ota_0,   0x20000,   1600K,
+ota_1,    app,  ota_1,   ,          1600K,
+factory_nvs, data,   nvs,     0x340000,  0x6000
+nvs_keys, data, nvs_keys,0x346000,  0x1000
diff --git a/examples/smart_outlet/sdkconfig.defaults b/examples/smart_outlet/sdkconfig.defaults
new file mode 100644
index 0000000..e0468d8
--- /dev/null
+++ b/examples/smart_outlet/sdkconfig.defaults
@@ -0,0 +1,19 @@
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_hap.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
+CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=n
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=n
+CONFIG_FREERTOS_ASSERT_DISABLE=y
+CONFIG_LWIP_MAX_SOCKETS=16
+CONFIG_LWIP_SO_REUSE=y
+CONFIG_LWIP_MAX_ACTIVE_TCP=12
+CONFIG_LWIP_MAX_LISTENING_TCP=12
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=10
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_HARDWARE_SHA=n
+CONFIG_ESP_TASK_WDT=n
+CONFIG_LWIP_AUTOIP=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_LWIP_AUTOIP_RATE_LIMIT_INTERVAL=60
+CONFIG_MP_BLOB_SUPPORT=y
diff --git a/tools/factory_nvs_gen/README.md b/tools/factory_nvs_gen/README.md
new file mode 100644
index 0000000..7615f79
--- /dev/null
+++ b/tools/factory_nvs_gen/README.md
@@ -0,0 +1,107 @@
+# Factory NVS Generator
+
+## Introduction
+
+factory\_nvs\_gen is a Python script that can be used to generate the Factory NVS Partition image with
+accessory setup information like setup\_id, setup\_salt and setup\_verifier. Using such images, the same
+firmware can be used for multiple accessories, as the setup information is no more a part of the
+firmware, but read from a different partition.
+
+Using this needs the factory\_nvs partition in partition table. Please check the partitions\_hap.csv 
+file in the example accessories for reference. Using the same file for your accessory is recommended.
+
+## Usage
+
+This utility requires the python library "srp". If not available already, please install using
+
+```
+pip install srp
+```
+
+The Utility can then be used as below:
+
+```
+usage: ./factory_nvs_gen.py [-h] [--infile INFILE] [--size SIZE]
+                            [--version {v1,v2}] [--keygen {true,false}]
+                            [--encrypt {true,false}] [--keyfile KEYFILE]
+                            setup_code setup_id outfile
+
+Factory NVS Generator
+
+optional arguments:
+  -h, --help            show this help message and exit
+
+To generate Factory NVS partition:
+  setup_code            the input setup code without hyphens Eg.: 11122333
+  setup_id              the input setup identifer Eg.: ES32
+  --infile INFILE       the input csv file with extension(full path) to add
+                        HomeKit data generated to this file Eg.: fan_data.csv
+  outfile               the output csv and bin filename without extension Eg.:
+                        fan_factory
+  --size SIZE           Size of NVS Partition in bytes (must be multiple of
+                        4096)
+  --version {v1,v2}     Set version. Default: v2
+  --keygen {true,false}
+                        Generate keys for encryption. Creates an
+                        `encryption_keys.bin` file. Default: false
+  --encrypt {true,false}
+                        Set encryption mode. Default: false
+  --keyfile KEYFILE     File having key for encryption (Applicable only if
+                        encryption mode is true)
+```
+
+where
+
+- *setup\_code* is the pairing code, without the hyphen (-). (Eg. 11122333)
+- *Setup\_id* is a 4 character alphanumeric string configured for an accessory (Eg. 7OSX)
+- *target\_filename\_without\_extension* is a name like fan\_factory, to which .csv and .bin extensions are added for creating the files
+
+## Example
+
+```
+~# ./factory_nvs_gen.py 11122333 ES32 fan_factory
+CSV Generated: fan_factory.csv
+NVS Flash Binary Generated: fan_factory.bin
+```
+
+```
+./factory_nvs_gen.py 11122333 ES32 fan_factory --version v2 --encrypt true --keygen true
+CSV Generated: fan_factory.csv
+Version:  v2 - Multipage Blob Support Enabled
+NVS binary created: /path/esp_homekit_sdk_src/tools/factory_nvs_gen/fan_factory.bin
+Encryption keys binary created: /path/esp_homekit_sdk_src/tools/factory_nvs_gen/keys/encryption_keys_04-11_18-32.bin
+NVS Flash Binary Generated: fan_factory.bin
+```
+
+## Using the Binary
+
+As mentioned, earlier, using this requires the factory\_nvs partition in your partition table.
+A `make` target has been added for flashing this, however it requires that
+
+- The .bin image is present in your accessory folder (where you will execute make) with the name
+    $(PROJECT_NAME)\_factory.bin (Eg. fan\_factory.bin)
+- The appropriate value is set for CONFIG\_APP\_FACTORY\_NVS\_OFFSET, which is basically the offset for
+    the factory_nvs partition in the partition table
+
+If the above requirements are met, first flash all the components, including the partition table and then flash the NVS partition as given below:
+
+```
+make flash
+make factory-nvs-flash
+```
+
+## Adding custom data
+
+For certain applications, some custom NVS data may be required in addition to the HomeKit data.
+Such data can be included by writing it into a CSV file, the format for which should be as per
+the requirements of nvs\_partition\_generator. Please refer the documentation under tools/nvs\_partition\_generator
+for details about formatting. The file with the custom data (say app.csv) should then be passed to
+the factory\_nvs\_gen as below:
+
+```
+~# ./factory_nvs_gen.py 11122333 ES32 fan_factory --infile app_data.csv
+CSV Generated: fan_factory.csv
+NVS Flash Binary Generated: fan_factory.bin
+```
+
+*Note that the custom data cannot use hap\_setup as the namespace, unless it is the UUID/Token for Software Authentication*
diff --git a/tools/factory_nvs_gen/factory_nvs_gen.py b/tools/factory_nvs_gen/factory_nvs_gen.py
new file mode 100755
index 0000000..8d6f05d
--- /dev/null
+++ b/tools/factory_nvs_gen/factory_nvs_gen.py
@@ -0,0 +1,165 @@
+#!/usr/bin/env python
+#
+# Copyright 2018 Espressif Systems (Shanghai) PTE LTD
+#
+# 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.
+#
+import sys
+import os
+import csv
+import subprocess
+import binascii
+import argparse
+try:
+    file_path = os.path.dirname(os.path.realpath(__file__))
+    nvs_gen_path = os.path.join(file_path,"../idf_tools/nvs_partition_generator/")
+
+    if not os.path.exists(nvs_gen_path):
+        print("Trying tools from IDF_PATH")
+        if os.getenv('IDF_PATH'):
+            nvs_gen_path = os.path.join(os.getenv('IDF_PATH'),'','components','','nvs_flash','','nvs_partition_generator','')
+        else:
+            sys.exit("Please check IDF_PATH")
+    sys.path.insert(0, nvs_gen_path)
+    import nvs_partition_gen
+    srp_tool_path = os.path.join(file_path, '../' ,'srp','')
+    sys.path.insert(0, srp_tool_path)
+    import srp_tool as srp
+
+
+except Exception as e:
+    print(e)
+
+def main():
+    try:
+        parser = argparse.ArgumentParser(prog='./factory_nvs_gen.py',\
+        description="Factory NVS Generator",\
+        formatter_class=argparse.RawDescriptionHelpFormatter)
+        factory_nvs_part_gen_group = parser.add_argument_group('To generate Factory NVS partition')
+        factory_nvs_part_gen_group.add_argument('setup_code',\
+        help='the input setup code without hyphens Eg.: 11122333 ')
+        factory_nvs_part_gen_group.add_argument('setup_id',\
+        help='the input setup identifer Eg.: ES32')
+        factory_nvs_part_gen_group.add_argument('--infile',dest='infile',\
+        help='the input csv file with extension(full path) to add HomeKit data generated to this file Eg.: fan_data.csv')
+        factory_nvs_part_gen_group.add_argument('outfile',\
+        help='the output csv and bin filename without extension Eg.: fan_factory')
+        factory_nvs_part_gen_group.add_argument('--size', \
+        help='Size of NVS Partition in bytes (must be multiple of 4096)', \
+        default='0x4000')
+        factory_nvs_part_gen_group.add_argument('--version', \
+        help='Set version. Default: v2',choices=['v1','v2'], \
+        default='v2',type=str.lower)
+        factory_nvs_part_gen_group.add_argument("--keygen", \
+        help='Generate keys for encryption. Creates an `encryption_keys.bin` file. Default: false', \
+        choices=['true','false'],default= 'false',type=str.lower)
+        factory_nvs_part_gen_group.add_argument("--encrypt", \
+        help='Set encryption mode. Default: false', \
+        choices=['true','false'],default='false',type=str.lower)
+        factory_nvs_part_gen_group.add_argument("--keyfile", \
+        help='File having key for encryption (Applicable only if encryption mode is true)',
+        default = None)
+        factory_nvs_part_gen_group.add_argument('--outdir', dest='outdir', \
+        help='the output directory to store the files created(Default: current directory)', default=os.getcwd())
+        factory_nvs_part_gen_group.add_argument('--salt', \
+        help='Predefined salt if any', \
+        default=None)
+
+        args = parser.parse_args()
+        part_size = args.size
+        is_key_gen = args.keygen
+        encrypt_mode = args.encrypt
+        version_no = args.version
+        key_file = args.keyfile
+        output_dir_path = args.outdir
+        salt_input = args.salt
+
+        # Check if the setup code has valid format
+        setup_code = args.setup_code
+        if (len(setup_code) != 8) or (not setup_code.isdigit()):
+            print("Setup code should be 8 numbers without any '-' in between. Eg. 11122333")
+            sys.exit (1)
+
+        # Add the hyphen (-) in the PIN for salt-verifier generation. So, 11122333 will become 111-22-333
+        setup_code = setup_code[:3] + '-' + setup_code[3:5] + '-' + setup_code[5:]
+        setup_id = args.setup_id
+        file_prefix = args.outfile
+
+        if not args.infile:
+            csv_file = file_prefix + ".csv"
+        else:
+            if not os.path.isfile(args.infile):
+                sys.exit("Oops...file: `" + args.infile + "` does not exist...")
+            else:
+                csv_file = file_prefix + ".csv"
+        bin_file = file_prefix + ".bin"
+        # Consider enabling RFC5054 compatibility for interoperation with non srp SRP-6a implementations
+        #srp.rfc5054_enable()
+
+        # The Modulus, N, and Generator, g, as specified by the 3072-bit group of RFC5054. This is required since the standard srp script does not support this
+        n_3072 = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF"
+        g_3072 = "5"
+
+        # Generate the Salt and Verifier for the given PIN
+        salt, vkey = srp.create_salted_verification_key( 'Pair-Setup', setup_code, srp.SHA512, srp.NG_CUSTOM, n_3072, g_3072, salt_len=16 , salt=salt_input)
+
+        # Create the CSV file with appropriate data
+        f = open(csv_file, 'w')
+        if not args.infile:
+            f.write("key,type,encoding,value\n")
+        else:
+            in_f = open(args.infile, 'r')
+            data = in_f.read()
+            f.write(data)
+            in_f.close()
+
+        f.close()
+
+        hap_setup_found = False
+
+        f = open(csv_file,'a+')
+        f.seek(0)
+        f_reader = csv.reader(f, delimiter='\n')
+        for data in f_reader:
+            if 'hap_setup,namespace,,' in data:
+                hap_setup_found = True
+                break
+
+        if not hap_setup_found:
+            f.write("hap_setup,namespace,,\n")
+
+        f.write("setup_id,data,binary," + setup_id + "\n")
+        f.write("setup_salt,data,hex2bin," + binascii.b2a_hex(salt).zfill(32).decode("utf-8") + "\n")
+        f.write("setup_verifier,data,hex2bin," + binascii.b2a_hex(vkey).zfill(768).decode("utf-8"))
+        f.close()
+
+        print("CSV Generated: " + csv_file)
+
+        print_arg_str = "Invalid.\nTo generate nvs partition binary --input, --output and --size arguments are mandatory.\nTo generate encryption keys --keygen argument is mandatory."
+        print_encrypt_arg_str = "Missing parameter. Enter --keyfile or --keygen."
+
+        nvs_partition_gen.check_input_args(csv_file, bin_file, part_size, is_key_gen,\
+                                            encrypt_mode, key_file, version_no, print_arg_str, print_encrypt_arg_str, output_dir_path)
+
+        nvs_partition_gen.nvs_part_gen(input_filename=csv_file, output_filename=bin_file,\
+                                        input_part_size=part_size, is_key_gen=is_key_gen,\
+                                        encrypt_mode=encrypt_mode, key_file=key_file,\
+                                        encr_key_prefix=None, version_no=version_no, output_dir=output_dir_path)
+
+        print("NVS Flash Binary Generated: " + bin_file)
+
+    except Exception as e:
+        sys.exit(e)
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/idf_tools/mass_mfg/mfg_gen.py b/tools/idf_tools/mass_mfg/mfg_gen.py
new file mode 100755
index 0000000..48a7806
--- /dev/null
+++ b/tools/idf_tools/mass_mfg/mfg_gen.py
@@ -0,0 +1,549 @@
+#!/usr/bin/env python
+#
+# Copyright 2018 Espressif Systems (Shanghai) PTE LTD
+#
+# 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.
+#
+
+from __future__ import print_function
+from builtins import range
+from future.moves.itertools import zip_longest
+import sys
+import os
+import csv
+import argparse
+import distutils.dir_util
+
+try:
+    sys.path.insert(0, os.getenv('IDF_PATH') + "/components/nvs_flash/nvs_partition_generator/")
+    import nvs_partition_gen
+except Exception as e:
+    print(e)
+    sys.exit("Please check IDF_PATH")
+
+
+def verify_values_exist(input_values_file, keys_in_values_file):
+    """ Verify all keys have corresponding values in values file
+    """
+    line_no = 1
+    key_count_in_values_file = len(keys_in_values_file)
+
+    values_file = open(input_values_file, 'r')
+    values_file_reader = csv.reader(values_file, delimiter=',')
+    next(values_file_reader)
+
+    for values_data in values_file_reader:
+        line_no += 1
+        if len(values_data) != key_count_in_values_file:
+            raise SystemExit("\nOops...Number of values is not equal to number of keys in file: %s at line No:%s\n"
+                             % (str(input_values_file), str(line_no)))
+
+
+def verify_keys_exist(values_file_keys, input_config_file):
+    """ Verify all keys from config file are present in values file
+    """
+    keys_missing = []
+
+    config_file = open(input_config_file,'r')
+    config_file_reader = csv.reader(config_file, delimiter=',')
+    for line_no, config_data in enumerate(config_file_reader,1):
+        if 'namespace' not in config_data:
+            if values_file_keys:
+                if config_data[0] == values_file_keys[0]:
+                    del values_file_keys[0]
+                else:
+                    keys_missing.append([config_data[0], line_no])
+            else:
+                keys_missing.append([config_data[0], line_no])
+
+    if keys_missing:
+        for key, line_no in keys_missing:
+            print("Key:`", str(key), "` at line no:", str(line_no),
+                  " in config file is not found in values file.")
+        config_file.close()
+        raise SystemExit(1)
+
+    config_file.close()
+
+
+def verify_datatype_encoding(input_config_file):
+    """ Verify datatype and encodings from config file is valid
+    """
+    valid_encodings = ["string", "binary", "hex2bin","u8", "i8", "u16", "u32", "i32","base64"]
+    valid_datatypes = ["file","data","namespace"]
+    line_no = 0
+
+    config_file = open(input_config_file,'r')
+    config_file_reader = csv.reader(config_file, delimiter=',')
+    for config_data in config_file_reader:
+        line_no += 1
+        if config_data[1] not in valid_datatypes:
+            raise SystemExit("Oops...config file: %s has invalid datatype at line no:%s\n`"
+                             % (str(input_config_file), str(line_no)))
+        if 'namespace' not in config_data:
+            if config_data[2] not in valid_encodings:
+                raise SystemExit("Oops...config file: %s has invalid encoding at line no:%s\n`"
+                                 % (str(input_config_file), str(line_no)))
+
+
+def verify_file_data_count(input_config_file, keys_repeat):
+    """ Verify count of data on each line in config file is equal to 3
+    (as format must be: <key,type and encoding>)
+    """
+    line_no = 0
+    config_file = open(input_config_file, 'r')
+    config_file_reader = csv.reader(config_file, delimiter=',')
+    for line in config_file_reader:
+        line_no += 1
+        if len(line) != 3 and line[0] not in keys_repeat:
+            raise SystemExit("Oops...data missing in config file at line no:%s <format needed:key,type,encoding>\n"
+                             % str(line_no))
+    config_file.close()
+
+
+def verify_data_in_file(input_config_file, input_values_file, config_file_keys, keys_in_values_file, keys_repeat):
+    """ Verify count of data on each line in config file is equal to 3 \
+    (as format must be: <key,type and encoding>)
+    Verify datatype and encodings from config file is valid
+    Verify all keys from config file are present in values file and \
+    Verify each key has corresponding value in values file
+    """
+    try:
+        values_file_keys = []
+
+        verify_file_data_count(input_config_file, keys_repeat)
+
+        verify_datatype_encoding(input_config_file)
+
+        # Get keys from values file present in config files
+        values_file_keys = get_keys(keys_in_values_file, config_file_keys)
+
+        verify_keys_exist(values_file_keys, input_config_file)
+
+        verify_values_exist(input_values_file, keys_in_values_file)
+
+    except Exception as err:
+        print(err)
+        raise
+
+
+def get_keys(keys_in_values_file, config_file_keys):
+    """ Get keys from values file present in config file
+    """
+    values_file_keys = []
+    for key in range(len(keys_in_values_file)):
+        if keys_in_values_file[key] in config_file_keys:
+            values_file_keys.append(keys_in_values_file[key])
+
+    return values_file_keys
+
+
+def add_config_data_per_namespace(input_config_file):
+    """ Add config data per namespace to `config_data_to_write` list
+    """
+    config_data_to_write = []
+    config_data_per_namespace = []
+
+    csv_config_file = open(input_config_file,'r')
+    config_file_reader = csv.reader(csv_config_file, delimiter=',')
+
+    # `config_data_per_namespace` is added to `config_data_to_write` list after reading next namespace
+    for config_data in config_file_reader:
+        if 'REPEAT' in config_data:
+            config_data.remove('REPEAT')
+        if 'namespace' in config_data:
+            if config_data_per_namespace:
+                config_data_to_write.append(config_data_per_namespace)
+                config_data_per_namespace = []
+                config_data_per_namespace.append(config_data)
+            else:
+                config_data_per_namespace.append(config_data)
+        else:
+            config_data_per_namespace.append(config_data)
+
+    # `config_data_per_namespace` is added to `config_data_to_write` list as EOF is reached
+    if (not config_data_to_write) or (config_data_to_write and config_data_per_namespace):
+        config_data_to_write.append(config_data_per_namespace)
+
+    csv_config_file.close()
+
+    return config_data_to_write
+
+
+def get_fileid_val(file_identifier, keys_in_config_file, keys_in_values_file,
+                   values_data_line, key_value_data, fileid_value):
+    """ Get file identifier value
+    """
+    file_id_found = False
+
+    for key in key_value_data:
+        if file_identifier and not file_id_found and file_identifier in key:
+            fileid_value = key[1]
+            file_id_found = True
+
+    if not file_id_found:
+        fileid_value = str(int(fileid_value) + 1)
+
+    return fileid_value
+
+
+def add_data_to_file(config_data_to_write, key_value_pair, output_csv_file):
+    """ Add data to csv target file
+    """
+    header = ['key', 'type', 'encoding', 'value']
+    data_to_write = []
+
+    target_csv_file = open(output_csv_file, 'w')
+
+    output_file_writer = csv.writer(target_csv_file, delimiter=',')
+    output_file_writer.writerow(header)
+
+    for namespace_config_data in config_data_to_write:
+        for data in namespace_config_data:
+            data_to_write = data[:]
+            if 'namespace' in data:
+                data_to_write.append('')
+                output_file_writer.writerow(data_to_write)
+            else:
+                key = data[0]
+                while key not in key_value_pair[0]:
+                    del key_value_pair[0]
+                if key in key_value_pair[0]:
+                    value = key_value_pair[0][1]
+                    data_to_write.append(value)
+                    del key_value_pair[0]
+                    output_file_writer.writerow(data_to_write)
+
+    # Set index to start of file
+    target_csv_file.seek(0)
+
+    target_csv_file.close()
+
+
+def create_dir(filetype, output_dir_path):
+    """ Create new directory(if doesn't exist) to store file generated
+    """
+    output_target_dir = output_dir_path + filetype
+    if not os.path.isdir(output_target_dir):
+        distutils.dir_util.mkpath(output_target_dir)
+
+    return output_target_dir
+
+
+def set_repeat_value(total_keys_repeat, keys, csv_file, target_filename):
+    key_val_pair = []
+    key_repeated = []
+    with open(csv_file, 'r') as read_from, open(target_filename,'w') as write_to:
+        csv_file_reader = csv.reader(read_from, delimiter=',')
+        headers = next(csv_file_reader)
+        values = next(csv_file_reader)
+        csv_file_writer = csv.writer(write_to, delimiter=',')
+        csv_file_writer.writerow(headers)
+        csv_file_writer.writerow(values)
+        total_keys_values = list(zip_longest(keys, values))
+
+        # read new data, add value if key has repeat tag, write to new file
+        for row in csv_file_reader:
+            index = -1
+            key_val_new = list(zip_longest(keys, row))
+            key_val_pair = total_keys_values[:]
+            key_repeated = total_keys_repeat[:]
+            while key_val_new and key_repeated:
+                index = index + 1
+                #  if key has repeat tag, get its corresponding value, write to file
+                if key_val_new[0][0] == key_repeated[0]:
+                    val = key_val_pair[0][1]
+                    row[index] = val
+                    csv_file_writer.writerow(row)
+                    del key_repeated[0]
+                del key_val_new[0]
+                del key_val_pair[0]
+
+    return target_filename
+
+
+def main(input_config_file=None,input_values_file=None,target_file_name_prefix=None,
+         file_identifier=None,output_dir_path=None,part_size=None,input_version=None,
+         input_is_keygen=None,input_is_encrypt=None,input_is_keyfile=None):
+    try:
+        if all(arg is None for arg in [input_config_file,input_values_file,target_file_name_prefix,
+                                       file_identifier,output_dir_path]):
+            parser = argparse.ArgumentParser(prog='./mfg_gen.py',
+                                             description="Create binary files from input config and values file",
+                                             formatter_class=argparse.RawDescriptionHelpFormatter)
+
+            parser.add_argument('--conf',
+                                dest='config_file',
+                                help='the input configuration csv file',
+                                default=None)
+
+            parser.add_argument('--values',
+                                dest='values_file',
+                                help='the input values csv file',
+                                default=None)
+
+            parser.add_argument('--prefix',
+                                dest='prefix',
+                                help='the unique name as each filename prefix')
+
+            parser.add_argument('--fileid',
+                                dest='fileid',
+                                help='the unique file identifier(any key in values file) \
+                                as each filename suffix (Default: numeric value(1,2,3...)')
+
+            parser.add_argument('--outdir',
+                                dest='outdir',
+                                default=os.getcwd(),
+                                help='the output directory to store the files created\
+                                (Default: current directory)')
+
+            parser.add_argument("--size",
+                                dest='part_size',
+                                help='Size of NVS Partition in bytes (must be multiple of 4096)')
+
+            parser.add_argument("--version",
+                                dest="version",
+                                help='Set version. Default: v2',
+                                choices=['v1','v2'],
+                                default='v2',
+                                type=str.lower)
+
+            parser.add_argument("--keygen",
+                                dest="keygen",
+                                help='Generate keys for encryption. Default: false',
+                                choices=['true','false'],
+                                default='false',
+                                type=str.lower)
+
+            parser.add_argument("--encrypt",
+                                dest="encrypt",
+                                help='Set encryption mode. Default: false',
+                                choices=['true','false'],
+                                default='false',
+                                type=str.lower)
+
+            parser.add_argument("--keyfile",
+                                dest="keyfile",
+                                help='File having key for encryption (Applicable only if encryption mode is true)',
+                                default=None)
+
+            args = parser.parse_args()
+
+            args.outdir = os.path.join(args.outdir, '')
+
+            input_config_file = args.config_file
+            input_values_file = args.values_file
+            target_file_name_prefix = args.prefix
+            output_dir_path = args.outdir
+            part_size = args.part_size
+            input_version = args.version
+            input_is_keygen = args.keygen
+            input_is_encrypt = args.encrypt
+            input_is_keyfile = args.keyfile
+            file_identifier = ''
+            print_arg_str = "Invalid.\nTo generate binary --conf, --values, --prefix and --size arguments are mandatory.\
+            \nTo generate encryption keys --keygen argument is mandatory."
+            print_encrypt_arg_str = "Missing parameter. Enter --keygen or --keyfile."
+
+            if args.fileid:
+                file_identifier = args.fileid
+
+            if input_config_file and input_is_encrypt.lower() == 'true' and input_is_keygen.lower() == 'true' and input_is_keyfile:
+                sys.exit('Invalid. Cannot provide both --keygen and --keyfile argument together.')
+
+            nvs_partition_gen.check_input_args(input_config_file, input_values_file, part_size, input_is_keygen,
+                                               input_is_encrypt, input_is_keyfile, input_version, print_arg_str,
+                                               print_encrypt_arg_str, output_dir_path)
+
+            if not input_config_file and input_is_keygen:
+                if input_is_encrypt == 'true':
+                    sys.exit("Invalid.\nOnly --keyfile and --outdir arguments allowed.\n")
+                # Generate Key Only
+                nvs_partition_gen.nvs_part_gen(input_filename=input_config_file, output_filename=input_values_file,
+                                               input_part_size=part_size, is_key_gen=input_is_keygen,
+                                               encrypt_mode=input_is_encrypt, key_file=input_is_keyfile,
+                                               version_no=input_version, output_dir=output_dir_path)
+                exit(0)
+
+            if not (input_config_file and input_values_file and target_file_name_prefix and part_size):
+                sys.exit(print_arg_str)
+
+        keys_in_values_file = []
+        keys_in_config_file = []
+        config_data_to_write = []
+        key_value_data = []
+        csv_file_list = []
+        keys_repeat = []
+        is_empty_line = False
+        files_created = False
+        file_identifier_value = '0'
+        output_target_dir = ''
+        target_values_file = None
+        output_file_prefix = None
+
+        # Verify config file is not empty
+        if os.stat(input_config_file).st_size == 0:
+            raise SystemExit("Oops...config file: %s is empty." % input_config_file)
+
+        # Verify values file is not empty
+        if os.stat(input_values_file).st_size == 0:
+            raise SystemExit("Oops...values file: %s is empty." % input_values_file)
+
+        # Verify config file does not have empty lines
+        csv_config_file = open(input_config_file,'r')
+        try:
+            config_file_reader = csv.reader(csv_config_file, delimiter=',')
+            for config_data in config_file_reader:
+                for data in config_data:
+                    empty_line = data.strip()
+                    if empty_line is '':
+                        is_empty_line = True
+                    else:
+                        is_empty_line = False
+                        break
+                if is_empty_line:
+                    raise SystemExit("Oops...config file: %s cannot have empty lines. " % input_config_file)
+                if not config_data:
+                    raise SystemExit("Oops...config file: %s cannot have empty lines." % input_config_file)
+
+            csv_config_file.seek(0)
+
+            # Extract keys from config file
+            for config_data in config_file_reader:
+                if 'namespace' not in config_data:
+                    keys_in_config_file.append(config_data[0])
+                if 'REPEAT' in config_data:
+                    keys_repeat.append(config_data[0])
+
+            csv_config_file.close()
+        except Exception as e:
+            print(e)
+        finally:
+            csv_config_file.close()
+
+        is_empty_line = False
+        # Verify values file does not have empty lines
+        csv_values_file = open(input_values_file, 'r')
+        try:
+            values_file_reader = csv.reader(csv_values_file, delimiter=',')
+            for values_data in values_file_reader:
+                for data in values_data:
+                    empty_line = data.strip()
+                    if empty_line is '':
+                        is_empty_line = True
+                    else:
+                        is_empty_line = False
+                        break
+                if is_empty_line:
+                    raise SystemExit("Oops...values file: %s cannot have empty lines." % input_values_file)
+                if not values_data:
+                    raise SystemExit("Oops...values file: %s cannot have empty lines." % input_values_file)
+
+            csv_values_file.seek(0)
+
+            # Extract keys from values file
+            keys_in_values_file = next(values_file_reader)
+
+            csv_values_file.close()
+        except Exception as e:
+            print(e)
+            exit(1)
+        finally:
+            csv_values_file.close()
+
+        # Verify file identifier exists in values file
+        if file_identifier:
+            if file_identifier not in keys_in_values_file:
+                raise SystemExit('Oops...target_file_identifier: %s does not exist in values file.\n' % file_identifier)
+
+        # Verify data in the input_config_file and input_values_file
+        verify_data_in_file(input_config_file, input_values_file, keys_in_config_file,
+                            keys_in_values_file, keys_repeat)
+
+        # Add config data per namespace to `config_data_to_write` list
+        config_data_to_write = add_config_data_per_namespace(input_config_file)
+
+        try:
+            with open(input_values_file, 'r') as csv_values_file:
+                values_file_reader = csv.reader(csv_values_file, delimiter=',')
+                keys = next(values_file_reader)
+
+            filename, file_ext = os.path.splitext(input_values_file)
+            target_filename = filename + "_created" + file_ext
+            if keys_repeat:
+                target_values_file = set_repeat_value(keys_repeat, keys, input_values_file, target_filename)
+            else:
+                target_values_file = input_values_file
+
+            csv_values_file = open(target_values_file, 'r')
+
+            values_file_reader = csv.reader(csv_values_file, delimiter=',')
+            next(values_file_reader)
+            for values_data_line in values_file_reader:
+                key_value_data = list(zip_longest(keys_in_values_file,values_data_line))
+
+                # Get file identifier value from values file
+                file_identifier_value = get_fileid_val(file_identifier, keys_in_config_file,
+                                                       keys_in_values_file, values_data_line, key_value_data, file_identifier_value)
+
+                key_value_pair = key_value_data[:]
+
+                # Create new directory(if doesn't exist) to store csv file generated
+                output_target_dir = create_dir("csv/", output_dir_path)
+
+                # Verify if output csv file does not exist
+                csv_filename = target_file_name_prefix + "-" + file_identifier_value + ".csv"
+                csv_file_list.append(csv_filename)
+                output_csv_file = output_target_dir + csv_filename
+                if os.path.isfile(output_csv_file):
+                    raise SystemExit("Target csv file: %s already exists.`" % output_csv_file)
+
+                # Add values corresponding to each key to csv target file
+                add_data_to_file(config_data_to_write, key_value_pair, output_csv_file)
+
+                # Create new directory(if doesn't exist) to store bin file generated
+                output_target_dir = create_dir("bin/", output_dir_path)
+
+                # Verify if output bin file does not exist
+                output_file_prefix = target_file_name_prefix + "-" + file_identifier_value
+                output_bin_file = output_target_dir + output_file_prefix + ".bin"
+                if os.path.isfile(output_bin_file):
+                    raise SystemExit("Target csv file: %s already exists.`" % output_bin_file)
+
+                # Create output csv and bin file
+                if input_is_keygen.lower() == 'true' and input_is_keyfile:
+                    input_is_keyfile = os.path.basename(input_is_keyfile)
+                nvs_partition_gen.nvs_part_gen(input_filename=output_csv_file, output_filename=output_bin_file,
+                                               input_part_size=part_size, is_key_gen=input_is_keygen,
+                                               encrypt_mode=input_is_encrypt, key_file=input_is_keyfile,
+                                               version_no=input_version, encr_key_prefix=output_file_prefix, output_dir=output_dir_path)
+                print("CSV Generated: ", str(output_csv_file))
+
+                files_created = True
+
+            csv_values_file.close()
+        except Exception as e:
+            print(e)
+            exit(1)
+        finally:
+            csv_values_file.close()
+        return csv_file_list, files_created, target_values_file
+
+    except ValueError as err:
+        print(err)
+    except Exception:
+        raise
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/idf_tools/nvs_partition_generator/README.rst b/tools/idf_tools/nvs_partition_generator/README.rst
new file mode 100644
index 0000000..cf31261
--- /dev/null
+++ b/tools/idf_tools/nvs_partition_generator/README.rst
@@ -0,0 +1,187 @@
+NVS Partition Generator Utility
+===============================
+
+Introduction
+------------
+
+:component_file:`nvs_flash/nvs_partition_generator/nvs_partition_gen.py` utility is designed to help create a binary file, compatible with NVS architecture defined in :doc:`Non-Volatile Storage </api-reference/storage/nvs_flash>`, based on user provided key-value pairs in a CSV file.
+Utility is ideally suited for generating a binary blob, containing data specific to ODM/OEM, which can be flashed externally at the time of device manufacturing. This helps manufacturers set unique value for various parameters for each device, e.g. serial number, while using same application firmware for all devices.
+
+Prerequisites
+-------------
+To use this utility in encryption mode, the following packages need to be installed:
+    - cryptography package
+
+These dependencies is already captured by including these packages in `requirement.txt` in top level IDF directory.
+
+CSV file format
+---------------
+
+Each row of the .csv file should have 4 parameters, separated by comma. Below is the description of each of these parameters:
+
+Key
+	Key of the data. Data can later be accessed from an application via this key.
+
+Type
+	Supported values are ``file``, ``data`` and ``namespace``.
+
+Encoding
+    Supported values are: ``u8``, ``i8``, ``u16``, ``u32``, ``i32``, ``string``, ``hex2bin``, ``base64`` and ``binary``. This specifies how actual data values are encoded in the resultant binary file. Difference between ``string`` and ``binary`` encoding is that ``string`` data is terminated with a NULL character, whereas ``binary`` data is not.
+
+.. note:: For ``file`` type, only ``hex2bin``, ``base64``, ``string`` and ``binary`` is supported as of now.
+
+Value
+	Data value.
+
+.. note:: Encoding and Value cells for ``namespace`` field type should be empty. Encoding and Value of ``namespace`` is fixed and isn't configurable. Any value in these cells are ignored.
+
+.. note:: First row of the CSV file should always be column header and isn't configurable.
+
+Below is an example dump of such CSV file::
+
+    key,type,encoding,value     <-- column header
+    namespace_name,namespace,,  <-- First entry should be of type "namespace"
+    key1,data,u8,1
+    key2,file,string,/path/to/file
+
+.. note:: Make sure there are no spaces before and after ',' or at the end of each line in CSV file.
+
+NVS Entry and Namespace association
+-----------------------------------
+
+When a new namespace entry is encountered in the CSV file, each follow-up entries will be part of that namespace, until next namespace entry is found, in which case all the follow-up entries will be part of the new namespace.
+
+.. note:: First entry in a CSV file should always be ``namespace`` entry.
+
+Multipage Blob Support
+----------------------
+
+By default, binary blobs are allowed to span over multiple pages and written in the format mentioned in section :ref:`structure_of_entry`.
+If older format is intended to be used, the utility provides an option to disable this feature.
+
+Encryption Support
+-------------------
+This utility allows you to create an enrypted binary file also. Encryption used is AES-XTS encryption. Refer to :ref:`nvs_encryption` for more details.
+
+Running the utility
+-------------------
+
+**Usage**::
+
+    python nvs_partition_gen.py [-h] [--input INPUT] [--output OUTPUT]
+                            [--size SIZE] [--version {v1,v2}]
+                            [--keygen {true,false}] [--encrypt {true,false}]
+                            [--keyfile KEYFILE] [--outdir OUTDIR]
+
+
++------------------------+----------------------------------------------------------------------------------------------+
+|   Arguments            |                                     Description                                              |
++========================+==============================================================================================+
+| --input INPUT          | Path to CSV file to parse.                                                                   |
++------------------------+----------------------------------------------------------------------------------------------+
+| --output OUTPUT        | Path to output generated binary file.                                                        |
++------------------------+----------------------------------------------------------------------------------------------+
+| --size SIZE            | Size of NVS Partition in bytes (must be multiple of 4096)                                    |
++------------------------+----------------------------------------------------------------------------------------------+
+| --version {v1,v2}      | Set version. Default: v2                                                                     |
++------------------------+----------------------------------------------------------------------------------------------+
+| --keygen {true,false}  | Generate keys for encryption.                                                                |
++------------------------+----------------------------------------------------------------------------------------------+
+| --encrypt {true,false} | Set encryption mode. Default: false                                                          |
++------------------------+----------------------------------------------------------------------------------------------+
+| --keyfile KEYFILE      | File having key for encryption (Applicable only if encryption mode is true)                  |
++------------------------+----------------------------------------------------------------------------------------------+
+| --outdir OUTDIR        | The output directory to store the files created (Default: current directory)                 |
++------------------------+----------------------------------------------------------------------------------------------+
+
+You can run this utility in two modes:
+    -   Default mode - Binary generated in this mode is an unencrypted binary file.
+    -   Encryption mode - Binary generated in this mode is an encrypted binary file.
+
+
+**In default mode:**
+--------------------
+
+*Usage*::
+
+    python nvs_partition_gen.py [-h] --input INPUT --output OUTPUT
+                            --size SIZE [--version {v1,v2}]
+                            [--keygen {true,false}] [--encrypt {true,false}]
+                            [--keyfile KEYFILE] [--outdir OUTDIR]
+
+You can run the utility using below command::
+
+    python nvs_partition_gen.py --input sample.csv --output sample.bin --size 0x3000
+
+
+
+**In encryption mode:**
+-----------------------
+
+*Usage*::
+
+    python nvs_partition_gen.py [-h] --input INPUT --output OUTPUT
+                            --size SIZE --encrypt {true,false}
+                            --keygen {true,false} --keyfile KEYFILE
+                            [--version {v1,v2}] [--outdir OUTDIR]
+
+
+You can run the utility using below commands:
+
+    -   By enabling generation of encryption keys::
+
+            python nvs_partition_gen.py --input sample.csv --output sample_encrypted.bin --size 0x3000 --encrypt true --keygen true
+
+    -   By taking encryption keys as an input file. A sample encryption keys binary file is provided with the utility::
+
+            python nvs_partition_gen.py --input sample.csv --output sample_encrypted.bin --size 0x3000 --encrypt true --keyfile testdata/sample_encryption_keys.bin
+
+    -   By enabling generation of encryption keys and storing the keys in custom filename::
+
+            python nvs_partition_gen.py --input sample.csv --output sample_encrypted.bin --size 0x3000 --encrypt true --keygen true --keyfile encryption_keys_generated.bin
+
+.. note:: If `--keygen` is given with `--keyfile` argument, generated keys will be stored in `--keyfile` file. If `--keygen` argument is absent, `--keyfile` is taken as input file having key for encryption.
+
+
+*To generate* **only** *encryption keys with this utility*::
+
+    python nvs_partition_gen.py --keygen true
+
+This creates an `encryption_keys_<timestamp>.bin` file.
+
+.. note:: This newly created file having encryption keys in `keys/` directory is compatible with NVS key-partition structure. Refer to :ref:`nvs_key_partition` for more details.
+
+
+You can also provide the format version number (in any of the two modes):
+    - Multipage Blob Support Enabled (v2)
+    - Multipage Blob Support Disabled (v1)
+
+
+**Multipage Blob Support Enabled (v2):**
+----------------------------------------
+
+You can run the utility in this format by setting the version parameter to v2, as shown below.
+A sample CSV file is provided with the utility::
+
+    python nvs_partition_gen.py --input sample_multipage_blob.csv --output partition_multipage_blob.bin --size 0x4000 --version v2
+
+
+**Multipage Blob Support Disabled (v1):**
+-----------------------------------------
+
+You can run the utility in this format by setting the version parameter to v1, as shown below.
+A sample CSV file is provided with the utility::
+
+    python nvs_partition_gen.py --input sample_singlepage_blob.csv --output partition_single_page.bin --size 0x3000 --version v1
+
+
+.. note::  *Minimum NVS Partition Size needed is 0x3000 bytes.*
+
+.. note::  *When flashing the binary onto the device, make sure it is consistent with the application's sdkconfig.*
+
+Caveats
+-------
+-  Utility doesn't check for duplicate keys and will write data pertaining to both keys. User needs to make sure keys are distinct.
+-  Once a new page is created, no data will be written in the space left in previous page. Fields in the CSV file need to be ordered in such a way so as to optimize memory.
+-  64-bit datatype is not yet supported.
+
diff --git a/tools/idf_tools/nvs_partition_generator/nvs_partition_gen.py b/tools/idf_tools/nvs_partition_generator/nvs_partition_gen.py
new file mode 100755
index 0000000..bc295af
--- /dev/null
+++ b/tools/idf_tools/nvs_partition_generator/nvs_partition_gen.py
@@ -0,0 +1,887 @@
+#!/usr/bin/env python
+#
+# esp-idf NVS partition generation tool. Tool helps in generating NVS-compatible
+# partition binary, with key-value pair entries provided via a CSV file.
+#
+# Copyright 2018 Espressif Systems (Shanghai) PTE LTD
+#
+# 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.
+#
+
+from __future__ import division, print_function
+from builtins import int, range, bytes
+from io import open
+import sys
+import argparse
+import binascii
+import random
+import struct
+import os
+import array
+import csv
+import zlib
+import codecs
+import datetime
+import distutils.dir_util
+try:
+    from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+    from cryptography.hazmat.backends import default_backend
+except ImportError:
+    print('The cryptography package is not installed.'
+          'Please refer to the Get Started section of the ESP-IDF Programming Guide for '
+          'setting up the required packages.')
+    raise
+
+VERSION1_PRINT = "v1 - Multipage Blob Support Disabled"
+VERSION2_PRINT = "v2 - Multipage Blob Support Enabled"
+
+
+""" Class for standard NVS page structure """
+
+
+class Page(object):
+    PAGE_PARAMS = {
+        "max_size": 4096,
+        "max_old_blob_size": 1984,
+        "max_new_blob_size": 4000,
+        "max_entries": 126
+    }
+
+    # Item type codes
+    U8   = 0x01
+    I8   = 0x11
+    U16  = 0x02
+    I16  = 0x12
+    U32  = 0x04
+    I32  = 0x14
+    SZ   = 0x21
+    BLOB = 0x41
+    BLOB_DATA = 0x42
+    BLOB_IDX = 0x48
+
+    # Few Page constants
+    HEADER_SIZE = 32
+    BITMAPARRAY_OFFSET = 32
+    BITMAPARRAY_SIZE_IN_BYTES = 32
+    FIRST_ENTRY_OFFSET = 64
+    SINGLE_ENTRY_SIZE = 32
+    CHUNK_ANY = 0xFF
+    ACTIVE = 0xFFFFFFFE
+    FULL = 0xFFFFFFFC
+    VERSION1 = 0xFF
+    VERSION2 = 0xFE
+
+    def __init__(self, page_num, is_rsrv_page=False):
+        self.entry_num = 0
+        self.is_encrypt = False
+        self.encr_key = None
+        self.bitmap_array = array.array('B')
+        self.version = Page.VERSION2
+        self.page_buf = bytearray(b'\xff') * Page.PAGE_PARAMS["max_size"]
+        if not is_rsrv_page:
+            self.bitmap_array = self.create_bitmap_array()
+            self.set_header(page_num)
+
+    def set_header(self, page_num):
+        global page_header
+
+        # set page state to active
+        page_header = bytearray(b'\xff') * 32
+        page_state_active_seq = Page.ACTIVE
+        struct.pack_into('<I', page_header, 0,  page_state_active_seq)
+        # set page sequence number
+        struct.pack_into('<I', page_header, 4, page_num)
+        # set version
+        if version == Page.VERSION2:
+            page_header[8] = Page.VERSION2
+        elif version == Page.VERSION1:
+            page_header[8] = Page.VERSION1
+        # set header's CRC
+        crc_data = bytes(page_header[4:28])
+        crc = zlib.crc32(crc_data, 0xFFFFFFFF)
+        struct.pack_into('<I', page_header, 28, crc & 0xFFFFFFFF)
+        self.page_buf[0:len(page_header)] = page_header
+
+    def create_bitmap_array(self):
+        bitarray = array.array('B')
+        charsize = 32  # bitmaparray has 256 bits, hence 32 bytes
+        fill = 255  # Fill all 8 bits with 1's
+        bitarray.extend((fill,) * charsize)
+        return bitarray
+
+    def write_bitmaparray(self):
+        bitnum = self.entry_num * 2
+        byte_idx = bitnum // 8  # Find byte index in the array
+        bit_offset = bitnum & 7  # Find bit offset in given byte index
+        mask = ~(1 << bit_offset)
+        self.bitmap_array[byte_idx] &= mask
+        start_idx = Page.BITMAPARRAY_OFFSET
+        end_idx = Page.BITMAPARRAY_OFFSET + Page.BITMAPARRAY_SIZE_IN_BYTES
+        self.page_buf[start_idx:end_idx] = self.bitmap_array
+
+    def encrypt_entry(self, data_arr, tweak_arr, encr_key):
+        # Encrypt 32 bytes of data using AES-XTS encryption
+        backend = default_backend()
+        plain_text = codecs.decode(data_arr, 'hex')
+        tweak = codecs.decode(tweak_arr, 'hex')
+
+        cipher = Cipher(algorithms.AES(encr_key), modes.XTS(tweak), backend=backend)
+        encryptor = cipher.encryptor()
+        encrypted_data = encryptor.update(plain_text)
+
+        return encrypted_data
+
+    def reverse_hexbytes(self, addr_tmp):
+        addr = []
+        reversed_bytes = ""
+        for i in range(0, len(addr_tmp), 2):
+            addr.append(addr_tmp[i:i + 2])
+        reversed_bytes = "".join(reversed(addr))
+
+        return reversed_bytes
+
+    def encrypt_data(self, data_input, no_of_entries, nvs_obj):
+        # Set values needed for encryption and encrypt data byte wise
+        encr_data_to_write = bytearray()
+        data_len_needed = 64  # in hex
+        tweak_len_needed = 32  # in hex
+        init_tweak_val = '0'
+        init_data_val = 'f'
+        tweak_tmp = ''
+        encr_key_input = None
+
+        # Extract encryption key and tweak key from given key input
+        if len(self.encr_key) == key_len_needed:
+            encr_key_input = self.encr_key
+        else:
+            encr_key_input = codecs.decode(self.encr_key, 'hex')
+
+        rel_addr = nvs_obj.page_num * Page.PAGE_PARAMS["max_size"] + Page.FIRST_ENTRY_OFFSET
+
+        if not isinstance(data_input, bytearray):
+            byte_arr = bytearray(b'\xff') * 32
+            byte_arr[0:len(data_input)] = data_input
+            data_input = byte_arr
+
+        data_input = binascii.hexlify(data_input)
+
+        entry_no = self.entry_num
+        start_idx = 0
+        end_idx = start_idx + 64
+
+        for _ in range(0, no_of_entries):
+            # Set tweak value
+            offset = entry_no * Page.SINGLE_ENTRY_SIZE
+            addr = hex(rel_addr + offset)[2:]
+            addr_len = len(addr)
+            if addr_len > 2:
+                if not addr_len % 2:
+                    addr_tmp = addr
+                    tweak_tmp = self.reverse_hexbytes(addr_tmp)
+                    tweak_val = tweak_tmp + (init_tweak_val * (tweak_len_needed - (len(tweak_tmp))))
+                else:
+                    addr_tmp = init_tweak_val + addr
+                    tweak_tmp = self.reverse_hexbytes(addr_tmp)
+                    tweak_val = tweak_tmp + (init_tweak_val * (tweak_len_needed - (len(tweak_tmp))))
+            else:
+                tweak_val = addr + (init_tweak_val * (tweak_len_needed - len(addr)))
+
+            # Encrypt data
+            data_bytes = data_input[start_idx:end_idx]
+            if type(data_bytes) == bytes:
+                data_bytes = data_bytes.decode()
+
+            data_val = data_bytes + (init_data_val * (data_len_needed - len(data_bytes)))
+            encr_data_ret = self.encrypt_entry(data_val, tweak_val, encr_key_input)
+            encr_data_to_write = encr_data_to_write + encr_data_ret
+            # Update values for encrypting next set of data bytes
+            start_idx = end_idx
+            end_idx = start_idx + 64
+            entry_no += 1
+
+        return encr_data_to_write
+
+    def write_entry_to_buf(self, data, entrycount,nvs_obj):
+        encr_data = bytearray()
+
+        if self.is_encrypt:
+            encr_data_ret = self.encrypt_data(data, entrycount,nvs_obj)
+            encr_data[0:len(encr_data_ret)] = encr_data_ret
+            data = encr_data
+
+        data_offset = Page.FIRST_ENTRY_OFFSET + (Page.SINGLE_ENTRY_SIZE * self.entry_num)
+        start_idx = data_offset
+        end_idx = data_offset + len(data)
+        self.page_buf[start_idx:end_idx]  = data
+
+        # Set bitmap array for entries in current page
+        for i in range(0, entrycount):
+            self.write_bitmaparray()
+            self.entry_num += 1
+
+    def set_crc_header(self, entry_struct):
+        crc_data = bytearray(b'28')
+        crc_data[0:4] = entry_struct[0:4]
+        crc_data[4:28] = entry_struct[8:32]
+        crc_data = bytes(crc_data)
+        crc = zlib.crc32(crc_data, 0xFFFFFFFF)
+        struct.pack_into('<I', entry_struct, 4, crc & 0xFFFFFFFF)
+        return entry_struct
+
+    def write_varlen_binary_data(self, entry_struct, ns_index, key, data, data_size, total_entry_count, encoding, nvs_obj):
+        chunk_start = 0
+        chunk_count = 0
+        chunk_index = Page.CHUNK_ANY
+        offset = 0
+        remaining_size = data_size
+        tailroom = None
+
+        while True:
+            chunk_size = 0
+
+            # Get the size available in current page
+            tailroom = (Page.PAGE_PARAMS["max_entries"] - self.entry_num - 1) * Page.SINGLE_ENTRY_SIZE
+            assert tailroom >= 0, "Page overflow!!"
+
+            # Split the binary data into two and store a chunk of available size onto curr page
+            if tailroom < remaining_size:
+                chunk_size = tailroom
+            else:
+                chunk_size = remaining_size
+
+            remaining_size = remaining_size - chunk_size
+
+            # Change type of data to BLOB_DATA
+            entry_struct[1] = Page.BLOB_DATA
+
+            # Calculate no. of entries data chunk will require
+            datachunk_rounded_size = (chunk_size + 31) & ~31
+            datachunk_entry_count = datachunk_rounded_size // 32
+            datachunk_total_entry_count = datachunk_entry_count + 1  # +1 for the entry header
+
+            # Set Span
+            entry_struct[2] = datachunk_total_entry_count
+
+            # Update the chunkIndex
+            chunk_index = chunk_start + chunk_count
+            entry_struct[3] = chunk_index
+
+            # Set data chunk
+            data_chunk = data[offset:offset + chunk_size]
+
+            # Compute CRC of data chunk
+            struct.pack_into('<H', entry_struct, 24, chunk_size)
+
+            if type(data) != bytes:
+                data_chunk = bytes(data_chunk, encoding='utf8')
+
+            crc = zlib.crc32(data_chunk, 0xFFFFFFFF)
+            struct.pack_into('<I', entry_struct, 28, crc & 0xFFFFFFFF)
+
+            # compute crc of entry header
+            entry_struct = self.set_crc_header(entry_struct)
+
+            # write entry header
+            self.write_entry_to_buf(entry_struct, 1,nvs_obj)
+            # write actual data
+            self.write_entry_to_buf(data_chunk, datachunk_entry_count,nvs_obj)
+
+            chunk_count = chunk_count + 1
+
+            if remaining_size or (tailroom - chunk_size) < Page.SINGLE_ENTRY_SIZE:
+                if page_header[0:4] != Page.FULL:
+                    page_state_full_seq = Page.FULL
+                    struct.pack_into('<I', page_header, 0, page_state_full_seq)
+                nvs_obj.create_new_page()
+                self = nvs_obj.cur_page
+
+            offset = offset + chunk_size
+
+            # All chunks are stored, now store the index
+            if not remaining_size:
+                # Initialise data field to 0xff
+                data_array = bytearray(b'\xff') * 8
+                entry_struct[24:32] = data_array
+
+                # change type of data to BLOB_IDX
+                entry_struct[1] = Page.BLOB_IDX
+
+                # Set Span
+                entry_struct[2] = 1
+
+                # Update the chunkIndex
+                chunk_index = Page.CHUNK_ANY
+                entry_struct[3] = chunk_index
+
+                struct.pack_into('<I', entry_struct, 24, data_size)
+                entry_struct[28] = chunk_count
+                entry_struct[29] = chunk_start
+
+                # compute crc of entry header
+                entry_struct = self.set_crc_header(entry_struct)
+
+                # write last entry
+                self.write_entry_to_buf(entry_struct, 1,nvs_obj)
+                break
+
+        return entry_struct
+
+    def write_single_page_entry(self, entry_struct, data, datalen, data_entry_count, nvs_obj):
+        # compute CRC of data
+        struct.pack_into('<H', entry_struct, 24, datalen)
+
+        if type(data) != bytes:
+            data = bytes(data, encoding='utf8')
+
+        crc = zlib.crc32(data, 0xFFFFFFFF)
+        struct.pack_into('<I', entry_struct, 28, crc & 0xFFFFFFFF)
+
+        # compute crc of entry header
+        entry_struct = self.set_crc_header(entry_struct)
+
+        # write entry header
+        self.write_entry_to_buf(entry_struct, 1, nvs_obj)
+        # write actual data
+        self.write_entry_to_buf(data, data_entry_count, nvs_obj)
+
+    """
+    Low-level function to write variable length data into page buffer. Data should be formatted
+    according to encoding specified.
+    """
+    def write_varlen_data(self, key, data, encoding, ns_index,nvs_obj):
+        # Set size of data
+        datalen = len(data)
+
+        if datalen > Page.PAGE_PARAMS["max_old_blob_size"]:
+            if version == Page.VERSION1:
+                raise InputError("Version %s\n%s: Size exceeds max allowed length." % (VERSION1_PRINT,key))
+            else:
+                if encoding == "string":
+                    raise InputError("Version %s\n%s: Size exceeds max allowed length." % (VERSION2_PRINT,key))
+
+        # Calculate no. of entries data will require
+        rounded_size = (datalen + 31) & ~31
+        data_entry_count = rounded_size // 32
+        total_entry_count = data_entry_count + 1  # +1 for the entry header
+
+        # Check if page is already full and new page is needed to be created right away
+        if self.entry_num >= Page.PAGE_PARAMS["max_entries"]:
+            raise PageFullError()
+        elif (self.entry_num + total_entry_count) >= Page.PAGE_PARAMS["max_entries"]:
+            if not (version == Page.VERSION2 and encoding in ["hex2bin", "binary", "base64"]):
+                raise PageFullError()
+
+        # Entry header
+        entry_struct = bytearray(b'\xff') * 32
+        # Set Namespace Index
+        entry_struct[0] = ns_index
+        # Set Span
+        if version == Page.VERSION2:
+            if encoding == "string":
+                entry_struct[2] = data_entry_count + 1
+            # Set Chunk Index
+            chunk_index = Page.CHUNK_ANY
+            entry_struct[3] = chunk_index
+        else:
+            entry_struct[2] = data_entry_count + 1
+
+        # set key
+        key_array = b'\x00' * 16
+        entry_struct[8:24] = key_array
+        entry_struct[8:8 + len(key)] = key.encode()
+
+        # set Type
+        if encoding == "string":
+            entry_struct[1] = Page.SZ
+        elif encoding in ["hex2bin", "binary", "base64"]:
+            entry_struct[1] = Page.BLOB
+
+        if version == Page.VERSION2 and (encoding in ["hex2bin", "binary", "base64"]):
+            entry_struct = self.write_varlen_binary_data(entry_struct,ns_index,key,data,
+                                                         datalen,total_entry_count, encoding, nvs_obj)
+        else:
+            self.write_single_page_entry(entry_struct, data, datalen, data_entry_count, nvs_obj)
+
+    """ Low-level function to write data of primitive type into page buffer. """
+    def write_primitive_data(self, key, data, encoding, ns_index,nvs_obj):
+        # Check if entry exceeds max number of entries allowed per page
+        if self.entry_num >= Page.PAGE_PARAMS["max_entries"]:
+            raise PageFullError()
+
+        entry_struct = bytearray(b'\xff') * 32
+        entry_struct[0] = ns_index  # namespace index
+        entry_struct[2] = 0x01  # Span
+        chunk_index = Page.CHUNK_ANY
+        entry_struct[3] = chunk_index
+
+        # write key
+        key_array = b'\x00' * 16
+        entry_struct[8:24] = key_array
+        entry_struct[8:8 + len(key)] = key.encode()
+
+        if encoding == "u8":
+            entry_struct[1] = Page.U8
+            struct.pack_into('<B', entry_struct, 24, data)
+        elif encoding == "i8":
+            entry_struct[1] = Page.I8
+            struct.pack_into('<b', entry_struct, 24, data)
+        elif encoding == "u16":
+            entry_struct[1] = Page.U16
+            struct.pack_into('<H', entry_struct, 24, data)
+        elif encoding == "u32":
+            entry_struct[1] = Page.U32
+            struct.pack_into('<I', entry_struct, 24, data)
+        elif encoding == "i32":
+            entry_struct[1] = Page.I32
+            struct.pack_into('<i', entry_struct, 24, data)
+
+        # Compute CRC
+        crc_data = bytearray(b'28')
+        crc_data[0:4] = entry_struct[0:4]
+        crc_data[4:28] = entry_struct[8:32]
+        crc_data = bytes(crc_data)
+        crc = zlib.crc32(crc_data, 0xFFFFFFFF)
+        struct.pack_into('<I', entry_struct, 4, crc & 0xFFFFFFFF)
+
+        # write to file
+        self.write_entry_to_buf(entry_struct, 1,nvs_obj)
+
+    """ Get page buffer data of a given page """
+    def get_data(self):
+        return self.page_buf
+
+
+"""
+NVS class encapsulates all NVS specific operations to create a binary with given key-value pairs.
+Binary can later be flashed onto device via a flashing utility.
+"""
+
+
+class NVS(object):
+    def __init__(self, fout, input_size):
+        self.size = input_size
+        self.namespace_idx = 0
+        self.page_num = -1
+        self.pages = []
+        self.cur_page = self.create_new_page()
+        self.fout = fout
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        if exc_type is None and exc_value is None:
+            # Create pages for remaining available size
+            while True:
+                try:
+                    self.create_new_page()
+                except InsufficientSizeError:
+                    self.size = None
+                    # Creating the last reserved page
+                    self.create_new_page(is_rsrv_page=True)
+                    break
+
+            result = self.get_binary_data()
+            if version == Page.VERSION1:
+                print("Version: ", VERSION1_PRINT)
+            else:
+                print("Version: ", VERSION2_PRINT)
+            self.fout.write(result)
+
+    def create_new_page(self, is_rsrv_page=False):
+        # Update available size as each page is created
+        if self.size == 0:
+            raise InsufficientSizeError("Size parameter is less than the size of data in csv.Please increase size.")
+        if not is_rsrv_page:
+            self.size = self.size - Page.PAGE_PARAMS["max_size"]
+        self.page_num += 1
+        new_page = Page(self.page_num, is_rsrv_page)
+        new_page.version = version
+        new_page.is_encrypt = is_encrypt_data
+        if new_page.is_encrypt:
+            new_page.encr_key = key_input
+        self.pages.append(new_page)
+        self.cur_page = new_page
+        return new_page
+
+    """
+    Write namespace entry and subsequently increase namespace count so that all upcoming entries
+    will be mapped to a new namespace.
+    """
+    def write_namespace(self, key):
+        self.namespace_idx += 1
+        try:
+            self.cur_page.write_primitive_data(key, self.namespace_idx, "u8", 0,self)
+        except PageFullError:
+            new_page = self.create_new_page()
+            new_page.write_primitive_data(key, self.namespace_idx, "u8", 0,self)
+
+    """
+    Write key-value pair. Function accepts value in the form of ascii character and converts
+    it into appropriate format before calling Page class's functions to write entry into NVS format.
+    Function handles PageFullError and creates a new page and re-invokes the function on a new page.
+    We don't have to guard re-invocation with try-except since no entry can span multiple pages.
+    """
+    def write_entry(self, key, value, encoding):
+        if encoding == "hex2bin":
+            if len(value) % 2 != 0:
+                raise InputError("%s: Invalid data length. Should be multiple of 2." % key)
+            value = binascii.a2b_hex(value)
+
+        if encoding == "base64":
+            value = binascii.a2b_base64(value)
+
+        if encoding == "string":
+            if type(value) == bytes:
+                value = value.decode()
+            value += '\0'
+
+        encoding = encoding.lower()
+        varlen_encodings = ["string", "binary", "hex2bin", "base64"]
+        primitive_encodings = ["u8", "i8", "u16", "u32", "i32"]
+
+        if encoding in varlen_encodings:
+            try:
+                self.cur_page.write_varlen_data(key, value, encoding, self.namespace_idx,self)
+            except PageFullError:
+                new_page = self.create_new_page()
+                new_page.write_varlen_data(key, value, encoding, self.namespace_idx,self)
+        elif encoding in primitive_encodings:
+            try:
+                self.cur_page.write_primitive_data(key, int(value), encoding, self.namespace_idx,self)
+            except PageFullError:
+                new_page = self.create_new_page()
+                new_page.write_primitive_data(key, int(value), encoding, self.namespace_idx,self)
+        else:
+            raise InputError("%s: Unsupported encoding" % encoding)
+
+    """ Return accumulated data of all pages """
+    def get_binary_data(self):
+        data = bytearray()
+        for page in self.pages:
+            data += page.get_data()
+        return data
+
+
+class PageFullError(RuntimeError):
+    """
+    Represents error when current page doesn't have sufficient entries left
+    to accommodate current request
+    """
+    def __init__(self):
+        super(PageFullError, self).__init__()
+
+
+class InputError(RuntimeError):
+    """
+    Represents error on the input
+    """
+    def __init__(self, e):
+        super(InputError, self).__init__(e)
+
+
+class InsufficientSizeError(RuntimeError):
+    """
+    Represents error when NVS Partition size given is insufficient
+    to accomodate the data in the given csv file
+    """
+    def __init__(self, e):
+        super(InsufficientSizeError, self).__init__(e)
+
+
+def nvs_open(result_obj, input_size):
+    """ Wrapper to create and NVS class object. This object can later be used to set key-value pairs
+
+    :param result_obj: File/Stream object to dump resultant binary. If data is to be dumped into memory, one way is to use BytesIO object
+    :param input_size: Size of Partition
+    :return: NVS class instance
+    """
+    return NVS(result_obj, input_size)
+
+
+def write_entry(nvs_instance, key, datatype, encoding, value):
+    """ Wrapper to set key-value pair in NVS format
+
+    :param nvs_instance: Instance of an NVS class returned by nvs_open()
+    :param key: Key of the data
+    :param datatype: Data type. Valid values are "file", "data" and "namespace"
+    :param encoding: Data encoding. Valid values are "u8", "i8", "u16", "u32", "i32", "string", "binary", "hex2bin" and "base64"
+    :param value: Data value in ascii encoded string format for "data" datatype and filepath for "file" datatype
+    :return: None
+    """
+
+    if datatype == "file":
+        abs_file_path = value
+        if os.path.isabs(value) is False:
+            script_dir = os.getcwd()
+            abs_file_path = os.path.join(script_dir, value)
+
+        with open(abs_file_path, 'rb') as f:
+            value = f.read()
+
+    if datatype == "namespace":
+        nvs_instance.write_namespace(key)
+    else:
+        nvs_instance.write_entry(key, value, encoding)
+
+
+def nvs_close(nvs_instance):
+    """ Wrapper to finish writing to NVS and write data to file/stream object provided to nvs_open method
+
+    :param nvs_instance: Instance of NVS class returned by nvs_open()
+    :return: None
+    """
+    nvs_instance.__exit__(None, None, None)
+
+
+def check_input_args(input_filename=None, output_filename=None, input_part_size=None, is_key_gen=None,
+                     encrypt_mode=None, key_file=None, version_no=None, print_arg_str=None, print_encrypt_arg_str=None,
+                     output_dir=None):
+
+    global version, is_encrypt_data, input_size, key_gen
+
+    version = version_no
+    is_encrypt_data = encrypt_mode
+    key_gen = is_key_gen
+    input_size = input_part_size
+
+    if not output_dir == os.getcwd() and (key_file and os.path.isabs(key_file)):
+        sys.exit("Error. Cannot provide --outdir argument as --keyfile is absolute path.")
+
+    if not os.path.isdir(output_dir):
+        distutils.dir_util.mkpath(output_dir)
+
+    if is_encrypt_data.lower() == 'true':
+        is_encrypt_data = True
+    elif is_encrypt_data.lower() == 'false':
+        is_encrypt_data = False
+
+    if version == 'v1':
+        version = Page.VERSION1
+    elif version == 'v2':
+        version = Page.VERSION2
+
+    if key_gen.lower() == 'true':
+        key_gen = True
+    elif key_gen.lower() == 'false':
+        key_gen = False
+
+    if key_gen:
+        if all(arg is not None for arg in [input_filename, output_filename, input_size]):
+            if not is_encrypt_data:
+                sys.exit("--encrypt argument is missing or set to false.")
+        elif any(arg is not None for arg in [input_filename, output_filename, input_size]):
+            sys.exit(print_arg_str)
+    else:
+        if not (input_filename and output_filename and input_size):
+            sys.exit(print_arg_str)
+
+        if is_encrypt_data and not key_gen and not key_file:
+            sys.exit(print_encrypt_arg_str)
+
+        if not is_encrypt_data and key_file:
+            sys.exit("Invalid. Cannot give --keyfile as --encrypt is set to false.")
+
+    if key_file:
+        key_file_name, key_file_ext = os.path.splitext(key_file)
+        if key_file_ext:
+            if not key_file_ext == '.bin':
+                sys.exit("--keyfile argument can be a filename with no extension or .bin extension only")
+
+    # If only one of the arguments - input_filename, output_filename, input_size is given
+    if ((any(arg is None for arg in [input_filename, output_filename, input_size])) is True) and \
+            ((all(arg is None for arg in [input_filename, output_filename, input_size])) is False):
+            sys.exit(print_arg_str)
+
+    if input_size:
+        # Set size
+        input_size = int(input_size, 0)
+
+        if input_size % 4096 != 0:
+            sys.exit("Size of partition must be multiple of 4096")
+
+        # Update size as a page needs to be reserved of size 4KB
+        input_size = input_size - Page.PAGE_PARAMS["max_size"]
+
+        if input_size < (2 * Page.PAGE_PARAMS["max_size"]):
+            sys.exit("Minimum NVS partition size needed is 0x3000 bytes.")
+
+
+def nvs_part_gen(input_filename=None, output_filename=None, input_part_size=None, is_key_gen=None, encrypt_mode=None,
+                 key_file=None, encr_key_prefix=None, version_no=None, output_dir=None):
+    """ Wrapper to generate nvs partition binary
+
+    :param input_filename: Name of input file containing data
+    :param output_filename: Name of output file to store generated binary
+    :param input_part_size: Size of partition in bytes (must be multiple of 4096)
+    :param is_key_gen: Enable encryption key generation in encryption mode
+    :param encrypt_mode: Enable/Disable encryption mode
+    :param key_file: Input file having encryption keys in encryption mode
+    :param version_no: Format Version number
+    :return: None
+    """
+
+    global key_input, key_len_needed
+    encr_key_bin_file = None
+    encr_keys_dir = None
+    backslash = ['/','\\']
+
+    key_len_needed = 64
+    key_input = bytearray()
+
+    if key_gen:
+        key_input = ''.join(random.choice('0123456789abcdef') for _ in range(128)).strip()
+    elif key_file:
+        with open(key_file, 'rb') as key_f:
+            key_input = key_f.read(64)
+
+    if all(arg is not None for arg in [input_filename, output_filename, input_size]):
+        if not os.path.isabs(output_filename) and not any(ch in output_filename for ch in backslash):
+            output_filename = os.path.join(output_dir, '') + output_filename
+        input_file = open(input_filename, 'rt', encoding='utf8')
+        output_file = open(output_filename, 'wb')
+
+        with nvs_open(output_file, input_size) as nvs_obj:
+            reader = csv.DictReader(input_file, delimiter=',')
+            for row in reader:
+                try:
+                    write_entry(nvs_obj, row["key"], row["type"], row["encoding"], row["value"])
+                except (InputError) as e:
+                    print(e)
+                    input_file.close()
+                    output_file.close()
+                    sys.exit(-2)
+
+        input_file.close()
+        output_file.close()
+
+        print("NVS binary created: " + output_filename)
+
+    if key_gen:
+        keys_page_buf = bytearray(b'\xff') * Page.PAGE_PARAMS["max_size"]
+        key_bytes = bytearray()
+        if len(key_input) == key_len_needed:
+            key_bytes = key_input
+        else:
+            key_bytes = codecs.decode(key_input, 'hex')
+        key_len = len(key_bytes)
+        keys_page_buf[0:key_len] = key_bytes
+        crc_data = keys_page_buf[0:key_len]
+        crc_data = bytes(crc_data)
+        crc = zlib.crc32(crc_data, 0xFFFFFFFF)
+        struct.pack_into('<I', keys_page_buf, key_len,  crc & 0xFFFFFFFF)
+
+        if not key_file or (key_file and not os.path.isabs(key_file)):
+            # Create encryption keys bin file with timestamp
+            if not encr_key_prefix:
+                timestamp = datetime.datetime.now().strftime('%m-%d_%H-%M')
+            output_dir = os.path.join(output_dir, '')
+            encr_keys_dir = output_dir + "keys"
+            if not os.path.isdir(encr_keys_dir):
+                distutils.dir_util.mkpath(encr_keys_dir)
+
+            # Add backslash to `keys` dir if it is not present
+            encr_keys_dir = os.path.join(encr_keys_dir, '')
+
+        if key_file:
+            key_file_name, ext  = os.path.splitext(key_file)
+            if ext:
+                if ".bin" not in ext:
+                    sys.exit("Error: --keyfile must have .bin extension")
+                encr_key_bin_file = os.path.basename(key_file)
+            else:
+                encr_key_bin_file = key_file_name + ".bin"
+            if encr_keys_dir:
+                encr_key_bin_file = encr_keys_dir + encr_key_bin_file
+        else:
+            if encr_key_prefix:
+                encr_key_bin_file = encr_keys_dir + encr_key_prefix + "-keys" + ".bin"
+            else:
+                encr_key_bin_file = encr_keys_dir + "encryption_keys_" + timestamp + ".bin"
+
+        with open(encr_key_bin_file,'wb') as output_keys_file:
+            output_keys_file.write(keys_page_buf)
+
+        print("Encryption keys binary created: " + encr_key_bin_file)
+
+
+def main():
+    parser = argparse.ArgumentParser(description="ESP32 NVS partition generation utility")
+    nvs_part_gen_group = parser.add_argument_group('To generate NVS partition')
+    nvs_part_gen_group.add_argument("--input",
+                                    help="Path to CSV file to parse.",
+                                    default=None)
+
+    nvs_part_gen_group.add_argument("--output",
+                                    help='Path to output converted binary file.',
+                                    default=None)
+
+    nvs_part_gen_group.add_argument("--size",
+                                    help='Size of NVS Partition in bytes (must be multiple of 4096)')
+
+    nvs_part_gen_group.add_argument("--version",
+                                    help='Set version. Default: v2',
+                                    choices=['v1','v2'],
+                                    default='v2',
+                                    type=str.lower)
+
+    keygen_action_key = nvs_part_gen_group.add_argument("--keygen",
+                                                        help='Generate keys for encryption.',
+                                                        choices=['true','false'],
+                                                        default='false',
+                                                        type=str.lower)
+
+    nvs_part_gen_group.add_argument("--encrypt",
+                                    help='Set encryption mode. Default: false',
+                                    choices=['true','false'],
+                                    default='false',
+                                    type=str.lower)
+
+    keygen_action_file = nvs_part_gen_group.add_argument("--keyfile",
+                                                         help='File having key for encryption (Applicable only if encryption mode is true).',
+                                                         default=None)
+
+    keygen_action_dir = nvs_part_gen_group.add_argument('--outdir',
+                                                        dest='outdir',
+                                                        default=os.getcwd(),
+                                                        help='the output directory to store the files created\
+                                                        (Default: current directory)')
+
+    key_gen_group = parser.add_argument_group('To generate encryption keys')
+    key_gen_group._group_actions.append(keygen_action_key)
+    key_gen_group._group_actions.append(keygen_action_file)
+    key_gen_group._group_actions.append(keygen_action_dir)
+
+    args = parser.parse_args()
+    input_filename = args.input
+    output_filename = args.output
+    part_size = args.size
+    version_no = args.version
+    is_key_gen = args.keygen
+    is_encrypt_data = args.encrypt
+    key_file = args.keyfile
+    output_dir_path = args.outdir
+    encr_keys_prefix = None
+
+    print_arg_str = "Invalid.\nTo generate nvs partition binary --input, --output and --size arguments are mandatory.\
+                    \nTo generate encryption keys --keygen argument is mandatory."
+    print_encrypt_arg_str = "Missing parameter. Enter --keyfile or --keygen."
+
+    check_input_args(input_filename,output_filename, part_size, is_key_gen, is_encrypt_data, key_file, version_no,
+                     print_arg_str, print_encrypt_arg_str, output_dir_path)
+    nvs_part_gen(input_filename, output_filename, part_size, is_key_gen, is_encrypt_data, key_file,
+                 encr_keys_prefix, version_no, output_dir_path)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/mfg_homekit/README.md b/tools/mfg_homekit/README.md
new file mode 100644
index 0000000..5fcadb4
--- /dev/null
+++ b/tools/mfg_homekit/README.md
@@ -0,0 +1,233 @@
+# HomeKit Manufacturing Utility
+
+## Introduction
+
+HomeKit Specifications require that each accessory should have a unique setup id and setup code, which is generated randomly. Moreover, the setup code cannot be stored directly on the accessory, and instead the salt-verifier combination for the given code must be stored. The ESP HomeKit SDK has a concept of factory\_nvs partition, which can hold this information, so that the same firmware can be used across multiple instances of an accessory. Only the factoy\_nvs partition image will change. Some accessories may also require some additional information like firmware decryption/verification keys (for Firmware Upgrades), serial number, non-iOS provisioning/control, password, etc. which can be a part of the factory\_nvs.
+
+One important consideration here is how to create such individual images for larger number of accessories. This utility called as HomeKit Manufacturing Utility can be used to meet this requirement. It can be used for 2 different use cases:
+
+1. HomeKit-only Data
+2. HomeKit + Custom Data
+
+## Prerequisites
+
+* Operating System requirements:
+	-	Linux / MacOS / Windows (standard distributions)
+
+* The following packages are needed for using this utility:
+	-	'srp' package.
+		-	Command to install: ``pip install srp``
+	-	Python version: 2.7 (minimum) is required.
+		-	Link to install python: <https://www.python.org/downloads/>
+
+
+**Note::** Make sure the python path is set in the PATH environment variable before using this utility.
+
+
+
+## Usage
+
+The HomeKit Manufacturing Utility is a python script. If run with the -h option, it will give the usage information as follows:
+
+```
+./hk_mfg_gen.py [-h] [--conf CONFIG_FILE] [--values VALUES_FILE]
+                     [--prefix PREFIX] [--fileid FILEID] [--outdir OUTDIR]
+                     [--cid CID] [--count COUNT] [--size PART_SIZE]
+                     [--version {v1,v2}] [--keygen {true,false}]
+                     [--encrypt {true,false}] [--keyfile KEYFILE]
+
+Generate HomeKit specific data and create binaries and HomeKit setup info
+
+optional arguments:
+  -h, --help            show this help message and exit
+  --conf CONFIG_FILE    the input configuration csv file
+  --values VALUES_FILE  the input values csv file (the number of accessories
+                        to create HomeKit data for is equal to the data
+                        entries in this file)
+  --prefix PREFIX       the accessory name as each filename prefix
+  --fileid FILEID       the unique file identifier(any key in values file) as
+                        each filename suffix (Default: setup_code)
+  --outdir OUTDIR       the output directory to store the files created
+                        (Default: current directory)
+  --cid CID             the accessory category identifier
+  --count COUNT         the number of accessories to create HomeKit data for,
+                        applicable only if --values is not given
+  --size PART_SIZE      Size of NVS Partition in bytes (must be multiple of
+                        4096)
+  --version {v1,v2}     Set version. Default: v2
+  --keygen {true,false}
+                        Generate keys for encryption. Creates an `encryption_keys_<timestamp>.bin` file
+                        (in `keys/` directory in current path). Default: False
+  --encrypt {true,false}
+                        Set encryption mode. Default: False
+  --keyfile KEYFILE     File having key for encryption (Applicable only if
+                        encryption mode is true)
+
+```
+
+As mentioned earlier, this utility can be used for 2 different use cases:
+
+### HomeKit-only Data
+
+This is the simplest use case, wherein no custom data is required and the requirement is to just create random setup ids and setup codes. As an example, here is the usage to generate 5 such factory-nvs images for a Fan accessory:
+
+```
+mkdir images
+./hk_mfg_gen.py --prefix Fan --count 5 --outdir images --cid 3 --size 0x3000
+```
+
+**Note**:: To generate images with HomeKit-only data --count, --prefix --cid, and --size arguments are mandatory.
+
+Output
+
+```
+Version:  v2 - Multipage Blob Support Enabled
+Binary created.
+CSV Generated:  images/csv/Fan-985-05-005.csv
+NVS Flash Binary Generated:  images/bin/Fan-985-05-005.bin
+Version:  v2 - Multipage Blob Support Enabled
+Binary created.
+CSV Generated:  images/csv/Fan-344-47-290.csv
+NVS Flash Binary Generated:  images/bin/Fan-344-47-290.bin
+Version:  v2 - Multipage Blob Support Enabled
+Binary created.
+CSV Generated:  images/csv/Fan-946-46-242.csv
+NVS Flash Binary Generated:  images/bin/Fan-946-46-242.bin
+Version:  v2 - Multipage Blob Support Enabled
+Binary created.
+CSV Generated:  images/csv/Fan-521-88-048.csv
+NVS Flash Binary Generated:  images/bin/Fan-521-88-048.bin
+Version:  v2 - Multipage Blob Support Enabled
+Binary created.
+CSV Generated:  images/csv/Fan-875-45-449.csv
+NVS Flash Binary Generated:  images/bin/Fan-875-45-449.bin
+HomeKit config data generated is added to file:  images/homekit_config_10-30_22-58.csv
+HomeKit values data generated is added to file:  images/homekit_values_10-30_22-58.csv
+HomeKit Setup Info File Generated:  images/homekit_setup_info/Fan-985-05-005.txt
+HomeKit Setup Info File Generated:  images/homekit_setup_info/Fan-344-47-290.txt
+HomeKit Setup Info File Generated:  images/homekit_setup_info/Fan-946-46-242.txt
+HomeKit Setup Info File Generated:  images/homekit_setup_info/Fan-521-88-048.txt
+HomeKit Setup Info File Generated:  images/homekit_setup_info/Fan-875-45-449.txt
+```
+
+This generates 5 images in images/bin/ which can be flashed on the factory NVS. The corresponding files in images/homekit\_setup\_info give the setup code and setup payload, which can be used to prepare the stickers to be pasted on the physical HomeKit accessory.
+The version used to create the images is also displayed. For further details refer to README of tools/nvs\_partition\_utility.
+
+The configuration file \(homekit\_config\_10-30_22-58.csv\) generated gives information of all the NVS variables and their data types. The various values generated are stored in the values file (homekit\_values\_10-30\_22-58.csv). The values file can be considered as a master database as it has all the information for all the images, including metadata like the setup\_code used to generate setup\_salt and setup\_verifier, the value of setup\_id and even the setup\_payload which can be used to generate the QR code for accessory setup. Of these, only setup\_id, setup\_salt and setup\_verifier are actually used to generate the images. This logic is decided by the configuration file mentioned above, as it has entries only for these.
+
+
+### HomeKit + Custom Data
+If some custom data is required, a user will have to write 2 files:
+#### CSV Configuration File:
+This file contains the configuration of the NVS data for the accessories to be manufactured.
+
+The data in configuration file **must** have the following format:
+
+	name1,namespace,	   <-- First entry should be of type "namespace"
+	key1,type1,encoding1
+	key2,type2,encoding2
+	name2,namespace,
+	key3,type3,encoding3
+	key4,type4,encoding4
+
+**Note::** First entry in this file should always be ``namespace`` entry.
+
+Each row should have these 3 parameters: ``key,type,encoding`` separated by comma.
+
+*Please refer to README of tools/nvs\_partition\_utility for detailed description of each parameter.*
+
+
+Below is a sample example of such a configuration file:
+
+
+	app,namespace,
+	firmware_key,data,hex2bin
+	serial_no,data,i32
+
+
+**Note::** Make sure there are no spaces before and after ',' or at the end of each line in the configuration file.
+
+--
+
+#### Master CSV Values File:
+This file contains information of each device to be manufactured. Each row in this file corresponds to a device instance.
+
+The data in values file **must** have the following format:
+
+	key1,key2,key3,.....
+	value1,value2,value3,....
+
+**Note::** First row in this file should always be the keys. The keys must exist in this file in the **same order** as present in the configuration file. This file can even have additional columns(keys) anywhere in between and they will act like metadata and would not be part of final binary files.
+
+Each row should have the ``value`` of the corresponding keys, separated by comma. Below is the description of this parameter:
+
+``value``
+	Data value.
+
+Below is a sample example of such a values file:
+
+	id,firmware_key,serial_no
+	1,1a2b3c4d5e6faabb,101
+	2,1a2b3c4d5e6fccdd,102
+
+--
+
+**Note::** *Intermediate CSV files are created by this utility which are input to the nvs partition utility to generate the binary files.
+The format of this intermediate csv file will be:*
+
+	key,type,encoding,value
+	key,namespace, ,
+	key1,type1,encoding1,value1
+	key2,type2,encoding2,value2
+
+The utility can then be run as follows:
+
+```
+$ ./hk_mfg_gen.py --conf sample_config.csv --values sample_values.csv --prefix Fan --cid 3 --outdir images --size 0x3000
+```
+
+**Note::** To generate images with HomeKit + Custom data --conf, --values, --prefix --cid, and --size arguments are mandatory. 
+
+The Manufacturing utlity will add HomeKit related data (setup id, salt, verifier, etc.) to the configuration and master values file and create the individual binaries.
+
+--
+
+**Note::** *``bin/``, ``homekit_setup_info/`` and ``csv/`` sub-directories are created in the ``outdir`` directory specified while running this utility. The binary files generated will be stored in ``bin/``, information to be printed on accessories will be available in homekit\_setup\_info and the intermediate CSVs generated will be saved in csv/.*
+
+*If you want the files to have a custom identifier, say the serial number, you can provide it as the fileid argument. As an example, running the utility as below will generate files with serial number as the suffix:*
+
+```
+./hk_mfg_gen.py --conf sample_config.csv --values sample_values.csv --prefix Fan --cid 3 --outdir images --fileid serial_no --size 0x3000
+```
+
+For the input values given in the examples above, files Fan-101.bin and Fan-102.bin will be generated.
+
+
+*If you want to use encryption mode you can run the utility as given below:*
+
+```
+./hk_mfg_gen.py --conf sample_config.csv --values sample_values.csv --prefix Fan --cid 3 --outdir images --fileid
+serial_no --size 0x3000 --encrypt true --keygen true
+```
+
+```
+./hk_mfg_gen.py --prefix Fan --count 5 --outdir images --cid 3 --size 0x3000 --encrypt true --keygen true
+```
+
+This will generate encryption keys and generate encrypted binaries.
+
+**Note::** *You can also provide --keyfile argument, generated encrypted binaries will expect this --keyfile file to have encryption keys.*
+
+**Note::** The --outdir directory is created if not present. 
+
+**Note::** *You can also run the below command to use the utility to* **only** *generate encryption keys binary file (created in `keys/`), which can further be used to encrypt the images:*
+    
+    $ ./hk_mfg_gen.py --keygen true
+    
+    $ ./hk_mfg_gen.py --keygen true --outdir tmp --keyfile encr_keys.bin
+
+**Note::** When running utility to generate only ``keys``, if --keyfile is given it will generate encryption keys with filename given in --keyfile argument. ``keys/`` directory is generated with the encryption keys filename of the form ``prefix-fileid-keys.bin``.
+
+**Note::** The file path given in the ``file`` type in the values file is expected to be relative to the current directory from which you are running the utility.
+
+**Note::** *Make sure the parameters set are consistent with application's configurations.*
diff --git a/tools/mfg_homekit/hk_mfg_gen.py b/tools/mfg_homekit/hk_mfg_gen.py
new file mode 100755
index 0000000..42dc478
--- /dev/null
+++ b/tools/mfg_homekit/hk_mfg_gen.py
@@ -0,0 +1,755 @@
+#!/usr/bin/env python
+#
+# Copyright 2018 Espressif Systems (Shanghai) PTE LTD
+#
+# 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.
+
+from __future__ import print_function
+from future.moves.itertools import zip_longest
+from builtins import range
+import os
+import string
+import random
+import binascii
+import csv
+import itertools
+import shutil
+import sys
+import argparse
+import datetime
+import distutils.dir_util
+import setup_info_gen
+import pdb
+
+try:
+    file_path = os.path.dirname(os.path.realpath(__file__))
+    nvs_gen_path = os.path.join(file_path,"../idf_tools/nvs_partition_generator/")
+    mass_mfg_path = os.path.join(file_path,"../idf_tools/mass_mfg/")
+
+    if not os.path.exists(nvs_gen_path):
+        print("Trying tools from IDF_PATH")
+        if os.getenv('IDF_PATH'):
+            nvs_gen_path = os.path.join(os.getenv('IDF_PATH'),'','components','','nvs_flash','','nvs_partition_generator','')
+            mass_mfg_path = os.path.join(os.getenv('IDF_PATH'),'','tools','','mass_mfg','')
+        else:
+            sys.exit("Please check IDF_PATH")
+    sys.path.insert(0, nvs_gen_path)
+    sys.path.insert(0, mass_mfg_path)
+    import nvs_partition_gen
+    import mfg_gen
+except Exception as e:
+    sys.exit(e)
+
+try:
+    file_path = os.path.dirname(os.path.realpath(__file__))
+    srp_tool_path = os.path.join(file_path, '../' ,'srp','')
+    sys.path.insert(0, srp_tool_path)
+    import srp_tool as srp
+except Exception as e:
+    print(e)
+
+
+
+def write_homekit_setup_info(homekit_csv_file, output_target_dir, csv_output_filenames):
+    """ Write homekit setup info (setup code and setup payload generated) to output txt file
+    """
+    try:
+        setup_code = b''
+        setup_payload = b''
+
+        hk_file = open(homekit_csv_file,'r')
+        hk_file_reader = csv.reader(hk_file,delimiter=',')
+        hk_keys = next(hk_file_reader)
+        hk_keys = hk_keys[-5:]
+        
+        for data in hk_file_reader:
+            csv_file = csv_output_filenames[0]
+            # Create output filename with .txt extension 
+            output_txt_file = output_target_dir + csv_file.replace(".csv",".txt")
+
+            # Terminate if target file exist
+            if os.path.isfile(output_txt_file):
+                raise SystemExit("HomeKit setup info target file: %s ` already exists...`" % output_txt_file)
+            
+            # Write data to output txt file 
+            hk_values = data[-5:]
+            hk_data = list(zip_longest(hk_keys, hk_values))
+            for data in hk_data:
+                if 'setup_code' in data:
+                    setup_code = data[1]
+                if 'setup_payload' in data:
+                    setup_payload = data[1]
+            setup_info_gen.write_setup_info_to_file(setup_code,setup_payload,output_txt_file)
+            print("HomeKit Setup Info File Generated: " , str(output_txt_file))
+            del csv_output_filenames[0]
+
+        hk_file.close()
+    
+    except Exception as std_err:
+        print(std_err)
+    except:
+        raise
+
+
+def verify_values_exist(input_values_file, keys_in_values_file):
+    """ Verify all keys have corresponding values in values file
+    """
+    line_no = 1
+    key_count_in_values_file = len(keys_in_values_file)
+    
+    values_file = open(input_values_file,'r')
+    values_file_reader = csv.reader(values_file, delimiter=',')
+    next(values_file_reader)
+
+    for values_data in values_file_reader:
+        line_no +=1
+        if len(values_data) != key_count_in_values_file:
+            raise SystemExit("Oops...Number of values is not equal to number of keys in file: %s ' at line No: %s'" \
+            % (str(input_values_file), str(line_no)))
+
+
+def verify_keys_exist(input_config_file, values_file_keys):
+    """ Verify all keys from config file are present in values file
+    """
+    keys_missing = []
+    
+    config_file = open(input_config_file,'r')
+    config_file_reader = csv.reader(config_file, delimiter=',')
+    for line_no, config_data in enumerate(config_file_reader,1):
+        if 'namespace' not in config_data:
+            if values_file_keys:
+                if config_data[0] == values_file_keys[0]:
+                    del values_file_keys[0]
+                else:
+                    keys_missing.append([config_data[0], line_no])
+            else:
+                keys_missing.append([config_data[0], line_no])
+
+    if keys_missing:
+        for key, line_no in keys_missing:
+            print("Key:`", str(key), "` at line no:", str(line_no), \
+            " in config file is not found in values file...")
+        config_file.close()
+        raise SystemExit(1)
+
+    config_file.close()
+
+
+def verify_datatype_encoding(input_config_file):
+    """ Verify datatype and encodings from config file is valid
+    """
+    valid_encodings = ["string", "binary", "hex2bin","u8", "i8", "u16", "u32", "i32","base64"]
+    valid_datatypes = ["file","data","namespace"]
+    line_no = 0
+    
+    config_file = open(input_config_file,'r')
+    config_file_reader = csv.reader(config_file, delimiter=',')
+    for config_data in config_file_reader:
+        line_no+=1
+        if config_data[1] not in valid_datatypes:
+            raise SystemExit("Oops...config file: %s has invalid datatype at line no: %s" % (str(input_config_file), str(line_no)))
+        if 'namespace' not in config_data:
+            if config_data[2] not in valid_encodings:
+                raise SystemExit("Oops...config file: %s has invalid encoding at line no: %s" % (str(input_config_file), str(line_no)))
+
+
+def verify_file_data_count(input_config_file):
+    """ Verify count of data on each line in config file is equal to 3
+    (as format must be: <key,type and encoding>)
+    """
+    line_no = 0
+    config_file = open(input_config_file, 'r')
+    config_file_reader = csv.reader(config_file, delimiter=',')
+    for line in config_file_reader:
+        line_no += 1
+        if len(line) < 3 or len(line) > 4:
+            raise SystemExit("Oops...data missing in config file at line no: %s  <format needed:key,type,encoding>" % str(line_no))
+
+    config_file.close()
+
+
+def verify_hap_setup(input_config_file,is_exists):
+    """ Verify hap_setup namespace does not already exist in config file
+    """
+    config_file = open(input_config_file,'r')
+    config_file_reader = csv.reader(config_file, delimiter=',')
+    for config_data in config_file_reader:
+        if 'hap_setup' in config_data and not is_exists:
+            config_file.close()
+            raise SystemExit("Oops...`hap_setup` namespace already exists in config file...")
+
+    config_file.close()
+
+
+def verify_data_in_file(input_config_file=None, input_values_file=None, config_file_keys=None, keys_in_values_file=None):
+    """
+    Verify count of data on each line in config file is equal to 3 \
+    ( as format must be: <key,type and encoding> ) 
+    Verify datatype and encodings from config file is valid
+    Verify all keys from config file are present in values file and \
+    Verify each key has corresponding value in values file 
+    """
+    try:
+        # Verify data if input config file is given
+        if input_config_file:
+            verify_file_data_count(input_config_file)
+            verify_datatype_encoding(input_config_file)
+           
+        # Verify data if input values file is given
+        if input_values_file:
+            verify_values_exist(input_values_file, keys_in_values_file)        
+            
+        # Verify data if input config file and input values file is given
+        if input_config_file and input_values_file:
+            verify_keys_exist(input_config_file, values_file_keys)
+       
+        
+    except Exception as std_err:
+        print(std_err)
+    except:
+        raise
+
+
+
+def add_homekit_data_to_file(input_config_file,input_values_file,keys_in_values_file,homekit_data,output_dir):
+    """ Add homekit data generated to input csv config and values file respectively 
+    """
+    try:
+        # Create a new target config and values file if \
+        # input_config_file or input_values_file is None with prefix as `homekit_` \ 
+        # and suffix as timestamp generated
+        timestamp = datetime.datetime.now().strftime('%m-%d_%H-%M')
+        if input_config_file is None: 
+            target_config_file = output_dir + 'homekit_config_' + timestamp + '.csv'
+        else:
+            input_config_filename = os.path.basename(input_config_file)
+            target_config_file = output_dir + 'homekit_' + input_config_filename
+       
+        if input_values_file is None:
+            target_values_file = output_dir + 'homekit_values_' + timestamp + '.csv'
+        else:
+            input_values_filename = os.path.basename(input_values_file)
+            target_values_file = output_dir + 'homekit_' + input_values_filename
+    
+        # Terminate if target files exist
+        if os.path.isfile(target_config_file):
+            raise SystemExit("Target config file: %s already exists...`" % target_config_file)
+        if os.path.isfile(target_values_file):
+            raise SystemExit("Target values file: %s already exists...`" % target_values_file)
+        
+        # Copy contents of input_config_file and input_values_file to 
+        # target_config and target_values file
+        conf_file_mode = 'w'
+        if input_config_file:
+            shutil.copyfile(input_config_file,target_config_file)
+            conf_file_mode = 'a+'
+        if  input_values_file:
+            shutil.copyfile(input_values_file,target_values_file)
+
+        hap_setup_found = False
+
+        configfile = open(target_config_file, conf_file_mode)
+        valuesfile = open(target_values_file, 'w')
+
+        if conf_file_mode == 'a+':
+            configfile.seek(0)
+            config_file_reader = csv.reader(configfile, delimiter=',')
+            for config_data in config_file_reader:
+                if 'hap_setup' in config_data:
+                    hap_setup_found = True
+                    break
+
+        if not hap_setup_found:
+            configfile.write(u"hap_setup,namespace,\n")
+        
+        configfile.write(u"setup_id,data,binary\n")
+        configfile.write(u"setup_salt,data,hex2bin\n")
+        configfile.write(u"setup_verifier,data,hex2bin\n")
+
+        valuesfile_writer = csv.writer(valuesfile, delimiter=',')
+        valuesfile_writer.writerow(keys_in_values_file)
+        for data in homekit_data:
+            valuesfile_writer.writerow(data)
+        
+        configfile.close()
+        valuesfile.close()
+   
+        return target_config_file,target_values_file
+
+    except Exception as std_err:
+        print(std_err)
+    except:
+        raise
+
+
+def salt_vkey_gen(setup_code_created):
+    """ Generate a Salt and Verification Key for each setup code generated
+    """
+
+    try:
+        # The Modulus, N, and Generator, g, as specified by the 3072-bit group of RFC5054. 
+        # This is required since the standard srp script does not support this
+        n_3072 = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF"
+        g_3072 = "5"
+    
+        salt_created = []
+        vkey_created = []
+        salt_len_needed = 32
+        vkey_len_needed = 768
+
+        for setup_code in setup_code_created:
+            while True:
+                salt, vkey = srp.create_salted_verification_key( 'Pair-Setup', str(setup_code), srp.SHA512, \
+                srp.NG_CUSTOM, n_3072.encode(), g_3072.encode(), salt_len=16 )
+                salt = binascii.b2a_hex(salt).decode()
+                vkey = binascii.b2a_hex(vkey).decode()
+
+                if len(salt) == salt_len_needed and len(vkey) == vkey_len_needed:
+                    break
+
+            salt_created.append(salt)
+            vkey_created.append(vkey)
+
+        return salt_created, vkey_created
+
+    except Exception as std_err:
+        print(std_err)
+    except:
+        raise
+
+
+def setup_id_gen(total_value_count):
+    """ Generate a setup id corresponding to each fileid
+    """
+    try:
+        setup_id_created = []
+
+        for x in range(total_value_count):
+            setup_id = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(4))
+            setup_id_created.append(setup_id)
+
+        return setup_id_created
+
+    except Exception as std_err:
+        print(std_err)
+    except:
+        raise
+
+
+def setup_code_gen(total_value_count):
+    """ Generate a setup code corresponding to each fileid
+    """
+    try:
+        invalid_setup_codes = ['00000000','11111111','22222222','33333333','44444444','55555555',\
+                           '66666666','77777777','88888888','99999999','12345678','87654321'] 
+   
+        setup_code_created = []
+
+        for _ in range(total_value_count):
+       
+            setup_code = ''
+
+            # random generate setup_code
+            for _ in range(8):
+                random_num = str(random.randint(0,9))
+                setup_code += random_num
+
+            # generate again till valid
+            while setup_code in invalid_setup_codes:
+                setup_code = ''
+                for _ in range(8):
+                    random_num = str(randint(0,9))
+                    setup_code += random_num
+
+            # Check if the setup code has valid format
+            if (len(setup_code) != 8) or (not setup_code.isdigit()):
+                print("Setup code generated should be 8 numbers without any '-' in between. Eg. 11122333")
+                raise SystemExit (1)
+
+            # Add the hyphen (-) in the PIN for salt-verifier generation. So, 11122333 will become 111-22-333
+            setup_code = setup_code[:3] + '-' + setup_code[3:5] + '-' + setup_code[5:]
+
+            setup_code_created.append(setup_code)
+    
+        return setup_code_created
+    
+    except Exception as std_err:
+        print(std_err)
+    except:
+        raise
+
+
+def homekit_data_gen(no_of_accessories=None):
+    """ Generate homekit data - setup_id,setup_code
+    salt and verifier key
+    """
+    setup_id_created = setup_id_gen(no_of_accessories)
+    setup_code_created = setup_code_gen(no_of_accessories) 
+    salt_created, vkey_created = salt_vkey_gen(setup_code_created)
+    
+    return setup_id_created,setup_code_created,salt_created,vkey_created
+
+
+def get_keys(keys_in_values_file, config_file_keys):
+    """ Get keys from values file present in config file
+    """
+    values_file_keys = []
+    for key in range(len(keys_in_values_file)):
+        if keys_in_values_file[key] in config_file_keys:
+            values_file_keys.append(keys_in_values_file[key])
+    
+    return values_file_keys
+
+
+
+def main():
+    try:
+        filename = os.path.join('.','hk_mfg_gen.py')
+        parser = argparse.ArgumentParser(prog=filename,
+                                         description="Generate HomeKit specific data and create binaries and HomeKit setup info",
+                                         formatter_class=argparse.RawDescriptionHelpFormatter)
+        
+        parser.add_argument('--conf',
+                            dest='config_file',
+                            help='the input configuration csv file')
+        
+        parser.add_argument('--values',
+                            dest='values_file',
+                            help='the input values csv file (the number of accessories \
+                            to create HomeKit data for is equal to the data entries \
+                            in this file)',
+                            default=None)
+        
+        parser.add_argument('--prefix',
+                            dest='prefix',
+                            help='the accessory name as each filename prefix',
+                            default=None)
+        
+        parser.add_argument('--fileid',
+                            dest='fileid',
+                            help='the unique file identifier(any key in values file) as \
+                            each filename suffix (Default: setup_code)',
+                            default=None)
+        
+        curr_dir = os.path.join('.','')
+        parser.add_argument('--outdir',
+                            dest='outdir',
+                            default=curr_dir,
+                            help='the output directory to store the files created \
+                            (Default: current directory)')
+        
+        parser.add_argument('--cid',
+                            dest='cid',
+                            type=int,
+                            help='the accessory category identifier',
+                            default=None)
+        
+        parser.add_argument('--count',
+                            dest='count',
+                            type=int,
+                            help='the number of accessories to create HomeKit data for,\
+                            applicable only if --values is not given',
+                            default=None)
+       
+        parser.add_argument("--size",
+                            dest='part_size',
+                            help='Size of NVS Partition in bytes (must be multiple of 4096)',
+                            default=None)
+
+        parser.add_argument("--version",
+                            dest="version",
+                            help='Set version. Default: v2',
+                            choices=['v1','v2'],
+                            default='v2',
+                            type=str.lower)
+
+        parser.add_argument("--keygen",
+                            dest="keygen",
+                            help='Generate keys for encryption. Default: False',
+                            choices=['true','false'],
+                            default= 'false',
+                            type=str.lower)
+
+        parser.add_argument("--encrypt",
+                            dest="encrypt",
+                            help='Set encryption mode. Default: False',
+                            choices=['true','false'],
+                            default='false',
+                            type=str.lower)
+
+        parser.add_argument("--keyfile",
+                            dest="keyfile",
+                            help='File having key for encryption (Applicable only if encryption mode is true)',
+                            default = None)
+
+        args = parser.parse_args()
+        input_config_file = args.config_file
+        input_values_file = args.values_file
+        input_prefix = args.prefix
+        input_fileid = args.fileid
+        input_outdir = args.outdir
+        input_cid = args.cid
+        input_count = args.count
+        part_size = args.part_size
+        version = args.version
+        input_is_keygen = args.keygen
+        input_is_encrypt = args.encrypt
+        input_is_keyfile = args.keyfile
+        GENERATE_KEY_ONLY = False
+        print_arg_str = "\nTo generate nvs partition binary with custom data --conf, --values, --prefix --cid, and --size arguments are mandatory.\
+        \nTo generate nvs partition binary without any custom data --count, --prefix --cid, and --size arguments are mandatory.\
+        \nTo generate encryption keys --keygen argument is mandatory."
+        
+        print_encrypt_arg_str = "Missing parameter. Enter --keyfile."
+
+        if not part_size and input_is_keygen.lower() == 'true':
+            if input_is_encrypt == 'true':
+                sys.exit("Invalid.\nOnly --keyfile and --outdir arguments allowed.\n")
+            GENERATE_KEY_ONLY = True
+        
+            nvs_partition_gen.check_input_args(input_config_file, input_values_file, part_size, input_is_keygen,\
+                                               input_is_encrypt, input_is_keyfile, version, print_arg_str,
+                                               print_encrypt_arg_str, input_outdir)
+         
+            nvs_partition_gen.nvs_part_gen(input_filename = input_config_file, output_filename = input_values_file,\
+                                           input_part_size=part_size, is_key_gen=input_is_keygen,\
+                                           encrypt_mode=input_is_encrypt, key_file=input_is_keyfile,\
+                                           version_no=version, output_dir=input_outdir)
+            sys.exit(0)
+ 
+        # Verify that --cid argument and --prefix arguments are given
+        if not input_cid or not input_prefix:
+            parser.error(print_arg_str)
+
+        # Verify that --values argument and --count argument are not given together
+        if input_values_file and input_count:
+            parser.error('--values and --count cannot be given together')
+        
+        # Verify if --fileid argument is given then --values argument should also be given
+        if input_fileid and not input_values_file:
+            parser.error('--values is needed as --fileid given')
+        
+        # Verify --count argument is given if --values file is not given
+        if not input_config_file:
+            if not input_values_file and not input_count:
+                parser.error('--count or --values is needed')
+        else:
+            # Verify that --conf argument and --count argument are not given together
+            if input_count:
+                parser.error('--conf and --count cannot be given together')
+            
+            # Verify if --conf argument is given then --values argument should also be given
+            if not input_values_file:
+                parser.error('--values is needed as --conf given')
+         
+        # Add backslash to outdir if it is not present
+        backslash = ['/','\\']
+        if not any(ch in input_outdir for ch in backslash):
+            input_outdir = os.path.join(args.outdir , '')
+
+        # Set default value for fileid if --fileid argument is not given
+        if not input_fileid:
+            input_fileid = 'setup_code'
+
+        if input_is_encrypt.lower() == 'true':
+            if input_is_keygen.lower() == 'true' and input_is_keyfile:
+                parser.error('Invalid. Cannot provide --keygen and --keyfile with --encrypt argument.')
+            #else:
+            #    parser.error('Invalid. --keyfile needed as --encrypt is True.')
+            elif not (input_is_keygen.lower() == 'true' or input_is_keyfile):
+                parser.error('Invalid. Must provide --keygen or --keyfile with --encrypt argument.')
+
+        if input_count:
+            nvs_partition_gen.check_input_args("None", "None", part_size, input_is_keygen,\
+                input_is_encrypt, input_is_keyfile, version, print_arg_str, print_encrypt_arg_str, input_outdir)
+        else:
+            nvs_partition_gen.check_input_args(input_config_file, input_values_file, part_size, input_is_keygen,\
+                input_is_encrypt, input_is_keyfile, version, print_arg_str, print_encrypt_arg_str, input_outdir)
+        
+        setup_id_created = []
+        setup_code_created = []
+        salt_created = []
+        vkey_created = []
+        keys_in_values_file = []
+        keys_in_config_file = []
+        values_file_keys = []
+        homekit_data = []
+        data_in_values_file = []
+        csv_output_filenames = []
+        setup_payload = b''
+        setup_code = b''
+        is_empty_line = False
+        files_created = False
+        total_value_count = 1
+        hk_setup_info_dir = os.path.join('homekit_setup_info','')
+
+        if input_config_file:
+            # Verify config file is not empty
+            if os.stat(input_config_file).st_size == 0:
+                raise SystemExit("Oops...config file: %s is empty..." % input_config_file)
+            
+            # Verify config file does not have empty lines
+            config_file = open(input_config_file,'r')
+            config_file_reader = csv.reader(config_file, delimiter=',')
+            for config_data in config_file_reader:
+                for data in config_data:
+                    empty_line = data.strip()
+                    if empty_line is '':
+                        is_empty_line = True
+                    else:
+                        is_empty_line = False
+                        break
+                if is_empty_line:
+                    raise SystemExit("Oops...config file: %s cannot have empty lines..." % input_config_file)
+                if not config_data:
+                    raise SystemExit("Oops...config file: %s cannot have empty lines..." % str(input_config_file))
+            config_file.close()
+       
+            # Extract keys from config file 
+            config_file = open(input_config_file,'r')
+            config_file_reader = csv.reader(config_file, delimiter=',')
+            for config_data in config_file_reader:
+                if not 'namespace' in config_data:
+                    keys_in_config_file.append(config_data[0])
+            config_file.close()
+
+            # Verify data in the input config file 
+            verify_data_in_file(input_config_file=input_config_file)
+       
+        is_empty_line = False
+
+        if input_values_file:
+            # Verify values file is not empty
+            if os.stat(input_values_file).st_size == 0:
+                raise SystemExit("Oops...values file: %s is empty..." % input_values_file)
+            
+            # Verify values file does not have empty lines 
+            csv_values_file = open(input_values_file,'r')
+            values_file_reader = csv.reader(csv_values_file, delimiter=',')
+            for values_data in values_file_reader:
+                for data in values_data:
+                    empty_line = data.strip()
+                    if empty_line is '':
+                        is_empty_line = True
+                    else:
+                        is_empty_line = False
+                        break
+                if is_empty_line is True:
+                    raise SystemExit("Oops...values file: %s cannot have empty lines..." % input_values_file)
+                if not values_data:
+                    raise SystemExit("Oops...values file: %s cannot have empty lines..." % str(input_values_file))
+            csv_values_file.close()
+            
+            # Extract keys from values file 
+            values_file = open(input_values_file,'r')
+            values_file_reader = csv.reader(values_file, delimiter=',')
+            keys_in_values_file = next(values_file_reader)
+            values_file.close()
+
+            values_file = open(input_values_file,'r')
+            values_file_reader = csv.reader(values_file, delimiter=',')
+            next(values_file_reader)
+            
+            # Verify file identifier exists in values file 
+            if 'setup_code' not in input_fileid:
+                if input_fileid not in keys_in_values_file:
+                    raise SystemExit('Oops...target_file_id: %s does not exist in values file...\n' % input_fileid)
+        
+            # Verify data in the input values_file 
+            verify_data_in_file(input_values_file=input_values_file, keys_in_values_file=keys_in_values_file)
+
+            # Add data in values file to list
+            for values in values_file_reader:
+                data_in_values_file.append(values)
+            
+            # Get number of rows from values file which is equal to\
+            # the number of accessories to create HomeKit data for
+            total_value_count = len(data_in_values_file)
+
+            values_file.close()
+
+
+        if input_config_file and input_values_file:
+            # Get keys from values file present in config files
+            values_file_keys = get_keys(keys_in_values_file, keys_in_config_file)
+            
+            # Verify data in the input values_file 
+            verify_data_in_file(input_config_file=input_config_file, keys_in_values_file=values_file_keys)
+       
+        if input_values_file:
+            keys_in_values_file.extend(['setup_id','setup_code','setup_salt','setup_verifier','setup_payload'])
+        else:
+            keys_in_values_file = ['setup_id','setup_code','setup_salt','setup_verifier','setup_payload']
+        
+        # Generate homekit data
+        if input_count:
+            setup_id_created,setup_code_created,salt_created,vkey_created = homekit_data_gen(no_of_accessories=input_count)
+        else:
+            setup_id_created,setup_code_created,salt_created,vkey_created = homekit_data_gen(no_of_accessories=total_value_count)
+       
+        # Verify Accessory Category Identifier (cid)
+        setup_info_gen.verify_cid(input_cid)
+      
+        # Generate setup payload and add it alongwith the homekit data generated to config and values file(if exist)\
+        # if input config and input values file do not exist then new files are created
+        if data_in_values_file:
+            for (values, setup_id, setup_code, salt, vkey) in \
+            list(zip_longest(data_in_values_file,setup_id_created,setup_code_created,\
+            salt_created, vkey_created)):
+                setup_payload,setup_code = setup_info_gen.setup_payload_create(input_cid,\
+                setup_code=setup_code,setup_id=setup_id)
+                values.extend([setup_id, setup_code, salt, vkey,setup_payload])
+                homekit_data.append(values)
+        else:
+            for (setup_id, setup_code, salt, vkey) in \
+            list(zip_longest(setup_id_created,setup_code_created,\
+            salt_created, vkey_created)):
+                setup_payload,setup_code = setup_info_gen.setup_payload_create(input_cid,\
+                setup_code=setup_code,setup_id=setup_id)
+                homekit_data.append([setup_id, setup_code, salt, vkey,setup_payload])
+
+
+        target_config_file,target_values_file = add_homekit_data_to_file(input_config_file, \
+        input_values_file, keys_in_values_file, homekit_data, input_outdir)
+
+        # Generate csv and bin file
+        csv_output_filenames, files_created, target_values_file = mfg_gen.main(input_config_file=target_config_file, input_values_file=target_values_file,\
+                                                           target_file_name_prefix=input_prefix, file_identifier=input_fileid,\
+                                                           output_dir_path=input_outdir, part_size=part_size,\
+                                                           input_version=version, input_is_keygen=input_is_keygen,\
+                                                           input_is_encrypt=input_is_encrypt ,input_is_keyfile=input_is_keyfile)
+
+        print("HomeKit config data generated is added to file: " , target_config_file)
+        print("HomeKit values data generated is added to file: " , target_values_file)
+        
+        if not files_created:
+            raise SystemExit("Oops...csv,bin,setup info files could not be created...Please check your input files...")
+
+        # Create new directory(if doesn't exist) to store homekit setup info generated
+        output_target_dir = input_outdir + hk_setup_info_dir 
+        if not os.path.isdir(output_target_dir):
+            distutils.dir_util.mkpath(output_target_dir)
+
+        # Write homekit setup info generated to output_target_file
+        write_homekit_setup_info(target_values_file, output_target_dir, csv_output_filenames)
+
+
+    except Exception as std_err:
+        print(std_err)
+    except:
+        raise
+
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/mfg_homekit/setup_info_gen.py b/tools/mfg_homekit/setup_info_gen.py
new file mode 100755
index 0000000..1c3128f
--- /dev/null
+++ b/tools/mfg_homekit/setup_info_gen.py
@@ -0,0 +1,191 @@
+#!/usr/bin/env python
+#
+# Copyright 2018 Espressif Systems (Shanghai) PTE LTD
+#
+# 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.
+
+import sys
+import os
+import csv
+import itertools
+import argparse
+import random
+import string
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)) + "/../setup_payload_gen/")
+import setup_payload_gen
+
+
+def verify_cid(cid):
+    """ Verify accessory category id is positive number less than 255 (1 byte long)
+    """
+    if not 1 <= cid <=255:
+        raise SystemExit("Oops..(Accessory Category Identifier) cid should be between 1-255...\n")
+
+
+def setup_id_gen(no_of_accessories):
+    """ Generate setup id 
+    """
+    try:
+        setup_id_created = []
+
+        for x in range(no_of_accessories):
+            setup_id = ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(4))
+            setup_id_created.append(setup_id)
+
+        return setup_id_created
+
+    except StandardError as std_err:
+        print std_err
+    except:
+        raise    
+
+
+def setup_code_gen(no_of_accessories):
+    """ Generate setup code
+    """
+    try:
+        invalid_setup_codes = ['00000000','11111111','22222222','33333333','44444444','55555555',\
+                           '66666666','77777777','88888888','99999999','12345678','87654321'] 
+   
+        setup_code_created = []
+
+        for _ in range(no_of_accessories):
+       
+            setup_code = ''
+
+            # random generate setup_code
+            for _ in range(8):
+                random_num = str(random.randint(0,9))
+                setup_code += random_num
+
+            # generate again till valid
+            while setup_code in invalid_setup_codes:
+                setup_code = ''
+                for _ in range(8):
+                    random_num = str(randint(0,9))
+                    setup_code += random_num
+
+            # Check if the setup code has valid format
+            if (len(setup_code) != 8) or (not setup_code.isdigit()):
+                print "\nSetup code generated should be 8 numbers without any '-' in between. Eg. 11122333 \n"
+                raise SystemExit(1)
+
+            # Add the hyphen (-) in the PIN for salt-verifier generation. So, 11122333 will become 111-22-333
+            setup_code = setup_code[:3] + '-' + setup_code[3:5] + '-' + setup_code[5:]
+
+            setup_code_created.append(setup_code)
+    
+        return setup_code_created
+    
+    except StandardError as std_err:
+        print std_err
+    except:
+        raise    
+
+
+def write_setup_info_to_file(setup_code,setup_payload,output_txt_file):
+    """ Write setup info (setup code and setup payload generated) to file
+    """
+    if os.path.isfile(output_txt_file):
+        if os.stat(output_txt_file).st_size == 0:
+            txt_file = open(output_txt_file,"w")
+        else:
+            txt_file = open(output_txt_file,"a")
+    else:
+        txt_file = open(output_txt_file,"w")
+    txt_file.write("Setup Code: " + setup_code + "\n")
+    txt_file.write("Setup Payload: " + setup_payload + "\n")
+    txt_file.close()
+
+
+def setup_payload_create(cid,setup_code=None,setup_id=None):
+    """ Generate setup payload
+    """
+    try:
+        s_code = setup_code.replace('-','')
+        setup_payload = setup_payload_gen.main(cid=cid,setupCode=int(s_code),setupID=setup_id)
+        return setup_payload,setup_code
+
+    except StandardError as std_err:
+        print std_err
+    except:
+        raise    
+
+def main(cid=None,output_target_file=None,target_values_file=None):
+    try:
+        if all(arg is None for arg in [cid,output_target_file,target_values_file]):
+            parser = argparse.ArgumentParser(prog='./setup_info_gen.py',
+                                             description="Generate HomeKit Setup Info (Setup Code and Setup Payload)",\
+                                             formatter_class=argparse.RawDescriptionHelpFormatter)
+            
+            parser.add_argument('--cid',
+                                dest='cid',
+                                type=int,
+                                required=True,
+                                help='the accessory category identifier')
+            
+            parser.add_argument('--outfile',
+                                dest='filename',
+                                required=True,
+                                help='the output filename to write setup info generated')
+            
+            parser.add_argument('--count',
+                                dest='count',
+                                type=int,
+                                required=True,
+                                help='the number of accessories to create setup info for')
+            
+            parser.add_argument('--outdir',
+                                dest='outdir',
+                                default='./',
+                                help='the output directory to store the file created\
+                                (Default: current directory)')
+                
+        args = parser.parse_args()
+        
+        # Verify if output_dir_path argument is given then output directory exists
+        if not os.path.isdir(args.outdir):
+            parser.error('--outdir ' + args.outdir + ' does not exist...')
+
+        # Add '/' to outdir if it is not present
+        if not args.outdir.endswith('/'):
+            args.outdir = args.outdir + '/'
+        
+        # Verify Accessory Category Identifier 
+        verify_cid(args.cid)
+       
+        setup_id_generated = []
+        setup_code_generated = []
+       
+        # Generate setup id for 'count' no. of accessories
+        setup_id_generated = setup_id_gen(args.count)
+        # Generate setup code for 'count' no. of accessories
+        setup_code_generated = setup_code_gen(args.count)
+
+        # Generate setup payload and write setup info (setup code and
+        # setup payload generated) to output txt file
+        for sid, scode in itertools.izip_longest(setup_id_generated, setup_code_generated):
+            setup_payload, setup_code = setup_payload_create(args.cid, setup_code=scode, setup_id=sid)
+            output_txt_file = args.outdir + args.filename + '-' + str(setup_code) + '.txt' 
+            write_setup_info_to_file(setup_code,setup_payload,output_txt_file)
+            print "File: " + output_txt_file + " created..."
+
+    except StandardError as std_err:
+        print std_err
+    except:
+        raise    
+
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/setup_payload_gen/README.md b/tools/setup_payload_gen/README.md
new file mode 100644
index 0000000..6bbb938
--- /dev/null
+++ b/tools/setup_payload_gen/README.md
@@ -0,0 +1,30 @@
+# Setup Payload Generator
+
+## Introduction
+setup\_payload\_gen is a Python script that can be used to generate the Setup Payload required
+for generating the QR code for HomeKit Accessory Setup
+
+## Usage
+
+```
+~# ./setup_payload_gen.py <AccessoryCategory> <setupCode> <SetupID>
+```
+
+where
+
+- *AccessoryCategory* is a number from the "Accessory Categories" table of HAP Spec. (Eg. 3 for fan)
+- *setupCode* is the pairing code, without the hyphen (-). (Eg. 11122333)
+- *SetupID* is a 4 character alphannumeric string configured for an accessory (Eg. 7OSX)
+
+## Example
+
+```
+~# ./setup_payload_gen.py 7 51808582 7OSX
+Setup Payload: X-HM://007JNU5AE7OSX
+```
+
+## Generating QR
+Any standard QR code generator can be used for generating the QR code for
+HomeKit Acessory Setup using the Payload generated above.
+
+Eg. [http://www.qr-code-generator.com/](http://www.qr-code-generator.com/)
diff --git a/tools/setup_payload_gen/setup_payload_gen.py b/tools/setup_payload_gen/setup_payload_gen.py
new file mode 100755
index 0000000..7ef5dcb
--- /dev/null
+++ b/tools/setup_payload_gen/setup_payload_gen.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+#
+# Copyright 2018 Espressif Systems (Shanghai) PTE LTD
+#
+# 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.
+#
+import sys
+
+def base36encode(integer):
+    chars, encoded = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ', ''
+
+    while integer > 0:
+        integer, remainder = divmod(integer, 36)
+        encoded = chars[remainder] + encoded
+
+    return encoded
+
+def main(cid=None,setupCode=None,setupID=None):
+    try:
+        setup_payload_string = None
+        if all(arg is None for arg in [cid,setupCode,setupID]):
+            if len (sys.argv) != 4 :
+                print "Usage: ./setup_payload_gen.py <AccessoryCategory> <setupCode> <SetupID>"
+                print "Eg.: ./setup_payload_gen.py 7 51808582 7OSX"
+                raise SystemExit(1)
+
+            cid = int(sys.argv[1]);
+            setupCode = int(sys.argv[2]);
+            setupID = sys.argv[3]
+            setup_payload_string = "Setup Payload: "
+
+        nw_flags = 0xa; # For IP accessories supporting WAC. Use 0x4 for BLE
+        VersionCategoryFlagsAndSetupCode = (cid << 31) | (nw_flags << 27) | setupCode
+        VersionCategoryFlagsAndSetupCode = base36encode(VersionCategoryFlagsAndSetupCode)
+
+        setup_payload = "X-HM://00" + VersionCategoryFlagsAndSetupCode + setupID
+        print setup_payload
+
+        if setup_payload_string:
+            print setup_payload_string + setup_payload
+
+        return setup_payload
+
+    except StandardError as e:
+        print e
+    except:
+        raise
+
+
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file
diff --git a/tools/srp/srp_tool.py b/tools/srp/srp_tool.py
new file mode 100644
index 0000000..efb1276
--- /dev/null
+++ b/tools/srp/srp_tool.py
@@ -0,0 +1,424 @@
+  # N    A large safe prime (N = 2q+1, where q is prime)
+  #      All arithmetic is done modulo N.
+  # g    A generator modulo N
+  # k    Multiplier parameter (k = H(N, g) in SRP-6a, k = 3 for legacy SRP-6)
+  # s    User's salt
+  # I    Username
+  # p    Cleartext Password
+  # H()  One-way hash function
+  # ^    (Modular) Exponentiation
+  # u    Random scrambling parameter
+  # a,b  Secret ephemeral values
+  # A,B  Public ephemeral values
+  # x    Private key (derived from p and s)
+  # v    Password verifier
+
+import hashlib
+import os
+import binascii
+import six
+
+
+_rfc5054_compat = False
+_no_username_in_x = False
+
+def rfc5054_enable(enable=True):
+    global _rfc5054_compat
+    _rfc5054_compat = enable
+
+def no_username_in_x(enable=True):
+    global _no_username_in_x
+    _no_username_in_x = enable
+
+
+SHA1   = 0
+SHA224 = 1
+SHA256 = 2
+SHA384 = 3
+SHA512 = 4
+
+NG_1024   = 0
+NG_2048   = 1
+NG_4096   = 2
+NG_8192   = 3
+NG_CUSTOM = 4
+
+_hash_map = { SHA1   : hashlib.sha1,
+              SHA224 : hashlib.sha224,
+              SHA256 : hashlib.sha256,
+              SHA384 : hashlib.sha384,
+              SHA512 : hashlib.sha512 }
+
+
+_ng_const = (
+# 1024-bit
+('''\
+EEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C9C256576D674DF7496\
+EA81D3383B4813D692C6E0E0D5D8E250B98BE48E495C1D6089DAD15DC7D7B46154D6B6CE8E\
+F4AD69B15D4982559B297BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA\
+9AFD5138FE8376435B9FC61D2FC0EB06E3''',
+"2"),
+# 2048
+('''\
+AC6BDB41324A9A9BF166DE5E1389582FAF72B6651987EE07FC3192943DB56050A37329CBB4\
+A099ED8193E0757767A13DD52312AB4B03310DCD7F48A9DA04FD50E8083969EDB767B0CF60\
+95179A163AB3661A05FBD5FAAAE82918A9962F0B93B855F97993EC975EEAA80D740ADBF4FF\
+747359D041D5C33EA71D281E446B14773BCA97B43A23FB801676BD207A436C6481F1D2B907\
+8717461A5B9D32E688F87748544523B524B0D57D5EA77A2775D2ECFA032CFBDBF52FB37861\
+60279004E57AE6AF874E7303CE53299CCC041C7BC308D82A5698F3A8D0C38271AE35F8E9DB\
+FBB694B5C803D89F7AE435DE236D525F54759B65E372FCD68EF20FA7111F9E4AFF73''',
+"2"),
+# 4096
+('''\
+FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08\
+8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B\
+302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9\
+A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6\
+49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8\
+FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D\
+670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C\
+180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718\
+3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D\
+04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D\
+B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226\
+1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C\
+BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC\
+E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26\
+99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB\
+04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2\
+233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127\
+D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199\
+FFFFFFFFFFFFFFFF''',
+"5"),
+# 8192
+('''\
+FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08\
+8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B\
+302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9\
+A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6\
+49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8\
+FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D\
+670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C\
+180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718\
+3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D\
+04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D\
+B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226\
+1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C\
+BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC\
+E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26\
+99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB\
+04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2\
+233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127\
+D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492\
+36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406\
+AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918\
+DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B33205151\
+2BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03\
+F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97F\
+BEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA\
+CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58B\
+B7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632\
+387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E\
+6DBE115974A3926F12FEE5E438777CB6A932DF8CD8BEC4D073B931BA\
+3BC832B68D9DD300741FA7BF8AFC47ED2576F6936BA424663AAB639C\
+5AE4F5683423B4742BF1C978238F16CBE39D652DE3FDB8BEFC848AD9\
+22222E04A4037C0713EB57A81A23F0C73473FC646CEA306B4BCBC886\
+2F8385DDFA9D4B7FA2C087E879683303ED5BDD3A062B3CF5B3A278A6\
+6D2A13F83F44F82DDF310EE074AB6A364597E899A0255DC164F31CC5\
+0846851DF9AB48195DED7EA1B1D510BD7EE74D73FAF36BC31ECFA268\
+359046F4EB879F924009438B481C6CD7889A002ED5EE382BC9190DA6\
+FC026E479558E4475677E9AA9E3050E2765694DFC81F56E880B96E71\
+60C980DD98EDD3DFFFFFFFFFFFFFFFFF''',
+'0x13')
+)
+
+def get_ng( ng_type, n_hex, g_hex ):
+    if ng_type < NG_CUSTOM:
+        n_hex, g_hex = _ng_const[ ng_type ]
+    return int(n_hex,16), int(g_hex,16)
+
+
+def bytes_to_long(s):
+    n = 0
+    for b in six.iterbytes(s):
+        n = (n << 8) | b
+    return n
+
+
+def long_to_bytes(n):
+    l = list()
+    x = 0
+    off = 0
+    while x != n:
+        b = (n >> off) & 0xFF
+        l.append( chr(b) )
+        x = x | (b << off)
+        off += 8
+    l.reverse()
+    return six.b(''.join(l))
+
+
+def get_random( nbytes ):
+    return bytes_to_long( os.urandom( nbytes ) )
+
+
+def get_random_of_length( nbytes ):
+    offset = (nbytes*8) - 1
+    return get_random( nbytes ) | (1 << offset)
+
+
+def old_H( hash_class, s1, s2 = '', s3=''):
+    if isinstance(s1, six.integer_types):
+        s1 = long_to_bytes(s1)
+    if s2 and isinstance(s2, six.integer_types):
+        s2 = long_to_bytes(s2)
+    if s3 and isinstance(s3, six.integer_types):
+        s3 = long_to_bytes(s3)
+    s = s1 + s2 + s3
+    return long(hash_class(s).hexdigest(), 16)
+
+
+def H( hash_class, *args, **kwargs ):
+    width = kwargs.get('width', None)
+    
+    h = hash_class()
+
+    for s in args:
+        if s is not None:
+            data = long_to_bytes(s) if isinstance(s, six.integer_types) else s
+            if width is not None and _rfc5054_compat:
+                h.update( bytes(width - len(data)))
+            h.update( data )
+
+    #return int( h.hexdigest(), 16 )
+    return (h.hexdigest())
+
+
+
+#N = 0xAC6BDB41324A9A9BF166DE5E1389582FAF72B6651987EE07FC3192943DB56050A37329CBB4A099ED8193E0757767A13DD52312AB4B03310DCD7F48A9DA04FD50E8083969EDB767B0CF6095179A163AB3661A05FBD5FAAAE82918A9962F0B93B855F97993EC975EEAA80D740ADBF4FF747359D041D5C33EA71D281E446B14773BCA97B43A23FB801676BD207A436C6481F1D2B9078717461A5B9D32E688F87748544523B524B0D57D5EA77A2775D2ECFA032CFBDBF52FB3786160279004E57AE6AF874E7303CE53299CCC041C7BC308D82A5698F3A8D0C38271AE35F8E9DBFBB694B5C803D89F7AE435DE236D525F54759B65E372FCD68EF20FA7111F9E4AFF73;
+#g = 2;
+#k = H(N,g)
+
+def HNxorg( hash_class, N, g ):
+    bin_N = long_to_bytes(N)
+    bin_g = long_to_bytes(g)
+
+    padding = len(bin_N) - len(bin_g) if _rfc5054_compat else 0
+
+    hN = hash_class( bin_N ).digest()
+    hg = hash_class( b''.join( [b'\0'*padding, bin_g] ) ).digest()
+
+    return six.b( ''.join( chr( six.indexbytes(hN, i) ^ six.indexbytes(hg, i) ) for i in range(0,len(hN)) ) )
+
+
+
+def gen_x( hash_class, salt, username, password):
+    username = username.encode() if hasattr(username, 'encode') else username
+    password = password.encode() if hasattr(password, 'encode') else password
+    if _no_username_in_x:
+        username = six.b('')
+    return int(H( hash_class, salt, binascii.a2b_hex(H( hash_class, username + six.b(':') + password))),16)
+    #return H( hash_class, salt, H( hash_class, username + six.b(':') + password ))
+
+
+
+
+def create_salted_verification_key( username, password, hash_alg=SHA1, ng_type=NG_2048, n_hex=None, g_hex=None, salt_len=4, salt=None ):
+    if ng_type == NG_CUSTOM and (n_hex is None or g_hex is None):
+        raise ValueError("Both n_hex and g_hex are required when ng_type = NG_CUSTOM")
+    hash_class = _hash_map[ hash_alg ]
+    N,g = get_ng( ng_type, n_hex, g_hex )
+    if salt is None:
+        _s = long_to_bytes( get_random( salt_len ) )
+    else:
+        _s = binascii.a2b_hex(salt)
+    _v = long_to_bytes( pow(g,  gen_x( hash_class, _s, username, password ), N) )
+
+    return _s, _v
+
+
+
+def calculate_M( hash_class, N, g, I, s, A, B, K ):
+    I = I.encode() if hasattr(I, 'encode') else I
+    h = hash_class()
+    h.update( HNxorg( hash_class, N, g ) )
+    h.update( hash_class(I).digest() )
+    h.update( long_to_bytes(s) )
+    h.update( long_to_bytes(A) )
+    h.update( long_to_bytes(B) )
+    h.update( K )
+    return h.digest()
+
+
+def calculate_H_AMK( hash_class, A, M, K ):
+    h = hash_class()
+    h.update( long_to_bytes(A) )
+    h.update( M )
+    h.update( K )
+    return h.digest()
+
+
+
+
+class Verifier (object):
+
+    def __init__(self, username, bytes_s, bytes_v, bytes_A, hash_alg=SHA1, ng_type=NG_2048, n_hex=None, g_hex=None, bytes_b=None):
+        if ng_type == NG_CUSTOM and (n_hex is None or g_hex is None):
+            raise ValueError("Both n_hex and g_hex are required when ng_type = NG_CUSTOM")
+        if bytes_b and len(bytes_b) != 32:
+            raise ValueError("32 bytes required for bytes_b")
+        self.s = bytes_to_long(bytes_s)
+        self.v = bytes_to_long(bytes_v)
+        self.I = username
+        self.K = None
+        self._authenticated = False
+
+        N,g        = get_ng( ng_type, n_hex, g_hex )
+        hash_class = _hash_map[ hash_alg ]
+        k          = H( hash_class, N, g, width=len(long_to_bytes(N)) )
+
+        self.hash_class = hash_class
+        self.N          = N
+        self.g          = g
+        self.k          = k
+
+        self.A = bytes_to_long(bytes_A)
+
+        # SRP-6a safety check
+        self.safety_failed = self.A % N == 0
+
+        if not self.safety_failed:
+
+            if bytes_b:
+                self.b = bytes_to_long(bytes_b)
+            else:
+                self.b = get_random_of_length( 32 )
+            self.B = (k*self.v + pow(g, self.b, N)) % N
+            self.u = H(hash_class, self.A, self.B, width=len(long_to_bytes(N)))
+            self.S = pow(self.A*pow(self.v, self.u, N ), self.b, N)
+            self.K = hash_class( long_to_bytes(self.S) ).digest()
+            self.M = calculate_M( hash_class, N, g, self.I, self.s, self.A, self.B, self.K )
+            self.H_AMK = calculate_H_AMK( hash_class, self.A, self.M, self.K )
+
+
+    def authenticated(self):
+        return self._authenticated
+
+
+    def get_username(self):
+        return self.I
+
+
+    def get_ephemeral_secret(self):
+        return long_to_bytes(self.b)
+
+
+    def get_session_key(self):
+        return self.K if self._authenticated else None
+
+    # returns (bytes_s, bytes_B) on success, (None,None) if SRP-6a safety check fails
+    def get_challenge(self):
+        if self.safety_failed:
+            return None,None
+        else:
+            return (long_to_bytes(self.s), long_to_bytes(self.B))
+
+    # returns H_AMK on success, None on failure
+    def verify_session(self, user_M):
+        if not self.safety_failed and user_M == self.M:
+            self._authenticated = True
+            return self.H_AMK
+
+
+
+
+class User (object):
+    def __init__(self, username, password, hash_alg=SHA1, ng_type=NG_2048, n_hex=None, g_hex=None, bytes_a=None, bytes_A=None):
+        if ng_type == NG_CUSTOM and (n_hex is None or g_hex is None):
+            raise ValueError("Both n_hex and g_hex are required when ng_type = NG_CUSTOM")
+        if bytes_a and len(bytes_a) != 32:
+            raise ValueError("32 bytes required for bytes_a")
+        N,g        = get_ng( ng_type, n_hex, g_hex )
+        hash_class = _hash_map[ hash_alg ]
+        k          = H( hash_class, N, g, width=len(long_to_bytes(N)) )
+
+        self.I     = username
+        self.p     = password
+        if bytes_a:
+            self.a = bytes_to_long(bytes_a)
+        else:
+            self.a = get_random_of_length( 32 )
+        if bytes_A:
+            self.A = bytes_to_long(bytes_A)
+        else:
+            self.A = pow(g, self.a, N)
+        self.v     = None
+        self.M     = None
+        self.K     = None
+        self.H_AMK = None
+        self._authenticated = False
+
+        self.hash_class = hash_class
+        self.N          = N
+        self.g          = g
+        self.k          = k
+
+
+    def authenticated(self):
+        return self._authenticated
+
+
+    def get_username(self):
+        return self.I
+
+
+    def get_ephemeral_secret(self):
+        return long_to_bytes(self.a)
+
+
+    def get_session_key(self):
+        return self.K if self._authenticated else None
+
+
+    def start_authentication(self):
+        return (self.I, long_to_bytes(self.A))
+
+
+    # Returns M or None if SRP-6a safety check is violated
+    def process_challenge(self, bytes_s, bytes_B):
+
+        self.s = bytes_to_long( bytes_s )
+        self.B = bytes_to_long( bytes_B )
+
+        N = self.N
+        g = self.g
+        k = self.k
+
+        hash_class = self.hash_class
+
+        # SRP-6a safety check
+        if (self.B % N) == 0:
+            return None
+
+        self.u = H( hash_class, self.A, self.B, width=len(long_to_bytes(N)) )
+
+        # SRP-6a safety check
+        if self.u == 0:
+            return None
+
+        self.x = gen_x( hash_class, self.s, self.I, self.p )
+
+        self.v = pow(g, self.x, N)
+
+        self.S = pow((self.B - k*self.v), (self.a + self.u*self.x), N)
+
+        self.K     = hash_class( long_to_bytes(self.S) ).digest()
+        self.M     = calculate_M( hash_class, N, g, self.I, self.s, self.A, self.B, self.K )
+        self.H_AMK = calculate_H_AMK(hash_class, self.A, self.M, self.K)
+
+        return self.M
+
+
+    def verify_session(self, host_HAMK):
+        if self.H_AMK == host_HAMK:
+            self._authenticated = True