Update forked idf components

72 files changed, 2777 insertions, 10715 deletions

diff --git a/lib/bt/porting/ext/tinycrypt/AUTHORS b/lib/bt/porting/ext/tinycrypt/AUTHORS
deleted file mode 100644
index bd1c1a1f..00000000
--- a/lib/bt/porting/ext/tinycrypt/AUTHORS
+++ /dev/null
@@ -1,15 +0,0 @@
-Architect:
-Rafael Misoczki <rafael.misoczki@intel.com>
-
-Open Source Maintainer:
-Constanza Heath <constanza.m.heath@intel.com>
-Rafael Misoczki <rafael.misoczki@intel.com>
-
-Contributors:
-Constanza Heath <constanza.m.heath@intel.com>
-Rafael Misoczki <rafael.misoczki@intel.com>
-Flavio Santes <flavio.santes@intel.com>
-Jarkko Sakkinen <jarkko.sakkinen@intel.com>
-Chris Morrison
-Marti Bolivar
-Colin Ian King
diff --git a/lib/bt/porting/ext/tinycrypt/LICENSE b/lib/bt/porting/ext/tinycrypt/LICENSE
deleted file mode 100644
index b3c55243..00000000
--- a/lib/bt/porting/ext/tinycrypt/LICENSE
+++ /dev/null
@@ -1,61 +0,0 @@
-
-================================================================================
-
-                     TinyCrypt Cryptographic Library
-
-================================================================================
-
-          Copyright (c) 2017, Intel Corporation. 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 the Intel Corporation nor the names of its 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.
-
-================================================================================
-Copyright (c) 2014, Kenneth MacKay
-All rights reserved.
-
-https://github.com/kmackay/micro-ecc
-
-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.
-
-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 HOLDER 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.
-
-================================================================================
diff --git a/lib/bt/porting/ext/tinycrypt/README b/lib/bt/porting/ext/tinycrypt/README
deleted file mode 100644
index 48bdf9ba..00000000
--- a/lib/bt/porting/ext/tinycrypt/README
+++ /dev/null
@@ -1,70 +0,0 @@
-
-================================================================================
-
-                     TinyCrypt Cryptographic Library
-
-================================================================================
-
-          Copyright (c) 2017, Intel Corporation. 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 the Intel Corporation nor the names of its 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.
-
-================================================================================
-
-Overview:
-
-The TinyCrypt Library provides an implementation for constrained devices of a
-minimal set of standard cryptography primitives.
-
-Please, ***SEE THE DOCUMENTATION*** folder for more information on the supported
-cryptographic primitives and the limitations of TinyCrypt library. For usage,
-security and technicalities, please see the corresponding header file of each
-cryptographic primitive.
-
-================================================================================
-
-Organization:
-
-/lib: C source code of the cryptographic primitives.
-/lib/include/tinycrypt: C header files of the cryptographic primitives.
-/tests: Test vectors of the cryptographic primitives.
-/doc: Documentation of TinyCrypt.
-
-================================================================================
-
-Building:
-
-1) In Makefile.conf set:
-    - CFLAGS for compiler flags.
-    - CC for compiler.
-    - ENABLE_TESTS for enabling (true) or disabling (false) tests compilation.
-2) In lib/Makefile select the primitives required by your project.
-3) In tests/Makefile select the corresponding tests of the selected primitives.
-4) make
-5) run tests in tests/
-
-================================================================================
diff --git a/lib/bt/porting/ext/tinycrypt/VERSION b/lib/bt/porting/ext/tinycrypt/VERSION
deleted file mode 100644
index a45be462..00000000
--- a/lib/bt/porting/ext/tinycrypt/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.2.8
diff --git a/lib/bt/porting/ext/tinycrypt/documentation/tinycrypt.rst b/lib/bt/porting/ext/tinycrypt/documentation/tinycrypt.rst
deleted file mode 100644
index 356c099a..00000000
--- a/lib/bt/porting/ext/tinycrypt/documentation/tinycrypt.rst
+++ /dev/null
@@ -1,352 +0,0 @@
-
-TinyCrypt Cryptographic Library
-###############################
-Copyright (C) 2017 by Intel Corporation, All Rights Reserved.
-
-Overview
-********
-The TinyCrypt Library provides an implementation for targeting constrained devices
-with a minimal set of standard cryptography primitives, as listed below. To better
-serve applications targeting constrained devices, TinyCrypt implementations differ
-from the standard specifications (see the Important Remarks section for some
-important differences). Certain cryptographic primitives depend on other
-primitives, as mentioned in the list below.
-
-Aside from the Important Remarks section below, valuable information on the usage,
-security and technicalities of each cryptographic primitive are found in the
-corresponding header file.
-
-* SHA-256:
-
-  * Type of primitive: Hash function.
-  * Standard Specification: NIST FIPS PUB 180-4.
-  * Requires: --
-
-* HMAC-SHA256:
-
-  * Type of primitive: Message authentication code.
-  * Standard Specification: RFC 2104.
-  * Requires: SHA-256
-
-* HMAC-PRNG:
-
-  * Type of primitive: Pseudo-random number generator (256-bit strength).
-  * Standard Specification: NIST SP 800-90A.
-  * Requires: SHA-256 and HMAC-SHA256.
-
-* AES-128:
-
-  * Type of primitive: Block cipher.
-  * Standard Specification: NIST FIPS PUB 197.
-  * Requires: --
-
-* AES-CBC mode:
-
-  * Type of primitive: Encryption mode of operation.
-  * Standard Specification: NIST SP 800-38A.
-  * Requires: AES-128.
-
-* AES-CTR mode:
-
-  * Type of primitive: Encryption mode of operation.
-  * Standard Specification: NIST SP 800-38A.
-  * Requires: AES-128.
-
-* AES-CMAC mode:
-
-  * Type of primitive: Message authentication code.
-  * Standard Specification: NIST SP 800-38B.
-  * Requires: AES-128.
-
-* AES-CCM mode:
-
-  * Type of primitive: Authenticated encryption.
-  * Standard Specification: NIST SP 800-38C.
-  * Requires: AES-128.
-
-* CTR-PRNG:
-
-  * Type of primitive: Pseudo-random number generator (128-bit strength).
-  * Standard Specification: NIST SP 800-90A.
-  * Requires: AES-128.
-  
-* ECC-DH:
-
-  * Type of primitive: Key exchange based on curve NIST p-256.
-  * Standard Specification: RFC 6090.
-  * Requires: ECC auxiliary functions (ecc.h/c).
-
-* ECC-DSA:
-
-  * Type of primitive: Digital signature based on curve NIST p-256.
-  * Standard Specification: RFC 6090.
-  * Requires: ECC auxiliary functions (ecc.h/c).
-
-Design Goals
-************
-
-* Minimize the code size of each cryptographic primitive. This means minimize
- the size of a platform-independent implementation, as presented in TinyCrypt.
- Note that various applications may require further features, optimizations with
- respect to other metrics and countermeasures for particular threats. These
- peculiarities would increase the code size and thus are not considered here.
-
-* Minimize the dependencies among the cryptographic primitives. This means
- that it is unnecessary to build and allocate object code for more primitives
- than the ones strictly required by the intended application. In other words,
- one can select and compile only the primitives required by the application.
-
-
-Important Remarks
-*****************
-
-The cryptographic implementations in TinyCrypt library have some limitations.
-Some of these limitations are inherent to the cryptographic primitives
-themselves, while others are specific to TinyCrypt. These limitations were accepted
-in order to meet its design goals (in special, minimal code size) and to better 
-serve applications targeting constrained devices in general. Some of these 
-limitations are discussed in-depth below.
-
-General Remarks
-***************
-
-* TinyCrypt does **not** intend to be fully side-channel resistant. Due to the
-  variety of side-channel attacks, many of them only relevant to certain 
-  platforms. In this sense, instead of penalizing all library users with
-  side-channel countermeasures such as increasing the overall code size,
-  TinyCrypt only implements certain generic timing-attack countermeasures.
-
-Specific Remarks
-****************
-
-* SHA-256:
-
-  * The number of bits_hashed in the state is not checked for overflow. Note
-    however that this will only be a problem if you intend to hash more than
-    2^64 bits, which is an extremely large window.
-
-* HMAC:
-
-  * The HMAC verification process is assumed to be performed by the application.
-    This compares the computed tag with some given tag.
-    Note that conventional memory-comparison methods (such as memcmp function)
-    might be vulnerable to timing attacks; thus be sure to use a constant-time
-    memory comparison function (such as compare_constant_time
-    function provided in lib/utils.c).
-
-  * The tc_hmac_final function, responsible for computing the message tag,
-    cleans the state context before exiting. Thus, applications do not need to
-    clean the TCHmacState_t ctx after calling tc_hmac_final. This should not
-    be changed in future versions of the library as there are applications
-    currently relying on this good-practice/feature of TinyCrypt.
-
-* HMAC-PRNG:
-
-  * Before using HMAC-PRNG, you *must* find an entropy source to produce a seed.
-    PRNGs only stretch the seed into a seemingly random output of arbitrary
-    length. The security of the output is exactly equal to the
-    unpredictability of the seed.
-
-  * NIST SP 800-90A requires three items as seed material in the initialization
-    step: entropy seed, personalization and a nonce (which is not implemented).
-    TinyCrypt requires the personalization byte array and automatically creates
-    the entropy seed using a mandatory call to the re-seed function.
-
-* AES-128:
-
-  * The current implementation does not support other key-lengths (such as 256
-    bits). Note that if you need AES-256, it doesn't sound as though your
-    application is running in a constrained environment. AES-256 requires keys
-    twice the size as for AES-128, and the key schedule is 40% larger.
-
-* CTR mode:
-
-  * The AES-CTR mode limits the size of a data message they encrypt to 2^32
-    blocks. If you need to encrypt larger data sets, your application would
-    need to replace the key after 2^32 block encryptions.
-
-* CTR-PRNG:
-
-  * Before using CTR-PRNG, you *must* find an entropy source to produce a seed.
-    PRNGs only stretch the seed into a seemingly random output of arbitrary
-    length. The security of the output is exactly equal to the
-    unpredictability of the seed.
-
-* CBC mode:
-
-  * TinyCrypt CBC decryption assumes that the iv and the ciphertext are
-    contiguous (as produced by TinyCrypt CBC encryption). This allows for a
-    very efficient decryption algorithm that would not otherwise be possible.
-
-* CMAC mode:
-
-  * AES128-CMAC mode of operation offers 64 bits of security against collision
-    attacks. Note however that an external attacker cannot generate the tags
-    him/herself without knowing the MAC key. In this sense, to attack the
-    collision property of AES128-CMAC, an external attacker would need the
-    cooperation of the legal user to produce an exponentially high number of
-    tags (e.g. 2^64) to finally be able to look for collisions and benefit
-    from them. As an extra precaution, the current implementation allows to at
-    most 2^48 calls to tc_cmac_update function before re-calling tc_cmac_setup
-    (allowing a new key to be set), as suggested in Appendix B of SP 800-38B.
-
-* CCM mode:
-
-  * There are a few tradeoffs for the selection of the parameters of CCM mode.
-    In special, there is a tradeoff between the maximum number of invocations
-    of CCM under a given key and the maximum payload length for those
-    invocations. Both things are related to the parameter 'q' of CCM mode. The
-    maximum number of invocations of CCM under a given key is determined by
-    the nonce size, which is: 15-q bytes. The maximum payload length for those
-    invocations is defined as 2^(8q) bytes.
-
-    To achieve minimal code size, TinyCrypt CCM implementation fixes q = 2,
-    which is a quite reasonable choice for constrained applications. The
-    implications of this choice are:
-
-    The nonce size is: 13 bytes.
-
-    The maximum payload length is: 2^16 bytes = 65 KB.
-
-    The mac size parameter is an important parameter to estimate the security
-    against collision attacks (that aim at finding different messages that
-    produce the same authentication tag). TinyCrypt CCM implementation
-    accepts any even integer between 4 and 16, as suggested in SP 800-38C.
-
-  * TinyCrypt CCM implementation accepts associated data of any length between
-    0 and (2^16 - 2^8) = 65280 bytes.
-
-  * TinyCrypt CCM implementation accepts:
-
-        * Both non-empty payload and associated data (it encrypts and
-          authenticates the payload and only authenticates the associated data);
-
-        * Non-empty payload and empty associated data (it encrypts and
-          authenticates the payload);
-
-        * Non-empty associated data and empty payload (it degenerates to an
-          authentication-only mode on the associated data).
-
-   * RFC-3610, which also specifies CCM, presents a few relevant security
-     suggestions, such as: it is recommended for most applications to use a
-     mac size greater than 8. Besides, it is emphasized that the usage of the
-     same nonce for two different messages which are encrypted with the same
-     key obviously destroys the security properties of CCM mode.
-
-* ECC-DH and ECC-DSA:
-
-  * TinyCrypt ECC implementation is based on micro-ecc (see
-    https://github.com/kmackay/micro-ecc). In the original micro-ecc 
-    documentation, there is an important remark about the way integers are
-    represented:
-
-    "Integer representation: To reduce code size, all large integers are
-    represented using little-endian words - so the least significant word is
-    first. You can use the 'ecc_bytes2native()' and 'ecc_native2bytes()'
-    functions to convert between the native integer representation and the
-    standardized octet representation."
-
-    Note that the assumed bit layout is: {31, 30, ..., 0}, {63, 62, ..., 32},
-    {95, 94, ..., 64}, {127, 126, ..., 96} for a very-long-integer (vli)
-    consisting of 4 unsigned integers (as an example).
-
-  * A cryptographically-secure PRNG function must be set (using uECC_set_rng())
-    before calling uECC_make_key() or uECC_sign().
-
-Examples of Applications
-************************
-It is possible to do useful cryptography with only the given small set of
-primitives. With this list of primitives it becomes feasible to support a range
-of cryptography usages:
-
- * Measurement of code, data structures, and other digital artifacts (SHA256);
-
- * Generate commitments (SHA256);
-
- * Construct keys (HMAC-SHA256);
-
- * Extract entropy from strings containing some randomness (HMAC-SHA256);
-
- * Construct random mappings (HMAC-SHA256);
-
- * Construct nonces and challenges (HMAC-PRNG, CTR-PRNG);
-
- * Authenticate using a shared secret (HMAC-SHA256);
-
- * Create an authenticated, replay-protected session (HMAC-SHA256 + HMAC-PRNG);
-
- * Authenticated encryption (AES-128 + AES-CCM);
-
- * Key-exchange (EC-DH);
-
- * Digital signature (EC-DSA);
-
-Test Vectors
-************
-
-The library provides a test program for each cryptographic primitive (see 'test'
-folder). Besides illustrating how to use the primitives, these tests evaluate
-the correctness of the implementations by checking the results against
-well-known publicly validated test vectors.
-
-For the case of the HMAC-PRNG, due to the necessity of performing an extensive
-battery test to produce meaningful conclusions, we suggest the user to evaluate
-the unpredictability of the implementation by using the NIST Statistical Test
-Suite (see References).
-
-For the case of the EC-DH and EC-DSA implementations, most of the test vectors
-were obtained from the site of the NIST Cryptographic Algorithm Validation
-Program (CAVP), see References.
-
-References
-**********
-
-* `NIST FIPS PUB 180-4 (SHA-256)`_
-
-.. _NIST FIPS PUB 180-4 (SHA-256):
-   http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf
-
-* `NIST FIPS PUB 197 (AES-128)`_
-
-.. _NIST FIPS PUB 197 (AES-128):
-   http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
-
-* `NIST SP800-90A (HMAC-PRNG)`_
-
-.. _NIST SP800-90A (HMAC-PRNG):
-   http://csrc.nist.gov/publications/nistpubs/800-90A/SP800-90A.pdf
-
-* `NIST SP 800-38A (AES-CBC and AES-CTR)`_
-
-.. _NIST SP 800-38A (AES-CBC and AES-CTR):
-   http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
-
-* `NIST SP 800-38B (AES-CMAC)`_
-
-.. _NIST SP 800-38B (AES-CMAC):
-   http://csrc.nist.gov/publications/nistpubs/800-38B/SP_800-38B.pdf
-
-* `NIST SP 800-38C (AES-CCM)`_
-
-.. _NIST SP 800-38C (AES-CCM):
-    http://csrc.nist.gov/publications/nistpubs/800-38C/SP800-38C_updated-July20_2007.pdf
-
-* `NIST Statistical Test Suite (useful for testing HMAC-PRNG)`_
-
-.. _NIST Statistical Test Suite (useful for testing HMAC-PRNG):
-   http://csrc.nist.gov/groups/ST/toolkit/rng/documentation_software.html
-
-* `NIST Cryptographic Algorithm Validation Program (CAVP) site`_
-
-.. _NIST Cryptographic Algorithm Validation Program (CAVP) site:
-   http://csrc.nist.gov/groups/STM/cavp/
-
-* `RFC 2104 (HMAC-SHA256)`_
-
-.. _RFC 2104 (HMAC-SHA256):
-   https://www.ietf.org/rfc/rfc2104.txt
-
-* `RFC 6090 (ECC-DH and ECC-DSA)`_
-
-.. _RFC 6090 (ECC-DH and ECC-DSA):
-   https://www.ietf.org/rfc/rfc6090.txt
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/aes.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/aes.h
deleted file mode 100644
index 885c02e0..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/aes.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* aes.h - TinyCrypt interface to an AES-128 implementation */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief -- Interface to an AES-128 implementation.
- *
- *  Overview:   AES-128 is a NIST approved block cipher specified in
- *              FIPS 197. Block ciphers are deterministic algorithms that
- *              perform a transformation specified by a symmetric key in fixed-
- *              length data sets, also called blocks.
- *
- *  Security:   AES-128 provides approximately 128 bits of security.
- *
- *  Usage:      1) call tc_aes128_set_encrypt/decrypt_key to set the key.
- *
- *              2) call tc_aes_encrypt/decrypt to process the data.
- */
-
-#ifndef __TC_AES_H__
-#define __TC_AES_H__
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define Nb (4)  /* number of columns (32-bit words) comprising the state */
-#define Nk (4)  /* number of 32-bit words comprising the key */
-#define Nr (10) /* number of rounds */
-#define TC_AES_BLOCK_SIZE (Nb*Nk)
-#define TC_AES_KEY_SIZE (Nb*Nk)
-
-typedef struct tc_aes_key_sched_struct {
-	unsigned int words[Nb*(Nr+1)];
-} *TCAesKeySched_t;
-
-/**
- *  @brief Set AES-128 encryption key
- *  Uses key k to initialize s
- *  @return  returns TC_CRYPTO_SUCCESS (1)
- *           returns TC_CRYPTO_FAIL (0) if: s == NULL or k == NULL
- *  @note       This implementation skips the additional steps required for keys
- *              larger than 128 bits, and must not be used for AES-192 or
- *              AES-256 key schedule -- see FIPS 197 for details
- *  @param      s IN/OUT -- initialized struct tc_aes_key_sched_struct
- *  @param      k IN -- points to the AES key
- */
-int tc_aes128_set_encrypt_key(TCAesKeySched_t s, const uint8_t *k);
-
-/**
- *  @brief AES-128 Encryption procedure
- *  Encrypts contents of in buffer into out buffer under key;
- *              schedule s
- *  @note Assumes s was initialized by aes_set_encrypt_key;
- *              out and in point to 16 byte buffers
- *  @return  returns TC_CRYPTO_SUCCESS (1)
- *           returns TC_CRYPTO_FAIL (0) if: out == NULL or in == NULL or s == NULL
- *  @param out IN/OUT -- buffer to receive ciphertext block
- *  @param in IN -- a plaintext block to encrypt
- *  @param s IN -- initialized AES key schedule
- */
-int tc_aes_encrypt(uint8_t *out, const uint8_t *in,
-		   const TCAesKeySched_t s);
-
-/**
- *  @brief Set the AES-128 decryption key
- *  Uses key k to initialize s
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if: s == NULL or k == NULL
- *  @note       This is the implementation of the straightforward inverse cipher
- *              using the cipher documented in FIPS-197 figure 12, not the
- *              equivalent inverse cipher presented in Figure 15
- *  @warning    This routine skips the additional steps required for keys larger
- *              than 128, and must not be used for AES-192 or AES-256 key
- *              schedule -- see FIPS 197 for details
- *  @param s  IN/OUT -- initialized struct tc_aes_key_sched_struct
- *  @param k  IN -- points to the AES key
- */
-int tc_aes128_set_decrypt_key(TCAesKeySched_t s, const uint8_t *k);
-
-/**
- *  @brief AES-128 Encryption procedure
- *  Decrypts in buffer into out buffer under key schedule s
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if: out is NULL or in is NULL or s is NULL
- *  @note   Assumes s was initialized by aes_set_encrypt_key
- *          out and in point to 16 byte buffers
- *  @param out IN/OUT -- buffer to receive ciphertext block
- *  @param in IN -- a plaintext block to encrypt
- *  @param s IN -- initialized AES key schedule
- */
-int tc_aes_decrypt(uint8_t *out, const uint8_t *in,
-		   const TCAesKeySched_t s);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_AES_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/cbc_mode.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/cbc_mode.h
deleted file mode 100644
index 4a837fd0..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/cbc_mode.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* cbc_mode.h - TinyCrypt interface to a CBC mode implementation */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief Interface to a CBC mode implementation.
- *
- *  Overview: CBC (for "cipher block chaining") mode is a NIST approved mode of
- *            operation defined in SP 800-38a. It can be used with any block
- *            cipher to provide confidentiality of strings whose lengths are
- *            multiples of the block_size of the underlying block cipher.
- *            TinyCrypt hard codes AES as the block cipher.
- *
- *  Security: CBC mode provides data confidentiality given that the maximum
- *            number q of blocks encrypted under a single key satisfies
- *            q < 2^63, which is not a practical constraint (it is considered a
- *            good practice to replace the encryption when q == 2^56). CBC mode
- *            provides NO data integrity.
- *
- *            CBC mode assumes that the IV value input into the
- *            tc_cbc_mode_encrypt is randomly generated. The TinyCrypt library
- *            provides HMAC-PRNG module, which generates suitable IVs. Other
- *            methods for generating IVs are acceptable, provided that the
- *            values of the IVs generated appear random to any adversary,
- *            including someone with complete knowledge of the system design.
- *
- *            The randomness property on which CBC mode's security depends is
- *            the unpredictability of the IV. Since it is unpredictable, this
- *            means in practice that CBC mode requires that the IV is stored
- *            somehow with the ciphertext in order to recover the plaintext.
- *
- *            TinyCrypt CBC encryption prepends the IV to the ciphertext,
- *            because this affords a more efficient (few buffers) decryption.
- *            Hence tc_cbc_mode_encrypt assumes the ciphertext buffer is always
- *            16 bytes larger than the plaintext buffer.
- *
- *  Requires: AES-128
- *
- *  Usage:    1) call tc_cbc_mode_encrypt to encrypt data.
- *
- *            2) call tc_cbc_mode_decrypt to decrypt data.
- *
- */
-
-#ifndef __TC_CBC_MODE_H__
-#define __TC_CBC_MODE_H__
-
-#include <tinycrypt/aes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  @brief CBC encryption procedure
- *  CBC encrypts inlen bytes of the in buffer into the out buffer
- *  using the encryption key schedule provided, prepends iv to out
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if:
- *                out == NULL or
- *                in == NULL or
- *                ctr == NULL or
- *                sched == NULL or
- *                inlen == 0 or
- *                (inlen % TC_AES_BLOCK_SIZE) != 0 or
- *                (outlen % TC_AES_BLOCK_SIZE) != 0 or
- *                outlen != inlen + TC_AES_BLOCK_SIZE
- *  @note Assumes: - sched has been configured by aes_set_encrypt_key
- *              - iv contains a 16 byte random string
- *              - out buffer is large enough to hold the ciphertext + iv
- *              - out buffer is a contiguous buffer
- *              - in holds the plaintext and is a contiguous buffer
- *              - inlen gives the number of bytes in the in buffer
- *  @param out IN/OUT -- buffer to receive the ciphertext
- *  @param outlen IN -- length of ciphertext buffer in bytes
- *  @param in IN -- plaintext to encrypt
- *  @param inlen IN -- length of plaintext buffer in bytes
- *  @param iv IN -- the IV for the this encrypt/decrypt
- *  @param sched IN --  AES key schedule for this encrypt
- */
-int tc_cbc_mode_encrypt(uint8_t *out, unsigned int outlen, const uint8_t *in,
-			unsigned int inlen, const uint8_t *iv,
-			const TCAesKeySched_t sched);
-
-/**
- * @brief CBC decryption procedure
- * CBC decrypts inlen bytes of the in buffer into the out buffer
- * using the provided encryption key schedule
- * @return returns TC_CRYPTO_SUCCESS (1)
- *         returns TC_CRYPTO_FAIL (0) if:
- *                out == NULL or
- *                in == NULL or
- *                sched == NULL or
- *                inlen == 0 or
- *                outlen == 0 or
- *                (inlen % TC_AES_BLOCK_SIZE) != 0 or
- *                (outlen % TC_AES_BLOCK_SIZE) != 0 or
- *                outlen != inlen + TC_AES_BLOCK_SIZE
- * @note Assumes:- in == iv + ciphertext, i.e. the iv and the ciphertext are
- *                contiguous. This allows for a very efficient decryption
- *                algorithm that would not otherwise be possible
- *              - sched was configured by aes_set_decrypt_key
- *              - out buffer is large enough to hold the decrypted plaintext
- *              and is a contiguous buffer
- *              - inlen gives the number of bytes in the in buffer
- * @param out IN/OUT -- buffer to receive decrypted data
- * @param outlen IN -- length of plaintext buffer in bytes
- * @param in IN -- ciphertext to decrypt, including IV
- * @param inlen IN -- length of ciphertext buffer in bytes
- * @param iv IN -- the IV for the this encrypt/decrypt
- * @param sched IN --  AES key schedule for this decrypt
- *
- */
-int tc_cbc_mode_decrypt(uint8_t *out, unsigned int outlen, const uint8_t *in,
-			unsigned int inlen, const uint8_t *iv,
-			const TCAesKeySched_t sched);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_CBC_MODE_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ccm_mode.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ccm_mode.h
deleted file mode 100644
index 69c798e2..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ccm_mode.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ccm_mode.h - TinyCrypt interface to a CCM mode implementation */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief Interface to a CCM mode implementation.
- *
- *  Overview: CCM (for "Counter with CBC-MAC") mode is a NIST approved mode of
- *            operation defined in SP 800-38C.
- *
- *            TinyCrypt CCM implementation accepts:
- *
- *            1) Both non-empty payload and associated data (it encrypts and
- *            authenticates the payload and also authenticates the associated
- *            data);
- *            2) Non-empty payload and empty associated data (it encrypts and
- *            authenticates the payload);
- *            3) Non-empty associated data and empty payload (it degenerates to
- *            an authentication mode on the associated data).
- *
- *            TinyCrypt CCM implementation accepts associated data of any length
- *            between 0 and (2^16 - 2^8) bytes.
- *
- *  Security: The mac length parameter is an important parameter to estimate the
- *            security against collision attacks (that aim at finding different
- *            messages that produce the same authentication tag). TinyCrypt CCM
- *            implementation accepts any even integer between 4 and 16, as
- *            suggested in SP 800-38C.
- *
- *            RFC-3610, which also specifies CCM, presents a few relevant
- *            security suggestions, such as: it is recommended for most
- *            applications to use a mac length greater than 8. Besides, the
- *            usage of the same nonce for two different messages which are
- *            encrypted with the same key destroys the security of CCM mode.
- *
- *  Requires: AES-128
- *
- *  Usage:    1) call tc_ccm_config to configure.
- *
- *            2) call tc_ccm_mode_encrypt to encrypt data and generate tag.
- *
- *            3) call tc_ccm_mode_decrypt to decrypt data and verify tag.
- */
-
-#ifndef __TC_CCM_MODE_H__
-#define __TC_CCM_MODE_H__
-
-#include <tinycrypt/aes.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* max additional authenticated size in bytes: 2^16 - 2^8 = 65280 */
-#define TC_CCM_AAD_MAX_BYTES 0xff00
-
-/* max message size in bytes: 2^(8L) = 2^16 = 65536 */
-#define TC_CCM_PAYLOAD_MAX_BYTES 0x10000
-
-/* struct tc_ccm_mode_struct represents the state of a CCM computation */
-typedef struct tc_ccm_mode_struct {
-	TCAesKeySched_t sched; /* AES key schedule */
-	uint8_t *nonce; /* nonce required by CCM */
-	unsigned int mlen; /* mac length in bytes (parameter t in SP-800 38C) */
-} *TCCcmMode_t;
-
-/**
- * @brief CCM configuration procedure
- * @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if:
- *                c == NULL or
- *                sched == NULL or
- *                nonce == NULL or
- *                mlen != {4, 6, 8, 10, 12, 16}
- * @param c -- CCM state
- * @param sched IN -- AES key schedule
- * @param nonce IN - nonce
- * @param nlen -- nonce length in bytes
- * @param mlen -- mac length in bytes (parameter t in SP-800 38C)
- */
-int tc_ccm_config(TCCcmMode_t c, TCAesKeySched_t sched, uint8_t *nonce,
-		  unsigned int nlen, unsigned int mlen);
-
-/**
- * @brief CCM tag generation and encryption procedure
- * @return returns TC_CRYPTO_SUCCESS (1)
- *         returns TC_CRYPTO_FAIL (0) if:
- *                out == NULL or
- *                c == NULL or
- *                ((plen > 0) and (payload == NULL)) or
- *                ((alen > 0) and (associated_data == NULL)) or
- *                (alen >= TC_CCM_AAD_MAX_BYTES) or
- *                (plen >= TC_CCM_PAYLOAD_MAX_BYTES) or
- *                (olen < plen + maclength)
- *
- * @param out OUT -- encrypted data
- * @param olen IN -- output length in bytes
- * @param associated_data IN -- associated data
- * @param alen IN -- associated data length in bytes
- * @param payload IN -- payload
- * @param plen IN -- payload length in bytes
- * @param c IN -- CCM state
- *
- * @note: out buffer should be at least (plen + c->mlen) bytes long.
- *
- * @note: The sequence b for encryption is formatted as follows:
- *        b = [FLAGS | nonce | counter ], where:
- *          FLAGS is 1 byte long
- *          nonce is 13 bytes long
- *          counter is 2 bytes long
- *        The byte FLAGS is composed by the following 8 bits:
- *          0-2 bits: used to represent the value of q-1
- *          3-7 btis: always 0's
- *
- * @note: The sequence b for authentication is formatted as follows:
- *        b = [FLAGS | nonce | length(mac length)], where:
- *          FLAGS is 1 byte long
- *          nonce is 13 bytes long
- *          length(mac length) is 2 bytes long
- *        The byte FLAGS is composed by the following 8 bits:
- *          0-2 bits: used to represent the value of q-1
- *          3-5 bits: mac length (encoded as: (mlen-2)/2)
- *          6: Adata (0 if alen == 0, and 1 otherwise)
- *          7: always 0
- */
-int tc_ccm_generation_encryption(uint8_t *out, unsigned int olen,
-			   	 const uint8_t *associated_data,
-			   	 unsigned int alen, const uint8_t *payload,
-				 unsigned int plen, TCCcmMode_t c);
-
-/**
- * @brief CCM decryption and tag verification procedure
- * @return returns TC_CRYPTO_SUCCESS (1)
- *         returns TC_CRYPTO_FAIL (0) if:
- *                out == NULL or
- *                c == NULL or
- *                ((plen > 0) and (payload == NULL)) or
- *                ((alen > 0) and (associated_data == NULL)) or
- *                (alen >= TC_CCM_AAD_MAX_BYTES) or
- *                (plen >= TC_CCM_PAYLOAD_MAX_BYTES) or
- *                (olen < plen - c->mlen)
- *
- * @param out OUT -- decrypted data
- * @param associated_data IN -- associated data
- * @param alen IN -- associated data length in bytes
- * @param payload IN -- payload
- * @param plen IN -- payload length in bytes
- * @param c IN -- CCM state
- *
- * @note: out buffer should be at least (plen - c->mlen) bytes long.
- *
- * @note: The sequence b for encryption is formatted as follows:
- *        b = [FLAGS | nonce | counter ], where:
- *          FLAGS is 1 byte long
- *          nonce is 13 bytes long
- *          counter is 2 bytes long
- *        The byte FLAGS is composed by the following 8 bits:
- *          0-2 bits: used to represent the value of q-1
- *          3-7 btis: always 0's
- *
- * @note: The sequence b for authentication is formatted as follows:
- *        b = [FLAGS | nonce | length(mac length)], where:
- *          FLAGS is 1 byte long
- *          nonce is 13 bytes long
- *          length(mac length) is 2 bytes long
- *        The byte FLAGS is composed by the following 8 bits:
- *          0-2 bits: used to represent the value of q-1
- *          3-5 bits: mac length (encoded as: (mlen-2)/2)
- *          6: Adata (0 if alen == 0, and 1 otherwise)
- *          7: always 0
- */
-int tc_ccm_decryption_verification(uint8_t *out, unsigned int olen,
-				   const uint8_t *associated_data,
-				   unsigned int alen, const uint8_t *payload, unsigned int plen,
-				   TCCcmMode_t c);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_CCM_MODE_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/cmac_mode.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/cmac_mode.h
deleted file mode 100644
index f44b0a53..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/cmac_mode.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*  cmac_mode.h -- interface to a CMAC implementation */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief Interface to a CMAC implementation.
- *
- *  Overview: CMAC is defined NIST in SP 800-38B, and is the standard algorithm
- *            for computing a MAC using a block cipher. It can compute the MAC
- *            for a byte string of any length. It is distinguished from CBC-MAC
- *            in the processing of the final message block; CMAC uses a
- *            different technique to compute the final message block is full
- *            size or only partial, while CBC-MAC uses the same technique for
- *            both. This difference permits CMAC to be applied to variable
- *            length messages, while all messages authenticated by CBC-MAC must
- *            be the same length.
- *
- *  Security: AES128-CMAC mode of operation offers 64 bits of security against
- *            collision attacks. Note however that an external attacker cannot
- *            generate the tags him/herself without knowing the MAC key. In this
- *            sense, to attack the collision property of AES128-CMAC, an
- *            external attacker would need the cooperation of the legal user to
- *            produce an exponentially high number of tags (e.g. 2^64) to
- *            finally be able to look for collisions and benefit from them. As
- *            an extra precaution, the current implementation allows to at most
- *            2^48 calls to the tc_cmac_update function before re-calling
- *            tc_cmac_setup (allowing a new key to be set), as suggested in
- *            Appendix B of SP 800-38B.
- *
- *  Requires: AES-128
- *
- *  Usage:   This implementation provides a "scatter-gather" interface, so that
- *           the CMAC value can be computed incrementally over a message
- *           scattered in different segments throughout memory. Experience shows
- *           this style of interface tends to minimize the burden of programming
- *           correctly. Like all symmetric key operations, it is session
- *           oriented.
- *
- *           To begin a CMAC session, use tc_cmac_setup to initialize a struct
- *           tc_cmac_struct with encryption key and buffer. Our implementation
- *           always assume that the AES key to be the same size as the block
- *           cipher block size. Once setup, this data structure can be used for
- *           many CMAC computations.
- *
- *           Once the state has been setup with a key, computing the CMAC of
- *           some data requires three steps:
- *
- *           (1) first use tc_cmac_init to initialize a new CMAC computation.
- *           (2) next mix all of the data into the CMAC computation state using
- *               tc_cmac_update. If all of the data resides in a single data
- *               segment then only one tc_cmac_update call is needed; if data
- *               is scattered throughout memory in n data segments, then n calls
- *               will be needed. CMAC IS ORDER SENSITIVE, to be able to detect
- *               attacks that swap bytes, so the order in which data is mixed
- *               into the state is critical!
- *           (3) Once all of the data for a message has been mixed, use
- *               tc_cmac_final to compute the CMAC tag value.
- *
- *           Steps (1)-(3) can be repeated as many times as you want to CMAC
- *           multiple messages. A practical limit is 2^48 1K messages before you
- *           have to change the key.
- *
- *           Once you are done computing CMAC with a key, it is a good idea to
- *           destroy the state so an attacker cannot recover the key; use
- *           tc_cmac_erase to accomplish this.
- */
-
-#ifndef __TC_CMAC_MODE_H__
-#define __TC_CMAC_MODE_H__
-
-#include <tinycrypt/aes.h>
-
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* padding for last message block */
-#define TC_CMAC_PADDING 0x80
-
-/* struct tc_cmac_struct represents the state of a CMAC computation */
-typedef struct tc_cmac_struct {
-/* initialization vector */
-	uint8_t iv[TC_AES_BLOCK_SIZE];
-/* used if message length is a multiple of block_size bytes */
-	uint8_t K1[TC_AES_BLOCK_SIZE];
-/* used if message length isn't a multiple block_size bytes */
-	uint8_t K2[TC_AES_BLOCK_SIZE];
-/* where to put bytes that didn't fill a block */
-	uint8_t leftover[TC_AES_BLOCK_SIZE];
-/* identifies the encryption key */
-	unsigned int keyid;
-/* next available leftover location */
-	unsigned int leftover_offset;
-/* AES key schedule */
-	TCAesKeySched_t sched;
-/* calls to tc_cmac_update left before re-key */
-	uint64_t countdown;
-} *TCCmacState_t;
-
-/**
- * @brief Configures the CMAC state to use the given AES key
- * @return returns TC_CRYPTO_SUCCESS (1) after having configured the CMAC state
- *         returns TC_CRYPTO_FAIL (0) if:
- *              s == NULL or
- *              key == NULL
- *
- * @param s IN/OUT -- the state to set up
- * @param key IN -- the key to use
- * @param sched IN -- AES key schedule
- */
-int tc_cmac_setup(TCCmacState_t s, const uint8_t *key,
-		      TCAesKeySched_t sched);
-
-/**
- * @brief Erases the CMAC state
- * @return returns TC_CRYPTO_SUCCESS (1) after having configured the CMAC state
- *         returns TC_CRYPTO_FAIL (0) if:
- *              s == NULL
- *
- * @param s IN/OUT -- the state to erase
- */
-int tc_cmac_erase(TCCmacState_t s);
-
-/**
- * @brief Initializes a new CMAC computation
- * @return returns TC_CRYPTO_SUCCESS (1) after having initialized the CMAC state
- *         returns TC_CRYPTO_FAIL (0) if:
- *              s == NULL
- *
- * @param s IN/OUT -- the state to initialize
- */
-int tc_cmac_init(TCCmacState_t s);
-
-/**
- * @brief Incrementally computes CMAC over the next data segment
- * @return returns TC_CRYPTO_SUCCESS (1) after successfully updating the CMAC state
- *         returns TC_CRYPTO_FAIL (0) if:
- *              s == NULL or
- *              if data == NULL when dlen > 0
- *
- * @param s IN/OUT -- the CMAC state
- * @param data IN -- the next data segment to MAC
- * @param dlen IN -- the length of data in bytes
- */
-int tc_cmac_update(TCCmacState_t s, const uint8_t *data, size_t dlen);
-
-/**
- * @brief Generates the tag from the CMAC state
- * @return returns TC_CRYPTO_SUCCESS (1) after successfully generating the tag
- *         returns TC_CRYPTO_FAIL (0) if:
- *              tag == NULL or
- *              s == NULL
- *
- * @param tag OUT -- the CMAC tag
- * @param s IN -- CMAC state
- */
-int tc_cmac_final(uint8_t *tag, TCCmacState_t s);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_CMAC_MODE_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/constants.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/constants.h
deleted file mode 100644
index 965490e0..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/constants.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* constants.h - TinyCrypt interface to constants */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief -- Interface to constants.
- *
- */
-
-#ifndef __TC_CONSTANTS_H__
-#define __TC_CONSTANTS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdbool.h>
-
-#ifndef NULL
-#define NULL ((void *)0)
-#endif
-
-#define TC_CRYPTO_SUCCESS 1
-#define TC_CRYPTO_FAIL 0
-
-#define TC_ZERO_BYTE 0x00
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_CONSTANTS_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ctr_mode.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ctr_mode.h
deleted file mode 100644
index dc221f9e..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ctr_mode.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ctr_mode.h - TinyCrypt interface to CTR mode */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief Interface to CTR mode.
- *
- *  Overview:  CTR (pronounced "counter") mode is a NIST approved mode of
- *             operation defined in SP 800-38a. It can be used with any
- *             block cipher to provide confidentiality of strings of any
- *             length. TinyCrypt hard codes AES128 as the block cipher.
- *
- *  Security:  CTR mode achieves confidentiality only if the counter value is
- *             never reused with a same encryption key. If the counter is
- *             repeated, than an adversary might be able to defeat the scheme.
- *
- *             A usual method to ensure different counter values refers to
- *             initialize the counter in a given value (0, for example) and
- *             increases it every time a new block is enciphered. This naturally
- *             leaves to a limitation on the number q of blocks that can be
- *             enciphered using a same key: q < 2^(counter size).
- *
- *             TinyCrypt uses a counter of 32 bits. This means that after 2^32
- *             block encryptions, the counter will be reused (thus losing CBC
- *             security). 2^32 block encryptions should be enough for most of
- *             applications targeting constrained devices. Applications intended
- *             to encrypt a larger number of blocks must replace the key after
- *             2^32 block encryptions.
- *
- *             CTR mode provides NO data integrity.
- *
- *  Requires: AES-128
- *
- *  Usage:     1) call tc_ctr_mode to process the data to encrypt/decrypt.
- *
- */
-
-#ifndef __TC_CTR_MODE_H__
-#define __TC_CTR_MODE_H__
-
-#include <tinycrypt/aes.h>
-#include <tinycrypt/constants.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- *  @brief CTR mode encryption/decryption procedure.
- *  CTR mode encrypts (or decrypts) inlen bytes from in buffer into out buffer
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if:
- *                out == NULL or
- *                in == NULL or
- *                ctr == NULL or
- *                sched == NULL or
- *                inlen == 0 or
- *                outlen == 0 or
- *                inlen != outlen
- *  @note Assumes:- The current value in ctr has NOT been used with sched
- *              - out points to inlen bytes
- *              - in points to inlen bytes
- *              - ctr is an integer counter in littleEndian format
- *              - sched was initialized by aes_set_encrypt_key
- * @param out OUT -- produced ciphertext (plaintext)
- * @param outlen IN -- length of ciphertext buffer in bytes
- * @param in IN -- data to encrypt (or decrypt)
- * @param inlen IN -- length of input data in bytes
- * @param ctr IN/OUT -- the current counter value
- * @param sched IN -- an initialized AES key schedule
- */
-int tc_ctr_mode(uint8_t *out, unsigned int outlen, const uint8_t *in,
-		unsigned int inlen, uint8_t *ctr, const TCAesKeySched_t sched);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_CTR_MODE_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ctr_prng.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ctr_prng.h
deleted file mode 100644
index 69cbe020..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ctr_prng.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* ctr_prng.h - TinyCrypt interface to a CTR-PRNG implementation */
-
-/*
- * Copyright (c) 2016, Chris Morrison
- * 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.
- *
- * 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 HOLDER 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.
- */
-
-/**
- * @file
- * @brief Interface to a CTR-PRNG implementation.
- *
- *  Overview:   A pseudo-random number generator (PRNG) generates a sequence
- *              of numbers that have a distribution close to the one expected
- *              for a sequence of truly random numbers. The NIST Special
- *              Publication 800-90A specifies several mechanisms to generate
- *              sequences of pseudo random numbers, including the CTR-PRNG one
- *              which is based on AES. TinyCrypt implements CTR-PRNG with
- *              AES-128.
- *
- *  Security:   A cryptographically secure PRNG depends on the existence of an
- *              entropy source to provide a truly random seed as well as the
- *              security of the primitives used as the building blocks (AES-128
- *              in this instance).
- *
- *  Requires:   - AES-128
- *
- *  Usage:      1) call tc_ctr_prng_init to seed the prng context
- *
- *              2) call tc_ctr_prng_reseed to mix in additional entropy into
- *              the prng context
- *
- *              3) call tc_ctr_prng_generate to output the pseudo-random data
- *
- *              4) call tc_ctr_prng_uninstantiate to zero out the prng context
- */
-
-#ifndef __TC_CTR_PRNG_H__
-#define __TC_CTR_PRNG_H__
-
-#include <tinycrypt/aes.h>
-
-#define TC_CTR_PRNG_RESEED_REQ -1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-	/* updated each time another BLOCKLEN_BYTES bytes are produced */
-	uint8_t V[TC_AES_BLOCK_SIZE];
-
-	/* updated whenever the PRNG is reseeded */
-	struct tc_aes_key_sched_struct key;
-
-	/* number of requests since initialization/reseeding */
-	uint64_t reseedCount;
-} TCCtrPrng_t;
-
-
-/**
- *  @brief CTR-PRNG initialization procedure
- *  Initializes prng context with entropy and personalization string (if any)
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if:
- *                ctx == NULL,
- *                entropy == NULL,
- *                entropyLen < (TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE)
- *  @note       Only the first (TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE) bytes of
- *              both the entropy and personalization inputs are used -
- *              supplying additional bytes has no effect.
- *  @param ctx IN/OUT -- the PRNG context to initialize
- *  @param entropy IN -- entropy used to seed the PRNG
- *  @param entropyLen IN -- entropy length in bytes
- *  @param personalization IN -- personalization string used to seed the PRNG
- *  (may be null)
- *  @param plen IN -- personalization length in bytes
- *
- */
-int tc_ctr_prng_init(TCCtrPrng_t * const ctx,
-		     uint8_t const * const entropy,
-		     unsigned int entropyLen,
-		     uint8_t const * const personalization,
-		     unsigned int pLen);
-
-/**
- *  @brief CTR-PRNG reseed procedure
- *  Mixes entropy and additional_input into the prng context
- *  @return returns  TC_CRYPTO_SUCCESS (1)
- *  returns TC_CRYPTO_FAIL (0) if:
- *          ctx == NULL,
- *          entropy == NULL,
- *          entropylen < (TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE)
- *  @note It is better to reseed an existing prng context rather than
- *        re-initialise, so that any existing entropy in the context is
- *        presereved.  This offers some protection against undetected failures
- *        of the entropy source.
- *  @note Assumes tc_ctr_prng_init has been called for ctx
- *  @param ctx IN/OUT -- the PRNG state
- *  @param entropy IN -- entropy to mix into the prng
- *  @param entropylen IN -- length of entropy in bytes
- *  @param additional_input IN -- additional input to the prng (may be null)
- *  @param additionallen IN -- additional input length in bytes
- */
-int tc_ctr_prng_reseed(TCCtrPrng_t * const ctx,
-		       uint8_t const * const entropy,
-		       unsigned int entropyLen,
-		       uint8_t const * const additional_input,
-		       unsigned int additionallen);
-
-/**
- *  @brief CTR-PRNG generate procedure
- *  Generates outlen pseudo-random bytes into out buffer, updates prng
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CTR_PRNG_RESEED_REQ (-1) if a reseed is needed
- *             returns TC_CRYPTO_FAIL (0) if:
- *                ctx == NULL,
- *                out == NULL,
- *                outlen >= 2^16
- *  @note Assumes tc_ctr_prng_init has been called for ctx
- *  @param ctx IN/OUT -- the PRNG context
- *  @param additional_input IN -- additional input to the prng (may be null)
- *  @param additionallen IN -- additional input length in bytes
- *  @param out IN/OUT -- buffer to receive output
- *  @param outlen IN -- size of out buffer in bytes
- */
-int tc_ctr_prng_generate(TCCtrPrng_t * const ctx,
-			 uint8_t const * const additional_input,
-			 unsigned int additionallen,
-			 uint8_t * const out,
-			 unsigned int outlen);
-
-/**
- *  @brief CTR-PRNG uninstantiate procedure
- *  Zeroes the internal state of the supplied prng context
- *  @return none
- *  @param ctx IN/OUT -- the PRNG context
- */
-void tc_ctr_prng_uninstantiate(TCCtrPrng_t * const ctx);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_CTR_PRNG_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ecc.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ecc.h
deleted file mode 100644
index e8357320..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ecc.h
+++ /dev/null
@@ -1,545 +0,0 @@
-/* ecc.h - TinyCrypt interface to common ECC functions */
-
-/* Copyright (c) 2014, Kenneth MacKay
- * 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.
- *
- * 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 HOLDER 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.
- */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief -- Interface to common ECC functions.
- *
- *  Overview: This software is an implementation of common functions
- *            necessary to elliptic curve cryptography. This implementation uses
- *            curve NIST p-256.
- *
- *  Security: The curve NIST p-256 provides approximately 128 bits of security.
- *
- */
-
-#ifndef __TC_UECC_H__
-#define __TC_UECC_H__
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Word size (4 bytes considering 32-bits architectures) */
-#define uECC_WORD_SIZE 4
-
-/* setting max number of calls to prng: */
-#ifndef uECC_RNG_MAX_TRIES
-#define uECC_RNG_MAX_TRIES 64
-#endif
-
-/* defining data types to store word and bit counts: */
-typedef int8_t wordcount_t;
-typedef int16_t bitcount_t;
-/* defining data type for comparison result: */
-typedef int8_t cmpresult_t;
-/* defining data type to store ECC coordinate/point in 32bits words: */
-typedef unsigned int uECC_word_t;
-/* defining data type to store an ECC coordinate/point in 64bits words: */
-typedef uint64_t uECC_dword_t;
-
-/* defining masks useful for ecc computations: */
-#define HIGH_BIT_SET 0x80000000
-#define uECC_WORD_BITS 32
-#define uECC_WORD_BITS_SHIFT 5
-#define uECC_WORD_BITS_MASK 0x01F
-
-/* Number of words of 32 bits to represent an element of the the curve p-256: */
-#define NUM_ECC_WORDS 8
-/* Number of bytes to represent an element of the the curve p-256: */
-#define NUM_ECC_BYTES (uECC_WORD_SIZE*NUM_ECC_WORDS)
-
-/* structure that represents an elliptic curve (e.g. p256):*/
-struct uECC_Curve_t;
-typedef const struct uECC_Curve_t * uECC_Curve;
-struct uECC_Curve_t {
-  wordcount_t num_words;
-  wordcount_t num_bytes;
-  bitcount_t num_n_bits;
-  uECC_word_t p[NUM_ECC_WORDS];
-  uECC_word_t n[NUM_ECC_WORDS];
-  uECC_word_t G[NUM_ECC_WORDS * 2];
-  uECC_word_t b[NUM_ECC_WORDS];
-  void (*double_jacobian)(uECC_word_t * X1, uECC_word_t * Y1, uECC_word_t * Z1,
-	uECC_Curve curve);
-  void (*x_side)(uECC_word_t *result, const uECC_word_t *x, uECC_Curve curve);
-  void (*mmod_fast)(uECC_word_t *result, uECC_word_t *product);
-};
-
-/*
- * @brief computes doubling of point ion jacobian coordinates, in place.
- * @param X1 IN/OUT -- x coordinate
- * @param Y1 IN/OUT -- y coordinate
- * @param Z1 IN/OUT -- z coordinate
- * @param curve IN -- elliptic curve
- */
-void double_jacobian_default(uECC_word_t * X1, uECC_word_t * Y1,
-			     uECC_word_t * Z1, uECC_Curve curve);
-
-/*
- * @brief Computes x^3 + ax + b. result must not overlap x.
- * @param result OUT -- x^3 + ax + b
- * @param x IN -- value of x
- * @param curve IN -- elliptic curve
- */
-void x_side_default(uECC_word_t *result, const uECC_word_t *x,
-		    uECC_Curve curve);
-
-/*
- * @brief Computes result = product % curve_p
- * from http://www.nsa.gov/ia/_files/nist-routines.pdf
- * @param result OUT -- product % curve_p
- * @param product IN -- value to be reduced mod curve_p
- */
-void vli_mmod_fast_secp256r1(unsigned int *result, unsigned int *product);
-
-/* Bytes to words ordering: */
-#define BYTES_TO_WORDS_8(a, b, c, d, e, f, g, h) 0x##d##c##b##a, 0x##h##g##f##e
-#define BYTES_TO_WORDS_4(a, b, c, d) 0x##d##c##b##a
-#define BITS_TO_WORDS(num_bits) \
-	((num_bits + ((uECC_WORD_SIZE * 8) - 1)) / (uECC_WORD_SIZE * 8))
-#define BITS_TO_BYTES(num_bits) ((num_bits + 7) / 8)
-
-/* definition of curve NIST p-256: */
-static const struct uECC_Curve_t curve_secp256r1 = {
-	NUM_ECC_WORDS,
-	NUM_ECC_BYTES,
-	256, /* num_n_bits */ {
-		BYTES_TO_WORDS_8(FF, FF, FF, FF, FF, FF, FF, FF),
-		BYTES_TO_WORDS_8(FF, FF, FF, FF, 00, 00, 00, 00),
-        	BYTES_TO_WORDS_8(00, 00, 00, 00, 00, 00, 00, 00),
-        	BYTES_TO_WORDS_8(01, 00, 00, 00, FF, FF, FF, FF)
-	}, {
-		BYTES_TO_WORDS_8(51, 25, 63, FC, C2, CA, B9, F3),
-            	BYTES_TO_WORDS_8(84, 9E, 17, A7, AD, FA, E6, BC),
-            	BYTES_TO_WORDS_8(FF, FF, FF, FF, FF, FF, FF, FF),
-            	BYTES_TO_WORDS_8(00, 00, 00, 00, FF, FF, FF, FF)
-	}, {
-		BYTES_TO_WORDS_8(96, C2, 98, D8, 45, 39, A1, F4),
-                BYTES_TO_WORDS_8(A0, 33, EB, 2D, 81, 7D, 03, 77),
-                BYTES_TO_WORDS_8(F2, 40, A4, 63, E5, E6, BC, F8),
-                BYTES_TO_WORDS_8(47, 42, 2C, E1, F2, D1, 17, 6B),
-
-                BYTES_TO_WORDS_8(F5, 51, BF, 37, 68, 40, B6, CB),
-                BYTES_TO_WORDS_8(CE, 5E, 31, 6B, 57, 33, CE, 2B),
-                BYTES_TO_WORDS_8(16, 9E, 0F, 7C, 4A, EB, E7, 8E),
-                BYTES_TO_WORDS_8(9B, 7F, 1A, FE, E2, 42, E3, 4F)
-	}, {
-		BYTES_TO_WORDS_8(4B, 60, D2, 27, 3E, 3C, CE, 3B),
-                BYTES_TO_WORDS_8(F6, B0, 53, CC, B0, 06, 1D, 65),
-                BYTES_TO_WORDS_8(BC, 86, 98, 76, 55, BD, EB, B3),
-                BYTES_TO_WORDS_8(E7, 93, 3A, AA, D8, 35, C6, 5A)
-	},
-        &double_jacobian_default,
-        &x_side_default,
-        &vli_mmod_fast_secp256r1
-};
-
-uECC_Curve uECC_secp256r1(void);
-
-/*
- * @brief Generates a random integer in the range 0 < random < top.
- * Both random and top have num_words words.
- * @param random OUT -- random integer in the range 0 < random < top
- * @param top IN -- upper limit
- * @param num_words IN -- number of words
- * @return a random integer in the range 0 < random < top
- */
-int uECC_generate_random_int(uECC_word_t *random, const uECC_word_t *top,
-			     wordcount_t num_words);
-
-
-/* uECC_RNG_Function type
- * The RNG function should fill 'size' random bytes into 'dest'. It should
- * return 1 if 'dest' was filled with random data, or 0 if the random data could
- * not be generated. The filled-in values should be either truly random, or from
- * a cryptographically-secure PRNG.
- *
- * A correctly functioning RNG function must be set (using uECC_set_rng())
- * before calling uECC_make_key() or uECC_sign().
- *
- * Setting a correctly functioning RNG function improves the resistance to
- * side-channel attacks for uECC_shared_secret().
- *
- * A correct RNG function is set by default. If you are building on another
- * POSIX-compliant system that supports /dev/random or /dev/urandom, you can
- * define uECC_POSIX to use the predefined RNG.
- */
-typedef int(*uECC_RNG_Function)(uint8_t *dest, unsigned int size);
-
-/*
- * @brief Set the function that will be used to generate random bytes. The RNG
- * function should return 1 if the random data was generated, or 0 if the random
- * data could not be generated.
- *
- * @note On platforms where there is no predefined RNG function, this must be
- * called before uECC_make_key() or uECC_sign() are used.
- *
- * @param rng_function IN -- function that will be used to generate random bytes
- */
-void uECC_set_rng(uECC_RNG_Function rng_function);
-
-/*
- * @brief provides current uECC_RNG_Function.
- * @return Returns the function that will be used to generate random bytes.
- */
-uECC_RNG_Function uECC_get_rng(void);
-
-/*
- * @brief computes the size of a private key for the curve in bytes.
- * @param curve IN -- elliptic curve
- * @return size of a private key for the curve in bytes.
- */
-int uECC_curve_private_key_size(uECC_Curve curve);
-
-/*
- * @brief computes the size of a public key for the curve in bytes.
- * @param curve IN -- elliptic curve
- * @return the size of a public key for the curve in bytes.
- */
-int uECC_curve_public_key_size(uECC_Curve curve);
-
-/*
- * @brief Compute the corresponding public key for a private key.
- * @param private_key IN -- The private key to compute the public key for
- * @param public_key OUT -- Will be filled in with the corresponding public key
- * @param curve
- * @return Returns 1 if key was computed successfully, 0 if an error occurred.
- */
-int uECC_compute_public_key(const uint8_t *private_key,
-			    uint8_t *public_key, uECC_Curve curve);
-
-/*
- * @brief Compute public-key.
- * @return corresponding public-key.
- * @param result OUT -- public-key
- * @param private_key IN -- private-key
- * @param curve IN -- elliptic curve
- */
-uECC_word_t EccPoint_compute_public_key(uECC_word_t *result,
-					uECC_word_t *private_key, uECC_Curve curve);
-
-/*
- * @brief Regularize the bitcount for the private key so that attackers cannot
- * use a side channel attack to learn the number of leading zeros.
- * @return Regularized k
- * @param k IN -- private-key
- * @param k0 IN/OUT -- regularized k
- * @param k1 IN/OUT -- regularized k
- * @param curve IN -- elliptic curve
- */
-uECC_word_t regularize_k(const uECC_word_t * const k, uECC_word_t *k0,
-			 uECC_word_t *k1, uECC_Curve curve);
-
-/*
- * @brief Point multiplication algorithm using Montgomery's ladder with co-Z
- * coordinates. See http://eprint.iacr.org/2011/338.pdf.
- * @note Result may overlap point.
- * @param result OUT -- returns scalar*point
- * @param point IN -- elliptic curve point
- * @param scalar IN -- scalar
- * @param initial_Z IN -- initial value for z
- * @param num_bits IN -- number of bits in scalar
- * @param curve IN -- elliptic curve
- */
-void EccPoint_mult(uECC_word_t * result, const uECC_word_t * point,
-		   const uECC_word_t * scalar, const uECC_word_t * initial_Z,
-		   bitcount_t num_bits, uECC_Curve curve);
-
-/*
- * @brief Constant-time comparison to zero - secure way to compare long integers
- * @param vli IN -- very long integer
- * @param num_words IN -- number of words in the vli
- * @return 1 if vli == 0, 0 otherwise.
- */
-uECC_word_t uECC_vli_isZero(const uECC_word_t *vli, wordcount_t num_words);
-
-/*
- * @brief Check if 'point' is the point at infinity
- * @param point IN -- elliptic curve point
- * @param curve IN -- elliptic curve
- * @return if 'point' is the point at infinity, 0 otherwise.
- */
-uECC_word_t EccPoint_isZero(const uECC_word_t *point, uECC_Curve curve);
-
-/*
- * @brief computes the sign of left - right, in constant time.
- * @param left IN -- left term to be compared
- * @param right IN -- right term to be compared
- * @param num_words IN -- number of words
- * @return the sign of left - right
- */
-cmpresult_t uECC_vli_cmp(const uECC_word_t *left, const uECC_word_t *right,
-			 wordcount_t num_words);
-
-/*
- * @brief computes sign of left - right, not in constant time.
- * @note should not be used if inputs are part of a secret
- * @param left IN -- left term to be compared
- * @param right IN -- right term to be compared
- * @param num_words IN -- number of words
- * @return the sign of left - right
- */
-cmpresult_t uECC_vli_cmp_unsafe(const uECC_word_t *left, const uECC_word_t *right,
-				wordcount_t num_words);
-
-/*
- * @brief Computes result = (left - right) % mod.
- * @note Assumes that (left < mod) and (right < mod), and that result does not
- * overlap mod.
- * @param result OUT -- (left - right) % mod
- * @param left IN -- leftright term in modular subtraction
- * @param right IN -- right term in modular subtraction
- * @param mod IN -- mod
- * @param num_words IN -- number of words
- */
-void uECC_vli_modSub(uECC_word_t *result, const uECC_word_t *left,
-		     const uECC_word_t *right, const uECC_word_t *mod,
-		     wordcount_t num_words);
-
-/*
- * @brief Computes P' = (x1', y1', Z3), P + Q = (x3, y3, Z3) or
- * P => P', Q => P + Q
- * @note assumes Input P = (x1, y1, Z), Q = (x2, y2, Z)
- * @param X1 IN -- x coordinate of P
- * @param Y1 IN -- y coordinate of P
- * @param X2 IN -- x coordinate of Q
- * @param Y2 IN -- y coordinate of Q
- * @param curve IN -- elliptic curve
- */
-void XYcZ_add(uECC_word_t * X1, uECC_word_t * Y1, uECC_word_t * X2,
-	      uECC_word_t * Y2, uECC_Curve curve);
-
-/*
- * @brief Computes (x1 * z^2, y1 * z^3)
- * @param X1 IN -- previous x1 coordinate
- * @param Y1 IN -- previous y1 coordinate
- * @param Z IN -- z value
- * @param curve IN -- elliptic curve
- */
-void apply_z(uECC_word_t * X1, uECC_word_t * Y1, const uECC_word_t * const Z,
-	     uECC_Curve curve);
-
-/*
- * @brief Check if bit is set.
- * @return Returns nonzero if bit 'bit' of vli is set.
- * @warning It is assumed that the value provided in 'bit' is within the
- * boundaries of the word-array 'vli'.
- * @note The bit ordering layout assumed for vli is: {31, 30, ..., 0},
- * {63, 62, ..., 32}, {95, 94, ..., 64}, {127, 126,..., 96} for a vli consisting
- * of 4 uECC_word_t elements.
- */
-uECC_word_t uECC_vli_testBit(const uECC_word_t *vli, bitcount_t bit);
-
-/*
- * @brief Computes result = product % mod, where product is 2N words long.
- * @param result OUT -- product % mod
- * @param mod IN -- module
- * @param num_words IN -- number of words
- * @warning Currently only designed to work for curve_p or curve_n.
- */
-void uECC_vli_mmod(uECC_word_t *result, uECC_word_t *product,
-		   const uECC_word_t *mod, wordcount_t num_words);
-
-/*
- * @brief Computes modular product (using curve->mmod_fast)
- * @param result OUT -- (left * right) mod % curve_p
- * @param left IN -- left term in product
- * @param right IN -- right term in product
- * @param curve IN -- elliptic curve
- */
-void uECC_vli_modMult_fast(uECC_word_t *result, const uECC_word_t *left,
-			   const uECC_word_t *right, uECC_Curve curve);
-
-/*
- * @brief Computes result = left - right.
- * @note Can modify in place.
- * @param result OUT -- left - right
- * @param left IN -- left term in subtraction
- * @param right IN -- right term in subtraction
- * @param num_words IN -- number of words
- * @return borrow
- */
-uECC_word_t uECC_vli_sub(uECC_word_t *result, const uECC_word_t *left,
-			 const uECC_word_t *right, wordcount_t num_words);
-
-/*
- * @brief Constant-time comparison function(secure way to compare long ints)
- * @param left IN -- left term in comparison
- * @param right IN -- right term in comparison
- * @param num_words IN -- number of words
- * @return Returns 0 if left == right, 1 otherwise.
- */
-uECC_word_t uECC_vli_equal(const uECC_word_t *left, const uECC_word_t *right,
-			   wordcount_t num_words);
-
-/*
- * @brief Computes (left * right) % mod
- * @param result OUT -- (left * right) % mod
- * @param left IN -- left term in product
- * @param right IN -- right term in product
- * @param mod IN -- mod
- * @param num_words IN -- number of words
- */
-void uECC_vli_modMult(uECC_word_t *result, const uECC_word_t *left,
-		      const uECC_word_t *right, const uECC_word_t *mod,
-	              wordcount_t num_words);
-
-/*
- * @brief Computes (1 / input) % mod
- * @note All VLIs are the same size.
- * @note See "Euclid's GCD to Montgomery Multiplication to the Great Divide"
- * @param result OUT -- (1 / input) % mod
- * @param input IN -- value to be modular inverted
- * @param mod IN -- mod
- * @param num_words -- number of words
- */
-void uECC_vli_modInv(uECC_word_t *result, const uECC_word_t *input,
-		     const uECC_word_t *mod, wordcount_t num_words);
-
-/*
- * @brief Sets dest = src.
- * @param dest OUT -- destination buffer
- * @param src IN --  origin buffer
- * @param num_words IN -- number of words
- */
-void uECC_vli_set(uECC_word_t *dest, const uECC_word_t *src,
-		  wordcount_t num_words);
-
-/*
- * @brief Computes (left + right) % mod.
- * @note Assumes that (left < mod) and right < mod), and that result does not
- * overlap mod.
- * @param result OUT -- (left + right) % mod.
- * @param left IN -- left term in addition
- * @param right IN -- right term in addition
- * @param mod IN -- mod
- * @param num_words IN -- number of words
- */
-void uECC_vli_modAdd(uECC_word_t *result,  const uECC_word_t *left,
-    		     const uECC_word_t *right, const uECC_word_t *mod,
-   		     wordcount_t num_words);
-
-/*
- * @brief Counts the number of bits required to represent vli.
- * @param vli IN -- very long integer
- * @param max_words IN -- number of words
- * @return number of bits in given vli
- */
-bitcount_t uECC_vli_numBits(const uECC_word_t *vli,
-			    const wordcount_t max_words);
-
-/*
- * @brief Erases (set to 0) vli
- * @param vli IN -- very long integer
- * @param num_words IN -- number of words
- */
-void uECC_vli_clear(uECC_word_t *vli, wordcount_t num_words);
-
-/*
- * @brief check if it is a valid point in the curve
- * @param point IN -- point to be checked
- * @param curve IN -- elliptic curve
- * @return 0 if point is valid
- * @exception returns -1 if it is a point at infinity
- * @exception returns -2 if x or y is smaller than p,
- * @exception returns -3 if y^2 != x^3 + ax + b.
- */
-int uECC_valid_point(const uECC_word_t *point, uECC_Curve curve);
-
-/*
- * @brief Check if a public key is valid.
- * @param public_key IN -- The public key to be checked.
- * @return returns 0 if the public key is valid
- * @exception returns -1 if it is a point at infinity
- * @exception returns -2 if x or y is smaller than p,
- * @exception returns -3 if y^2 != x^3 + ax + b.
- * @exception returns -4 if public key is the group generator.
- *
- * @note Note that you are not required to check for a valid public key before
- * using any other uECC functions. However, you may wish to avoid spending CPU
- * time computing a shared secret or verifying a signature using an invalid
- * public key.
- */
-int uECC_valid_public_key(const uint8_t *public_key, uECC_Curve curve);
-
- /*
-  * @brief Converts an integer in uECC native format to big-endian bytes.
-  * @param bytes OUT -- bytes representation
-  * @param num_bytes IN -- number of bytes
-  * @param native IN -- uECC native representation
-  */
-void uECC_vli_nativeToBytes(uint8_t *bytes, int num_bytes,
-    			    const unsigned int *native);
-
-/*
- * @brief Converts big-endian bytes to an integer in uECC native format.
- * @param native OUT -- uECC native representation
- * @param bytes IN -- bytes representation
- * @param num_bytes IN -- number of bytes
- */
-void uECC_vli_bytesToNative(unsigned int *native, const uint8_t *bytes,
-			    int num_bytes);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_UECC_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ecc_dh.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ecc_dh.h
deleted file mode 100644
index b828e195..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ecc_dh.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ecc_dh.h - TinyCrypt interface to EC-DH implementation */
-
-/*
- * Copyright (c) 2014, Kenneth MacKay
- * 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.
- *
- * 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 HOLDER 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.
- */
-
-/* Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief -- Interface to EC-DH implementation.
- *
- *  Overview: This software is an implementation of EC-DH. This implementation
- *            uses curve NIST p-256.
- *
- *  Security: The curve NIST p-256 provides approximately 128 bits of security.
- */
-
-#ifndef __TC_ECC_DH_H__
-#define __TC_ECC_DH_H__
-
-#include <tinycrypt/ecc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief Create a public/private key pair.
- * @return returns TC_CRYPTO_SUCCESS (1) if the key pair was generated successfully
- *         returns TC_CRYPTO_FAIL (0) if error while generating key pair
- *
- * @param p_public_key OUT -- Will be filled in with the public key. Must be at
- * least 2 * the curve size (in bytes) long. For curve secp256r1, p_public_key
- * must be 64 bytes long.
- * @param p_private_key OUT -- Will be filled in with the private key. Must be as
- * long as the curve order (for secp256r1, p_private_key must be 32 bytes long).
- *
- * @note side-channel countermeasure: algorithm strengthened against timing
- * attack.
- * @warning A cryptographically-secure PRNG function must be set (using
- * uECC_set_rng()) before calling uECC_make_key().
- */
-int uECC_make_key(uint8_t *p_public_key, uint8_t *p_private_key, uECC_Curve curve);
-
-#ifdef ENABLE_TESTS
-
-/**
- * @brief Create a public/private key pair given a specific d.
- *
- * @note THIS FUNCTION SHOULD BE CALLED ONLY FOR TEST PURPOSES. Refer to
- * uECC_make_key() function for real applications.
- */
-int uECC_make_key_with_d(uint8_t *p_public_key, uint8_t *p_private_key,
-    			 unsigned int *d, uECC_Curve curve);
-#endif
-
-/**
- * @brief Compute a shared secret given your secret key and someone else's
- * public key.
- * @return returns TC_CRYPTO_SUCCESS (1) if the shared secret was computed successfully
- *         returns TC_CRYPTO_FAIL (0) otherwise
- *
- * @param p_secret OUT -- Will be filled in with the shared secret value. Must be
- * the same size as the curve size (for curve secp256r1, secret must be 32 bytes
- * long.
- * @param p_public_key IN -- The public key of the remote party.
- * @param p_private_key IN -- Your private key.
- *
- * @warning It is recommended to use the output of uECC_shared_secret() as the
- * input of a recommended Key Derivation Function (see NIST SP 800-108) in
- * order to produce a cryptographically secure symmetric key.
- */
-int uECC_shared_secret(const uint8_t *p_public_key, const uint8_t *p_private_key,
-		       uint8_t *p_secret, uECC_Curve curve);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_ECC_DH_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ecc_dsa.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ecc_dsa.h
deleted file mode 100644
index aca00bc9..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ecc_dsa.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* ecc_dh.h - TinyCrypt interface to EC-DSA implementation */
-
-/*
- * Copyright (c) 2014, Kenneth MacKay
- * 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.
- *
- * 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 HOLDER 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.
- */
-
-/*
- * Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief -- Interface to EC-DSA implementation.
- *
- *  Overview: This software is an implementation of EC-DSA. This implementation
- *            uses curve NIST p-256.
- *
- *  Security: The curve NIST p-256 provides approximately 128 bits of security.
- *
- *  Usage:  - To sign: Compute a hash of the data you wish to sign (SHA-2 is
- *          recommended) and pass it in to ecdsa_sign function along with your
- *          private key and a random number. You must use a new non-predictable
- *          random number to generate each new signature.
- *          - To verify a signature: Compute the hash of the signed data using
- *          the same hash as the signer and pass it to this function along with
- *          the signer's public key and the signature values (r and s).
- */
-
-#ifndef __TC_ECC_DSA_H__
-#define __TC_ECC_DSA_H__
-
-#include <tinycrypt/ecc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief Generate an ECDSA signature for a given hash value.
- * @return returns TC_CRYPTO_SUCCESS (1) if the signature generated successfully
- *         returns TC_CRYPTO_FAIL (0) if an error occurred.
- *
- * @param p_private_key IN -- Your private key.
- * @param p_message_hash IN -- The hash of the message to sign.
- * @param p_hash_size IN -- The size of p_message_hash in bytes.
- * @param p_signature OUT -- Will be filled in with the signature value. Must be
- * at least 2 * curve size long (for secp256r1, signature must be 64 bytes long).
- *
- * @warning A cryptographically-secure PRNG function must be set (using
- * uECC_set_rng()) before calling uECC_sign().
- * @note Usage: Compute a hash of the data you wish to sign (SHA-2 is
- * recommended) and pass it in to this function along with your private key.
- * @note side-channel countermeasure: algorithm strengthened against timing
- * attack.
- */
-int uECC_sign(const uint8_t *p_private_key, const uint8_t *p_message_hash,
-	      unsigned p_hash_size, uint8_t *p_signature, uECC_Curve curve);
-
-#ifdef ENABLE_TESTS
-/*
- * THIS FUNCTION SHOULD BE CALLED FOR TEST PURPOSES ONLY.
- * Refer to uECC_sign() function for real applications.
- */
-int uECC_sign_with_k(const uint8_t *private_key, const uint8_t *message_hash,
-		     unsigned int hash_size, uECC_word_t *k, uint8_t *signature,
-		     uECC_Curve curve);
-#endif
-
-/**
- * @brief Verify an ECDSA signature.
- * @return returns TC_SUCCESS (1) if the signature is valid
- * 	   returns TC_FAIL (0) if the signature is invalid.
- *
- * @param p_public_key IN -- The signer's public key.
- * @param p_message_hash IN -- The hash of the signed data.
- * @param p_hash_size IN -- The size of p_message_hash in bytes.
- * @param p_signature IN -- The signature values.
- *
- * @note Usage: Compute the hash of the signed data using the same hash as the
- * signer and pass it to this function along with the signer's public key and
- * the signature values (hash_size and signature).
- */
-int uECC_verify(const uint8_t *p_public_key, const uint8_t *p_message_hash,
-		unsigned int p_hash_size, const uint8_t *p_signature, uECC_Curve curve);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_ECC_DSA_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ecc_platform_specific.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ecc_platform_specific.h
deleted file mode 100644
index a55adf4f..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/ecc_platform_specific.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*  uECC_platform_specific.h - Interface to platform specific functions*/
-
-/* Copyright (c) 2014, Kenneth MacKay
- * 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.
- *
- * 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 HOLDER 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.*/
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- *
- *  uECC_platform_specific.h -- Interface to platform specific functions
- */
-
-#ifndef __UECC_PLATFORM_SPECIFIC_H_
-#define __UECC_PLATFORM_SPECIFIC_H_
-
-/*
- * The RNG function should fill 'size' random bytes into 'dest'. It should
- * return 1 if 'dest' was filled with random data, or 0 if the random data could
- * not be generated. The filled-in values should be either truly random, or from
- * a cryptographically-secure PRNG.
- *
- * A cryptographically-secure PRNG function must be set (using uECC_set_rng())
- * before calling uECC_make_key() or uECC_sign().
- *
- * Setting a cryptographically-secure PRNG function improves the resistance to
- * side-channel attacks for uECC_shared_secret().
- *
- * A correct PRNG function is set by default (default_RNG_defined = 1) and works
- * for some platforms, such as Unix and Linux. For other platforms, you may need
- * to provide another PRNG function.
-*/
-#define default_RNG_defined 0
-
-int default_CSPRNG(uint8_t *dest, unsigned int size);
-
-#endif /* __UECC_PLATFORM_SPECIFIC_H_ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/hmac.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/hmac.h
deleted file mode 100644
index 3a081494..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/hmac.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* hmac.h - TinyCrypt interface to an HMAC implementation */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief Interface to an HMAC implementation.
- *
- *  Overview:   HMAC is a message authentication code based on hash functions.
- *              TinyCrypt hard codes SHA-256 as the hash function. A message
- *              authentication code based on hash functions is also called a
- *              keyed cryptographic hash function since it performs a
- *              transformation specified by a key in an arbitrary length data
- *              set into a fixed length data set (also called tag).
- *
- *  Security:   The security of the HMAC depends on the length of the key and
- *              on the security of the hash function. Note that HMAC primitives
- *              are much less affected by collision attacks than their
- *              corresponding hash functions.
- *
- *  Requires:   SHA-256
- *
- *  Usage:      1) call tc_hmac_set_key to set the HMAC key.
- *
- *              2) call tc_hmac_init to initialize a struct hash_state before
- *              processing the data.
- *
- *              3) call tc_hmac_update to process the next input segment;
- *              tc_hmac_update can be called as many times as needed to process
- *              all of the segments of the input; the order is important.
- *
- *              4) call tc_hmac_final to out put the tag.
- */
-
-#ifndef __TC_HMAC_H__
-#define __TC_HMAC_H__
-
-#include <tinycrypt/sha256.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct tc_hmac_state_struct {
-	/* the internal state required by h */
-	struct tc_sha256_state_struct hash_state;
-	/* HMAC key schedule */
-	uint8_t key[2*TC_SHA256_BLOCK_SIZE];
-};
-typedef struct tc_hmac_state_struct *TCHmacState_t;
-
-/**
- *  @brief HMAC set key procedure
- *  Configures ctx to use key
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if
- *                ctx == NULL or
- *                key == NULL or
- *                key_size == 0
- * @param ctx IN/OUT -- the struct tc_hmac_state_struct to initial
- * @param key IN -- the HMAC key to configure
- * @param key_size IN -- the HMAC key size
- */
-int tc_hmac_set_key(TCHmacState_t ctx, const uint8_t *key,
-		    unsigned int key_size);
-
-/**
- * @brief HMAC init procedure
- * Initializes ctx to begin the next HMAC operation
- * @return returns TC_CRYPTO_SUCCESS (1)
- *         returns TC_CRYPTO_FAIL (0) if: ctx == NULL or key == NULL
- * @param ctx IN/OUT -- struct tc_hmac_state_struct buffer to init
- */
-int tc_hmac_init(TCHmacState_t ctx);
-
-/**
- *  @brief HMAC update procedure
- *  Mixes data_length bytes addressed by data into state
- *  @return returns TC_CRYPTO_SUCCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if: ctx == NULL or key == NULL
- *  @note Assumes state has been initialized by tc_hmac_init
- *  @param ctx IN/OUT -- state of HMAC computation so far
- *  @param data IN -- data to incorporate into state
- *  @param data_length IN -- size of data in bytes
- */
-int tc_hmac_update(TCHmacState_t ctx, const void *data,
-		   unsigned int data_length);
-
-/**
- *  @brief HMAC final procedure
- *  Writes the HMAC tag into the tag buffer
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if:
- *                tag == NULL or
- *                ctx == NULL or
- *                key == NULL or
- *                taglen != TC_SHA256_DIGEST_SIZE
- *  @note ctx is erased before exiting. This should never be changed/removed.
- *  @note Assumes the tag bufer is at least sizeof(hmac_tag_size(state)) bytes
- *  state has been initialized by tc_hmac_init
- *  @param tag IN/OUT -- buffer to receive computed HMAC tag
- *  @param taglen IN -- size of tag in bytes
- *  @param ctx IN/OUT -- the HMAC state for computing tag
- */
-int tc_hmac_final(uint8_t *tag, unsigned int taglen, TCHmacState_t ctx);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__TC_HMAC_H__*/
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/hmac_prng.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/hmac_prng.h
deleted file mode 100644
index ad12cbbf..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/hmac_prng.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* hmac_prng.h - TinyCrypt interface to an HMAC-PRNG implementation */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief Interface to an HMAC-PRNG implementation.
- *
- *  Overview:   A pseudo-random number generator (PRNG) generates a sequence
- *              of numbers that have a distribution close to the one expected
- *              for a sequence of truly random numbers. The NIST Special
- *              Publication 800-90A specifies several mechanisms to generate
- *              sequences of pseudo random numbers, including the HMAC-PRNG one
- *              which is based on HMAC. TinyCrypt implements HMAC-PRNG with
- *              certain modifications from the NIST SP 800-90A spec.
- *
- *  Security:   A cryptographically secure PRNG depends on the existence of an
- *              entropy source to provide a truly random seed as well as the
- *              security of the primitives used as the building blocks (HMAC and
- *              SHA256, for TinyCrypt).
- *
- *              The NIST SP 800-90A standard tolerates a null personalization,
- *              while TinyCrypt requires a non-null personalization. This is
- *              because a personalization string (the host name concatenated
- *              with a time stamp, for example) is easily computed and might be
- *              the last line of defense against failure of the entropy source.
- *
- *  Requires:   - SHA-256
- *              - HMAC
- *
- *  Usage:      1) call tc_hmac_prng_init to set the HMAC key and process the
- *              personalization data.
- *
- *              2) call tc_hmac_prng_reseed to process the seed and additional
- *              input.
- *
- *              3) call tc_hmac_prng_generate to out put the pseudo-random data.
- */
-
-#ifndef __TC_HMAC_PRNG_H__
-#define __TC_HMAC_PRNG_H__
-
-#include <tinycrypt/sha256.h>
-#include <tinycrypt/hmac.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define TC_HMAC_PRNG_RESEED_REQ -1
-
-struct tc_hmac_prng_struct {
-	/* the HMAC instance for this PRNG */
-	struct tc_hmac_state_struct h;
-	/* the PRNG key */
-	uint8_t key[TC_SHA256_DIGEST_SIZE];
-	/* PRNG state */
-	uint8_t v[TC_SHA256_DIGEST_SIZE];
-	/* calls to tc_hmac_prng_generate left before re-seed */
-	unsigned int countdown;
-};
-
-typedef struct tc_hmac_prng_struct *TCHmacPrng_t;
-
-/**
- *  @brief HMAC-PRNG initialization procedure
- *  Initializes prng with personalization, disables tc_hmac_prng_generate
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if:
- *                prng == NULL,
- *                personalization == NULL,
- *                plen > MAX_PLEN
- *  @note Assumes: - personalization != NULL.
- *              The personalization is a platform unique string (e.g., the host
- *              name) and is the last line of defense against failure of the
- *              entropy source
- *  @warning    NIST SP 800-90A specifies 3 items as seed material during
- *              initialization: entropy seed, personalization, and an optional
- *              nonce. TinyCrypts requires instead a non-null personalization
- *              (which is easily computed) and indirectly requires an entropy
- *              seed (since the reseed function is mandatorily called after
- *              init)
- *  @param prng IN/OUT -- the PRNG state to initialize
- *  @param personalization IN -- personalization string
- *  @param plen IN -- personalization length in bytes
- */
-int tc_hmac_prng_init(TCHmacPrng_t prng,
-		      const uint8_t *personalization,
-		      unsigned int plen);
-
-/**
- *  @brief HMAC-PRNG reseed procedure
- *  Mixes seed into prng, enables tc_hmac_prng_generate
- *  @return returns  TC_CRYPTO_SUCCESS (1)
- *  	    returns TC_CRYPTO_FAIL (0) if:
- *          prng == NULL,
- *          seed == NULL,
- *          seedlen < MIN_SLEN,
- *          seendlen > MAX_SLEN,
- *          additional_input != (const uint8_t *) 0 && additionallen == 0,
- *          additional_input != (const uint8_t *) 0 && additionallen > MAX_ALEN
- *  @note Assumes:- tc_hmac_prng_init has been called for prng
- *              - seed has sufficient entropy.
- *
- *  @param prng IN/OUT -- the PRNG state
- *  @param seed IN -- entropy to mix into the prng
- *  @param seedlen IN -- length of seed in bytes
- *  @param additional_input IN -- additional input to the prng
- *  @param additionallen IN -- additional input length in bytes
- */
-int tc_hmac_prng_reseed(TCHmacPrng_t prng, const uint8_t *seed,
-			unsigned int seedlen, const uint8_t *additional_input,
-			unsigned int additionallen);
-
-/**
- *  @brief HMAC-PRNG generate procedure
- *  Generates outlen pseudo-random bytes into out buffer, updates prng
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_HMAC_PRNG_RESEED_REQ (-1) if a reseed is needed
- *          returns TC_CRYPTO_FAIL (0) if:
- *                out == NULL,
- *                prng == NULL,
- *                outlen == 0,
- *                outlen >= MAX_OUT
- *  @note Assumes tc_hmac_prng_init has been called for prng
- *  @param out IN/OUT -- buffer to receive output
- *  @param outlen IN -- size of out buffer in bytes
- *  @param prng IN/OUT -- the PRNG state
- */
-int tc_hmac_prng_generate(uint8_t *out, unsigned int outlen, TCHmacPrng_t prng);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_HMAC_PRNG_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/sha256.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/sha256.h
deleted file mode 100644
index af5e8baf..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/sha256.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* sha256.h - TinyCrypt interface to a SHA-256 implementation */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief Interface to a SHA-256 implementation.
- *
- *  Overview:   SHA-256 is a NIST approved cryptographic hashing algorithm
- *              specified in FIPS 180. A hash algorithm maps data of arbitrary
- *              size to data of fixed length.
- *
- *  Security:   SHA-256 provides 128 bits of security against collision attacks
- *              and 256 bits of security against pre-image attacks. SHA-256 does
- *              NOT behave like a random oracle, but it can be used as one if
- *              the string being hashed is prefix-free encoded before hashing.
- *
- *  Usage:      1) call tc_sha256_init to initialize a struct
- *              tc_sha256_state_struct before hashing a new string.
- *
- *              2) call tc_sha256_update to hash the next string segment;
- *              tc_sha256_update can be called as many times as needed to hash
- *              all of the segments of a string; the order is important.
- *
- *              3) call tc_sha256_final to out put the digest from a hashing
- *              operation.
- */
-
-#ifndef __TC_SHA256_H__
-#define __TC_SHA256_H__
-
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define TC_SHA256_BLOCK_SIZE (64)
-#define TC_SHA256_DIGEST_SIZE (32)
-#define TC_SHA256_STATE_BLOCKS (TC_SHA256_DIGEST_SIZE/4)
-
-struct tc_sha256_state_struct {
-	unsigned int iv[TC_SHA256_STATE_BLOCKS];
-	uint64_t bits_hashed;
-	uint8_t leftover[TC_SHA256_BLOCK_SIZE];
-	size_t leftover_offset;
-};
-
-typedef struct tc_sha256_state_struct *TCSha256State_t;
-
-/**
- *  @brief SHA256 initialization procedure
- *  Initializes s
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if s == NULL
- *  @param s Sha256 state struct
- */
-int tc_sha256_init(TCSha256State_t s);
-
-/**
- *  @brief SHA256 update procedure
- *  Hashes data_length bytes addressed by data into state s
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if:
- *                s == NULL,
- *                s->iv == NULL,
- *                data == NULL
- *  @note Assumes s has been initialized by tc_sha256_init
- *  @warning The state buffer 'leftover' is left in memory after processing
- *           If your application intends to have sensitive data in this
- *           buffer, remind to erase it after the data has been processed
- *  @param s Sha256 state struct
- *  @param data message to hash
- *  @param datalen length of message to hash
- */
-int tc_sha256_update (TCSha256State_t s, const uint8_t *data, size_t datalen);
-
-/**
- *  @brief SHA256 final procedure
- *  Inserts the completed hash computation into digest
- *  @return returns TC_CRYPTO_SUCCESS (1)
- *          returns TC_CRYPTO_FAIL (0) if:
- *                s == NULL,
- *                s->iv == NULL,
- *                digest == NULL
- *  @note Assumes: s has been initialized by tc_sha256_init
- *        digest points to at least TC_SHA256_DIGEST_SIZE bytes
- *  @warning The state buffer 'leftover' is left in memory after processing
- *           If your application intends to have sensitive data in this
- *           buffer, remind to erase it after the data has been processed
- *  @param digest unsigned eight bit integer
- *  @param Sha256 state struct
- */
-int tc_sha256_final(uint8_t *digest, TCSha256State_t s);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_SHA256_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/utils.h b/lib/bt/porting/ext/tinycrypt/include/tinycrypt/utils.h
deleted file mode 100644
index bab5c320..00000000
--- a/lib/bt/porting/ext/tinycrypt/include/tinycrypt/utils.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* utils.h - TinyCrypt interface to platform-dependent run-time operations */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-/**
- * @file
- * @brief Interface to platform-dependent run-time operations.
- *
- */
-
-#ifndef __TC_UTILS_H__
-#define __TC_UTILS_H__
-
-#include <stdint.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief Copy the the buffer 'from' to the buffer 'to'.
- * @return returns TC_CRYPTO_SUCCESS (1)
- *         returns TC_CRYPTO_FAIL (0) if:
- *                from_len > to_len.
- *
- * @param to OUT -- destination buffer
- * @param to_len IN -- length of destination buffer
- * @param from IN -- origin buffer
- * @param from_len IN -- length of origin buffer
- */
-unsigned int _copy(uint8_t *to, unsigned int to_len,
-	           const uint8_t *from, unsigned int from_len);
-
-/**
- * @brief Set the value 'val' into the buffer 'to', 'len' times.
- *
- * @param to OUT -- destination buffer
- * @param val IN -- value to be set in 'to'
- * @param len IN -- number of times the value will be copied
- */
-void _set(void *to, uint8_t val, unsigned int len);
-
-/*
- * @brief AES specific doubling function, which utilizes
- * the finite field used by AES.
- * @return Returns a^2
- *
- * @param a IN/OUT -- value to be doubled
- */
-uint8_t _double_byte(uint8_t a);
-
-/*
- * @brief Constant-time algorithm to compare if two sequences of bytes are equal
- * @return Returns 0 if equal, and non-zero otherwise
- *
- * @param a IN -- sequence of bytes a
- * @param b IN -- sequence of bytes b
- * @param size IN -- size of sequences a and b
- */
-int _compare(const uint8_t *a, const uint8_t *b, size_t size);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TC_UTILS_H__ */
diff --git a/lib/bt/porting/ext/tinycrypt/src/aes_decrypt.c b/lib/bt/porting/ext/tinycrypt/src/aes_decrypt.c
deleted file mode 100644
index 993a6180..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/aes_decrypt.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/* aes_decrypt.c - TinyCrypt implementation of AES decryption procedure */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-#include <tinycrypt/aes.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
-
-static const uint8_t inv_sbox[256] = {
-	0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e,
-	0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
-	0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32,
-	0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
-	0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49,
-	0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
-	0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50,
-	0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
-	0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05,
-	0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
-	0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41,
-	0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
-	0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8,
-	0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
-	0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b,
-	0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
-	0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59,
-	0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
-	0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d,
-	0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
-	0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63,
-	0x55, 0x21, 0x0c, 0x7d
-};
-
-int tc_aes128_set_decrypt_key(TCAesKeySched_t s, const uint8_t *k)
-{
-	return tc_aes128_set_encrypt_key(s, k);
-}
-
-#define mult8(a)(_double_byte(_double_byte(_double_byte(a))))
-#define mult9(a)(mult8(a)^(a))
-#define multb(a)(mult8(a)^_double_byte(a)^(a))
-#define multd(a)(mult8(a)^_double_byte(_double_byte(a))^(a))
-#define multe(a)(mult8(a)^_double_byte(_double_byte(a))^_double_byte(a))
-
-static inline void mult_row_column(uint8_t *out, const uint8_t *in)
-{
-	out[0] = multe(in[0]) ^ multb(in[1]) ^ multd(in[2]) ^ mult9(in[3]);
-	out[1] = mult9(in[0]) ^ multe(in[1]) ^ multb(in[2]) ^ multd(in[3]);
-	out[2] = multd(in[0]) ^ mult9(in[1]) ^ multe(in[2]) ^ multb(in[3]);
-	out[3] = multb(in[0]) ^ multd(in[1]) ^ mult9(in[2]) ^ multe(in[3]);
-}
-
-static inline void inv_mix_columns(uint8_t *s)
-{
-	uint8_t t[Nb*Nk];
-
-	mult_row_column(t, s);
-	mult_row_column(&t[Nb], s+Nb);
-	mult_row_column(&t[2*Nb], s+(2*Nb));
-	mult_row_column(&t[3*Nb], s+(3*Nb));
-	(void)_copy(s, sizeof(t), t, sizeof(t));
-}
-
-static inline void add_round_key(uint8_t *s, const unsigned int *k)
-{
-	s[0] ^= (uint8_t)(k[0] >> 24); s[1] ^= (uint8_t)(k[0] >> 16);
-	s[2] ^= (uint8_t)(k[0] >> 8); s[3] ^= (uint8_t)(k[0]);
-	s[4] ^= (uint8_t)(k[1] >> 24); s[5] ^= (uint8_t)(k[1] >> 16);
-	s[6] ^= (uint8_t)(k[1] >> 8); s[7] ^= (uint8_t)(k[1]);
-	s[8] ^= (uint8_t)(k[2] >> 24); s[9] ^= (uint8_t)(k[2] >> 16);
-	s[10] ^= (uint8_t)(k[2] >> 8); s[11] ^= (uint8_t)(k[2]);
-	s[12] ^= (uint8_t)(k[3] >> 24); s[13] ^= (uint8_t)(k[3] >> 16);
-	s[14] ^= (uint8_t)(k[3] >> 8); s[15] ^= (uint8_t)(k[3]);
-}
-
-static inline void inv_sub_bytes(uint8_t *s)
-{
-	unsigned int i;
-
-	for (i = 0; i < (Nb*Nk); ++i) {
-		s[i] = inv_sbox[s[i]];
-	}
-}
-
-/*
- * This inv_shift_rows also implements the matrix flip required for
- * inv_mix_columns, but performs it here to reduce the number of memory
- * operations.
- */
-static inline void inv_shift_rows(uint8_t *s)
-{
-	uint8_t t[Nb*Nk];
-
-	t[0]  = s[0]; t[1] = s[13]; t[2] = s[10]; t[3] = s[7];
-	t[4]  = s[4]; t[5] = s[1]; t[6] = s[14]; t[7] = s[11];
-	t[8]  = s[8]; t[9] = s[5]; t[10] = s[2]; t[11] = s[15];
-	t[12] = s[12]; t[13] = s[9]; t[14] = s[6]; t[15] = s[3];
-	(void)_copy(s, sizeof(t), t, sizeof(t));
-}
-
-int tc_aes_decrypt(uint8_t *out, const uint8_t *in, const TCAesKeySched_t s)
-{
-	uint8_t state[Nk*Nb];
-	unsigned int i;
-
-	if (out == (uint8_t *) 0) {
-		return TC_CRYPTO_FAIL;
-	} else if (in == (const uint8_t *) 0) {
-		return TC_CRYPTO_FAIL;
-	} else if (s == (TCAesKeySched_t) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	(void)_copy(state, sizeof(state), in, sizeof(state));
-
-	add_round_key(state, s->words + Nb*Nr);
-
-	for (i = Nr - 1; i > 0; --i) {
-		inv_shift_rows(state);
-		inv_sub_bytes(state);
-		add_round_key(state, s->words + Nb*i);
-		inv_mix_columns(state);
-	}
-
-	inv_shift_rows(state);
-	inv_sub_bytes(state);
-	add_round_key(state, s->words);
-
-	(void)_copy(out, sizeof(state), state, sizeof(state));
-
-	/*zeroing out the state buffer */
-	_set(state, TC_ZERO_BYTE, sizeof(state));
-
-
-	return TC_CRYPTO_SUCCESS;
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/aes_encrypt.c b/lib/bt/porting/ext/tinycrypt/src/aes_encrypt.c
deleted file mode 100644
index 8991aee5..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/aes_encrypt.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* aes_encrypt.c - TinyCrypt implementation of AES encryption procedure */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-#include <tinycrypt/aes.h>
-#include <tinycrypt/utils.h>
-#include <tinycrypt/constants.h>
-
-static const uint8_t sbox[256] = {
-	0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,
-	0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
-	0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26,
-	0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
-	0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2,
-	0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
-	0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed,
-	0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
-	0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f,
-	0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
-	0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec,
-	0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
-	0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14,
-	0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
-	0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d,
-	0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
-	0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f,
-	0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
-	0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11,
-	0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
-	0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f,
-	0xb0, 0x54, 0xbb, 0x16
-};
-
-static inline unsigned int rotword(unsigned int a)
-{
-	return (((a) >> 24)|((a) << 8));
-}
-
-#define subbyte(a, o)(sbox[((a) >> (o))&0xff] << (o))
-#define subword(a)(subbyte(a, 24)|subbyte(a, 16)|subbyte(a, 8)|subbyte(a, 0))
-
-int tc_aes128_set_encrypt_key(TCAesKeySched_t s, const uint8_t *k)
-{
-	const unsigned int rconst[11] = {
-		0x00000000, 0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000,
-		0x20000000, 0x40000000, 0x80000000, 0x1b000000, 0x36000000
-	};
-	unsigned int i;
-	unsigned int t;
-
-	if (s == (TCAesKeySched_t) 0) {
-		return TC_CRYPTO_FAIL;
-	} else if (k == (const uint8_t *) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	for (i = 0; i < Nk; ++i) {
-		s->words[i] = (k[Nb*i]<<24) | (k[Nb*i+1]<<16) |
-			      (k[Nb*i+2]<<8) | (k[Nb*i+3]);
-	}
-
-	for (; i < (Nb * (Nr + 1)); ++i) {
-		t = s->words[i-1];
-		if ((i % Nk) == 0) {
-			t = subword(rotword(t)) ^ rconst[i/Nk];
-		}
-		s->words[i] = s->words[i-Nk] ^ t;
-	}
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-static inline void add_round_key(uint8_t *s, const unsigned int *k)
-{
-	s[0] ^= (uint8_t)(k[0] >> 24); s[1] ^= (uint8_t)(k[0] >> 16);
-	s[2] ^= (uint8_t)(k[0] >> 8); s[3] ^= (uint8_t)(k[0]);
-	s[4] ^= (uint8_t)(k[1] >> 24); s[5] ^= (uint8_t)(k[1] >> 16);
-	s[6] ^= (uint8_t)(k[1] >> 8); s[7] ^= (uint8_t)(k[1]);
-	s[8] ^= (uint8_t)(k[2] >> 24); s[9] ^= (uint8_t)(k[2] >> 16);
-	s[10] ^= (uint8_t)(k[2] >> 8); s[11] ^= (uint8_t)(k[2]);
-	s[12] ^= (uint8_t)(k[3] >> 24); s[13] ^= (uint8_t)(k[3] >> 16);
-	s[14] ^= (uint8_t)(k[3] >> 8); s[15] ^= (uint8_t)(k[3]);
-}
-
-static inline void sub_bytes(uint8_t *s)
-{
-	unsigned int i;
-
-	for (i = 0; i < (Nb * Nk); ++i) {
-		s[i] = sbox[s[i]];
-	}
-}
-
-#define triple(a)(_double_byte(a)^(a))
-
-static inline void mult_row_column(uint8_t *out, const uint8_t *in)
-{
-	out[0] = _double_byte(in[0]) ^ triple(in[1]) ^ in[2] ^ in[3];
-	out[1] = in[0] ^ _double_byte(in[1]) ^ triple(in[2]) ^ in[3];
-	out[2] = in[0] ^ in[1] ^ _double_byte(in[2]) ^ triple(in[3]);
-	out[3] = triple(in[0]) ^ in[1] ^ in[2] ^ _double_byte(in[3]);
-}
-
-static inline void mix_columns(uint8_t *s)
-{
-	uint8_t t[Nb*Nk];
-
-	mult_row_column(t, s);
-	mult_row_column(&t[Nb], s+Nb);
-	mult_row_column(&t[2 * Nb], s + (2 * Nb));
-	mult_row_column(&t[3 * Nb], s + (3 * Nb));
-	(void) _copy(s, sizeof(t), t, sizeof(t));
-}
-
-/*
- * This shift_rows also implements the matrix flip required for mix_columns, but
- * performs it here to reduce the number of memory operations.
- */
-static inline void shift_rows(uint8_t *s)
-{
-	uint8_t t[Nb * Nk];
-
-	t[0]  = s[0]; t[1] = s[5]; t[2] = s[10]; t[3] = s[15];
-	t[4]  = s[4]; t[5] = s[9]; t[6] = s[14]; t[7] = s[3];
-	t[8]  = s[8]; t[9] = s[13]; t[10] = s[2]; t[11] = s[7];
-	t[12] = s[12]; t[13] = s[1]; t[14] = s[6]; t[15] = s[11];
-	(void) _copy(s, sizeof(t), t, sizeof(t));
-}
-
-int tc_aes_encrypt(uint8_t *out, const uint8_t *in, const TCAesKeySched_t s)
-{
-	uint8_t state[Nk*Nb];
-	unsigned int i;
-
-	if (out == (uint8_t *) 0) {
-		return TC_CRYPTO_FAIL;
-	} else if (in == (const uint8_t *) 0) {
-		return TC_CRYPTO_FAIL;
-	} else if (s == (TCAesKeySched_t) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	(void)_copy(state, sizeof(state), in, sizeof(state));
-	add_round_key(state, s->words);
-
-	for (i = 0; i < (Nr - 1); ++i) {
-		sub_bytes(state);
-		shift_rows(state);
-		mix_columns(state);
-		add_round_key(state, s->words + Nb*(i+1));
-	}
-
-	sub_bytes(state);
-	shift_rows(state);
-	add_round_key(state, s->words + Nb*(i+1));
-
-	(void)_copy(out, sizeof(state), state, sizeof(state));
-
-	/* zeroing out the state buffer */
-	_set(state, TC_ZERO_BYTE, sizeof(state));
-
-	return TC_CRYPTO_SUCCESS;
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/cbc_mode.c b/lib/bt/porting/ext/tinycrypt/src/cbc_mode.c
deleted file mode 100644
index 62d7879e..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/cbc_mode.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* cbc_mode.c - TinyCrypt implementation of CBC mode encryption & decryption */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-#include <tinycrypt/cbc_mode.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
-
-int tc_cbc_mode_encrypt(uint8_t *out, unsigned int outlen, const uint8_t *in,
-			    unsigned int inlen, const uint8_t *iv,
-			    const TCAesKeySched_t sched)
-{
-
-	uint8_t buffer[TC_AES_BLOCK_SIZE];
-	unsigned int n, m;
-
-	/* input sanity check: */
-	if (out == (uint8_t *) 0 ||
-	    in == (const uint8_t *) 0 ||
-	    sched == (TCAesKeySched_t) 0 ||
-	    inlen == 0 ||
-	    outlen == 0 ||
-	    (inlen % TC_AES_BLOCK_SIZE) != 0 ||
-	    (outlen % TC_AES_BLOCK_SIZE) != 0 ||
-	    outlen != inlen + TC_AES_BLOCK_SIZE) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	/* copy iv to the buffer */
-	(void)_copy(buffer, TC_AES_BLOCK_SIZE, iv, TC_AES_BLOCK_SIZE);
-	/* copy iv to the output buffer */
-	(void)_copy(out, TC_AES_BLOCK_SIZE, iv, TC_AES_BLOCK_SIZE);
-	out += TC_AES_BLOCK_SIZE;
-
-	for (n = m = 0; n < inlen; ++n) {
-		buffer[m++] ^= *in++;
-		if (m == TC_AES_BLOCK_SIZE) {
-			(void)tc_aes_encrypt(buffer, buffer, sched);
-			(void)_copy(out, TC_AES_BLOCK_SIZE,
-				    buffer, TC_AES_BLOCK_SIZE);
-			out += TC_AES_BLOCK_SIZE;
-			m = 0;
-		}
-	}
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_cbc_mode_decrypt(uint8_t *out, unsigned int outlen, const uint8_t *in,
-			    unsigned int inlen, const uint8_t *iv,
-			    const TCAesKeySched_t sched)
-{
-
-	uint8_t buffer[TC_AES_BLOCK_SIZE];
-	const uint8_t *p;
-	unsigned int n, m;
-
-	/* sanity check the inputs */
-	if (out == (uint8_t *) 0 ||
-	    in == (const uint8_t *) 0 ||
-	    sched == (TCAesKeySched_t) 0 ||
-	    inlen == 0 ||
-	    outlen == 0 ||
-	    (inlen % TC_AES_BLOCK_SIZE) != 0 ||
-	    (outlen % TC_AES_BLOCK_SIZE) != 0 ||
-	    outlen != inlen - TC_AES_BLOCK_SIZE) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	/*
-	 * Note that in == iv + ciphertext, i.e. the iv and the ciphertext are
-	 * contiguous. This allows for a very efficient decryption algorithm
-	 * that would not otherwise be possible.
-	 */
-	p = iv;
-	for (n = m = 0; n < inlen; ++n) {
-		if ((n % TC_AES_BLOCK_SIZE) == 0) {
-			(void)tc_aes_decrypt(buffer, in, sched);
-			in += TC_AES_BLOCK_SIZE;
-			m = 0;
-		}
-		*out++ = buffer[m++] ^ *p++;
-	}
-
-	return TC_CRYPTO_SUCCESS;
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/ccm_mode.c b/lib/bt/porting/ext/tinycrypt/src/ccm_mode.c
deleted file mode 100644
index 929adac6..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/ccm_mode.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* ccm_mode.c - TinyCrypt implementation of CCM mode */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-#include <tinycrypt/ccm_mode.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
-
-#include <stdio.h>
-
-int tc_ccm_config(TCCcmMode_t c, TCAesKeySched_t sched, uint8_t *nonce,
-		  unsigned int nlen, unsigned int mlen)
-{
-
-	/* input sanity check: */
-	if (c == (TCCcmMode_t) 0 ||
-	    sched == (TCAesKeySched_t) 0 ||
-	    nonce == (uint8_t *) 0) {
-		return TC_CRYPTO_FAIL;
-	} else if (nlen != 13) {
-		return TC_CRYPTO_FAIL; /* The allowed nonce size is: 13. See documentation.*/
-	} else if ((mlen < 4) || (mlen > 16) || (mlen & 1)) {
-		return TC_CRYPTO_FAIL; /* The allowed mac sizes are: 4, 6, 8, 10, 12, 14, 16.*/
-	}
-
-	c->mlen = mlen;
-	c->sched = sched;
-	c->nonce = nonce;
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-/**
- * Variation of CBC-MAC mode used in CCM.
- */
-static void ccm_cbc_mac(uint8_t *T, const uint8_t *data, unsigned int dlen,
-			unsigned int flag, TCAesKeySched_t sched)
-{
-
-	unsigned int i;
-
-	if (flag > 0) {
-		T[0] ^= (uint8_t)(dlen >> 8);
-		T[1] ^= (uint8_t)(dlen);
-		dlen += 2; i = 2;
-	} else {
-		i = 0;
-	}
-
-	while (i < dlen) {
-		T[i++ % (Nb * Nk)] ^= *data++;
-		if (((i % (Nb * Nk)) == 0) || dlen == i) {
-			(void) tc_aes_encrypt(T, T, sched);
-		}
-	}
-}
-
-/**
- * Variation of CTR mode used in CCM.
- * The CTR mode used by CCM is slightly different than the conventional CTR
- * mode (the counter is increased before encryption, instead of after
- * encryption). Besides, it is assumed that the counter is stored in the last
- * 2 bytes of the nonce.
- */
-static int ccm_ctr_mode(uint8_t *out, unsigned int outlen, const uint8_t *in,
-			unsigned int inlen, uint8_t *ctr, const TCAesKeySched_t sched)
-{
-
-	uint8_t buffer[TC_AES_BLOCK_SIZE];
-	uint8_t nonce[TC_AES_BLOCK_SIZE];
-	uint16_t block_num;
-	unsigned int i;
-
-	/* input sanity check: */
-	if (out == (uint8_t *) 0 ||
-	    in == (uint8_t *) 0 ||
-	    ctr == (uint8_t *) 0 ||
-	    sched == (TCAesKeySched_t) 0 ||
-	    inlen == 0 ||
-	    outlen == 0 ||
-	    outlen != inlen) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	/* copy the counter to the nonce */
-	(void) _copy(nonce, sizeof(nonce), ctr, sizeof(nonce));
-
-	/* select the last 2 bytes of the nonce to be incremented */
-	block_num = (uint16_t) ((nonce[14] << 8)|(nonce[15]));
-	for (i = 0; i < inlen; ++i) {
-		if ((i % (TC_AES_BLOCK_SIZE)) == 0) {
-			block_num++;
-			nonce[14] = (uint8_t)(block_num >> 8);
-			nonce[15] = (uint8_t)(block_num);
-			if (!tc_aes_encrypt(buffer, nonce, sched)) {
-				return TC_CRYPTO_FAIL;
-			}
-		}
-		/* update the output */
-		*out++ = buffer[i % (TC_AES_BLOCK_SIZE)] ^ *in++;
-	}
-
-	/* update the counter */
-	ctr[14] = nonce[14]; ctr[15] = nonce[15];
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_ccm_generation_encryption(uint8_t *out, unsigned int olen,
-				 const uint8_t *associated_data,
-				 unsigned int alen, const uint8_t *payload,
-				 unsigned int plen, TCCcmMode_t c)
-{
-
-	/* input sanity check: */
-	if ((out == (uint8_t *) 0) ||
-		(c == (TCCcmMode_t) 0) ||
-		((plen > 0) && (payload == (uint8_t *) 0)) ||
-		((alen > 0) && (associated_data == (uint8_t *) 0)) ||
-		(alen >= TC_CCM_AAD_MAX_BYTES) || /* associated data size unsupported */
-		(plen >= TC_CCM_PAYLOAD_MAX_BYTES) || /* payload size unsupported */
-		(olen < (plen + c->mlen))) {  /* invalid output buffer size */
-		return TC_CRYPTO_FAIL;
-	}
-
-	uint8_t b[Nb * Nk];
-	uint8_t tag[Nb * Nk];
-	unsigned int i;
-
-	/* GENERATING THE AUTHENTICATION TAG: */
-
-	/* formatting the sequence b for authentication: */
-	b[0] = ((alen > 0) ? 0x40:0) | (((c->mlen - 2) / 2 << 3)) | (1);
-	for (i = 1; i <= 13; ++i) {
-		b[i] = c->nonce[i - 1];
-	}
-	b[14] = (uint8_t)(plen >> 8);
-	b[15] = (uint8_t)(plen);
-
-	/* computing the authentication tag using cbc-mac: */
-	(void) tc_aes_encrypt(tag, b, c->sched);
-	if (alen > 0) {
-		ccm_cbc_mac(tag, associated_data, alen, 1, c->sched);
-	}
-	if (plen > 0) {
-		ccm_cbc_mac(tag, payload, plen, 0, c->sched);
-	}
-
-	/* ENCRYPTION: */
-
-	/* formatting the sequence b for encryption: */
-	b[0] = 1; /* q - 1 = 2 - 1 = 1 */
-	b[14] = b[15] = TC_ZERO_BYTE;
-
-	/* encrypting payload using ctr mode: */
-	ccm_ctr_mode(out, plen, payload, plen, b, c->sched);
-
-	b[14] = b[15] = TC_ZERO_BYTE; /* restoring initial counter for ctr_mode (0):*/
-
-	/* encrypting b and adding the tag to the output: */
-	(void) tc_aes_encrypt(b, b, c->sched);
-	out += plen;
-	for (i = 0; i < c->mlen; ++i) {
-		*out++ = tag[i] ^ b[i];
-	}
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_ccm_decryption_verification(uint8_t *out, unsigned int olen,
-				   const uint8_t *associated_data,
-				   unsigned int alen, const uint8_t *payload,
-				   unsigned int plen, TCCcmMode_t c)
-{
-
-	/* input sanity check: */
-	if ((out == (uint8_t *) 0) ||
-	    (c == (TCCcmMode_t) 0) ||
-	    ((plen > 0) && (payload == (uint8_t *) 0)) ||
-	    ((alen > 0) && (associated_data == (uint8_t *) 0)) ||
-	    (alen >= TC_CCM_AAD_MAX_BYTES) || /* associated data size unsupported */
-	    (plen >= TC_CCM_PAYLOAD_MAX_BYTES) || /* payload size unsupported */
-	    (olen < plen - c->mlen)) { /* invalid output buffer size */
-		return TC_CRYPTO_FAIL;
-  }
-
-	uint8_t b[Nb * Nk];
-	uint8_t tag[Nb * Nk];
-	unsigned int i;
-
-	/* DECRYPTION: */
-
-	/* formatting the sequence b for decryption: */
-	b[0] = 1; /* q - 1 = 2 - 1 = 1 */
-	for (i = 1; i < 14; ++i) {
-		b[i] = c->nonce[i - 1];
-	}
-	b[14] = b[15] = TC_ZERO_BYTE; /* initial counter value is 0 */
-
-	/* decrypting payload using ctr mode: */
-	ccm_ctr_mode(out, plen - c->mlen, payload, plen - c->mlen, b, c->sched);
-
-	b[14] = b[15] = TC_ZERO_BYTE; /* restoring initial counter value (0) */
-
-	/* encrypting b and restoring the tag from input: */
-	(void) tc_aes_encrypt(b, b, c->sched);
-	for (i = 0; i < c->mlen; ++i) {
-		tag[i] = *(payload + plen - c->mlen + i) ^ b[i];
-	}
-
-	/* VERIFYING THE AUTHENTICATION TAG: */
-
-	/* formatting the sequence b for authentication: */
-	b[0] = ((alen > 0) ? 0x40:0)|(((c->mlen - 2) / 2 << 3)) | (1);
-	for (i = 1; i < 14; ++i) {
-		b[i] = c->nonce[i - 1];
-	}
-	b[14] = (uint8_t)((plen - c->mlen) >> 8);
-	b[15] = (uint8_t)(plen - c->mlen);
-
-	/* computing the authentication tag using cbc-mac: */
-	(void) tc_aes_encrypt(b, b, c->sched);
-	if (alen > 0) {
-		ccm_cbc_mac(b, associated_data, alen, 1, c->sched);
-	}
-	if (plen > 0) {
-		ccm_cbc_mac(b, out, plen - c->mlen, 0, c->sched);
-	}
-
-	/* comparing the received tag and the computed one: */
-	if (_compare(b, tag, c->mlen) == 0) {
-		return TC_CRYPTO_SUCCESS;
-  	} else {
-		/* erase the decrypted buffer in case of mac validation failure: */
-		_set(out, 0, plen - c->mlen);
-		return TC_CRYPTO_FAIL;
-	}
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/cmac_mode.c b/lib/bt/porting/ext/tinycrypt/src/cmac_mode.c
deleted file mode 100644
index 96d147e8..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/cmac_mode.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/* cmac_mode.c - TinyCrypt CMAC mode implementation */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-#include <tinycrypt/aes.h>
-#include <tinycrypt/cmac_mode.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
-
-/* max number of calls until change the key (2^48).*/
-const static uint64_t MAX_CALLS = ((uint64_t)1 << 48);
-
-/*
- *  gf_wrap -- In our implementation, GF(2^128) is represented as a 16 byte
- *  array with byte 0 the most significant and byte 15 the least significant.
- *  High bit carry reduction is based on the primitive polynomial
- *
- *                     X^128 + X^7 + X^2 + X + 1,
- *
- *  which leads to the reduction formula X^128 = X^7 + X^2 + X + 1. Indeed,
- *  since 0 = (X^128 + X^7 + X^2 + 1) mod (X^128 + X^7 + X^2 + X + 1) and since
- *  addition of polynomials with coefficients in Z/Z(2) is just XOR, we can
- *  add X^128 to both sides to get
- *
- *       X^128 = (X^7 + X^2 + X + 1) mod (X^128 + X^7 + X^2 + X + 1)
- *
- *  and the coefficients of the polynomial on the right hand side form the
- *  string 1000 0111 = 0x87, which is the value of gf_wrap.
- *
- *  This gets used in the following way. Doubling in GF(2^128) is just a left
- *  shift by 1 bit, except when the most significant bit is 1. In the latter
- *  case, the relation X^128 = X^7 + X^2 + X + 1 says that the high order bit
- *  that overflows beyond 128 bits can be replaced by addition of
- *  X^7 + X^2 + X + 1 <--> 0x87 to the low order 128 bits. Since addition
- *  in GF(2^128) is represented by XOR, we therefore only have to XOR 0x87
- *  into the low order byte after a left shift when the starting high order
- *  bit is 1.
- */
-const unsigned char gf_wrap = 0x87;
-
-/*
- *  assumes: out != NULL and points to a GF(2^n) value to receive the
- *            doubled value;
- *           in != NULL and points to a 16 byte GF(2^n) value
- *            to double;
- *           the in and out buffers do not overlap.
- *  effects: doubles the GF(2^n) value pointed to by "in" and places
- *           the result in the GF(2^n) value pointed to by "out."
- */
-void gf_double(uint8_t *out, uint8_t *in)
-{
-
-	/* start with low order byte */
-	uint8_t *x = in + (TC_AES_BLOCK_SIZE - 1);
-
-	/* if msb == 1, we need to add the gf_wrap value, otherwise add 0 */
-	uint8_t carry = (in[0] >> 7) ? gf_wrap : 0;
-
-	out += (TC_AES_BLOCK_SIZE - 1);
-	for (;;) {
-		*out-- = (*x << 1) ^ carry;
-		if (x == in) {
-			break;
-		}
-		carry = *x-- >> 7;
-	}
-}
-
-int tc_cmac_setup(TCCmacState_t s, const uint8_t *key, TCAesKeySched_t sched)
-{
-
-	/* input sanity check: */
-	if (s == (TCCmacState_t) 0 ||
-	    key == (const uint8_t *) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	/* put s into a known state */
-	_set(s, 0, sizeof(*s));
-	s->sched = sched;
-
-	/* configure the encryption key used by the underlying block cipher */
-	tc_aes128_set_encrypt_key(s->sched, key);
-
-	/* compute s->K1 and s->K2 from s->iv using s->keyid */
-	_set(s->iv, 0, TC_AES_BLOCK_SIZE);
-	tc_aes_encrypt(s->iv, s->iv, s->sched);
-	gf_double (s->K1, s->iv);
-	gf_double (s->K2, s->K1);
-
-	/* reset s->iv to 0 in case someone wants to compute now */
-	tc_cmac_init(s);
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_cmac_erase(TCCmacState_t s)
-{
-	if (s == (TCCmacState_t) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	/* destroy the current state */
-	_set(s, 0, sizeof(*s));
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_cmac_init(TCCmacState_t s)
-{
-	/* input sanity check: */
-	if (s == (TCCmacState_t) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	/* CMAC starts with an all zero initialization vector */
-	_set(s->iv, 0, TC_AES_BLOCK_SIZE);
-
-	/* and the leftover buffer is empty */
-	_set(s->leftover, 0, TC_AES_BLOCK_SIZE);
-	s->leftover_offset = 0;
-
-	/* Set countdown to max number of calls allowed before re-keying: */
-	s->countdown = MAX_CALLS;
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_cmac_update(TCCmacState_t s, const uint8_t *data, size_t data_length)
-{
-	unsigned int i;
-
-	/* input sanity check: */
-	if (s == (TCCmacState_t) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-	if (data_length == 0) {
-		return  TC_CRYPTO_SUCCESS;
-	}
-	if (data == (const uint8_t *) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	if (s->countdown == 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	s->countdown--;
-
-	if (s->leftover_offset > 0) {
-		/* last data added to s didn't end on a TC_AES_BLOCK_SIZE byte boundary */
-		size_t remaining_space = TC_AES_BLOCK_SIZE - s->leftover_offset;
-
-		if (data_length < remaining_space) {
-			/* still not enough data to encrypt this time either */
-			_copy(&s->leftover[s->leftover_offset], data_length, data, data_length);
-			s->leftover_offset += data_length;
-			return TC_CRYPTO_SUCCESS;
-		}
-		/* leftover block is now full; encrypt it first */
-		_copy(&s->leftover[s->leftover_offset],
-		      remaining_space,
-		      data,
-		      remaining_space);
-		data_length -= remaining_space;
-		data += remaining_space;
-		s->leftover_offset = 0;
-
-		for (i = 0; i < TC_AES_BLOCK_SIZE; ++i) {
-			s->iv[i] ^= s->leftover[i];
-		}
-		tc_aes_encrypt(s->iv, s->iv, s->sched);
-	}
-
-	/* CBC encrypt each (except the last) of the data blocks */
-	while (data_length > TC_AES_BLOCK_SIZE) {
-		for (i = 0; i < TC_AES_BLOCK_SIZE; ++i) {
-			s->iv[i] ^= data[i];
-		}
-		tc_aes_encrypt(s->iv, s->iv, s->sched);
-		data += TC_AES_BLOCK_SIZE;
-		data_length  -= TC_AES_BLOCK_SIZE;
-	}
-
-	if (data_length > 0) {
-		/* save leftover data for next time */
-		_copy(s->leftover, data_length, data, data_length);
-		s->leftover_offset = data_length;
-	}
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_cmac_final(uint8_t *tag, TCCmacState_t s)
-{
-	uint8_t *k;
-	unsigned int i;
-
-	/* input sanity check: */
-	if (tag == (uint8_t *) 0 ||
-	    s == (TCCmacState_t) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	if (s->leftover_offset == TC_AES_BLOCK_SIZE) {
-		/* the last message block is a full-sized block */
-		k = (uint8_t *) s->K1;
-	} else {
-		/* the final message block is not a full-sized  block */
-		size_t remaining = TC_AES_BLOCK_SIZE - s->leftover_offset;
-
-		_set(&s->leftover[s->leftover_offset], 0, remaining);
-		s->leftover[s->leftover_offset] = TC_CMAC_PADDING;
-		k = (uint8_t *) s->K2;
-	}
-	for (i = 0; i < TC_AES_BLOCK_SIZE; ++i) {
-		s->iv[i] ^= s->leftover[i] ^ k[i];
-	}
-
-	tc_aes_encrypt(tag, s->iv, s->sched);
-
-	/* erasing state: */
-	tc_cmac_erase(s);
-
-	return TC_CRYPTO_SUCCESS;
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/ctr_mode.c b/lib/bt/porting/ext/tinycrypt/src/ctr_mode.c
deleted file mode 100644
index 1dfb92df..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/ctr_mode.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ctr_mode.c - TinyCrypt CTR mode implementation */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-#include <tinycrypt/constants.h>
-#include <tinycrypt/ctr_mode.h>
-#include <tinycrypt/utils.h>
-
-int tc_ctr_mode(uint8_t *out, unsigned int outlen, const uint8_t *in,
-		unsigned int inlen, uint8_t *ctr, const TCAesKeySched_t sched)
-{
-
-	uint8_t buffer[TC_AES_BLOCK_SIZE];
-	uint8_t nonce[TC_AES_BLOCK_SIZE];
-	unsigned int block_num;
-	unsigned int i;
-
-	/* input sanity check: */
-	if (out == (uint8_t *) 0 ||
-	    in == (uint8_t *) 0 ||
-	    ctr == (uint8_t *) 0 ||
-	    sched == (TCAesKeySched_t) 0 ||
-	    inlen == 0 ||
-	    outlen == 0 ||
-	    outlen != inlen) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	/* copy the ctr to the nonce */
-	(void)_copy(nonce, sizeof(nonce), ctr, sizeof(nonce));
-
-	/* select the last 4 bytes of the nonce to be incremented */
-	block_num = (nonce[12] << 24) | (nonce[13] << 16) |
-		    (nonce[14] << 8) | (nonce[15]);
-	for (i = 0; i < inlen; ++i) {
-		if ((i % (TC_AES_BLOCK_SIZE)) == 0) {
-			/* encrypt data using the current nonce */
-			if (tc_aes_encrypt(buffer, nonce, sched)) {
-				block_num++;
-				nonce[12] = (uint8_t)(block_num >> 24);
-				nonce[13] = (uint8_t)(block_num >> 16);
-				nonce[14] = (uint8_t)(block_num >> 8);
-				nonce[15] = (uint8_t)(block_num);
-			} else {
-				return TC_CRYPTO_FAIL;
-			}
-		}
-		/* update the output */
-		*out++ = buffer[i%(TC_AES_BLOCK_SIZE)] ^ *in++;
-	}
-
-	/* update the counter */
-	ctr[12] = nonce[12]; ctr[13] = nonce[13];
-	ctr[14] = nonce[14]; ctr[15] = nonce[15];
-
-	return TC_CRYPTO_SUCCESS;
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/ctr_prng.c b/lib/bt/porting/ext/tinycrypt/src/ctr_prng.c
deleted file mode 100644
index 5090c397..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/ctr_prng.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* ctr_prng.c - TinyCrypt implementation of CTR-PRNG */
-
-/*
- * Copyright (c) 2016, Chris Morrison
- * 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.
- *
- * 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 HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <tinycrypt/ctr_prng.h>
-#include <tinycrypt/utils.h>
-#include <tinycrypt/constants.h>
-#include <string.h>
-
-/*
- * This PRNG is based on the CTR_DRBG described in Recommendation for Random
- * Number Generation Using Deterministic Random Bit Generators,
- * NIST SP 800-90A Rev. 1.
- *
- * Annotations to particular steps (e.g. 10.2.1.2 Step 1) refer to the steps
- * described in that document.
- *
- */
-
-/**
- *  @brief Array incrementer
- *  Treats the supplied array as one contiguous number (MSB in arr[0]), and
- *  increments it by one
- *  @return none
- *  @param arr IN/OUT -- array to be incremented
- *  @param len IN -- size of arr in bytes
- */
-static void arrInc(uint8_t arr[], unsigned int len)
-{
-	unsigned int i;
-	if (0 != arr) {
-		for (i = len; i > 0U; i--) {
-			if (++arr[i-1] != 0U) {
-				break;
-			}
-		}
-	}
-}
-
-/**
- *  @brief CTR PRNG update
- *  Updates the internal state of supplied the CTR PRNG context
- *  increments it by one
- *  @return none
- *  @note Assumes: providedData is (TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE) bytes long
- *  @param ctx IN/OUT -- CTR PRNG state
- *  @param providedData IN -- data used when updating the internal state
- */
-static void tc_ctr_prng_update(TCCtrPrng_t * const ctx, uint8_t const * const providedData)
-{
-	if (0 != ctx) {
-		/* 10.2.1.2 step 1 */
-		uint8_t temp[TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE];
-		unsigned int len = 0U;
-
-		/* 10.2.1.2 step 2 */
-		while (len < sizeof temp) {
-			unsigned int blocklen = sizeof(temp) - len;
-			uint8_t output_block[TC_AES_BLOCK_SIZE];
-
-			/* 10.2.1.2 step 2.1 */
-			arrInc(ctx->V, sizeof ctx->V);
-
-			/* 10.2.1.2 step 2.2 */
-			if (blocklen > TC_AES_BLOCK_SIZE) {
-				blocklen = TC_AES_BLOCK_SIZE;
-			}
-			(void)tc_aes_encrypt(output_block, ctx->V, &ctx->key);
-
-			/* 10.2.1.2 step 2.3/step 3 */
-			memcpy(&(temp[len]), output_block, blocklen);
-
-			len += blocklen;
-		}
-
-		/* 10.2.1.2 step 4 */
-		if (0 != providedData) {
-			unsigned int i;
-			for (i = 0U; i < sizeof temp; i++) {
-				temp[i] ^= providedData[i];
-			}
-		}
-
-		/* 10.2.1.2 step 5 */
-		(void)tc_aes128_set_encrypt_key(&ctx->key, temp);
-
-		/* 10.2.1.2 step 6 */
-		memcpy(ctx->V, &(temp[TC_AES_KEY_SIZE]), TC_AES_BLOCK_SIZE);
-	}
-}
-
-int tc_ctr_prng_init(TCCtrPrng_t * const ctx,
-		     uint8_t const * const entropy,
-		     unsigned int entropyLen,
-		     uint8_t const * const personalization,
-		     unsigned int pLen)
-{
-	int result = TC_CRYPTO_FAIL;
-	unsigned int i;
-	uint8_t personalization_buf[TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE] = {0U};
-	uint8_t seed_material[TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE];
-	uint8_t zeroArr[TC_AES_BLOCK_SIZE] = {0U};
-
-	if (0 != personalization) {
-		/* 10.2.1.3.1 step 1 */
-		unsigned int len = pLen;
-		if (len > sizeof personalization_buf) {
-			len = sizeof personalization_buf;
-		}
-
-		/* 10.2.1.3.1 step 2 */
-		memcpy(personalization_buf, personalization, len);
-	}
-
-	if ((0 != ctx) && (0 != entropy) && (entropyLen >= sizeof seed_material)) {
-		/* 10.2.1.3.1 step 3 */
-		memcpy(seed_material, entropy, sizeof seed_material);
-		for (i = 0U; i < sizeof seed_material; i++) {
-			seed_material[i] ^= personalization_buf[i];
-		}
-
-		/* 10.2.1.3.1 step 4 */
-		(void)tc_aes128_set_encrypt_key(&ctx->key, zeroArr);
-
-		/* 10.2.1.3.1 step 5 */
-		memset(ctx->V,   0x00, sizeof ctx->V);
-
-		/* 10.2.1.3.1 step 6 */
-		tc_ctr_prng_update(ctx, seed_material);
-
-		/* 10.2.1.3.1 step 7 */
-		ctx->reseedCount = 1U;
-
-		result = TC_CRYPTO_SUCCESS;
-	}
-	return result;
-}
-
-int tc_ctr_prng_reseed(TCCtrPrng_t * const ctx,
-			uint8_t const * const entropy,
-			unsigned int entropyLen,
-			uint8_t const * const additional_input,
-			unsigned int additionallen)
-{
-	unsigned int i;
-	int result = TC_CRYPTO_FAIL;
-	uint8_t additional_input_buf[TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE] = {0U};
-	uint8_t seed_material[TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE];
-
-	if (0 != additional_input) {
-		/* 10.2.1.4.1 step 1 */
-		unsigned int len = additionallen;
-		if (len > sizeof additional_input_buf) {
-			len = sizeof additional_input_buf;
-		}
-
-		/* 10.2.1.4.1 step 2 */
-		memcpy(additional_input_buf, additional_input, len);
-	}
-
-	unsigned int seedlen = (unsigned int)TC_AES_KEY_SIZE + (unsigned int)TC_AES_BLOCK_SIZE;
-	if ((0 != ctx) && (entropyLen >= seedlen)) {
-		/* 10.2.1.4.1 step 3 */
-		memcpy(seed_material, entropy, sizeof seed_material);
-		for (i = 0U; i < sizeof seed_material; i++) {
-			seed_material[i] ^= additional_input_buf[i];
-		}
-
-		/* 10.2.1.4.1 step 4 */
-		tc_ctr_prng_update(ctx, seed_material);
-
-		/* 10.2.1.4.1 step 5 */
-		ctx->reseedCount = 1U;
-
-		result = TC_CRYPTO_SUCCESS;
-	}
-	return result;
-}
-
-int tc_ctr_prng_generate(TCCtrPrng_t * const ctx,
-			uint8_t const * const additional_input,
-			unsigned int additionallen,
-			uint8_t * const out,
-			unsigned int outlen)
-{
-	/* 2^48 - see section 10.2.1 */
-	static const uint64_t MAX_REQS_BEFORE_RESEED = 0x1000000000000ULL;
-
-	/* 2^19 bits - see section 10.2.1 */
-	static const unsigned int MAX_BYTES_PER_REQ = 65536U;
-
-	unsigned int result = TC_CRYPTO_FAIL;
-
-	if ((0 != ctx) && (0 != out) && (outlen < MAX_BYTES_PER_REQ)) {
-		/* 10.2.1.5.1 step 1 */
-		if (ctx->reseedCount > MAX_REQS_BEFORE_RESEED) {
-			result = TC_CTR_PRNG_RESEED_REQ;
-		} else {
-			uint8_t additional_input_buf[TC_AES_KEY_SIZE + TC_AES_BLOCK_SIZE] = {0U};
-			if (0 != additional_input) {
-				/* 10.2.1.5.1 step 2  */
-				unsigned int len = additionallen;
-				if (len > sizeof additional_input_buf) {
-					len = sizeof additional_input_buf;
-				}
-				memcpy(additional_input_buf, additional_input, len);
-				tc_ctr_prng_update(ctx, additional_input_buf);
-			}
-
-			/* 10.2.1.5.1 step 3 - implicit */
-
-			/* 10.2.1.5.1 step 4 */
-			unsigned int len = 0U;
-			while (len < outlen) {
-				unsigned int blocklen = outlen - len;
-				uint8_t output_block[TC_AES_BLOCK_SIZE];
-
-				/* 10.2.1.5.1 step 4.1 */
-				arrInc(ctx->V, sizeof ctx->V);
-
-				/* 10.2.1.5.1 step 4.2 */
-				(void)tc_aes_encrypt(output_block, ctx->V, &ctx->key);
-
-				/* 10.2.1.5.1 step 4.3/step 5 */
-				if (blocklen > TC_AES_BLOCK_SIZE) {
-					blocklen = TC_AES_BLOCK_SIZE;
-				}
-				memcpy(&(out[len]), output_block, blocklen);
-
-				len += blocklen;
-			}
-
-			/* 10.2.1.5.1 step 6 */
-			tc_ctr_prng_update(ctx, additional_input_buf);
-
-			/* 10.2.1.5.1 step 7 */
-			ctx->reseedCount++;
-
-			/* 10.2.1.5.1 step 8 */
-			result = TC_CRYPTO_SUCCESS;
-		}
-	}
-
-	return result;
-}
-
-void tc_ctr_prng_uninstantiate(TCCtrPrng_t * const ctx)
-{
-	if (0 != ctx) {
-		memset(ctx->key.words, 0x00, sizeof ctx->key.words);
-		memset(ctx->V,         0x00, sizeof ctx->V);
-		ctx->reseedCount = 0U;
-	}
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/ecc.c b/lib/bt/porting/ext/tinycrypt/src/ecc.c
deleted file mode 100644
index 03d9187f..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/ecc.c
+++ /dev/null
@@ -1,939 +0,0 @@
-/* ecc.c - TinyCrypt implementation of common ECC functions */
-
-/*
- * Copyright (c) 2014, Kenneth MacKay
- * 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.
- *
- * 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 HOLDER 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.
- *
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-#include <tinycrypt/ecc.h>
-#include <tinycrypt/ecc_platform_specific.h>
-#include <string.h>
-
-/* IMPORTANT: Make sure a cryptographically-secure PRNG is set and the platform
- * has access to enough entropy in order to feed the PRNG regularly. */
-#if default_RNG_defined
-static uECC_RNG_Function g_rng_function = &default_CSPRNG;
-#else
-static uECC_RNG_Function g_rng_function = 0;
-#endif
-
-void uECC_set_rng(uECC_RNG_Function rng_function)
-{
-	g_rng_function = rng_function;
-}
-
-uECC_RNG_Function uECC_get_rng(void)
-{
-	return g_rng_function;
-}
-
-int uECC_curve_private_key_size(uECC_Curve curve)
-{
-	return BITS_TO_BYTES(curve->num_n_bits);
-}
-
-int uECC_curve_public_key_size(uECC_Curve curve)
-{
-	return 2 * curve->num_bytes;
-}
-
-void uECC_vli_clear(uECC_word_t *vli, wordcount_t num_words)
-{
-	wordcount_t i;
-	for (i = 0; i < num_words; ++i) {
-		 vli[i] = 0;
-	}
-}
-
-uECC_word_t uECC_vli_isZero(const uECC_word_t *vli, wordcount_t num_words)
-{
-	uECC_word_t bits = 0;
-	wordcount_t i;
-	for (i = 0; i < num_words; ++i) {
-		bits |= vli[i];
-	}
-	return (bits == 0);
-}
-
-uECC_word_t uECC_vli_testBit(const uECC_word_t *vli, bitcount_t bit)
-{
-	return (vli[bit >> uECC_WORD_BITS_SHIFT] &
-		((uECC_word_t)1 << (bit & uECC_WORD_BITS_MASK)));
-}
-
-/* Counts the number of words in vli. */
-static wordcount_t vli_numDigits(const uECC_word_t *vli,
-				 const wordcount_t max_words)
-{
-
-	wordcount_t i;
-	/* Search from the end until we find a non-zero digit. We do it in reverse
-	 * because we expect that most digits will be nonzero. */
-	for (i = max_words - 1; i >= 0 && vli[i] == 0; --i) {
-	}
-
-	return (i + 1);
-}
-
-bitcount_t uECC_vli_numBits(const uECC_word_t *vli,
-			    const wordcount_t max_words)
-{
-
-	uECC_word_t i;
-	uECC_word_t digit;
-
-	wordcount_t num_digits = vli_numDigits(vli, max_words);
-	if (num_digits == 0) {
-		return 0;
-	}
-
-	digit = vli[num_digits - 1];
-	for (i = 0; digit; ++i) {
-		digit >>= 1;
-	}
-
-	return (((bitcount_t)(num_digits - 1) << uECC_WORD_BITS_SHIFT) + i);
-}
-
-void uECC_vli_set(uECC_word_t *dest, const uECC_word_t *src,
-		  wordcount_t num_words)
-{
-	wordcount_t i;
-
-	for (i = 0; i < num_words; ++i) {
-		dest[i] = src[i];
-  	}
-}
-
-cmpresult_t uECC_vli_cmp_unsafe(const uECC_word_t *left,
-				const uECC_word_t *right,
-				wordcount_t num_words)
-{
-	wordcount_t i;
-
-	for (i = num_words - 1; i >= 0; --i) {
-		if (left[i] > right[i]) {
-			return 1;
-		} else if (left[i] < right[i]) {
-			return -1;
-		}
-	}
-	return 0;
-}
-
-uECC_word_t uECC_vli_equal(const uECC_word_t *left, const uECC_word_t *right,
-			   wordcount_t num_words)
-{
-
-	uECC_word_t diff = 0;
-	wordcount_t i;
-
-	for (i = num_words - 1; i >= 0; --i) {
-		diff |= (left[i] ^ right[i]);
-	}
-	return !(diff == 0);
-}
-
-uECC_word_t cond_set(uECC_word_t p_true, uECC_word_t p_false, unsigned int cond)
-{
-	return (p_true*(cond)) | (p_false*(!cond));
-}
-
-/* Computes result = left - right, returning borrow, in constant time.
- * Can modify in place. */
-uECC_word_t uECC_vli_sub(uECC_word_t *result, const uECC_word_t *left,
-			 const uECC_word_t *right, wordcount_t num_words)
-{
-	uECC_word_t borrow = 0;
-	wordcount_t i;
-	for (i = 0; i < num_words; ++i) {
-		uECC_word_t diff = left[i] - right[i] - borrow;
-		uECC_word_t val = (diff > left[i]);
-		borrow = cond_set(val, borrow, (diff != left[i]));
-
-		result[i] = diff;
-	}
-	return borrow;
-}
-
-/* Computes result = left + right, returning carry, in constant time.
- * Can modify in place. */
-static uECC_word_t uECC_vli_add(uECC_word_t *result, const uECC_word_t *left,
-				const uECC_word_t *right, wordcount_t num_words)
-{
-	uECC_word_t carry = 0;
-	wordcount_t i;
-	for (i = 0; i < num_words; ++i) {
-		uECC_word_t sum = left[i] + right[i] + carry;
-		uECC_word_t val = (sum < left[i]);
-		carry = cond_set(val, carry, (sum != left[i]));
-		result[i] = sum;
-	}
-	return carry;
-}
-
-cmpresult_t uECC_vli_cmp(const uECC_word_t *left, const uECC_word_t *right,
-			 wordcount_t num_words)
-{
-	uECC_word_t tmp[NUM_ECC_WORDS];
-	uECC_word_t neg = !!uECC_vli_sub(tmp, left, right, num_words);
-	uECC_word_t equal = uECC_vli_isZero(tmp, num_words);
-	return (!equal - 2 * neg);
-}
-
-/* Computes vli = vli >> 1. */
-static void uECC_vli_rshift1(uECC_word_t *vli, wordcount_t num_words)
-{
-	uECC_word_t *end = vli;
-	uECC_word_t carry = 0;
-
-	vli += num_words;
-	while (vli-- > end) {
-		uECC_word_t temp = *vli;
-		*vli = (temp >> 1) | carry;
-		carry = temp << (uECC_WORD_BITS - 1);
-	}
-}
-
-static void muladd(uECC_word_t a, uECC_word_t b, uECC_word_t *r0,
-		   uECC_word_t *r1, uECC_word_t *r2)
-{
-
-	uECC_dword_t p = (uECC_dword_t)a * b;
-	uECC_dword_t r01 = ((uECC_dword_t)(*r1) << uECC_WORD_BITS) | *r0;
-	r01 += p;
-	*r2 += (r01 < p);
-	*r1 = r01 >> uECC_WORD_BITS;
-	*r0 = (uECC_word_t)r01;
-
-}
-
-/* Computes result = left * right. Result must be 2 * num_words long. */
-static void uECC_vli_mult(uECC_word_t *result, const uECC_word_t *left,
-			  const uECC_word_t *right, wordcount_t num_words)
-{
-
-	uECC_word_t r0 = 0;
-	uECC_word_t r1 = 0;
-	uECC_word_t r2 = 0;
-	wordcount_t i, k;
-
-	/* Compute each digit of result in sequence, maintaining the carries. */
-	for (k = 0; k < num_words; ++k) {
-
-		for (i = 0; i <= k; ++i) {
-			muladd(left[i], right[k - i], &r0, &r1, &r2);
-		}
-
-		result[k] = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-
-	for (k = num_words; k < num_words * 2 - 1; ++k) {
-
-		for (i = (k + 1) - num_words; i < num_words; ++i) {
-			muladd(left[i], right[k - i], &r0, &r1, &r2);
-		}
-		result[k] = r0;
-		r0 = r1;
-		r1 = r2;
-		r2 = 0;
-	}
-	result[num_words * 2 - 1] = r0;
-}
-
-void uECC_vli_modAdd(uECC_word_t *result, const uECC_word_t *left,
-		     const uECC_word_t *right, const uECC_word_t *mod,
-		     wordcount_t num_words)
-{
-	uECC_word_t carry = uECC_vli_add(result, left, right, num_words);
-	if (carry || uECC_vli_cmp_unsafe(mod, result, num_words) != 1) {
-	/* result > mod (result = mod + remainder), so subtract mod to get
-	 * remainder. */
-		uECC_vli_sub(result, result, mod, num_words);
-	}
-}
-
-void uECC_vli_modSub(uECC_word_t *result, const uECC_word_t *left,
-		     const uECC_word_t *right, const uECC_word_t *mod,
-		     wordcount_t num_words)
-{
-	uECC_word_t l_borrow = uECC_vli_sub(result, left, right, num_words);
-	if (l_borrow) {
-		/* In this case, result == -diff == (max int) - diff. Since -x % d == d - x,
-		 * we can get the correct result from result + mod (with overflow). */
-		uECC_vli_add(result, result, mod, num_words);
-	}
-}
-
-/* Computes result = product % mod, where product is 2N words long. */
-/* Currently only designed to work for curve_p or curve_n. */
-void uECC_vli_mmod(uECC_word_t *result, uECC_word_t *product,
-    		   const uECC_word_t *mod, wordcount_t num_words)
-{
-	uECC_word_t mod_multiple[2 * NUM_ECC_WORDS];
-	uECC_word_t tmp[2 * NUM_ECC_WORDS];
-	uECC_word_t *v[2] = {tmp, product};
-	uECC_word_t index;
-
-	/* Shift mod so its highest set bit is at the maximum position. */
-	bitcount_t shift = (num_words * 2 * uECC_WORD_BITS) -
-			   uECC_vli_numBits(mod, num_words);
-	wordcount_t word_shift = shift / uECC_WORD_BITS;
-	wordcount_t bit_shift = shift % uECC_WORD_BITS;
-	uECC_word_t carry = 0;
-	uECC_vli_clear(mod_multiple, word_shift);
-	if (bit_shift > 0) {
-		for(index = 0; index < (uECC_word_t)num_words; ++index) {
-			mod_multiple[word_shift + index] = (mod[index] << bit_shift) | carry;
-			carry = mod[index] >> (uECC_WORD_BITS - bit_shift);
-		}
-	} else {
-		uECC_vli_set(mod_multiple + word_shift, mod, num_words);
-	}
-
-	for (index = 1; shift >= 0; --shift) {
-		uECC_word_t borrow = 0;
-		wordcount_t i;
-		for (i = 0; i < num_words * 2; ++i) {
-			uECC_word_t diff = v[index][i] - mod_multiple[i] - borrow;
-			if (diff != v[index][i]) {
-				borrow = (diff > v[index][i]);
-			}
-			v[1 - index][i] = diff;
-		}
-		/* Swap the index if there was no borrow */
-		index = !(index ^ borrow);
-		uECC_vli_rshift1(mod_multiple, num_words);
-		mod_multiple[num_words - 1] |= mod_multiple[num_words] <<
-					       (uECC_WORD_BITS - 1);
-		uECC_vli_rshift1(mod_multiple + num_words, num_words);
-	}
-	uECC_vli_set(result, v[index], num_words);
-}
-
-void uECC_vli_modMult(uECC_word_t *result, const uECC_word_t *left,
-		      const uECC_word_t *right, const uECC_word_t *mod,
-		      wordcount_t num_words)
-{
-	uECC_word_t product[2 * NUM_ECC_WORDS];
-	uECC_vli_mult(product, left, right, num_words);
-	uECC_vli_mmod(result, product, mod, num_words);
-}
-
-void uECC_vli_modMult_fast(uECC_word_t *result, const uECC_word_t *left,
-			   const uECC_word_t *right, uECC_Curve curve)
-{
-	uECC_word_t product[2 * NUM_ECC_WORDS];
-	uECC_vli_mult(product, left, right, curve->num_words);
-
-	curve->mmod_fast(result, product);
-}
-
-static void uECC_vli_modSquare_fast(uECC_word_t *result,
-				    const uECC_word_t *left,
-				    uECC_Curve curve)
-{
-	uECC_vli_modMult_fast(result, left, left, curve);
-}
-
-
-#define EVEN(vli) (!(vli[0] & 1))
-
-static void vli_modInv_update(uECC_word_t *uv,
-			      const uECC_word_t *mod,
-			      wordcount_t num_words)
-{
-
-	uECC_word_t carry = 0;
-
-	if (!EVEN(uv)) {
-		carry = uECC_vli_add(uv, uv, mod, num_words);
-	}
-	uECC_vli_rshift1(uv, num_words);
-	if (carry) {
-		uv[num_words - 1] |= HIGH_BIT_SET;
-	}
-}
-
-void uECC_vli_modInv(uECC_word_t *result, const uECC_word_t *input,
-		     const uECC_word_t *mod, wordcount_t num_words)
-{
-	uECC_word_t a[NUM_ECC_WORDS], b[NUM_ECC_WORDS];
-	uECC_word_t u[NUM_ECC_WORDS], v[NUM_ECC_WORDS];
-	cmpresult_t cmpResult;
-
-	if (uECC_vli_isZero(input, num_words)) {
-		uECC_vli_clear(result, num_words);
-		return;
-	}
-
-	uECC_vli_set(a, input, num_words);
-	uECC_vli_set(b, mod, num_words);
-	uECC_vli_clear(u, num_words);
-	u[0] = 1;
-	uECC_vli_clear(v, num_words);
-	while ((cmpResult = uECC_vli_cmp_unsafe(a, b, num_words)) != 0) {
-		if (EVEN(a)) {
-			uECC_vli_rshift1(a, num_words);
-      			vli_modInv_update(u, mod, num_words);
-    		} else if (EVEN(b)) {
-			uECC_vli_rshift1(b, num_words);
-			vli_modInv_update(v, mod, num_words);
-		} else if (cmpResult > 0) {
-			uECC_vli_sub(a, a, b, num_words);
-			uECC_vli_rshift1(a, num_words);
-			if (uECC_vli_cmp_unsafe(u, v, num_words) < 0) {
-        			uECC_vli_add(u, u, mod, num_words);
-      			}
-      			uECC_vli_sub(u, u, v, num_words);
-      			vli_modInv_update(u, mod, num_words);
-    		} else {
-      			uECC_vli_sub(b, b, a, num_words);
-      			uECC_vli_rshift1(b, num_words);
-      			if (uECC_vli_cmp_unsafe(v, u, num_words) < 0) {
-        			uECC_vli_add(v, v, mod, num_words);
-      			}
-      			uECC_vli_sub(v, v, u, num_words);
-      			vli_modInv_update(v, mod, num_words);
-    		}
-  	}
-  	uECC_vli_set(result, u, num_words);
-}
-
-/* ------ Point operations ------ */
-
-void double_jacobian_default(uECC_word_t * X1, uECC_word_t * Y1,
-			     uECC_word_t * Z1, uECC_Curve curve)
-{
-	/* t1 = X, t2 = Y, t3 = Z */
-	uECC_word_t t4[NUM_ECC_WORDS];
-	uECC_word_t t5[NUM_ECC_WORDS];
-	wordcount_t num_words = curve->num_words;
-
-	if (uECC_vli_isZero(Z1, num_words)) {
-		return;
-	}
-
-	uECC_vli_modSquare_fast(t4, Y1, curve);   /* t4 = y1^2 */
-	uECC_vli_modMult_fast(t5, X1, t4, curve); /* t5 = x1*y1^2 = A */
-	uECC_vli_modSquare_fast(t4, t4, curve);   /* t4 = y1^4 */
-	uECC_vli_modMult_fast(Y1, Y1, Z1, curve); /* t2 = y1*z1 = z3 */
-	uECC_vli_modSquare_fast(Z1, Z1, curve);   /* t3 = z1^2 */
-
-	uECC_vli_modAdd(X1, X1, Z1, curve->p, num_words); /* t1 = x1 + z1^2 */
-	uECC_vli_modAdd(Z1, Z1, Z1, curve->p, num_words); /* t3 = 2*z1^2 */
-	uECC_vli_modSub(Z1, X1, Z1, curve->p, num_words); /* t3 = x1 - z1^2 */
-	uECC_vli_modMult_fast(X1, X1, Z1, curve); /* t1 = x1^2 - z1^4 */
-
-	uECC_vli_modAdd(Z1, X1, X1, curve->p, num_words); /* t3 = 2*(x1^2 - z1^4) */
-	uECC_vli_modAdd(X1, X1, Z1, curve->p, num_words); /* t1 = 3*(x1^2 - z1^4) */
-	if (uECC_vli_testBit(X1, 0)) {
-		uECC_word_t l_carry = uECC_vli_add(X1, X1, curve->p, num_words);
-		uECC_vli_rshift1(X1, num_words);
-		X1[num_words - 1] |= l_carry << (uECC_WORD_BITS - 1);
-	} else {
-		uECC_vli_rshift1(X1, num_words);
-	}
-
-	/* t1 = 3/2*(x1^2 - z1^4) = B */
-	uECC_vli_modSquare_fast(Z1, X1, curve); /* t3 = B^2 */
-	uECC_vli_modSub(Z1, Z1, t5, curve->p, num_words); /* t3 = B^2 - A */
-	uECC_vli_modSub(Z1, Z1, t5, curve->p, num_words); /* t3 = B^2 - 2A = x3 */
-	uECC_vli_modSub(t5, t5, Z1, curve->p, num_words); /* t5 = A - x3 */
-	uECC_vli_modMult_fast(X1, X1, t5, curve); /* t1 = B * (A - x3) */
-	/* t4 = B * (A - x3) - y1^4 = y3: */
-	uECC_vli_modSub(t4, X1, t4, curve->p, num_words);
-
-	uECC_vli_set(X1, Z1, num_words);
-	uECC_vli_set(Z1, Y1, num_words);
-	uECC_vli_set(Y1, t4, num_words);
-}
-
-void x_side_default(uECC_word_t *result,
-		    const uECC_word_t *x,
-		    uECC_Curve curve)
-{
-	uECC_word_t _3[NUM_ECC_WORDS] = {3}; /* -a = 3 */
-	wordcount_t num_words = curve->num_words;
-
-	uECC_vli_modSquare_fast(result, x, curve); /* r = x^2 */
-	uECC_vli_modSub(result, result, _3, curve->p, num_words); /* r = x^2 - 3 */
-	uECC_vli_modMult_fast(result, result, x, curve); /* r = x^3 - 3x */
-	/* r = x^3 - 3x + b: */
-	uECC_vli_modAdd(result, result, curve->b, curve->p, num_words);
-}
-
-uECC_Curve uECC_secp256r1(void)
-{
-	return &curve_secp256r1;
-}
-
-void vli_mmod_fast_secp256r1(unsigned int *result, unsigned int*product)
-{
-	unsigned int tmp[NUM_ECC_WORDS];
-	int carry;
-
-	/* t */
-	uECC_vli_set(result, product, NUM_ECC_WORDS);
-
-	/* s1 */
-	tmp[0] = tmp[1] = tmp[2] = 0;
-	tmp[3] = product[11];
-	tmp[4] = product[12];
-	tmp[5] = product[13];
-	tmp[6] = product[14];
-	tmp[7] = product[15];
-	carry = uECC_vli_add(tmp, tmp, tmp, NUM_ECC_WORDS);
-	carry += uECC_vli_add(result, result, tmp, NUM_ECC_WORDS);
-
-	/* s2 */
-	tmp[3] = product[12];
-	tmp[4] = product[13];
-	tmp[5] = product[14];
-	tmp[6] = product[15];
-	tmp[7] = 0;
-	carry += uECC_vli_add(tmp, tmp, tmp, NUM_ECC_WORDS);
-	carry += uECC_vli_add(result, result, tmp, NUM_ECC_WORDS);
-
-	/* s3 */
-	tmp[0] = product[8];
-	tmp[1] = product[9];
-	tmp[2] = product[10];
-	tmp[3] = tmp[4] = tmp[5] = 0;
-	tmp[6] = product[14];
-	tmp[7] = product[15];
-  	carry += uECC_vli_add(result, result, tmp, NUM_ECC_WORDS);
-
-	/* s4 */
-	tmp[0] = product[9];
-	tmp[1] = product[10];
-	tmp[2] = product[11];
-	tmp[3] = product[13];
-	tmp[4] = product[14];
-	tmp[5] = product[15];
-	tmp[6] = product[13];
-	tmp[7] = product[8];
-	carry += uECC_vli_add(result, result, tmp, NUM_ECC_WORDS);
-
-	/* d1 */
-	tmp[0] = product[11];
-	tmp[1] = product[12];
-	tmp[2] = product[13];
-	tmp[3] = tmp[4] = tmp[5] = 0;
-	tmp[6] = product[8];
-	tmp[7] = product[10];
-	carry -= uECC_vli_sub(result, result, tmp, NUM_ECC_WORDS);
-
-	/* d2 */
-	tmp[0] = product[12];
-	tmp[1] = product[13];
-	tmp[2] = product[14];
-	tmp[3] = product[15];
-	tmp[4] = tmp[5] = 0;
-	tmp[6] = product[9];
-	tmp[7] = product[11];
-	carry -= uECC_vli_sub(result, result, tmp, NUM_ECC_WORDS);
-
-	/* d3 */
-	tmp[0] = product[13];
-	tmp[1] = product[14];
-	tmp[2] = product[15];
-	tmp[3] = product[8];
-	tmp[4] = product[9];
-	tmp[5] = product[10];
-	tmp[6] = 0;
-	tmp[7] = product[12];
-	carry -= uECC_vli_sub(result, result, tmp, NUM_ECC_WORDS);
-
-	/* d4 */
-	tmp[0] = product[14];
-	tmp[1] = product[15];
-	tmp[2] = 0;
-	tmp[3] = product[9];
-	tmp[4] = product[10];
-	tmp[5] = product[11];
-	tmp[6] = 0;
-	tmp[7] = product[13];
-	carry -= uECC_vli_sub(result, result, tmp, NUM_ECC_WORDS);
-
-	if (carry < 0) {
-		do {
-			carry += uECC_vli_add(result, result, curve_secp256r1.p, NUM_ECC_WORDS);
-		}
-		while (carry < 0);
-	} else  {
-		while (carry ||
-		       uECC_vli_cmp_unsafe(curve_secp256r1.p, result, NUM_ECC_WORDS) != 1) {
-			carry -= uECC_vli_sub(result, result, curve_secp256r1.p, NUM_ECC_WORDS);
-		}
-	}
-}
-
-uECC_word_t EccPoint_isZero(const uECC_word_t *point, uECC_Curve curve)
-{
-	return uECC_vli_isZero(point, curve->num_words * 2);
-}
-
-void apply_z(uECC_word_t * X1, uECC_word_t * Y1, const uECC_word_t * const Z,
-	     uECC_Curve curve)
-{
-	uECC_word_t t1[NUM_ECC_WORDS];
-
-	uECC_vli_modSquare_fast(t1, Z, curve);    /* z^2 */
-	uECC_vli_modMult_fast(X1, X1, t1, curve); /* x1 * z^2 */
-	uECC_vli_modMult_fast(t1, t1, Z, curve);  /* z^3 */
-	uECC_vli_modMult_fast(Y1, Y1, t1, curve); /* y1 * z^3 */
-}
-
-/* P = (x1, y1) => 2P, (x2, y2) => P' */
-static void XYcZ_initial_double(uECC_word_t * X1, uECC_word_t * Y1,
-				uECC_word_t * X2, uECC_word_t * Y2,
-				const uECC_word_t * const initial_Z,
-				uECC_Curve curve)
-{
-	uECC_word_t z[NUM_ECC_WORDS];
-	wordcount_t num_words = curve->num_words;
-	if (initial_Z) {
-		uECC_vli_set(z, initial_Z, num_words);
-	} else {
-		uECC_vli_clear(z, num_words);
-		z[0] = 1;
-	}
-
-	uECC_vli_set(X2, X1, num_words);
-	uECC_vli_set(Y2, Y1, num_words);
-
-	apply_z(X1, Y1, z, curve);
-	curve->double_jacobian(X1, Y1, z, curve);
-	apply_z(X2, Y2, z, curve);
-}
-
-void XYcZ_add(uECC_word_t * X1, uECC_word_t * Y1,
-	      uECC_word_t * X2, uECC_word_t * Y2,
-	      uECC_Curve curve)
-{
-	/* t1 = X1, t2 = Y1, t3 = X2, t4 = Y2 */
-	uECC_word_t t5[NUM_ECC_WORDS];
-	wordcount_t num_words = curve->num_words;
-
-	uECC_vli_modSub(t5, X2, X1, curve->p, num_words); /* t5 = x2 - x1 */
-	uECC_vli_modSquare_fast(t5, t5, curve); /* t5 = (x2 - x1)^2 = A */
-	uECC_vli_modMult_fast(X1, X1, t5, curve); /* t1 = x1*A = B */
-	uECC_vli_modMult_fast(X2, X2, t5, curve); /* t3 = x2*A = C */
-	uECC_vli_modSub(Y2, Y2, Y1, curve->p, num_words); /* t4 = y2 - y1 */
-	uECC_vli_modSquare_fast(t5, Y2, curve); /* t5 = (y2 - y1)^2 = D */
-
-	uECC_vli_modSub(t5, t5, X1, curve->p, num_words); /* t5 = D - B */
-	uECC_vli_modSub(t5, t5, X2, curve->p, num_words); /* t5 = D - B - C = x3 */
-	uECC_vli_modSub(X2, X2, X1, curve->p, num_words); /* t3 = C - B */
-	uECC_vli_modMult_fast(Y1, Y1, X2, curve); /* t2 = y1*(C - B) */
-	uECC_vli_modSub(X2, X1, t5, curve->p, num_words); /* t3 = B - x3 */
-	uECC_vli_modMult_fast(Y2, Y2, X2, curve); /* t4 = (y2 - y1)*(B - x3) */
-	uECC_vli_modSub(Y2, Y2, Y1, curve->p, num_words); /* t4 = y3 */
-
-	uECC_vli_set(X2, t5, num_words);
-}
-
-/* Input P = (x1, y1, Z), Q = (x2, y2, Z)
-   Output P + Q = (x3, y3, Z3), P - Q = (x3', y3', Z3)
-   or P => P - Q, Q => P + Q
- */
-static void XYcZ_addC(uECC_word_t * X1, uECC_word_t * Y1,
-		      uECC_word_t * X2, uECC_word_t * Y2,
-		      uECC_Curve curve)
-{
-	/* t1 = X1, t2 = Y1, t3 = X2, t4 = Y2 */
-	uECC_word_t t5[NUM_ECC_WORDS];
-	uECC_word_t t6[NUM_ECC_WORDS];
-	uECC_word_t t7[NUM_ECC_WORDS];
-	wordcount_t num_words = curve->num_words;
-
-	uECC_vli_modSub(t5, X2, X1, curve->p, num_words); /* t5 = x2 - x1 */
-	uECC_vli_modSquare_fast(t5, t5, curve); /* t5 = (x2 - x1)^2 = A */
-	uECC_vli_modMult_fast(X1, X1, t5, curve); /* t1 = x1*A = B */
-	uECC_vli_modMult_fast(X2, X2, t5, curve); /* t3 = x2*A = C */
-	uECC_vli_modAdd(t5, Y2, Y1, curve->p, num_words); /* t5 = y2 + y1 */
-	uECC_vli_modSub(Y2, Y2, Y1, curve->p, num_words); /* t4 = y2 - y1 */
-
-	uECC_vli_modSub(t6, X2, X1, curve->p, num_words); /* t6 = C - B */
-	uECC_vli_modMult_fast(Y1, Y1, t6, curve); /* t2 = y1 * (C - B) = E */
-	uECC_vli_modAdd(t6, X1, X2, curve->p, num_words); /* t6 = B + C */
-	uECC_vli_modSquare_fast(X2, Y2, curve); /* t3 = (y2 - y1)^2 = D */
-	uECC_vli_modSub(X2, X2, t6, curve->p, num_words); /* t3 = D - (B + C) = x3 */
-
-	uECC_vli_modSub(t7, X1, X2, curve->p, num_words); /* t7 = B - x3 */
-	uECC_vli_modMult_fast(Y2, Y2, t7, curve); /* t4 = (y2 - y1)*(B - x3) */
-	/* t4 = (y2 - y1)*(B - x3) - E = y3: */
-	uECC_vli_modSub(Y2, Y2, Y1, curve->p, num_words);
-
-	uECC_vli_modSquare_fast(t7, t5, curve); /* t7 = (y2 + y1)^2 = F */
-	uECC_vli_modSub(t7, t7, t6, curve->p, num_words); /* t7 = F - (B + C) = x3' */
-	uECC_vli_modSub(t6, t7, X1, curve->p, num_words); /* t6 = x3' - B */
-	uECC_vli_modMult_fast(t6, t6, t5, curve); /* t6 = (y2+y1)*(x3' - B) */
-	/* t2 = (y2+y1)*(x3' - B) - E = y3': */
-	uECC_vli_modSub(Y1, t6, Y1, curve->p, num_words);
-
-	uECC_vli_set(X1, t7, num_words);
-}
-
-void EccPoint_mult(uECC_word_t * result, const uECC_word_t * point,
-		   const uECC_word_t * scalar,
-		   const uECC_word_t * initial_Z,
-		   bitcount_t num_bits, uECC_Curve curve)
-{
-	/* R0 and R1 */
-	uECC_word_t Rx[2][NUM_ECC_WORDS];
-	uECC_word_t Ry[2][NUM_ECC_WORDS];
-	uECC_word_t z[NUM_ECC_WORDS];
-	bitcount_t i;
-	uECC_word_t nb;
-	wordcount_t num_words = curve->num_words;
-
-	uECC_vli_set(Rx[1], point, num_words);
-  	uECC_vli_set(Ry[1], point + num_words, num_words);
-
-	XYcZ_initial_double(Rx[1], Ry[1], Rx[0], Ry[0], initial_Z, curve);
-
-	for (i = num_bits - 2; i > 0; --i) {
-		nb = !uECC_vli_testBit(scalar, i);
-		XYcZ_addC(Rx[1 - nb], Ry[1 - nb], Rx[nb], Ry[nb], curve);
-		XYcZ_add(Rx[nb], Ry[nb], Rx[1 - nb], Ry[1 - nb], curve);
-	}
-
-	nb = !uECC_vli_testBit(scalar, 0);
-	XYcZ_addC(Rx[1 - nb], Ry[1 - nb], Rx[nb], Ry[nb], curve);
-
-	/* Find final 1/Z value. */
-	uECC_vli_modSub(z, Rx[1], Rx[0], curve->p, num_words); /* X1 - X0 */
-	uECC_vli_modMult_fast(z, z, Ry[1 - nb], curve); /* Yb * (X1 - X0) */
-	uECC_vli_modMult_fast(z, z, point, curve); /* xP * Yb * (X1 - X0) */
-	uECC_vli_modInv(z, z, curve->p, num_words); /* 1 / (xP * Yb * (X1 - X0))*/
-	/* yP / (xP * Yb * (X1 - X0)) */
-	uECC_vli_modMult_fast(z, z, point + num_words, curve);
-	/* Xb * yP / (xP * Yb * (X1 - X0)) */
-	uECC_vli_modMult_fast(z, z, Rx[1 - nb], curve);
-	/* End 1/Z calculation */
-
-	XYcZ_add(Rx[nb], Ry[nb], Rx[1 - nb], Ry[1 - nb], curve);
-	apply_z(Rx[0], Ry[0], z, curve);
-
-	uECC_vli_set(result, Rx[0], num_words);
-	uECC_vli_set(result + num_words, Ry[0], num_words);
-}
-
-uECC_word_t regularize_k(const uECC_word_t * const k, uECC_word_t *k0,
-			 uECC_word_t *k1, uECC_Curve curve)
-{
-
-	wordcount_t num_n_words = BITS_TO_WORDS(curve->num_n_bits);
-
-	bitcount_t num_n_bits = curve->num_n_bits;
-
-	uECC_word_t carry = uECC_vli_add(k0, k, curve->n, num_n_words) ||
-			     (num_n_bits < ((bitcount_t)num_n_words * uECC_WORD_SIZE * 8) &&
-			     uECC_vli_testBit(k0, num_n_bits));
-
-	uECC_vli_add(k1, k0, curve->n, num_n_words);
-
-	return carry;
-}
-
-uECC_word_t EccPoint_compute_public_key(uECC_word_t *result,
-					uECC_word_t *private_key,
-					uECC_Curve curve)
-{
-
-	uECC_word_t tmp1[NUM_ECC_WORDS];
- 	uECC_word_t tmp2[NUM_ECC_WORDS];
-	uECC_word_t *p2[2] = {tmp1, tmp2};
-	uECC_word_t carry;
-
-	/* Regularize the bitcount for the private key so that attackers cannot
-	 * use a side channel attack to learn the number of leading zeros. */
-	carry = regularize_k(private_key, tmp1, tmp2, curve);
-
-	EccPoint_mult(result, curve->G, p2[!carry], 0, curve->num_n_bits + 1, curve);
-
-	if (EccPoint_isZero(result, curve)) {
-		return 0;
-	}
-	return 1;
-}
-
-/* Converts an integer in uECC native format to big-endian bytes. */
-void uECC_vli_nativeToBytes(uint8_t *bytes, int num_bytes,
-			    const unsigned int *native)
-{
-	wordcount_t i;
-	for (i = 0; i < num_bytes; ++i) {
-		unsigned b = num_bytes - 1 - i;
-		bytes[i] = native[b / uECC_WORD_SIZE] >> (8 * (b % uECC_WORD_SIZE));
-	}
-}
-
-/* Converts big-endian bytes to an integer in uECC native format. */
-void uECC_vli_bytesToNative(unsigned int *native, const uint8_t *bytes,
-			    int num_bytes)
-{
-	wordcount_t i;
-	uECC_vli_clear(native, (num_bytes + (uECC_WORD_SIZE - 1)) / uECC_WORD_SIZE);
-	for (i = 0; i < num_bytes; ++i) {
-		unsigned b = num_bytes - 1 - i;
-		native[b / uECC_WORD_SIZE] |=
-			(uECC_word_t)bytes[i] << (8 * (b % uECC_WORD_SIZE));
-  	}
-}
-
-int uECC_generate_random_int(uECC_word_t *random, const uECC_word_t *top,
-			     wordcount_t num_words)
-{
-	uECC_word_t mask = (uECC_word_t)-1;
-	uECC_word_t tries;
-	bitcount_t num_bits = uECC_vli_numBits(top, num_words);
-
-	if (!g_rng_function) {
-		return 0;
-	}
-
-	for (tries = 0; tries < uECC_RNG_MAX_TRIES; ++tries) {
-		if (!g_rng_function((uint8_t *)random, num_words * uECC_WORD_SIZE)) {
-      			return 0;
-    		}
-		random[num_words - 1] &=
-        		mask >> ((bitcount_t)(num_words * uECC_WORD_SIZE * 8 - num_bits));
-		if (!uECC_vli_isZero(random, num_words) &&
-			uECC_vli_cmp(top, random, num_words) == 1) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
-
-int uECC_valid_point(const uECC_word_t *point, uECC_Curve curve)
-{
-	uECC_word_t tmp1[NUM_ECC_WORDS];
-	uECC_word_t tmp2[NUM_ECC_WORDS];
-	wordcount_t num_words = curve->num_words;
-
-	/* The point at infinity is invalid. */
-	if (EccPoint_isZero(point, curve)) {
-		return -1;
-	}
-
-	/* x and y must be smaller than p. */
-	if (uECC_vli_cmp_unsafe(curve->p, point, num_words) != 1 ||
-		uECC_vli_cmp_unsafe(curve->p, point + num_words, num_words) != 1) {
-		return -2;
-	}
-
-	uECC_vli_modSquare_fast(tmp1, point + num_words, curve);
-	curve->x_side(tmp2, point, curve); /* tmp2 = x^3 + ax + b */
-
-	/* Make sure that y^2 == x^3 + ax + b */
-	if (uECC_vli_equal(tmp1, tmp2, num_words) != 0)
-		return -3;
-
-	return 0;
-}
-
-int uECC_valid_public_key(const uint8_t *public_key, uECC_Curve curve)
-{
-
-	uECC_word_t _public[NUM_ECC_WORDS * 2];
-
-	uECC_vli_bytesToNative(_public, public_key, curve->num_bytes);
-	uECC_vli_bytesToNative(
-	_public + curve->num_words,
-	public_key + curve->num_bytes,
-	curve->num_bytes);
-
-	if (uECC_vli_cmp_unsafe(_public, curve->G, NUM_ECC_WORDS * 2) == 0) {
-		return -4;
-	}
-
-	return uECC_valid_point(_public, curve);
-}
-
-int uECC_compute_public_key(const uint8_t *private_key, uint8_t *public_key,
-			    uECC_Curve curve)
-{
-
-	uECC_word_t _private[NUM_ECC_WORDS];
-	uECC_word_t _public[NUM_ECC_WORDS * 2];
-
-	uECC_vli_bytesToNative(
-	_private,
-	private_key,
-	BITS_TO_BYTES(curve->num_n_bits));
-
-	/* Make sure the private key is in the range [1, n-1]. */
-	if (uECC_vli_isZero(_private, BITS_TO_WORDS(curve->num_n_bits))) {
-		return 0;
-	}
-
-	if (uECC_vli_cmp(curve->n, _private, BITS_TO_WORDS(curve->num_n_bits)) != 1) {
-		return 0;
-	}
-
-	/* Compute public key. */
-	if (!EccPoint_compute_public_key(_public, _private, curve)) {
-		return 0;
-	}
-
-	uECC_vli_nativeToBytes(public_key, curve->num_bytes, _public);
-	uECC_vli_nativeToBytes(
-	public_key +
-	curve->num_bytes, curve->num_bytes, _public + curve->num_words);
-	return 1;
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/ecc_dh.c b/lib/bt/porting/ext/tinycrypt/src/ecc_dh.c
deleted file mode 100644
index ecd8df3b..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/ecc_dh.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* ec_dh.c - TinyCrypt implementation of EC-DH */
-
-/*
- * Copyright (c) 2014, Kenneth MacKay
- * 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.
- *
- * 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 HOLDER 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.
- */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-#include <tinycrypt/constants.h>
-#include <tinycrypt/ecc.h>
-#include <tinycrypt/ecc_dh.h>
-#include <string.h>
-
-#if default_RNG_defined
-static uECC_RNG_Function g_rng_function = &default_CSPRNG;
-#else
-static uECC_RNG_Function g_rng_function = 0;
-#endif
-
-int uECC_make_key_with_d(uint8_t *public_key, uint8_t *private_key,
-			 unsigned int *d, uECC_Curve curve)
-{
-
-	uECC_word_t _private[NUM_ECC_WORDS];
-	uECC_word_t _public[NUM_ECC_WORDS * 2];
-
-	/* This function is designed for test purposes-only (such as validating NIST
-	 * test vectors) as it uses a provided value for d instead of generating
-	 * it uniformly at random. */
-	memcpy (_private, d, NUM_ECC_BYTES);
-
-	/* Computing public-key from private: */
-	if (EccPoint_compute_public_key(_public, _private, curve)) {
-
-		/* Converting buffers to correct bit order: */
-		uECC_vli_nativeToBytes(private_key,
-				       BITS_TO_BYTES(curve->num_n_bits),
-				       _private);
-		uECC_vli_nativeToBytes(public_key,
-				       curve->num_bytes,
-				       _public);
-		uECC_vli_nativeToBytes(public_key + curve->num_bytes,
-				       curve->num_bytes,
-				       _public + curve->num_words);
-
-		/* erasing temporary buffer used to store secret: */
-		memset(_private, 0, NUM_ECC_BYTES);
-
-		return 1;
-	}
-	return 0;
-}
-
-int uECC_make_key(uint8_t *public_key, uint8_t *private_key, uECC_Curve curve)
-{
-
-	uECC_word_t _random[NUM_ECC_WORDS * 2];
-	uECC_word_t _private[NUM_ECC_WORDS];
-	uECC_word_t _public[NUM_ECC_WORDS * 2];
-	uECC_word_t tries;
-
-	for (tries = 0; tries < uECC_RNG_MAX_TRIES; ++tries) {
-		/* Generating _private uniformly at random: */
-		uECC_RNG_Function rng_function = uECC_get_rng();
-		if (!rng_function ||
-			!rng_function((uint8_t *)_random, 2 * NUM_ECC_WORDS*uECC_WORD_SIZE)) {
-        		return 0;
-		}
-
-		/* computing modular reduction of _random (see FIPS 186.4 B.4.1): */
-		uECC_vli_mmod(_private, _random, curve->n, BITS_TO_WORDS(curve->num_n_bits));
-
-		/* Computing public-key from private: */
-		if (EccPoint_compute_public_key(_public, _private, curve)) {
-
-			/* Converting buffers to correct bit order: */
-			uECC_vli_nativeToBytes(private_key,
-					       BITS_TO_BYTES(curve->num_n_bits),
-					       _private);
-			uECC_vli_nativeToBytes(public_key,
-					       curve->num_bytes,
-					       _public);
-			uECC_vli_nativeToBytes(public_key + curve->num_bytes,
- 					       curve->num_bytes,
-					       _public + curve->num_words);
-
-			/* erasing temporary buffer that stored secret: */
-			memset(_private, 0, NUM_ECC_BYTES);
-
-      			return 1;
-    		}
-  	}
-	return 0;
-}
-
-int uECC_shared_secret(const uint8_t *public_key, const uint8_t *private_key,
-		       uint8_t *secret, uECC_Curve curve)
-{
-
-	uECC_word_t _public[NUM_ECC_WORDS * 2];
-	uECC_word_t _private[NUM_ECC_WORDS];
-
-	uECC_word_t tmp[NUM_ECC_WORDS];
-	uECC_word_t *p2[2] = {_private, tmp};
-	uECC_word_t *initial_Z = 0;
-	uECC_word_t carry;
-	wordcount_t num_words = curve->num_words;
-	wordcount_t num_bytes = curve->num_bytes;
-	int r;
-
-	/* Converting buffers to correct bit order: */
-	uECC_vli_bytesToNative(_private,
-      			       private_key,
-			       BITS_TO_BYTES(curve->num_n_bits));
-	uECC_vli_bytesToNative(_public,
-      			       public_key,
-			       num_bytes);
-	uECC_vli_bytesToNative(_public + num_words,
-			       public_key + num_bytes,
-			       num_bytes);
-
-	/* Regularize the bitcount for the private key so that attackers cannot use a
-	 * side channel attack to learn the number of leading zeros. */
-	carry = regularize_k(_private, _private, tmp, curve);
-
-	/* If an RNG function was specified, try to get a random initial Z value to
-	 * improve protection against side-channel attacks. */
-	if (g_rng_function) {
-		if (!uECC_generate_random_int(p2[carry], curve->p, num_words)) {
-			r = 0;
-			goto clear_and_out;
-    		}
-    		initial_Z = p2[carry];
-  	}
-
-	EccPoint_mult(_public, _public, p2[!carry], initial_Z, curve->num_n_bits + 1,
-		      curve);
-
-	uECC_vli_nativeToBytes(secret, num_bytes, _public);
-	r = !EccPoint_isZero(_public, curve);
-
-clear_and_out:
-	/* erasing temporary buffer used to store secret: */
-	memset(p2, 0, sizeof(p2));
-	__asm__ __volatile__("" :: "g"(p2) : "memory");
-	memset(tmp, 0, sizeof(tmp));
-	__asm__ __volatile__("" :: "g"(tmp) : "memory");
-	memset(_private, 0, sizeof(_private));
-	__asm__ __volatile__("" :: "g"(_private) : "memory");
-
-	return r;
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/ecc_dsa.c b/lib/bt/porting/ext/tinycrypt/src/ecc_dsa.c
deleted file mode 100644
index 02424d4e..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/ecc_dsa.c
+++ /dev/null
@@ -1,294 +0,0 @@
-/* ec_dsa.c - TinyCrypt implementation of EC-DSA */
-
-/* Copyright (c) 2014, Kenneth MacKay
- * 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.
- *
- * 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 HOLDER 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.*/
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-#include <tinycrypt/constants.h>
-#include <tinycrypt/ecc.h>
-#include <tinycrypt/ecc_dsa.h>
-
-#if default_RNG_defined
-static uECC_RNG_Function g_rng_function = &default_CSPRNG;
-#else
-static uECC_RNG_Function g_rng_function = 0;
-#endif
-
-static void bits2int(uECC_word_t *native, const uint8_t *bits,
-		     unsigned bits_size, uECC_Curve curve)
-{
-	unsigned num_n_bytes = BITS_TO_BYTES(curve->num_n_bits);
-	unsigned num_n_words = BITS_TO_WORDS(curve->num_n_bits);
-	int shift;
-	uECC_word_t carry;
-	uECC_word_t *ptr;
-
-	if (bits_size > num_n_bytes) {
-		bits_size = num_n_bytes;
-	}
-
-	uECC_vli_clear(native, num_n_words);
-	uECC_vli_bytesToNative(native, bits, bits_size);
-	if (bits_size * 8 <= (unsigned)curve->num_n_bits) {
-		return;
-	}
-	shift = bits_size * 8 - curve->num_n_bits;
-	carry = 0;
-	ptr = native + num_n_words;
-	while (ptr-- > native) {
-		uECC_word_t temp = *ptr;
-		*ptr = (temp >> shift) | carry;
-		carry = temp << (uECC_WORD_BITS - shift);
-	}
-
-	/* Reduce mod curve_n */
-	if (uECC_vli_cmp_unsafe(curve->n, native, num_n_words) != 1) {
-		uECC_vli_sub(native, native, curve->n, num_n_words);
-	}
-}
-
-int uECC_sign_with_k(const uint8_t *private_key, const uint8_t *message_hash,
-		     unsigned hash_size, uECC_word_t *k, uint8_t *signature,
-		     uECC_Curve curve)
-{
-
-	uECC_word_t tmp[NUM_ECC_WORDS];
-	uECC_word_t s[NUM_ECC_WORDS];
-	uECC_word_t *k2[2] = {tmp, s};
-	uECC_word_t p[NUM_ECC_WORDS * 2];
-	uECC_word_t carry;
-	wordcount_t num_words = curve->num_words;
-	wordcount_t num_n_words = BITS_TO_WORDS(curve->num_n_bits);
-	bitcount_t num_n_bits = curve->num_n_bits;
-
-	/* Make sure 0 < k < curve_n */
-  	if (uECC_vli_isZero(k, num_words) ||
-	    uECC_vli_cmp(curve->n, k, num_n_words) != 1) {
-		return 0;
-	}
-
-	carry = regularize_k(k, tmp, s, curve);
-	EccPoint_mult(p, curve->G, k2[!carry], 0, num_n_bits + 1, curve);
-	if (uECC_vli_isZero(p, num_words)) {
-		return 0;
-	}
-
-	/* If an RNG function was specified, get a random number
-	to prevent side channel analysis of k. */
-	if (!g_rng_function) {
-		uECC_vli_clear(tmp, num_n_words);
-		tmp[0] = 1;
-	}
-	else if (!uECC_generate_random_int(tmp, curve->n, num_n_words)) {
-		return 0;
-	}
-
-	/* Prevent side channel analysis of uECC_vli_modInv() to determine
-	bits of k / the private key by premultiplying by a random number */
-	uECC_vli_modMult(k, k, tmp, curve->n, num_n_words); /* k' = rand * k */
-	uECC_vli_modInv(k, k, curve->n, num_n_words);       /* k = 1 / k' */
-	uECC_vli_modMult(k, k, tmp, curve->n, num_n_words); /* k = 1 / k */
-
-	uECC_vli_nativeToBytes(signature, curve->num_bytes, p); /* store r */
-
-	/* tmp = d: */
-	uECC_vli_bytesToNative(tmp, private_key, BITS_TO_BYTES(curve->num_n_bits));
-
-	s[num_n_words - 1] = 0;
-	uECC_vli_set(s, p, num_words);
-	uECC_vli_modMult(s, tmp, s, curve->n, num_n_words); /* s = r*d */
-
-	bits2int(tmp, message_hash, hash_size, curve);
-	uECC_vli_modAdd(s, tmp, s, curve->n, num_n_words); /* s = e + r*d */
-	uECC_vli_modMult(s, s, k, curve->n, num_n_words);  /* s = (e + r*d) / k */
-	if (uECC_vli_numBits(s, num_n_words) > (bitcount_t)curve->num_bytes * 8) {
-		return 0;
-	}
-
-	uECC_vli_nativeToBytes(signature + curve->num_bytes, curve->num_bytes, s);
-	return 1;
-}
-
-int uECC_sign(const uint8_t *private_key, const uint8_t *message_hash,
-	      unsigned hash_size, uint8_t *signature, uECC_Curve curve)
-{
-	      uECC_word_t _random[2*NUM_ECC_WORDS];
-	      uECC_word_t k[NUM_ECC_WORDS];
-	      uECC_word_t tries;
-
-	for (tries = 0; tries < uECC_RNG_MAX_TRIES; ++tries) {
-		/* Generating _random uniformly at random: */
-		uECC_RNG_Function rng_function = uECC_get_rng();
-		if (!rng_function ||
-		    !rng_function((uint8_t *)_random, 2*NUM_ECC_WORDS*uECC_WORD_SIZE)) {
-			return 0;
-		}
-
-		// computing k as modular reduction of _random (see FIPS 186.4 B.5.1):
-		uECC_vli_mmod(k, _random, curve->n, BITS_TO_WORDS(curve->num_n_bits));
-
-		if (uECC_sign_with_k(private_key, message_hash, hash_size, k, signature,
-		    curve)) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static bitcount_t smax(bitcount_t a, bitcount_t b)
-{
-	return (a > b ? a : b);
-}
-
-int uECC_verify(const uint8_t *public_key, const uint8_t *message_hash,
-		unsigned hash_size, const uint8_t *signature,
-	        uECC_Curve curve)
-{
-
-	uECC_word_t u1[NUM_ECC_WORDS], u2[NUM_ECC_WORDS];
-	uECC_word_t z[NUM_ECC_WORDS];
-	uECC_word_t sum[NUM_ECC_WORDS * 2];
-	uECC_word_t rx[NUM_ECC_WORDS];
-	uECC_word_t ry[NUM_ECC_WORDS];
-	uECC_word_t tx[NUM_ECC_WORDS];
-	uECC_word_t ty[NUM_ECC_WORDS];
-	uECC_word_t tz[NUM_ECC_WORDS];
-	const uECC_word_t *points[4];
-	const uECC_word_t *point;
-	bitcount_t num_bits;
-	bitcount_t i;
-
-	uECC_word_t _public[NUM_ECC_WORDS * 2];
-	uECC_word_t r[NUM_ECC_WORDS], s[NUM_ECC_WORDS];
-	wordcount_t num_words = curve->num_words;
-	wordcount_t num_n_words = BITS_TO_WORDS(curve->num_n_bits);
-
-	rx[num_n_words - 1] = 0;
-	r[num_n_words - 1] = 0;
-	s[num_n_words - 1] = 0;
-
-	uECC_vli_bytesToNative(_public, public_key, curve->num_bytes);
-	uECC_vli_bytesToNative(_public + num_words, public_key + curve->num_bytes,
-			       curve->num_bytes);
-	uECC_vli_bytesToNative(r, signature, curve->num_bytes);
-	uECC_vli_bytesToNative(s, signature + curve->num_bytes, curve->num_bytes);
-
-	/* r, s must not be 0. */
-	if (uECC_vli_isZero(r, num_words) || uECC_vli_isZero(s, num_words)) {
-		return 0;
-	}
-
-	/* r, s must be < n. */
-	if (uECC_vli_cmp_unsafe(curve->n, r, num_n_words) != 1 ||
-	    uECC_vli_cmp_unsafe(curve->n, s, num_n_words) != 1) {
-		return 0;
-	}
-
-	/* Calculate u1 and u2. */
-	uECC_vli_modInv(z, s, curve->n, num_n_words); /* z = 1/s */
-	u1[num_n_words - 1] = 0;
-	bits2int(u1, message_hash, hash_size, curve);
-	uECC_vli_modMult(u1, u1, z, curve->n, num_n_words); /* u1 = e/s */
-	uECC_vli_modMult(u2, r, z, curve->n, num_n_words); /* u2 = r/s */
-
-	/* Calculate sum = G + Q. */
-	uECC_vli_set(sum, _public, num_words);
-	uECC_vli_set(sum + num_words, _public + num_words, num_words);
-	uECC_vli_set(tx, curve->G, num_words);
-	uECC_vli_set(ty, curve->G + num_words, num_words);
-	uECC_vli_modSub(z, sum, tx, curve->p, num_words); /* z = x2 - x1 */
-	XYcZ_add(tx, ty, sum, sum + num_words, curve);
-	uECC_vli_modInv(z, z, curve->p, num_words); /* z = 1/z */
-	apply_z(sum, sum + num_words, z, curve);
-
-	/* Use Shamir's trick to calculate u1*G + u2*Q */
-	points[0] = 0;
-	points[1] = curve->G;
-	points[2] = _public;
-	points[3] = sum;
-	num_bits = smax(uECC_vli_numBits(u1, num_n_words),
-	uECC_vli_numBits(u2, num_n_words));
-
-	point = points[(!!uECC_vli_testBit(u1, num_bits - 1)) |
-                       ((!!uECC_vli_testBit(u2, num_bits - 1)) << 1)];
-	uECC_vli_set(rx, point, num_words);
-	uECC_vli_set(ry, point + num_words, num_words);
-	uECC_vli_clear(z, num_words);
-	z[0] = 1;
-
-	for (i = num_bits - 2; i >= 0; --i) {
-		uECC_word_t index;
-		curve->double_jacobian(rx, ry, z, curve);
-
-		index = (!!uECC_vli_testBit(u1, i)) | ((!!uECC_vli_testBit(u2, i)) << 1);
-		point = points[index];
-		if (point) {
-			uECC_vli_set(tx, point, num_words);
-			uECC_vli_set(ty, point + num_words, num_words);
-			apply_z(tx, ty, z, curve);
-			uECC_vli_modSub(tz, rx, tx, curve->p, num_words); /* Z = x2 - x1 */
-			XYcZ_add(tx, ty, rx, ry, curve);
-			uECC_vli_modMult_fast(z, z, tz, curve);
-		}
-  	}
-
-	uECC_vli_modInv(z, z, curve->p, num_words); /* Z = 1/Z */
-	apply_z(rx, ry, z, curve);
-
-	/* v = x1 (mod n) */
-	if (uECC_vli_cmp_unsafe(curve->n, rx, num_n_words) != 1) {
-		uECC_vli_sub(rx, rx, curve->n, num_n_words);
-	}
-
-	/* Accept only if v == r. */
-	return (int)(uECC_vli_equal(rx, r, num_words) == 0);
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/ecc_platform_specific.c b/lib/bt/porting/ext/tinycrypt/src/ecc_platform_specific.c
deleted file mode 100644
index ca7650d8..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/ecc_platform_specific.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*  uECC_platform_specific.c - Implementation of platform specific functions*/
-
-/* Copyright (c) 2014, Kenneth MacKay
- * 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.
- *
- * 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 HOLDER 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.*/
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- *
- *  uECC_platform_specific.c -- Implementation of platform specific functions
- */
-
-
-#if defined(unix) || defined(__linux__) || defined(__unix__) || \
-    defined(__unix) |  (defined(__APPLE__) && defined(__MACH__)) || \
-    defined(uECC_POSIX)
-
-/* Some POSIX-like system with /dev/urandom or /dev/random. */
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <stdint.h>
-
-#ifndef O_CLOEXEC
-#define O_CLOEXEC 0
-#endif
-
-int default_CSPRNG(uint8_t *dest, unsigned int size) {
-
-  /* input sanity check: */
-  if (dest == (uint8_t *) 0 || (size <= 0))
-    return 0;
-
-  int fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC);
-  if (fd == -1) {
-    fd = open("/dev/random", O_RDONLY | O_CLOEXEC);
-    if (fd == -1) {
-      return 0;
-    }
-  }
-
-  char *ptr = (char *)dest;
-  size_t left = (size_t) size;
-  while (left > 0) {
-    ssize_t bytes_read = read(fd, ptr, left);
-    if (bytes_read <= 0) { // read failed
-      close(fd);
-      return 0;
-    }
-    left -= bytes_read;
-    ptr += bytes_read;
-  }
-
-  close(fd);
-  return 1;
-}
-
-#endif /* platform */
diff --git a/lib/bt/porting/ext/tinycrypt/src/hmac.c b/lib/bt/porting/ext/tinycrypt/src/hmac.c
deleted file mode 100644
index 89878cec..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/hmac.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* hmac.c - TinyCrypt implementation of the HMAC algorithm */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-#include <tinycrypt/hmac.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
-
-static void rekey(uint8_t *key, const uint8_t *new_key, unsigned int key_size)
-{
-	const uint8_t inner_pad = (uint8_t) 0x36;
-	const uint8_t outer_pad = (uint8_t) 0x5c;
-	unsigned int i;
-
-	for (i = 0; i < key_size; ++i) {
-		key[i] = inner_pad ^ new_key[i];
-		key[i + TC_SHA256_BLOCK_SIZE] = outer_pad ^ new_key[i];
-	}
-	for (; i < TC_SHA256_BLOCK_SIZE; ++i) {
-		key[i] = inner_pad; key[i + TC_SHA256_BLOCK_SIZE] = outer_pad;
-	}
-}
-
-int tc_hmac_set_key(TCHmacState_t ctx, const uint8_t *key,
-		    unsigned int key_size)
-{
-
-	/* input sanity check: */
-	if (ctx == (TCHmacState_t) 0 ||
-	    key == (const uint8_t *) 0 ||
-	    key_size == 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	const uint8_t dummy_key[key_size];
-	struct tc_hmac_state_struct dummy_state;
-
-	if (key_size <= TC_SHA256_BLOCK_SIZE) {
-		/*
-		 * The next three lines consist of dummy calls just to avoid
-		 * certain timing attacks. Without these dummy calls,
-		 * adversaries would be able to learn whether the key_size is
-		 * greater than TC_SHA256_BLOCK_SIZE by measuring the time
-		 * consumed in this process.
-		 */
-		(void)tc_sha256_init(&dummy_state.hash_state);
-		(void)tc_sha256_update(&dummy_state.hash_state,
-				       dummy_key,
-				       key_size);
-		(void)tc_sha256_final(&dummy_state.key[TC_SHA256_DIGEST_SIZE],
-				      &dummy_state.hash_state);
-
-		/* Actual code for when key_size <= TC_SHA256_BLOCK_SIZE: */
-		rekey(ctx->key, key, key_size);
-	} else {
-		(void)tc_sha256_init(&ctx->hash_state);
-		(void)tc_sha256_update(&ctx->hash_state, key, key_size);
-		(void)tc_sha256_final(&ctx->key[TC_SHA256_DIGEST_SIZE],
-				      &ctx->hash_state);
-		rekey(ctx->key,
-		      &ctx->key[TC_SHA256_DIGEST_SIZE],
-		      TC_SHA256_DIGEST_SIZE);
-	}
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_hmac_init(TCHmacState_t ctx)
-{
-
-	/* input sanity check: */
-	if (ctx == (TCHmacState_t) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-  (void) tc_sha256_init(&ctx->hash_state);
-  (void) tc_sha256_update(&ctx->hash_state, ctx->key, TC_SHA256_BLOCK_SIZE);
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_hmac_update(TCHmacState_t ctx,
-		   const void *data,
-		   unsigned int data_length)
-{
-
-	/* input sanity check: */
-	if (ctx == (TCHmacState_t) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	(void)tc_sha256_update(&ctx->hash_state, data, data_length);
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_hmac_final(uint8_t *tag, unsigned int taglen, TCHmacState_t ctx)
-{
-
-	/* input sanity check: */
-	if (tag == (uint8_t *) 0 ||
-	    taglen != TC_SHA256_DIGEST_SIZE ||
-	    ctx == (TCHmacState_t) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	(void) tc_sha256_final(tag, &ctx->hash_state);
-
-	(void)tc_sha256_init(&ctx->hash_state);
-	(void)tc_sha256_update(&ctx->hash_state,
-			       &ctx->key[TC_SHA256_BLOCK_SIZE],
-				TC_SHA256_BLOCK_SIZE);
-	(void)tc_sha256_update(&ctx->hash_state, tag, TC_SHA256_DIGEST_SIZE);
-	(void)tc_sha256_final(tag, &ctx->hash_state);
-
-	/* destroy the current state */
-	_set(ctx, 0, sizeof(*ctx));
-
-	return TC_CRYPTO_SUCCESS;
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/hmac_prng.c b/lib/bt/porting/ext/tinycrypt/src/hmac_prng.c
deleted file mode 100644
index 68b5b1fa..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/hmac_prng.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* hmac_prng.c - TinyCrypt implementation of HMAC-PRNG */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-#include <tinycrypt/hmac_prng.h>
-#include <tinycrypt/hmac.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
-
-/*
- * min bytes in the seed string.
- * MIN_SLEN*8 must be at least the expected security level.
- */
-static const unsigned int MIN_SLEN = 32;
-
-/*
- * max bytes in the seed string;
- * SP800-90A specifies a maximum of 2^35 bits (i.e., 2^32 bytes).
- */
-static const unsigned int MAX_SLEN = UINT32_MAX;
-
-/*
- * max bytes in the personalization string;
- * SP800-90A specifies a maximum of 2^35 bits (i.e., 2^32 bytes).
- */
-static const unsigned int MAX_PLEN = UINT32_MAX;
-
-/*
- * max bytes in the additional_info string;
- * SP800-90A specifies a maximum of 2^35 bits (i.e., 2^32 bytes).
- */
-static const unsigned int MAX_ALEN = UINT32_MAX;
-
-/*
- * max number of generates between re-seeds;
- * TinyCrypt accepts up to (2^32 - 1) which is the maximal value of
- * a 32-bit unsigned int variable, while SP800-90A specifies a maximum of 2^48.
- */
-static const unsigned int MAX_GENS = UINT32_MAX;
-
-/*
- * maximum bytes per generate call;
- * SP800-90A specifies a maximum up to 2^19.
- */
-static const unsigned int  MAX_OUT = (1 << 19);
-
-/*
- * Assumes: prng != NULL, e != NULL, len >= 0.
- */
-static void update(TCHmacPrng_t prng, const uint8_t *e, unsigned int len)
-{
-	const uint8_t separator0 = 0x00;
-	const uint8_t separator1 = 0x01;
-
-	/* use current state, e and separator 0 to compute a new prng key: */
-	(void)tc_hmac_init(&prng->h);
-	(void)tc_hmac_update(&prng->h, prng->v, sizeof(prng->v));
-	(void)tc_hmac_update(&prng->h, &separator0, sizeof(separator0));
-	(void)tc_hmac_update(&prng->h, e, len);
-	(void)tc_hmac_final(prng->key, sizeof(prng->key), &prng->h);
-	/* configure the new prng key into the prng's instance of hmac */
-	(void)tc_hmac_set_key(&prng->h, prng->key, sizeof(prng->key));
-
-	/* use the new key to compute a new state variable v */
-	(void)tc_hmac_init(&prng->h);
-	(void)tc_hmac_update(&prng->h, prng->v, sizeof(prng->v));
-	(void)tc_hmac_final(prng->v, sizeof(prng->v), &prng->h);
-
-	/* use current state, e and separator 1 to compute a new prng key: */
-	(void)tc_hmac_init(&prng->h);
-	(void)tc_hmac_update(&prng->h, prng->v, sizeof(prng->v));
-	(void)tc_hmac_update(&prng->h, &separator1, sizeof(separator1));
-	(void)tc_hmac_update(&prng->h, e, len);
-	(void)tc_hmac_final(prng->key, sizeof(prng->key), &prng->h);
-	/* configure the new prng key into the prng's instance of hmac */
-	(void)tc_hmac_set_key(&prng->h, prng->key, sizeof(prng->key));
-
-	/* use the new key to compute a new state variable v */
-	(void)tc_hmac_init(&prng->h);
-	(void)tc_hmac_update(&prng->h, prng->v, sizeof(prng->v));
-	(void)tc_hmac_final(prng->v, sizeof(prng->v), &prng->h);
-}
-
-int tc_hmac_prng_init(TCHmacPrng_t prng,
-		      const uint8_t *personalization,
-		      unsigned int plen)
-{
-
-	/* input sanity check: */
-	if (prng == (TCHmacPrng_t) 0 ||
-	    personalization == (uint8_t *) 0 ||
-	    plen > MAX_PLEN) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	/* put the generator into a known state: */
-	_set(prng->key, 0x00, sizeof(prng->key));
-	_set(prng->v, 0x01, sizeof(prng->v));
-	tc_hmac_set_key(&prng->h, prng->key, sizeof(prng->key));
-	/* update assumes SOME key has been configured into HMAC */
-
-	update(prng, personalization, plen);
-
-	/* force a reseed before allowing tc_hmac_prng_generate to succeed: */
-	prng->countdown = 0;
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_hmac_prng_reseed(TCHmacPrng_t prng,
-			const uint8_t *seed,
-			unsigned int seedlen,
-			const uint8_t *additional_input,
-			unsigned int additionallen)
-{
-
-	/* input sanity check: */
-	if (prng == (TCHmacPrng_t) 0 ||
-	    seed == (const uint8_t *) 0 ||
-	    seedlen < MIN_SLEN ||
-	    seedlen > MAX_SLEN) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	if (additional_input != (const uint8_t *) 0) {
-		/*
-		 * Abort if additional_input is provided but has inappropriate
-		 * length
-		 */
-		if (additionallen == 0 ||
-		    additionallen > MAX_ALEN) {
-			return TC_CRYPTO_FAIL;
-		} else {
-		/* call update for the seed and additional_input */
-		update(prng, seed, seedlen);
-		update(prng, additional_input, additionallen);
-		}
-	} else {
-		/* call update only for the seed */
-		update(prng, seed, seedlen);
-	}
-
-	/* ... and enable hmac_prng_generate */
-	prng->countdown = MAX_GENS;
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_hmac_prng_generate(uint8_t *out, unsigned int outlen, TCHmacPrng_t prng)
-{
-	unsigned int bufferlen;
-
-	/* input sanity check: */
-	if (out == (uint8_t *) 0 ||
-	    prng == (TCHmacPrng_t) 0 ||
-	    outlen == 0 ||
-	    outlen > MAX_OUT) {
-		return TC_CRYPTO_FAIL;
-	} else if (prng->countdown == 0) {
-		return TC_HMAC_PRNG_RESEED_REQ;
-	}
-
-	prng->countdown--;
-
-	while (outlen != 0) {
-		/* operate HMAC in OFB mode to create "random" outputs */
-		(void)tc_hmac_init(&prng->h);
-		(void)tc_hmac_update(&prng->h, prng->v, sizeof(prng->v));
-		(void)tc_hmac_final(prng->v, sizeof(prng->v), &prng->h);
-
-		bufferlen = (TC_SHA256_DIGEST_SIZE > outlen) ?
-			outlen : TC_SHA256_DIGEST_SIZE;
-		(void)_copy(out, bufferlen, prng->v, bufferlen);
-
-		out += bufferlen;
-		outlen = (outlen > TC_SHA256_DIGEST_SIZE) ?
-			(outlen - TC_SHA256_DIGEST_SIZE) : 0;
-	}
-
-	/* block future PRNG compromises from revealing past state */
-	update(prng, prng->v, TC_SHA256_DIGEST_SIZE);
-
-	return TC_CRYPTO_SUCCESS;
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/sha256.c b/lib/bt/porting/ext/tinycrypt/src/sha256.c
deleted file mode 100644
index b4efd204..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/sha256.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/* sha256.c - TinyCrypt SHA-256 crypto hash algorithm implementation */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-#include <tinycrypt/sha256.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
-
-static void compress(unsigned int *iv, const uint8_t *data);
-
-int tc_sha256_init(TCSha256State_t s)
-{
-	/* input sanity check: */
-	if (s == (TCSha256State_t) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	/*
-	 * Setting the initial state values.
-	 * These values correspond to the first 32 bits of the fractional parts
-	 * of the square roots of the first 8 primes: 2, 3, 5, 7, 11, 13, 17
-	 * and 19.
-	 */
-	_set((uint8_t *) s, 0x00, sizeof(*s));
-	s->iv[0] = 0x6a09e667;
-	s->iv[1] = 0xbb67ae85;
-	s->iv[2] = 0x3c6ef372;
-	s->iv[3] = 0xa54ff53a;
-	s->iv[4] = 0x510e527f;
-	s->iv[5] = 0x9b05688c;
-	s->iv[6] = 0x1f83d9ab;
-	s->iv[7] = 0x5be0cd19;
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_sha256_update(TCSha256State_t s, const uint8_t *data, size_t datalen)
-{
-	/* input sanity check: */
-	if (s == (TCSha256State_t) 0 ||
-	    data == (void *) 0) {
-		return TC_CRYPTO_FAIL;
-	} else if (datalen == 0) {
-		return TC_CRYPTO_SUCCESS;
-	}
-
-	while (datalen-- > 0) {
-		s->leftover[s->leftover_offset++] = *(data++);
-		if (s->leftover_offset >= TC_SHA256_BLOCK_SIZE) {
-			compress(s->iv, s->leftover);
-			s->leftover_offset = 0;
-			s->bits_hashed += (TC_SHA256_BLOCK_SIZE << 3);
-		}
-	}
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-int tc_sha256_final(uint8_t *digest, TCSha256State_t s)
-{
-	unsigned int i;
-
-	/* input sanity check: */
-	if (digest == (uint8_t *) 0 ||
-	    s == (TCSha256State_t) 0) {
-		return TC_CRYPTO_FAIL;
-	}
-
-	s->bits_hashed += (s->leftover_offset << 3);
-
-	s->leftover[s->leftover_offset++] = 0x80; /* always room for one byte */
-	if (s->leftover_offset > (sizeof(s->leftover) - 8)) {
-		/* there is not room for all the padding in this block */
-		_set(s->leftover + s->leftover_offset, 0x00,
-		     sizeof(s->leftover) - s->leftover_offset);
-		compress(s->iv, s->leftover);
-		s->leftover_offset = 0;
-	}
-
-	/* add the padding and the length in big-Endian format */
-	_set(s->leftover + s->leftover_offset, 0x00,
-	     sizeof(s->leftover) - 8 - s->leftover_offset);
-	s->leftover[sizeof(s->leftover) - 1] = (uint8_t)(s->bits_hashed);
-	s->leftover[sizeof(s->leftover) - 2] = (uint8_t)(s->bits_hashed >> 8);
-	s->leftover[sizeof(s->leftover) - 3] = (uint8_t)(s->bits_hashed >> 16);
-	s->leftover[sizeof(s->leftover) - 4] = (uint8_t)(s->bits_hashed >> 24);
-	s->leftover[sizeof(s->leftover) - 5] = (uint8_t)(s->bits_hashed >> 32);
-	s->leftover[sizeof(s->leftover) - 6] = (uint8_t)(s->bits_hashed >> 40);
-	s->leftover[sizeof(s->leftover) - 7] = (uint8_t)(s->bits_hashed >> 48);
-	s->leftover[sizeof(s->leftover) - 8] = (uint8_t)(s->bits_hashed >> 56);
-
-	/* hash the padding and length */
-	compress(s->iv, s->leftover);
-
-	/* copy the iv out to digest */
-	for (i = 0; i < TC_SHA256_STATE_BLOCKS; ++i) {
-		unsigned int t = *((unsigned int *) &s->iv[i]);
-		*digest++ = (uint8_t)(t >> 24);
-		*digest++ = (uint8_t)(t >> 16);
-		*digest++ = (uint8_t)(t >> 8);
-		*digest++ = (uint8_t)(t);
-	}
-
-	/* destroy the current state */
-	_set(s, 0, sizeof(*s));
-
-	return TC_CRYPTO_SUCCESS;
-}
-
-/*
- * Initializing SHA-256 Hash constant words K.
- * These values correspond to the first 32 bits of the fractional parts of the
- * cube roots of the first 64 primes between 2 and 311.
- */
-static const unsigned int k256[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
-};
-
-static inline unsigned int ROTR(unsigned int a, unsigned int n)
-{
-	return (((a) >> n) | ((a) << (32 - n)));
-}
-
-#define Sigma0(a)(ROTR((a), 2) ^ ROTR((a), 13) ^ ROTR((a), 22))
-#define Sigma1(a)(ROTR((a), 6) ^ ROTR((a), 11) ^ ROTR((a), 25))
-#define sigma0(a)(ROTR((a), 7) ^ ROTR((a), 18) ^ ((a) >> 3))
-#define sigma1(a)(ROTR((a), 17) ^ ROTR((a), 19) ^ ((a) >> 10))
-
-#define Ch(a, b, c)(((a) & (b)) ^ ((~(a)) & (c)))
-#define Maj(a, b, c)(((a) & (b)) ^ ((a) & (c)) ^ ((b) & (c)))
-
-static inline unsigned int BigEndian(const uint8_t **c)
-{
-	unsigned int n = 0;
-
-	n = (((unsigned int)(*((*c)++))) << 24);
-	n |= ((unsigned int)(*((*c)++)) << 16);
-	n |= ((unsigned int)(*((*c)++)) << 8);
-	n |= ((unsigned int)(*((*c)++)));
-	return n;
-}
-
-static void compress(unsigned int *iv, const uint8_t *data)
-{
-	unsigned int a, b, c, d, e, f, g, h;
-	unsigned int s0, s1;
-	unsigned int t1, t2;
-	unsigned int work_space[16];
-	unsigned int n;
-	unsigned int i;
-
-	a = iv[0]; b = iv[1]; c = iv[2]; d = iv[3];
-	e = iv[4]; f = iv[5]; g = iv[6]; h = iv[7];
-
-	for (i = 0; i < 16; ++i) {
-		n = BigEndian(&data);
-		t1 = work_space[i] = n;
-		t1 += h + Sigma1(e) + Ch(e, f, g) + k256[i];
-		t2 = Sigma0(a) + Maj(a, b, c);
-		h = g; g = f; f = e; e = d + t1;
-		d = c; c = b; b = a; a = t1 + t2;
-	}
-
-	for ( ; i < 64; ++i) {
-		s0 = work_space[(i+1)&0x0f];
-		s0 = sigma0(s0);
-		s1 = work_space[(i+14)&0x0f];
-		s1 = sigma1(s1);
-
-		t1 = work_space[i&0xf] += s0 + s1 + work_space[(i+9)&0xf];
-		t1 += h + Sigma1(e) + Ch(e, f, g) + k256[i];
-		t2 = Sigma0(a) + Maj(a, b, c);
-		h = g; g = f; f = e; e = d + t1;
-		d = c; c = b; b = a; a = t1 + t2;
-	}
-
-	iv[0] += a; iv[1] += b; iv[2] += c; iv[3] += d;
-	iv[4] += e; iv[5] += f; iv[6] += g; iv[7] += h;
-}
diff --git a/lib/bt/porting/ext/tinycrypt/src/utils.c b/lib/bt/porting/ext/tinycrypt/src/utils.c
deleted file mode 100644
index 13cc4951..00000000
--- a/lib/bt/porting/ext/tinycrypt/src/utils.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* utils.c - TinyCrypt platform-dependent run-time operations */
-
-/*
- *  Copyright (C) 2017 by Intel Corporation, 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 Intel Corporation nor the names of its 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.
- */
-
-#include <tinycrypt/utils.h>
-#include <tinycrypt/constants.h>
-
-#include <string.h>
-
-#define MASK_TWENTY_SEVEN 0x1b
-
-unsigned int _copy(uint8_t *to, unsigned int to_len,
-		   const uint8_t *from, unsigned int from_len)
-{
-	if (from_len <= to_len) {
-		(void)memcpy(to, from, from_len);
-		return from_len;
-	} else {
-		return TC_CRYPTO_FAIL;
-	}
-}
-
-void _set(void *to, uint8_t val, unsigned int len)
-{
-	(void)memset(to, val, len);
-}
-
-/*
- * Doubles the value of a byte for values up to 127.
- */
-uint8_t _double_byte(uint8_t a)
-{
-	return ((a<<1) ^ ((a>>7) * MASK_TWENTY_SEVEN));
-}
-
-int _compare(const uint8_t *a, const uint8_t *b, size_t size)
-{
-	const uint8_t *tempa = a;
-	const uint8_t *tempb = b;
-	uint8_t result = 0;
-
-	for (unsigned int i = 0; i < size; i++) {
-		result |= tempa[i] ^ tempb[i];
-	}
-	return result;
-}
diff --git a/lib/bt/porting/include/ble_hci_trans.h b/lib/bt/porting/include/ble_hci_trans.h
deleted file mode 100644
index 05267b6b..00000000
--- a/lib/bt/porting/include/ble_hci_trans.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef H_HCI_TRANSPORT_
-#define H_HCI_TRANSPORT_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <inttypes.h>
-#include "os/os_mempool.h"
-
-#define BLE_HCI_TRANS_CMD_SZ        260
-/*** Type of buffers for holding commands and events. */
-/**
- * Controller-to-host event buffers.  Events have one of two priorities:
- * o Low-priority   (BLE_HCI_TRANS_BUF_EVT_LO)
- * o High-priority  (BLE_HCI_TRANS_BUF_EVT_HI)
- *
- * Low-priority event buffers are only used for advertising reports.  If there
- * are no free low-priority event buffers, then an incoming advertising report
- * will get dropped.
- *
- * High-priority event buffers are for everything except advertising reports.
- * If there are no free high-priority event buffers, a request to allocate one
- * will try to allocate a low-priority buffer instead.
- *
- * If you want all events to be given equal treatment, then you should allocate
- * low-priority events only.
- *
- * Event priorities solve the problem of critical events getting dropped due to
- * a flood of advertising reports.  This solution is likely temporary: when
- * HCI flow control is added, event priorities may become obsolete.
- *
- * Not all transports distinguish between low and high priority events.  If the
- * transport does not have separate settings for low and high buffer counts,
- * then it treats all events with equal priority.
- */
-#define BLE_HCI_TRANS_BUF_EVT_LO    1
-#define BLE_HCI_TRANS_BUF_EVT_HI    2
-
-/* Host-to-controller command. */
-#define BLE_HCI_TRANS_BUF_CMD       3
-
-/** Callback function types; executed when HCI packets are received. */
-typedef int ble_hci_trans_rx_cmd_fn(uint8_t *cmd, void *arg);
-typedef int ble_hci_trans_rx_acl_fn(struct os_mbuf *om, void *arg);
-
-#if SOC_ESP_NIMBLE_CONTROLLER && CONFIG_BT_CONTROLLER_ENABLED
-#define ble_transport_alloc_cmd() ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_CMD)
-#define ble_transport_alloc_event(X) ble_hci_trans_buf_alloc(X ? BLE_HCI_TRANS_BUF_EVT_LO : BLE_HCI_TRANS_BUF_EVT_HI)
-#define ble_transport_free ble_hci_trans_buf_free
-
-struct ble_hci_trans_funcs_t {
-    int(*_ble_hci_trans_hs_acl_tx)(struct os_mbuf *om);
-    int(*_ble_hci_trans_hs_cmd_tx)(uint8_t *cmd);
-    int(*_ble_hci_trans_ll_acl_tx)(struct os_mbuf *om);
-    int(*_ble_hci_trans_ll_evt_tx)(uint8_t *hci_ev);
-    int(*_ble_hci_trans_reset)(void);
-    int(*_ble_hci_trans_set_acl_free_cb)(os_mempool_put_fn *cb, void *arg);
-};
-
-extern struct ble_hci_trans_funcs_t *ble_hci_trans_funcs_ptr;
-
-/**
- * Sends an HCI event from the controller to the host.
- *
- * @param cmd                   The HCI event to send.  This buffer must be
- *                                  allocated via ble_hci_trans_buf_alloc().
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-extern int r_ble_hci_trans_ll_evt_tx(uint8_t *hci_ev);
-#define ble_hci_trans_ll_evt_tx ble_hci_trans_funcs_ptr->_ble_hci_trans_ll_evt_tx
-
-/**
- * Sends ACL data from controller to host.
- *
- * @param om                    The ACL data packet to send.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-extern int r_ble_hci_trans_ll_acl_tx(struct os_mbuf *om);
-#define ble_hci_trans_ll_acl_tx ble_hci_trans_funcs_ptr->_ble_hci_trans_ll_acl_tx
-
-/**
- * Sends an HCI command from the host to the controller.
- *
- * @param cmd                   The HCI command to send.  This buffer must be
- *                                  allocated via ble_hci_trans_buf_alloc().
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-extern int r_ble_hci_trans_hs_cmd_tx(uint8_t *cmd);
-#define ble_hci_trans_hs_cmd_tx ble_hci_trans_funcs_ptr->_ble_hci_trans_hs_cmd_tx
-
-/**
- * Sends ACL data from host to controller.
- *
- * @param om                    The ACL data packet to send.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-extern int r_ble_hci_trans_hs_acl_tx(struct os_mbuf *om);
-#define ble_hci_trans_hs_acl_tx ble_hci_trans_funcs_ptr->_ble_hci_trans_hs_acl_tx
-
-/**
- * Allocates a flat buffer of the specified type.
- *
- * @param type                  The type of buffer to allocate; one of the
- *                                  BLE_HCI_TRANS_BUF_[...] constants.
- *
- * @return                      The allocated buffer on success;
- *                              NULL on buffer exhaustion.
- */
-extern uint8_t *r_ble_hci_trans_buf_alloc(int type);
-#define ble_hci_trans_buf_alloc r_ble_hci_trans_buf_alloc
-
-/**
- * Frees the specified flat buffer.  The buffer must have been allocated via
- * ble_hci_trans_buf_alloc().
- *
- * @param buf                   The buffer to free.
- */
-extern void r_ble_hci_trans_buf_free(uint8_t *buf);
-#define ble_hci_trans_buf_free r_ble_hci_trans_buf_free
-
-/**
- * Configures a callback to get executed whenever an ACL data packet is freed.
- * The function is called immediately before the free occurs.
- *
- * @param cb                    The callback to configure.
- * @param arg                   An optional argument to pass to the callback.
- *
- * @return                      0 on success;
- *                              BLE_ERR_UNSUPPORTED if the transport does not
- *                                  support this operation.
- */
-extern int r_ble_hci_trans_set_acl_free_cb(os_mempool_put_fn *cb, void *arg);
-#define ble_hci_trans_set_acl_free_cb ble_hci_trans_funcs_ptr->_ble_hci_trans_set_acl_free_cb
-
-/**
- * Configures the HCI transport to operate with a controller.  The transport
- * will execute specified callbacks upon receiving HCI packets from the host.
- *
- * @param cmd_cb                The callback to execute upon receiving an HCI
- *                                  command.
- * @param cmd_arg               Optional argument to pass to the command
- *                                  callback.
- * @param acl_cb                The callback to execute upon receiving ACL
- *                                  data.
- * @param acl_arg               Optional argument to pass to the ACL
- *                                  callback.
- */
-extern void r_ble_hci_trans_cfg_ll(ble_hci_trans_rx_cmd_fn *cmd_cb,
-                                   void *cmd_arg,
-                                   ble_hci_trans_rx_acl_fn *acl_cb,
-                                   void *acl_arg);
-#define ble_hci_trans_cfg_ll r_ble_hci_trans_cfg_ll
-
-/**
- * Configures the HCI transport to operate with a host.  The transport will
- * execute specified callbacks upon receiving HCI packets from the controller.
- *
- * @param evt_cb                The callback to execute upon receiving an HCI
- *                                  event.
- * @param evt_arg               Optional argument to pass to the event
- *                                  callback.
- * @param acl_cb                The callback to execute upon receiving ACL
- *                                  data.
- * @param acl_arg               Optional argument to pass to the ACL
- *                                  callback.
- */
-extern void r_ble_hci_trans_cfg_hs(ble_hci_trans_rx_cmd_fn *evt_cb,
-                                   void *evt_arg,
-                                   ble_hci_trans_rx_acl_fn *acl_cb,
-                                   void *acl_arg);
-#define ble_hci_trans_cfg_hs r_ble_hci_trans_cfg_hs
-
-/**
- * Resets the HCI module to a clean state.  Frees all buffers and reinitializes
- * the underlying transport.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-extern int r_ble_hci_trans_reset(void);
-#define ble_hci_trans_reset ble_hci_trans_funcs_ptr->_ble_hci_trans_reset
-
-void esp_ble_hci_trans_init(uint8_t);
-
-#else
-/**
- * Sends an HCI event from the controller to the host.
- *
- * @param cmd                   The HCI event to send.  This buffer must be
- *                                  allocated via ble_hci_trans_buf_alloc().
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-int ble_hci_trans_ll_evt_tx(uint8_t *hci_ev);
-
-/**
- * Sends ACL data from controller to host.
- *
- * @param om                    The ACL data packet to send.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-int ble_hci_trans_ll_acl_tx(struct os_mbuf *om);
-
-/**
- * Sends an HCI command from the host to the controller.
- *
- * @param cmd                   The HCI command to send.  This buffer must be
- *                                  allocated via ble_hci_trans_buf_alloc().
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-int ble_hci_trans_hs_cmd_tx(uint8_t *cmd);
-
-/**
- * Sends ACL data from host to controller.
- *
- * @param om                    The ACL data packet to send.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-int ble_hci_trans_hs_acl_tx(struct os_mbuf *om);
-
-/**
- * Allocates a flat buffer of the specified type.
- *
- * @param type                  The type of buffer to allocate; one of the
- *                                  BLE_HCI_TRANS_BUF_[...] constants.
- *
- * @return                      The allocated buffer on success;
- *                              NULL on buffer exhaustion.
- */
-int esp_ble_hci_trans_hs_cmd_tx(uint8_t *cmd);
-
-/**
- * Sends ACL data from host to controller.
- *
- * @param om                    The ACL data packet to send.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-int esp_ble_hci_trans_hs_acl_tx(struct os_mbuf *om);
-
-/**
- * Allocates a flat buffer of the specified type.
- *
- * @param type                  The type of buffer to allocate; one of the
- *                                  BLE_HCI_TRANS_BUF_[...] constants.
- *
- * @return                      The allocated buffer on success;
- *                              NULL on buffer exhaustion.
- */
-uint8_t *esp_ble_hci_trans_buf_alloc(int type);
-
-/**
- * Frees the specified flat buffer.  The buffer must have been allocated via
- * ble_hci_trans_buf_alloc().
- *
- * @param buf                   The buffer to free.
- */
-void esp_ble_hci_trans_buf_free(uint8_t *buf);
-
-/**
- * Configures the HCI transport to operate with a host.  The transport will
- * execute specified callbacks upon receiving HCI packets from the controller.
- *
- * @param evt_cb                The callback to execute upon receiving an HCI
- *                                  event.
- * @param evt_arg               Optional argument to pass to the event
- *                                  callback.
- * @param acl_cb                The callback to execute upon receiving ACL
- *                                  data.
- * @param acl_arg               Optional argument to pass to the ACL
- *                                  callback.
- */
-void esp_ble_hci_trans_cfg_hs(ble_hci_trans_rx_cmd_fn *evt_cb,
-                              void *evt_arg,
-                              ble_hci_trans_rx_acl_fn *acl_cb,
-                              void *acl_arg);
-
-/**
- * Resets the HCI module to a clean state.  Frees all buffers and reinitializes
- * the underlying transport.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-int esp_ble_hci_trans_reset(void);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* H_HCI_TRANSPORT_ */
diff --git a/lib/bt/porting/mem/bt_osi_mem.c b/lib/bt/porting/mem/bt_osi_mem.c
index 69c656dd..612099d2 100644
--- a/lib/bt/porting/mem/bt_osi_mem.c
+++ b/lib/bt/porting/mem/bt_osi_mem.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -7,18 +7,31 @@
 #include "esp_attr.h"
 #include "esp_heap_caps.h"
 #include "sdkconfig.h"
+#include "esp_log.h"
+#include <assert.h>
 
+static uint8_t log_count;
 IRAM_ATTR void *bt_osi_mem_malloc(size_t size)
 {
+    void *mem = NULL;
 #ifdef CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
-    return heap_caps_malloc(size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
+    mem = heap_caps_malloc(size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
 #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
-    return heap_caps_malloc(size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
+    mem =  heap_caps_malloc(size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
 #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_IRAM_8BIT
-    return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
+    mem =  heap_caps_malloc_prefer(size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
 #else
-    return malloc(size);
+    mem =  malloc(size);
 #endif
+    if (!mem) {
+        log_count ++;
+        if ((log_count % 100) == 0) {
+            ESP_EARLY_LOGI("ESP_LOG_INFO","malloc failed (size %zu)",size);
+            log_count = 0;
+        }
+       assert(mem != NULL);
+    }
+    return mem;
 }
 
 IRAM_ATTR void *bt_osi_mem_calloc(size_t n, size_t size)
diff --git a/lib/bt/porting/mem/bt_osi_mem.h b/lib/bt/porting/mem/bt_osi_mem.h
deleted file mode 100644
index 9ab06d0a..00000000
--- a/lib/bt/porting/mem/bt_osi_mem.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include "sdkconfig.h"
-#include "esp_attr.h"
-#include "esp_heap_caps.h"
-
-void *bt_osi_mem_malloc(size_t size);
-
-void *bt_osi_mem_calloc(size_t n, size_t size);
-
-void *bt_osi_mem_malloc_internal(size_t size);
-
-void *bt_osi_mem_calloc_internal(size_t n, size_t size);
-
-void bt_osi_mem_free(void *ptr);
diff --git a/lib/bt/porting/nimble/include/nimble/ble.h b/lib/bt/porting/nimble/include/nimble/ble.h
deleted file mode 100644
index f037d356..00000000
--- a/lib/bt/porting/nimble/include/nimble/ble.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 The Apache Software Foundation (ASF)
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * SPDX-FileContributor: 2019-2022 Espressif Systems (Shanghai) CO LTD
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 H_BLE_
-#define H_BLE_
-
-#include <inttypes.h>
-#include <string.h>
-#include "syscfg/syscfg.h"
-#include "os/os.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The number of advertising instances */
-#define BLE_ADV_INSTANCES    (MYNEWT_VAL(BLE_MULTI_ADV_INSTANCES) + 1)
-
-/* BLE encryption block definitions */
-#define BLE_ENC_BLOCK_SIZE       (16)
-
-/* 4 byte header + 251 byte payload. */
-#define BLE_ACL_MAX_PKT_SIZE     255
-
-struct ble_encryption_block
-{
-    uint8_t     key[BLE_ENC_BLOCK_SIZE];
-    uint8_t     plain_text[BLE_ENC_BLOCK_SIZE];
-    uint8_t     cipher_text[BLE_ENC_BLOCK_SIZE];
-};
-
-/*
- * BLE MBUF structure:
- *
- * The BLE mbuf structure is as follows. Note that this structure applies to
- * the packet header mbuf (not mbufs that are part of a "packet chain"):
- *      struct os_mbuf          (16)
- *      struct os_mbuf_pkthdr   (8)
- *      struct ble_mbuf_hdr     (8)
- *      Data buffer             (payload size, in bytes)
- *
- * The BLE mbuf header contains the following:
- *  flags: bitfield with the following values
- *      0x01:   Set if there was a match on the whitelist
- *      0x02:   Set if a connect request was transmitted upon receiving pdu
- *      0x04:   Set the first time we transmit the PDU (used to detect retry).
- *  channel: The logical BLE channel PHY channel # (0 - 39)
- *  crcok: flag denoting CRC check passed (1) or failed (0).
- *  rssi: RSSI, in dBm.
- */
-struct ble_mbuf_hdr_rxinfo
-{
-    uint16_t flags;
-    uint8_t channel;
-    uint8_t handle;
-    int8_t  rssi;
-    /* XXX: we could just use single phy_mode field */
-    int8_t  phy;
-    uint8_t phy_mode;
-#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
-    int8_t  rpa_index;
-#endif
-#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
-    void *user_data;
-#endif
-};
-
-/*
- * Flag definitions for rxinfo
- *
- * Note: it's ok to have symbols with the same values as long as they cannot be
- *       set for the same PDU (e.g. one use by scanner, other one used by
- *       connection)
- */
-#define BLE_MBUF_HDR_F_CONN_CREDIT      (0x8000)
-#define BLE_MBUF_HDR_F_IGNORED          (0x8000)
-#define BLE_MBUF_HDR_F_SCAN_REQ_TXD     (0x4000)
-#define BLE_MBUF_HDR_F_INITA_RESOLVED   (0x2000)
-#define BLE_MBUF_HDR_F_TARGETA_RESOLVED (0x2000)
-#define BLE_MBUF_HDR_F_EXT_ADV_SEC      (0x1000)
-#define BLE_MBUF_HDR_F_EXT_ADV          (0x0800)
-#define BLE_MBUF_HDR_F_RESOLVED         (0x0400)
-#define BLE_MBUF_HDR_F_AUX_PTR_WAIT     (0x0200)
-#define BLE_MBUF_HDR_F_AUX_INVALID      (0x0100)
-#define BLE_MBUF_HDR_F_CRC_OK           (0x0080)
-#define BLE_MBUF_HDR_F_DEVMATCH         (0x0040)
-#define BLE_MBUF_HDR_F_MIC_FAILURE      (0x0020)
-#define BLE_MBUF_HDR_F_SCAN_RSP_TXD     (0x0010)
-#define BLE_MBUF_HDR_F_SCAN_RSP_RXD     (0x0008)
-#define BLE_MBUF_HDR_F_RXSTATE_MASK     (0x0007)
-
-/* Transmit info. NOTE: no flags defined */
-struct ble_mbuf_hdr_txinfo
-{
-    uint8_t flags;
-    uint8_t reserve0;
-    uint8_t pyld_len;
-    uint8_t hdr_byte;
-    uint16_t offset;
-};
-
-struct ble_mbuf_hdr
-{
-    union {
-        struct ble_mbuf_hdr_rxinfo rxinfo;
-        struct ble_mbuf_hdr_txinfo txinfo;
-    };
-    uint32_t beg_cputime;
-    uint32_t rem_usecs;
-};
-
-#define BLE_MBUF_HDR_IGNORED(hdr) \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_IGNORED))
-
-#define BLE_MBUF_HDR_SCAN_REQ_TXD(hdr) \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_SCAN_REQ_TXD))
-
-#define BLE_MBUF_HDR_EXT_ADV_SEC(hdr) \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_EXT_ADV_SEC))
-
-#define BLE_MBUF_HDR_EXT_ADV(hdr) \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_EXT_ADV))
-
-#define BLE_MBUF_HDR_DEVMATCH(hdr) \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_DEVMATCH))
-
-#define BLE_MBUF_HDR_SCAN_RSP_RXD(hdr) \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_SCAN_RSP_RXD))
-
-#define BLE_MBUF_HDR_AUX_INVALID(hdr) \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_AUX_INVALID))
-
-#define BLE_MBUF_HDR_WAIT_AUX(hdr)      \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_AUX_PTR_WAIT))
-
-#define BLE_MBUF_HDR_CRC_OK(hdr)        \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_CRC_OK))
-
-#define BLE_MBUF_HDR_MIC_FAILURE(hdr)   \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_MIC_FAILURE))
-
-#define BLE_MBUF_HDR_RESOLVED(hdr)      \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_RESOLVED))
-
-#define BLE_MBUF_HDR_INITA_RESOLVED(hdr)      \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_INITA_RESOLVED))
-
-#define BLE_MBUF_HDR_TARGETA_RESOLVED(hdr)      \
-    (!!((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_TARGETA_RESOLVED))
-
-#define BLE_MBUF_HDR_RX_STATE(hdr)      \
-    ((uint8_t)((hdr)->rxinfo.flags & BLE_MBUF_HDR_F_RXSTATE_MASK))
-
-#define BLE_MBUF_HDR_PTR(om)            \
-    (struct ble_mbuf_hdr *)((uint8_t *)om + sizeof(struct os_mbuf) + \
-                            sizeof(struct os_mbuf_pkthdr))
-
-/* BLE mbuf overhead per packet header mbuf */
-#define BLE_MBUF_PKTHDR_OVERHEAD        \
-    (sizeof(struct os_mbuf_pkthdr) + sizeof(struct ble_mbuf_hdr))
-
-#define BLE_MBUF_MEMBLOCK_OVERHEAD      \
-    (sizeof(struct os_mbuf) + BLE_MBUF_PKTHDR_OVERHEAD)
-
-/* Length of host user header.  Only contains the peer's connection handle. */
-#define BLE_MBUF_HS_HDR_LEN     (2)
-
-#define BLE_DEV_ADDR_LEN        (6)
-extern uint8_t g_dev_addr[BLE_DEV_ADDR_LEN];
-extern uint8_t g_random_addr[BLE_DEV_ADDR_LEN];
-
-/* BLE Error Codes (Core v4.2 Vol 2 part D) */
-enum ble_error_codes
-{
-    /* An "error" code of 0x0 means success */
-    BLE_ERR_SUCCESS             = 0x00,
-    BLE_ERR_UNKNOWN_HCI_CMD     = 0x01,
-    BLE_ERR_UNK_CONN_ID         = 0x02,
-    BLE_ERR_HW_FAIL             = 0x03,
-    BLE_ERR_PAGE_TMO            = 0x04,
-    BLE_ERR_AUTH_FAIL           = 0x05,
-    BLE_ERR_PINKEY_MISSING      = 0x06,
-    BLE_ERR_MEM_CAPACITY        = 0x07,
-    BLE_ERR_CONN_SPVN_TMO       = 0x08,
-    BLE_ERR_CONN_LIMIT          = 0x09,
-    BLE_ERR_SYNCH_CONN_LIMIT    = 0x0a,
-    BLE_ERR_ACL_CONN_EXISTS     = 0x0b,
-    BLE_ERR_CMD_DISALLOWED      = 0x0c,
-    BLE_ERR_CONN_REJ_RESOURCES  = 0x0d,
-    BLE_ERR_CONN_REJ_SECURITY   = 0x0e,
-    BLE_ERR_CONN_REJ_BD_ADDR    = 0x0f,
-    BLE_ERR_CONN_ACCEPT_TMO     = 0x10,
-    BLE_ERR_UNSUPPORTED         = 0x11,
-    BLE_ERR_INV_HCI_CMD_PARMS   = 0x12,
-    BLE_ERR_REM_USER_CONN_TERM  = 0x13,
-    BLE_ERR_RD_CONN_TERM_RESRCS = 0x14,
-    BLE_ERR_RD_CONN_TERM_PWROFF = 0x15,
-    BLE_ERR_CONN_TERM_LOCAL     = 0x16,
-    BLE_ERR_REPEATED_ATTEMPTS   = 0x17,
-    BLE_ERR_NO_PAIRING          = 0x18,
-    BLE_ERR_UNK_LMP             = 0x19,
-    BLE_ERR_UNSUPP_REM_FEATURE  = 0x1a,
-    BLE_ERR_SCO_OFFSET          = 0x1b,
-    BLE_ERR_SCO_ITVL            = 0x1c,
-    BLE_ERR_SCO_AIR_MODE        = 0x1d,
-    BLE_ERR_INV_LMP_LL_PARM     = 0x1e,
-    BLE_ERR_UNSPECIFIED         = 0x1f,
-    BLE_ERR_UNSUPP_LMP_LL_PARM  = 0x20,
-    BLE_ERR_NO_ROLE_CHANGE      = 0x21,
-    BLE_ERR_LMP_LL_RSP_TMO      = 0x22,
-    BLE_ERR_LMP_COLLISION       = 0x23,
-    BLE_ERR_LMP_PDU             = 0x24,
-    BLE_ERR_ENCRYPTION_MODE     = 0x25,
-    BLE_ERR_LINK_KEY_CHANGE     = 0x26,
-    BLE_ERR_UNSUPP_QOS          = 0x27,
-    BLE_ERR_INSTANT_PASSED      = 0x28,
-    BLE_ERR_UNIT_KEY_PAIRING    = 0x29,
-    BLE_ERR_DIFF_TRANS_COLL     = 0x2a,
-    /* BLE_ERR_RESERVED         = 0x2b */
-    BLE_ERR_QOS_PARM            = 0x2c,
-    BLE_ERR_QOS_REJECTED        = 0x2d,
-    BLE_ERR_CHAN_CLASS          = 0x2e,
-    BLE_ERR_INSUFFICIENT_SEC    = 0x2f,
-    BLE_ERR_PARM_OUT_OF_RANGE   = 0x30,
-    /* BLE_ERR_RESERVED         = 0x31 */
-    BLE_ERR_PENDING_ROLE_SW     = 0x32,
-    /* BLE_ERR_RESERVED         = 0x33 */
-    BLE_ERR_RESERVED_SLOT       = 0x34,
-    BLE_ERR_ROLE_SW_FAIL        = 0x35,
-    BLE_ERR_INQ_RSP_TOO_BIG     = 0x36,
-    BLE_ERR_SEC_SIMPLE_PAIR     = 0x37,
-    BLE_ERR_HOST_BUSY_PAIR      = 0x38,
-    BLE_ERR_CONN_REJ_CHANNEL    = 0x39,
-    BLE_ERR_CTLR_BUSY           = 0x3a,
-    BLE_ERR_CONN_PARMS          = 0x3b,
-    BLE_ERR_DIR_ADV_TMO         = 0x3c,
-    BLE_ERR_CONN_TERM_MIC       = 0x3d,
-    BLE_ERR_CONN_ESTABLISHMENT  = 0x3e,
-    BLE_ERR_MAC_CONN_FAIL       = 0x3f,
-    BLE_ERR_COARSE_CLK_ADJ      = 0x40,
-    BLE_ERR_TYPE0_SUBMAP_NDEF   = 0x41,
-    BLE_ERR_UNK_ADV_INDENT      = 0x42,
-    BLE_ERR_LIMIT_REACHED       = 0x43,
-    BLE_ERR_OPERATION_CANCELLED = 0x44,
-    BLE_ERR_PACKET_TOO_LONG     = 0x45,
-    BLE_ERR_MAX                 = 0xff
-};
-
-/* HW error codes */
-#define BLE_HW_ERR_DO_NOT_USE           (0) /* XXX: reserve this one for now */
-#define BLE_HW_ERR_HCI_SYNC_LOSS        (1)
-
-/* Own Bluetooth Device address type */
-#define BLE_OWN_ADDR_PUBLIC                  (0x00)
-#define BLE_OWN_ADDR_RANDOM                  (0x01)
-#define BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT      (0x02)
-#define BLE_OWN_ADDR_RPA_RANDOM_DEFAULT      (0x03)
-
-/* Bluetooth Device address type */
-#define BLE_ADDR_PUBLIC      (0x00)
-#define BLE_ADDR_RANDOM      (0x01)
-#define BLE_ADDR_PUBLIC_ID   (0x02)
-#define BLE_ADDR_RANDOM_ID   (0x03)
-
-#define BLE_ADDR_ANY (&(ble_addr_t) { 0, {0, 0, 0, 0, 0, 0} })
-
-#define BLE_ADDR_IS_RPA(addr)     (((addr)->type == BLE_ADDR_RANDOM) && \
-                                   ((addr)->val[5] & 0xc0) == 0x40)
-#define BLE_ADDR_IS_NRPA(addr)    (((addr)->type == BLE_ADDR_RANDOM) && \
-                                   ((addr)->val[5] & 0xc0) == 0x00)
-#define BLE_ADDR_IS_STATIC(addr)  (((addr)->type == BLE_ADDR_RANDOM) && \
-                                   ((addr)->val[5] & 0xc0) == 0xc0)
-
-typedef struct {
-    uint8_t type;
-    uint8_t val[6];
-} ble_addr_t;
-
-
-static inline int ble_addr_cmp(const ble_addr_t *a, const ble_addr_t *b)
-{
-    int type_diff;
-
-    type_diff = a->type - b->type;
-    if (type_diff != 0) {
-        return type_diff;
-    }
-
-    return memcmp(a->val, b->val, sizeof(a->val));
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* H_BLE_ */
diff --git a/lib/bt/porting/nimble/include/nimble/ble_hci_trans.h b/lib/bt/porting/nimble/include/nimble/ble_hci_trans.h
deleted file mode 100644
index 5bbf9224..00000000
--- a/lib/bt/porting/nimble/include/nimble/ble_hci_trans.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 H_HCI_TRANSPORT_
-#define H_HCI_TRANSPORT_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <inttypes.h>
-#include "os/os_mempool.h"
-
-#define BLE_HCI_TRANS_CMD_SZ        260
-/*** Type of buffers for holding commands and events. */
-/**
- * Controller-to-host event buffers.  Events have one of two priorities:
- * o Low-priority   (BLE_HCI_TRANS_BUF_EVT_LO)
- * o High-priority  (BLE_HCI_TRANS_BUF_EVT_HI)
- *
- * Low-priority event buffers are only used for advertising reports.  If there
- * are no free low-priority event buffers, then an incoming advertising report
- * will get dropped.
- *
- * High-priority event buffers are for everything except advertising reports.
- * If there are no free high-priority event buffers, a request to allocate one
- * will try to allocate a low-priority buffer instead.
- *
- * If you want all events to be given equal treatment, then you should allocate
- * low-priority events only.
- *
- * Event priorities solve the problem of critical events getting dropped due to
- * a flood of advertising reports.  This solution is likely temporary: when
- * HCI flow control is added, event priorities may become obsolete.
- *
- * Not all transports distinguish between low and high priority events.  If the
- * transport does not have separate settings for low and high buffer counts,
- * then it treats all events with equal priority.
- */
-#define BLE_HCI_TRANS_BUF_EVT_LO    1
-#define BLE_HCI_TRANS_BUF_EVT_HI    2
-
-/* Host-to-controller command. */
-#define BLE_HCI_TRANS_BUF_CMD       3
-
-/** Callback function types; executed when HCI packets are received. */
-typedef int ble_hci_trans_rx_cmd_fn(uint8_t *cmd, void *arg);
-typedef int ble_hci_trans_rx_acl_fn(struct os_mbuf *om, void *arg);
-
-#if SOC_ESP_NIMBLE_CONTROLLER && CONFIG_BT_CONTROLLER_ENABLED
-#define ble_transport_alloc_cmd() ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_CMD)
-#define ble_transport_alloc_event(X) ble_hci_trans_buf_alloc(X ? BLE_HCI_TRANS_BUF_EVT_LO : BLE_HCI_TRANS_BUF_EVT_HI)
-#define ble_transport_free ble_hci_trans_buf_free
-
-struct ble_hci_trans_funcs_t {
-    int(*_ble_hci_trans_hs_acl_tx)(struct os_mbuf *om);
-    int(*_ble_hci_trans_hs_cmd_tx)(uint8_t *cmd);
-    int(*_ble_hci_trans_ll_acl_tx)(struct os_mbuf *om);
-    int(*_ble_hci_trans_ll_evt_tx)(uint8_t *hci_ev);
-    int(*_ble_hci_trans_reset)(void);
-    int(*_ble_hci_trans_set_acl_free_cb)(os_mempool_put_fn *cb, void *arg);
-};
-
-extern struct ble_hci_trans_funcs_t *ble_hci_trans_funcs_ptr;
-
-/**
- * Sends an HCI event from the controller to the host.
- *
- * @param cmd                   The HCI event to send.  This buffer must be
- *                                  allocated via ble_hci_trans_buf_alloc().
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-extern int r_ble_hci_trans_ll_evt_tx(uint8_t *hci_ev);
-#define ble_hci_trans_ll_evt_tx ble_hci_trans_funcs_ptr->_ble_hci_trans_ll_evt_tx
-
-/**
- * Sends ACL data from controller to host.
- *
- * @param om                    The ACL data packet to send.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-extern int r_ble_hci_trans_ll_acl_tx(struct os_mbuf *om);
-#define ble_hci_trans_ll_acl_tx ble_hci_trans_funcs_ptr->_ble_hci_trans_ll_acl_tx
-
-/**
- * Sends an HCI command from the host to the controller.
- *
- * @param cmd                   The HCI command to send.  This buffer must be
- *                                  allocated via ble_hci_trans_buf_alloc().
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-extern int r_ble_hci_trans_hs_cmd_tx(uint8_t *cmd);
-#define ble_hci_trans_hs_cmd_tx ble_hci_trans_funcs_ptr->_ble_hci_trans_hs_cmd_tx
-
-/**
- * Sends ACL data from host to controller.
- *
- * @param om                    The ACL data packet to send.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-extern int r_ble_hci_trans_hs_acl_tx(struct os_mbuf *om);
-#define ble_hci_trans_hs_acl_tx ble_hci_trans_funcs_ptr->_ble_hci_trans_hs_acl_tx
-
-/**
- * Allocates a flat buffer of the specified type.
- *
- * @param type                  The type of buffer to allocate; one of the
- *                                  BLE_HCI_TRANS_BUF_[...] constants.
- *
- * @return                      The allocated buffer on success;
- *                              NULL on buffer exhaustion.
- */
-extern uint8_t *r_ble_hci_trans_buf_alloc(int type);
-#define ble_hci_trans_buf_alloc r_ble_hci_trans_buf_alloc
-
-/**
- * Frees the specified flat buffer.  The buffer must have been allocated via
- * ble_hci_trans_buf_alloc().
- *
- * @param buf                   The buffer to free.
- */
-extern void r_ble_hci_trans_buf_free(uint8_t *buf);
-#define ble_hci_trans_buf_free r_ble_hci_trans_buf_free
-
-/**
- * Configures a callback to get executed whenever an ACL data packet is freed.
- * The function is called immediately before the free occurs.
- *
- * @param cb                    The callback to configure.
- * @param arg                   An optional argument to pass to the callback.
- *
- * @return                      0 on success;
- *                              BLE_ERR_UNSUPPORTED if the transport does not
- *                                  support this operation.
- */
-extern int r_ble_hci_trans_set_acl_free_cb(os_mempool_put_fn *cb, void *arg);
-#define ble_hci_trans_set_acl_free_cb ble_hci_trans_funcs_ptr->_ble_hci_trans_set_acl_free_cb
-
-/**
- * Configures the HCI transport to operate with a controller.  The transport
- * will execute specified callbacks upon receiving HCI packets from the host.
- *
- * @param cmd_cb                The callback to execute upon receiving an HCI
- *                                  command.
- * @param cmd_arg               Optional argument to pass to the command
- *                                  callback.
- * @param acl_cb                The callback to execute upon receiving ACL
- *                                  data.
- * @param acl_arg               Optional argument to pass to the ACL
- *                                  callback.
- */
-extern void r_ble_hci_trans_cfg_ll(ble_hci_trans_rx_cmd_fn *cmd_cb,
-                                   void *cmd_arg,
-                                   ble_hci_trans_rx_acl_fn *acl_cb,
-                                   void *acl_arg);
-#define ble_hci_trans_cfg_ll r_ble_hci_trans_cfg_ll
-
-/**
- * Configures the HCI transport to operate with a host.  The transport will
- * execute specified callbacks upon receiving HCI packets from the controller.
- *
- * @param evt_cb                The callback to execute upon receiving an HCI
- *                                  event.
- * @param evt_arg               Optional argument to pass to the event
- *                                  callback.
- * @param acl_cb                The callback to execute upon receiving ACL
- *                                  data.
- * @param acl_arg               Optional argument to pass to the ACL
- *                                  callback.
- */
-extern void r_ble_hci_trans_cfg_hs(ble_hci_trans_rx_cmd_fn *evt_cb,
-                                   void *evt_arg,
-                                   ble_hci_trans_rx_acl_fn *acl_cb,
-                                   void *acl_arg);
-#define ble_hci_trans_cfg_hs r_ble_hci_trans_cfg_hs
-
-/**
- * Resets the HCI module to a clean state.  Frees all buffers and reinitializes
- * the underlying transport.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-extern int r_ble_hci_trans_reset(void);
-#define ble_hci_trans_reset ble_hci_trans_funcs_ptr->_ble_hci_trans_reset
-
-void esp_ble_hci_trans_init(uint8_t);
-
-#else
-/**
- * Sends an HCI event from the controller to the host.
- *
- * @param cmd                   The HCI event to send.  This buffer must be
- *                                  allocated via ble_hci_trans_buf_alloc().
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-int ble_hci_trans_ll_evt_tx(uint8_t *hci_ev);
-
-/**
- * Sends ACL data from controller to host.
- *
- * @param om                    The ACL data packet to send.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-int ble_hci_trans_ll_acl_tx(struct os_mbuf *om);
-
-/**
- * Sends an HCI command from the host to the controller.
- *
- * @param cmd                   The HCI command to send.  This buffer must be
- *                                  allocated via ble_hci_trans_buf_alloc().
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-int ble_hci_trans_hs_cmd_tx(uint8_t *cmd);
-
-/**
- * Sends ACL data from host to controller.
- *
- * @param om                    The ACL data packet to send.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-int ble_hci_trans_hs_acl_tx(struct os_mbuf *om);
-
-/**
- * Allocates a flat buffer of the specified type.
- *
- * @param type                  The type of buffer to allocate; one of the
- *                                  BLE_HCI_TRANS_BUF_[...] constants.
- *
- * @return                      The allocated buffer on success;
- *                              NULL on buffer exhaustion.
- */
-int esp_ble_hci_trans_hs_cmd_tx(uint8_t *cmd);
-
-/**
- * Sends ACL data from host to controller.
- *
- * @param om                    The ACL data packet to send.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-int esp_ble_hci_trans_hs_acl_tx(struct os_mbuf *om);
-
-/**
- * Allocates a flat buffer of the specified type.
- *
- * @param type                  The type of buffer to allocate; one of the
- *                                  BLE_HCI_TRANS_BUF_[...] constants.
- *
- * @return                      The allocated buffer on success;
- *                              NULL on buffer exhaustion.
- */
-uint8_t *esp_ble_hci_trans_buf_alloc(int type);
-
-/**
- * Frees the specified flat buffer.  The buffer must have been allocated via
- * ble_hci_trans_buf_alloc().
- *
- * @param buf                   The buffer to free.
- */
-void esp_ble_hci_trans_buf_free(uint8_t *buf);
-
-/**
- * Configures the HCI transport to operate with a host.  The transport will
- * execute specified callbacks upon receiving HCI packets from the controller.
- *
- * @param evt_cb                The callback to execute upon receiving an HCI
- *                                  event.
- * @param evt_arg               Optional argument to pass to the event
- *                                  callback.
- * @param acl_cb                The callback to execute upon receiving ACL
- *                                  data.
- * @param acl_arg               Optional argument to pass to the ACL
- *                                  callback.
- */
-void esp_ble_hci_trans_cfg_hs(ble_hci_trans_rx_cmd_fn *evt_cb,
-                              void *evt_arg,
-                              ble_hci_trans_rx_acl_fn *acl_cb,
-                              void *acl_arg);
-
-/**
- * Resets the HCI module to a clean state.  Frees all buffers and reinitializes
- * the underlying transport.
- *
- * @return                      0 on success;
- *                              A BLE_ERR_[...] error code on failure.
- */
-int esp_ble_hci_trans_reset(void);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* H_HCI_TRANSPORT_ */
diff --git a/lib/bt/porting/nimble/include/nimble/nimble_npl.h b/lib/bt/porting/nimble/include/nimble/nimble_npl.h
deleted file mode 100644
index c11a2972..00000000
--- a/lib/bt/porting/nimble/include/nimble/nimble_npl.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 _NIMBLE_NPL_H_
-#define _NIMBLE_NPL_H_
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_npl_event;
-typedef void ble_npl_event_fn(struct ble_npl_event *ev);
-
-enum ble_npl_error {
-    BLE_NPL_OK = 0,
-    BLE_NPL_ENOMEM = 1,
-    BLE_NPL_EINVAL = 2,
-    BLE_NPL_INVALID_PARAM = 3,
-    BLE_NPL_MEM_NOT_ALIGNED = 4,
-    BLE_NPL_BAD_MUTEX = 5,
-    BLE_NPL_TIMEOUT = 6,
-    BLE_NPL_ERR_IN_ISR = 7,
-    BLE_NPL_ERR_PRIV = 8,
-    BLE_NPL_OS_NOT_STARTED = 9,
-    BLE_NPL_ENOENT = 10,
-    BLE_NPL_EBUSY = 11,
-    BLE_NPL_ERROR = 12,
-};
-
-typedef enum ble_npl_error ble_npl_error_t;
-
-/* Include OS-specific definitions */
-#include "nimble/nimble_npl_os.h"
-
-/*
- * Generic
- */
-
-bool ble_npl_os_started(void);
-
-void *ble_npl_get_current_task_id(void);
-
-/*
- * Event queue
- */
-
-void ble_npl_eventq_init(struct ble_npl_eventq *evq);
-
-void ble_npl_eventq_deinit(struct ble_npl_eventq *evq);
-
-struct ble_npl_event *ble_npl_eventq_get(struct ble_npl_eventq *evq,
-                                         ble_npl_time_t tmo);
-
-void ble_npl_eventq_put(struct ble_npl_eventq *evq, struct ble_npl_event *ev);
-
-void ble_npl_eventq_remove(struct ble_npl_eventq *evq,
-                           struct ble_npl_event *ev);
-
-void ble_npl_event_init(struct ble_npl_event *ev, ble_npl_event_fn *fn,
-                        void *arg);
-
-bool ble_npl_event_is_queued(struct ble_npl_event *ev);
-
-void *ble_npl_event_get_arg(struct ble_npl_event *ev);
-
-void ble_npl_event_set_arg(struct ble_npl_event *ev, void *arg);
-
-bool ble_npl_eventq_is_empty(struct ble_npl_eventq *evq);
-
-void ble_npl_event_run(struct ble_npl_event *ev);
-
-/*
- * Mutexes
- */
-
-ble_npl_error_t ble_npl_mutex_init(struct ble_npl_mutex *mu);
-
-ble_npl_error_t ble_npl_mutex_pend(struct ble_npl_mutex *mu,
-                                   ble_npl_time_t timeout);
-
-ble_npl_error_t ble_npl_mutex_release(struct ble_npl_mutex *mu);
-
-ble_npl_error_t ble_npl_mutex_deinit(struct ble_npl_mutex *mu);
-
-/*
- * Semaphores
- */
-
-ble_npl_error_t ble_npl_sem_init(struct ble_npl_sem *sem, uint16_t tokens);
-
-ble_npl_error_t ble_npl_sem_pend(struct ble_npl_sem *sem,
-                                 ble_npl_time_t timeout);
-
-ble_npl_error_t ble_npl_sem_release(struct ble_npl_sem *sem);
-
-ble_npl_error_t ble_npl_sem_deinit(struct ble_npl_sem *sem);
-
-uint16_t ble_npl_sem_get_count(struct ble_npl_sem *sem);
-
-/*
- * Callouts
- */
-
-int ble_npl_callout_init(struct ble_npl_callout *co, struct ble_npl_eventq *evq,
-                          ble_npl_event_fn *ev_cb, void *ev_arg);
-
-ble_npl_error_t ble_npl_callout_reset(struct ble_npl_callout *co,
-                                      ble_npl_time_t ticks);
-
-void ble_npl_callout_stop(struct ble_npl_callout *co);
-
-bool ble_npl_callout_is_active(struct ble_npl_callout *co);
-
-ble_npl_time_t ble_npl_callout_get_ticks(struct ble_npl_callout *co);
-
-ble_npl_time_t ble_npl_callout_remaining_ticks(struct ble_npl_callout *co,
-                                               ble_npl_time_t time);
-
-void ble_npl_callout_set_arg(struct ble_npl_callout *co,
-                             void *arg);
-/*
- * Time functions
- */
-
-ble_npl_time_t ble_npl_time_get(void);
-
-ble_npl_error_t ble_npl_time_ms_to_ticks(uint32_t ms, ble_npl_time_t *out_ticks);
-
-ble_npl_error_t ble_npl_time_ticks_to_ms(ble_npl_time_t ticks, uint32_t *out_ms);
-
-ble_npl_time_t ble_npl_time_ms_to_ticks32(uint32_t ms);
-
-uint32_t ble_npl_time_ticks_to_ms32(ble_npl_time_t ticks);
-
-void ble_npl_time_delay(ble_npl_time_t ticks);
-
-/*
- * Hardware-specific
- *
- * These symbols should be most likely defined by application since they are
- * specific to hardware, not to OS.
- */
-
-#if NIMBLE_CFG_CONTROLLER
-
-void ble_npl_hw_set_isr(int irqn, uint32_t addr);
-
-#endif
-
-uint32_t ble_npl_hw_enter_critical(void);
-
-void ble_npl_hw_exit_critical(uint32_t ctx);
-
-bool ble_npl_hw_is_in_critical(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* _NIMBLE_NPL_H_ */
diff --git a/lib/bt/porting/nimble/include/nimble/nimble_opt.h b/lib/bt/porting/nimble/include/nimble/nimble_opt.h
deleted file mode 100644
index f0e988b2..00000000
--- a/lib/bt/porting/nimble/include/nimble/nimble_opt.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 H_NIMBLE_OPT_
-#define H_NIMBLE_OPT_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Include automatically-generated settings. */
-#include "nimble/nimble_opt_auto.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/bt/porting/nimble/include/nimble/nimble_opt_auto.h b/lib/bt/porting/nimble/include/nimble/nimble_opt_auto.h
deleted file mode 100644
index daf21533..00000000
--- a/lib/bt/porting/nimble/include/nimble/nimble_opt_auto.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 The Apache Software Foundation (ASF)
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * SPDX-FileContributor: 2019-2022 Espressif Systems (Shanghai) CO LTD
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 H_NIMBLE_OPT_AUTO_
-#define H_NIMBLE_OPT_AUTO_
-
-#include "syscfg/syscfg.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/***
- * Automatic options.
- *
- * These settings are generated automatically from the user-specified syscfg
- * settings.
- */
-
-#undef NIMBLE_BLE_ADVERTISE
-#define NIMBLE_BLE_ADVERTISE                    \
-    (MYNEWT_VAL(BLE_ROLE_BROADCASTER) || MYNEWT_VAL(BLE_ROLE_PERIPHERAL))
-
-#undef NIMBLE_BLE_SCAN
-#define NIMBLE_BLE_SCAN                         \
-    (MYNEWT_VAL(BLE_ROLE_CENTRAL) || MYNEWT_VAL(BLE_ROLE_OBSERVER))
-
-#undef NIMBLE_BLE_CONNECT
-#define NIMBLE_BLE_CONNECT                      \
-    (MYNEWT_VAL(BLE_ROLE_CENTRAL) || MYNEWT_VAL(BLE_ROLE_PERIPHERAL))
-
-
-/** Supported client ATT commands. */
-
-#undef NIMBLE_BLE_ATT_CLT_FIND_INFO
-#define NIMBLE_BLE_ATT_CLT_FIND_INFO            \
-    (MYNEWT_VAL(BLE_GATT_DISC_ALL_DSCS))
-
-#undef NIMBLE_BLE_ATT_CLT_FIND_TYPE
-#define NIMBLE_BLE_ATT_CLT_FIND_TYPE            \
-    (MYNEWT_VAL(BLE_GATT_DISC_SVC_UUID))
-
-#undef NIMBLE_BLE_ATT_CLT_READ_TYPE
-#define NIMBLE_BLE_ATT_CLT_READ_TYPE            \
-    (MYNEWT_VAL(BLE_GATT_FIND_INC_SVCS) ||      \
-     MYNEWT_VAL(BLE_GATT_DISC_ALL_CHRS) ||      \
-     MYNEWT_VAL(BLE_GATT_DISC_CHRS_UUID) ||     \
-     MYNEWT_VAL(BLE_GATT_READ_UUID))
-
-#undef NIMBLE_BLE_ATT_CLT_READ
-#define NIMBLE_BLE_ATT_CLT_READ                 \
-    (MYNEWT_VAL(BLE_GATT_READ) ||               \
-     MYNEWT_VAL(BLE_GATT_READ_LONG) ||          \
-     MYNEWT_VAL(BLE_GATT_FIND_INC_SVCS))
-
-#undef NIMBLE_BLE_ATT_CLT_READ_BLOB
-#define NIMBLE_BLE_ATT_CLT_READ_BLOB            \
-    (MYNEWT_VAL(BLE_GATT_READ_LONG))
-
-#undef NIMBLE_BLE_ATT_CLT_READ_MULT
-#define NIMBLE_BLE_ATT_CLT_READ_MULT            \
-    (MYNEWT_VAL(BLE_GATT_READ_MULT))
-
-#undef NIMBLE_BLE_ATT_CLT_READ_GROUP_TYPE
-#define NIMBLE_BLE_ATT_CLT_READ_GROUP_TYPE      \
-    (MYNEWT_VAL(BLE_GATT_DISC_ALL_SVCS))
-
-#undef NIMBLE_BLE_ATT_CLT_WRITE
-#define NIMBLE_BLE_ATT_CLT_WRITE                \
-    (MYNEWT_VAL(BLE_GATT_WRITE))
-
-#undef NIMBLE_BLE_ATT_CLT_SIGNED_WRITE
-#define NIMBLE_BLE_ATT_CLT_SIGNED_WRITE         \
-    (MYNEWT_VAL(BLE_GATT_SIGNED_WRITE))
-
-#undef NIMBLE_BLE_ATT_CLT_WRITE_NO_RSP
-#define NIMBLE_BLE_ATT_CLT_WRITE_NO_RSP         \
-    (MYNEWT_VAL(BLE_GATT_WRITE_NO_RSP))
-
-#undef NIMBLE_BLE_ATT_CLT_PREP_WRITE
-#define NIMBLE_BLE_ATT_CLT_PREP_WRITE           \
-    (MYNEWT_VAL(BLE_GATT_WRITE_LONG))
-
-#undef NIMBLE_BLE_ATT_CLT_EXEC_WRITE
-#define NIMBLE_BLE_ATT_CLT_EXEC_WRITE           \
-    (MYNEWT_VAL(BLE_GATT_WRITE_LONG))
-
-#undef NIMBLE_BLE_ATT_CLT_NOTIFY
-#define NIMBLE_BLE_ATT_CLT_NOTIFY               \
-    (MYNEWT_VAL(BLE_GATT_NOTIFY))
-
-#undef NIMBLE_BLE_ATT_CLT_INDICATE
-#define NIMBLE_BLE_ATT_CLT_INDICATE             \
-    (MYNEWT_VAL(BLE_GATT_INDICATE))
-
-/** Security manager settings. */
-
-#undef NIMBLE_BLE_SM
-#define NIMBLE_BLE_SM   (MYNEWT_VAL(BLE_SM_LEGACY) || MYNEWT_VAL(BLE_SM_SC))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/bt/porting/nimble/include/nimble/nimble_port.h b/lib/bt/porting/nimble/include/nimble/nimble_port.h
deleted file mode 100644
index f4a98543..00000000
--- a/lib/bt/porting/nimble/include/nimble/nimble_port.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 _NIMBLE_PORT_H
-#define _NIMBLE_PORT_H
-
-#include "esp_err.h"
-#include "nimble/nimble_npl.h"
-
-#define NIMBLE_CORE (CONFIG_BT_NIMBLE_PINNED_TO_CORE < portNUM_PROCESSORS ? CONFIG_BT_NIMBLE_PINNED_TO_CORE : tskNO_AFFINITY)
-
-#define NIMBLE_HS_STACK_SIZE CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE
-
-#if SOC_ESP_NIMBLE_CONTROLLER && CONFIG_BT_CONTROLLER_ENABLED
-#define NIMBLE_LL_STACK_SIZE CONFIG_BT_LE_CONTROLLER_TASK_STACK_SIZE
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
-* @brief nimble_port_init - Initialize controller and NimBLE host stack
-*
-* @return esp_err_t   - ESP_OK ( if success)
-*                       Error code in case of failure
-*/
-esp_err_t nimble_port_init(void);
-
-/**
-* @brief nimble_port_deinit - Deinitialize controller and NimBLE host stack
-*
-* @return esp_err_t   - ESP_OK ( if success)
-*                       Error code in case of failure
-*/
-esp_err_t nimble_port_deinit(void);
-
-void nimble_port_run(void);
-int nimble_port_stop(void);
-
-/**
- * @brief esp_nimble_init - Initialize the NimBLE host stack
- *
- * @return esp_err_t
- */
-esp_err_t esp_nimble_init(void);
-
-/**
- * @brief esp_nimble_deinit - Deinitialize the NimBLE host stack
- *
- * @return esp_err_t
- */
-esp_err_t esp_nimble_deinit(void);
-
-struct ble_npl_eventq *nimble_port_get_dflt_eventq(void);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NIMBLE_PORT_H */
diff --git a/lib/bt/porting/nimble/include/os/endian.h b/lib/bt/porting/nimble/include/os/endian.h
deleted file mode 100644
index 2e06a8b5..00000000
--- a/lib/bt/porting/nimble/include/os/endian.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 The Apache Software Foundation (ASF)
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * SPDX-FileContributor: 2019-2022 Espressif Systems (Shanghai) CO LTD
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 H_ENDIAN_
-#define H_ENDIAN_
-
-#include <inttypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Internal helpers */
-#ifndef os_bswap_64
-#define os_bswap_64(x)   ((uint64_t)                \
-     ((((x) & 0xff00000000000000ull) >> 56) |       \
-      (((x) & 0x00ff000000000000ull) >> 40) |       \
-      (((x) & 0x0000ff0000000000ull) >> 24) |       \
-      (((x) & 0x000000ff00000000ull) >>  8) |       \
-      (((x) & 0x00000000ff000000ull) <<  8) |       \
-      (((x) & 0x0000000000ff0000ull) << 24) |       \
-      (((x) & 0x000000000000ff00ull) << 40) |       \
-      (((x) & 0x00000000000000ffull) << 56)))
-#endif
-
-#ifndef os_bswap_32
-#define os_bswap_32(x)    ((uint32_t)               \
-    ((((x) & 0xff000000) >> 24) |                   \
-     (((x) & 0x00ff0000) >>  8) |                   \
-     (((x) & 0x0000ff00) <<  8) |                   \
-     (((x) & 0x000000ff) << 24)))
-#endif
-
-#ifndef os_bswap_16
-#define os_bswap_16(x)   ((uint16_t)                \
-    ((((x) & 0xff00) >> 8) |                        \
-     (((x) & 0x00ff) << 8)))
-#endif
-
-#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-
-#ifndef ntohll
-#define ntohll(x)  ((uint64_t)(x))
-#endif
-
-#ifndef htonll
-#define htonll(x)  ((uint64_t)(x))
-#endif
-
-#ifndef ntohl
-#define ntohl(x)   ((uint32_t)(x))
-#endif
-
-#ifndef htonl
-#define htonl(x)   ((uint32_t)(x))
-#endif
-
-#ifndef ntohs
-#define ntohs(x)   ((uint16_t)(x))
-#endif
-
-#ifndef htons
-#define htons(x)   ((uint16_t)(x))
-#endif
-
-#ifndef htobe16
-#define htobe16(x) ((uint16_t)(x))
-#endif
-
-#ifndef htole16
-#define htole16(x) os_bswap_16 (x)
-#endif
-
-#ifndef be16toh
-#define be16toh(x) ((uint16_t)(x))
-#endif
-
-#ifndef le16toh
-#define le16toh(x) os_bswap_16 (x)
-#endif
-
-#ifndef htobe32
-#define htobe32(x) ((uint32_t)(x))
-#endif
-
-#ifndef htole32
-#define htole32(x) os_bswap_32 (x)
-#endif
-
-#ifndef be32toh
-#define be32toh(x) ((uint32_t)(x))
-#endif
-
-#ifndef le32toh
-#define le32toh(x) os_bswap_32 (x)
-#endif
-
-#ifndef htobe64
-#define htobe64(x) ((uint64_t)(x))
-#endif
-
-#ifndef htole64
-#define htole64(x) os_bswap_64 (x)
-#endif
-
-#ifndef be64toh
-#define be64toh(x) ((uint64_t)(x))
-#endif
-
-#ifndef le64toh
-#define le64toh(x) os_bswap_64 (x)
-#endif
-
-#else
-
-#ifndef ntohll
-#define ntohll(x)   os_bswap_64(x)
-#endif
-
-#ifndef htonll
-#define htonll      ntohll
-#endif
-
-/* These are not used in NimBLE and ESP-IDF uses them from LwIP */
-#if 0
-#ifndef ntohl
-#define ntohl(x)    os_bswap_32(x)
-#endif
-
-#ifndef htonl
-#define htonl       ntohl
-#endif
-
-#ifndef htons
-#define htons(x)    os_bswap_16(x)
-#endif
-
-#ifndef ntohs
-#define ntohs       htons
-#endif
-#endif
-
-#ifndef htobe16
-#define htobe16(x) os_bswap_16(x)
-#endif
-
-#ifndef htole16
-#define htole16(x) ((uint16_t)(x))
-#endif
-
-#ifndef be16toh
-#define be16toh(x) os_bswap_16(x)
-#endif
-
-#ifndef le16toh
-#define le16toh(x) ((uint16_t)(x))
-#endif
-
-#ifndef htobe32
-#define htobe32(x) os_bswap_32(x)
-#endif
-
-#ifndef htole32
-#define htole32(x) ((uint32_t)(x))
-#endif
-
-#ifndef be32toh
-#define be32toh(x) os_bswap_32(x)
-#endif
-
-#ifndef le32toh
-#define le32toh(x) ((uint32_t)(x))
-#endif
-
-#ifndef htobe64
-#define htobe64(x) os_bswap_64(x)
-#endif
-
-#ifndef htole64
-#define htole64(x) ((uint64_t)(x))
-#endif
-
-#ifndef be64toh
-#define be64toh(x) os_bswap_64(x)
-#endif
-
-#ifndef le64toh
-#define le64toh(x) ((uint64_t)(x))
-#endif
-
-#endif
-
-#if SOC_ESP_NIMBLE_CONTROLLER && CONFIG_BT_CONTROLLER_ENABLED
-void r_put_le16(void *buf, uint16_t x);
-#define put_le16 r_put_le16
-
-void r_put_le24(void *buf, uint32_t x);
-#define put_le24 r_put_le24
-
-void r_put_le32(void *buf, uint32_t x);
-#define put_le32 r_put_le32
-
-void r_put_le64(void *buf, uint64_t x);
-#define put_le64 r_put_le64
-
-uint16_t r_get_le16(const void *buf);
-#define get_le16 r_get_le16
-
-uint32_t r_get_le24(const void *buf);
-#define get_le24 r_get_le24
-
-uint32_t r_get_le32(const void *buf);
-#define get_le32 r_get_le32
-
-uint64_t r_get_le64(const void *buf);
-#define get_le64 r_get_le64
-
-void r_put_be16(void *buf, uint16_t x);
-#define put_be16 r_put_be16
-
-void r_put_be24(void *buf, uint32_t x);
-#define put_be24 r_put_be24
-
-void r_put_be32(void *buf, uint32_t x);
-#define put_be32 r_put_be32
-
-void r_put_be64(void *buf, uint64_t x);
-#define put_be64 r_put_be64
-
-uint16_t r_get_be16(const void *buf);
-#define get_be16 r_get_be16
-
-uint32_t r_get_be24(const void *buf);
-#define get_be24 r_get_be24
-
-uint32_t r_get_be32(const void *buf);
-#define get_be32 r_get_be32
-
-uint64_t r_get_be64(const void *buf);
-#define get_be64 r_get_be64
-
-void r_swap_in_place(void *buf, int len);
-#define swap_in_place r_swap_in_place
-
-void r_swap_buf(uint8_t *dst, const uint8_t *src, int len);
-#define swap_buf r_swap_buf
-
-
-#else
-void put_le16(void *buf, uint16_t x);
-void put_le24(void *buf, uint32_t x);
-void put_le32(void *buf, uint32_t x);
-void put_le64(void *buf, uint64_t x);
-uint16_t get_le16(const void *buf);
-uint32_t get_le24(const void *buf);
-uint32_t get_le32(const void *buf);
-uint64_t get_le64(const void *buf);
-void put_be16(void *buf, uint16_t x);
-void put_be24(void *buf, uint32_t x);
-void put_be32(void *buf, uint32_t x);
-void put_be64(void *buf, uint64_t x);
-uint16_t get_be16(const void *buf);
-uint32_t get_be24(const void *buf);
-uint32_t get_be32(const void *buf);
-uint64_t get_be64(const void *buf);
-void swap_in_place(void *buf, int len);
-void swap_buf(uint8_t *dst, const uint8_t *src, int len);
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/bt/porting/nimble/include/os/os.h b/lib/bt/porting/nimble/include/os/os.h
deleted file mode 100644
index 56fdf52d..00000000
--- a/lib/bt/porting/nimble/include/os/os.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 The Apache Software Foundation (ASF)
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * SPDX-FileContributor: 2019-2022 Espressif Systems (Shanghai) CO LTD
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 _OS_H
-#define _OS_H
-
-#include <assert.h>
-#include "esp_assert.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined __cplusplus && !defined static_assert
-#define static_assert _Static_assert
-#endif
-
-#include "nimble/nimble_npl.h"
-
-#define OS_ALIGN(__n, __a) (                             \
-        (((__n) & ((__a) - 1)) == 0)                   ? \
-            (__n)                                      : \
-            ((__n) + ((__a) - ((__n) & ((__a) - 1))))    \
-        )
-#define OS_ALIGNMENT    (BLE_NPL_OS_ALIGNMENT)
-
-typedef uint32_t os_sr_t;
-#define OS_ENTER_CRITICAL(_sr) (_sr = ble_npl_hw_enter_critical())
-#define OS_EXIT_CRITICAL(_sr) (ble_npl_hw_exit_critical(_sr))
-#define OS_ASSERT_CRITICAL() assert(ble_npl_hw_is_in_critical())
-
-/* Mynewt components (not abstracted in NPL) */
-#include "os/endian.h"
-#include "os/queue.h"
-#include "os/os_error.h"
-#include "os/os_mbuf.h"
-#include "os/os_mempool.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _OS_H */
diff --git a/lib/bt/porting/nimble/include/os/os_error.h b/lib/bt/porting/nimble/include/os/os_error.h
deleted file mode 100644
index 2e736e39..00000000
--- a/lib/bt/porting/nimble/include/os/os_error.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 The Apache Software Foundation (ASF)
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * SPDX-FileContributor: 2019-2022 Espressif Systems (Shanghai) CO LTD
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 H_OS_ERROR_
-#define H_OS_ERROR_
-
-#include "os/os.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* OS error enumerations */
-enum os_error {
-    OS_OK = 0,
-    OS_ENOMEM = 1,
-    OS_EINVAL = 2,
-    OS_INVALID_PARM = 3,
-    OS_MEM_NOT_ALIGNED = 4,
-    OS_BAD_MUTEX = 5,
-    OS_TIMEOUT = 6,
-    OS_ERR_IN_ISR = 7,      /* Function cannot be called from ISR */
-    OS_ERR_PRIV = 8,        /* Privileged access error */
-    OS_NOT_STARTED = 9,     /* OS must be started to call this function, but isn't */
-    OS_ENOENT = 10,         /* No such thing */
-    OS_EBUSY = 11,          /* Resource busy */
-    OS_ERROR = 12,          /* Generic Error */
-};
-
-typedef enum os_error os_error_t;
-
-/**
- * @brief Converts an OS error code (`OS_[...]`) to an equivalent system error
- * code (`SYS_E[...]`).
- *
- * @param os_error              The OS error code to convert.
- *
- * @return                      The equivalent system error code.
- */
-int os_error_to_sys(os_error_t os_error);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/bt/porting/nimble/include/os/os_mbuf.h b/lib/bt/porting/nimble/include/os/os_mbuf.h
deleted file mode 100644
index e6fd6b90..00000000
--- a/lib/bt/porting/nimble/include/os/os_mbuf.h
+++ /dev/null
@@ -1,1145 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 The Apache Software Foundation (ASF)
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * SPDX-FileContributor: 2019-2022 Espressif Systems (Shanghai) CO LTD
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-
-/**
- * @addtogroup OSKernel
- * @{
- *   @defgroup OSMbuf Chained Memory Buffers
- *   @{
- */
-
-
-#ifndef _OS_MBUF_H
-#define _OS_MBUF_H
-
-#include "os/os.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * A mbuf pool from which to allocate mbufs. This contains a pointer to the os
- * mempool to allocate mbufs out of, the total number of elements in the pool,
- * and the amount of "user" data in a non-packet header mbuf. The total pool
- * size, in bytes, should be:
- *  os_mbuf_count * (omp_databuf_len + sizeof(struct os_mbuf))
- */
-struct os_mbuf_pool {
-    /**
-     * Total length of the databuf in each mbuf.  This is the size of the
-     * mempool block, minus the mbuf header
-     */
-    uint16_t omp_databuf_len;
-    /**
-     * The memory pool which to allocate mbufs out of
-     */
-    struct os_mempool *omp_pool;
-
-    STAILQ_ENTRY(os_mbuf_pool) omp_next;
-};
-
-
-/**
- * A packet header structure that preceeds the mbuf packet headers.
- */
-struct os_mbuf_pkthdr {
-    /**
-     * Overall length of the packet.
-     */
-    uint16_t omp_len;
-    /**
-     * Flags
-     */
-    uint16_t omp_flags;
-
-    STAILQ_ENTRY(os_mbuf_pkthdr) omp_next;
-};
-
-/**
- * Chained memory buffer.
- */
-struct os_mbuf {
-    /**
-     * Current pointer to data in the structure
-     */
-    uint8_t *om_data;
-    /**
-     * Flags associated with this buffer, see OS_MBUF_F_* defintions
-     */
-    uint8_t om_flags;
-    /**
-     * Length of packet header
-     */
-    uint8_t om_pkthdr_len;
-    /**
-     * Length of data in this buffer
-     */
-    uint16_t om_len;
-
-    /**
-     * The mbuf pool this mbuf was allocated out of
-     */
-    struct os_mbuf_pool *om_omp;
-
-    SLIST_ENTRY(os_mbuf) om_next;
-
-    /**
-     * Pointer to the beginning of the data, after this buffer
-     */
-    uint8_t om_databuf[0];
-};
-
-/**
- * Structure representing a queue of mbufs.
- */
-struct os_mqueue {
-    STAILQ_HEAD(, os_mbuf_pkthdr) mq_head;
-    /** Event to post when new buffers are available on the queue. */
-    struct ble_npl_event mq_ev;
-};
-
-/*
- * Given a flag number, provide the mask for it
- *
- * @param __n The number of the flag in the mask
- */
-#define OS_MBUF_F_MASK(__n) (1 << (__n))
-
-/*
- * Checks whether a given mbuf is a packet header mbuf
- *
- * @param __om The mbuf to check
- */
-#define OS_MBUF_IS_PKTHDR(__om) \
-    ((__om)->om_pkthdr_len >= sizeof (struct os_mbuf_pkthdr))
-
-/** Get a packet header pointer given an mbuf pointer */
-#define OS_MBUF_PKTHDR(__om) ((struct os_mbuf_pkthdr *)     \
-    (void *)((uint8_t *)&(__om)->om_data + sizeof(struct os_mbuf)))
-
-/** Given a mbuf packet header pointer, return a pointer to the mbuf */
-#define OS_MBUF_PKTHDR_TO_MBUF(__hdr)   \
-     (struct os_mbuf *)(void *)((uint8_t *)(__hdr) - sizeof(struct os_mbuf))
-
-/**
- * Gets the length of an entire mbuf chain.  The specified mbuf must have a
- * packet header.
- */
-#define OS_MBUF_PKTLEN(__om) (OS_MBUF_PKTHDR(__om)->omp_len)
-
-/**
- * Access the data of a mbuf, and cast it to type
- *
- * @param __om The mbuf to access, and cast
- * @param __type The type to cast it to
- */
-#define OS_MBUF_DATA(__om, __type) \
-     (__type) ((__om)->om_data)
-
-/**
- * Access the "user header" in the head of an mbuf chain.
- *
- * @param om                    Pointer to the head of an mbuf chain.
- */
-#define OS_MBUF_USRHDR(om)                              \
-    (void *)((uint8_t *)om + sizeof (struct os_mbuf) +  \
-             sizeof (struct os_mbuf_pkthdr))
-
-/**
- * Retrieves the length of the user header in an mbuf.
- *
- * @param om                    Pointer to the mbuf to query.
- */
-#define OS_MBUF_USRHDR_LEN(om) \
-    ((om)->om_pkthdr_len - sizeof (struct os_mbuf_pkthdr))
-
-
-/** @cond INTERNAL_HIDDEN */
-
-/*
- * Called by OS_MBUF_LEADINGSPACE() macro
- */
-static inline uint16_t
-_os_mbuf_leadingspace(struct os_mbuf *om)
-{
-    uint16_t startoff;
-    uint16_t leadingspace;
-
-    startoff = 0;
-    if (OS_MBUF_IS_PKTHDR(om)) {
-        startoff = om->om_pkthdr_len;
-    }
-
-    leadingspace = (uint16_t) (OS_MBUF_DATA(om, uint8_t *) -
-                               ((uint8_t *) &om->om_databuf[0] + startoff));
-
-    return (leadingspace);
-}
-
-/** @endcond */
-
-/**
- * Returns the leading space (space at the beginning) of the mbuf.
- * Works on both packet header, and regular mbufs, as it accounts
- * for the additional space allocated to the packet header.
- *
- * @param __omp Is the mbuf pool (which contains packet header length.)
- * @param __om  Is the mbuf in that pool to get the leadingspace for
- *
- * @return Amount of leading space available in the mbuf
- */
-#define OS_MBUF_LEADINGSPACE(__om) _os_mbuf_leadingspace(__om)
-
-
-/** @cond INTERNAL_HIDDEN */
-
-/* Called by OS_MBUF_TRAILINGSPACE() macro. */
-static inline uint16_t
-_os_mbuf_trailingspace(struct os_mbuf *om)
-{
-    struct os_mbuf_pool *omp;
-
-    omp = om->om_omp;
-
-    return (&om->om_databuf[0] + omp->omp_databuf_len) -
-           (om->om_data + om->om_len);
-}
-
-/** @endcond */
-
-/**
- * Returns the trailing space (space at the end) of the mbuf.
- * Works on both packet header and regular mbufs.
- *
- * @param __omp The mbuf pool for this mbuf
- * @param __om  Is the mbuf in that pool to get trailing space for
- *
- * @return The amount of trailing space available in the mbuf
- */
-#define OS_MBUF_TRAILINGSPACE(__om) _os_mbuf_trailingspace(__om)
-
-
-#if SOC_ESP_NIMBLE_CONTROLLER && CONFIG_BT_CONTROLLER_ENABLED
-/**
- * Initializes an mqueue.  An mqueue is a queue of mbufs that ties to a
- * particular task's event queue.  Mqueues form a helper API around a common
- * paradigm: wait on an event queue until at least one packet is available,
- * then process a queue of packets.
- *
- * When mbufs are available on the queue, an event OS_EVENT_T_MQUEUE_DATA
- * will be posted to the task's mbuf queue.
- *
- * @param mq                    The mqueue to initialize
- * @param ev_cb                 The callback to associate with the mqeueue
- *                                  event.  Typically, this callback pulls each
- *                                  packet off the mqueue and processes them.
- * @param arg                   The argument to associate with the mqueue event.
- *
- * @return                      0 on success, non-zero on failure.
- */
-int r_os_mqueue_init(struct os_mqueue *mq, ble_npl_event_fn *ev_cb, void *arg);
-#define os_mqueue_init r_os_mqueue_init
-
-
-/**
- * Remove and return a single mbuf from the mbuf queue.  Does not block.
- *
- * @param mq The mbuf queue to pull an element off of.
- *
- * @return The next mbuf in the queue, or NULL if queue has no mbufs.
- */
-struct os_mbuf *r_os_mqueue_get(struct os_mqueue *);
-#define os_mqueue_get r_os_mqueue_get
-/**
- * Adds a packet (i.e. packet header mbuf) to an mqueue. The event associated
- * with the mqueue gets posted to the specified eventq.
- *
- * @param mq                    The mbuf queue to append the mbuf to.
- * @param evq                   The event queue to post an event to.
- * @param m                     The mbuf to append to the mbuf queue.
- *
- * @return 0 on success, non-zero on failure.
- */
-int r_os_mqueue_put(struct os_mqueue *, struct ble_npl_eventq *, struct os_mbuf *);
-#define os_mqueue_put r_os_mqueue_put
-
-
-/**
- * MSYS is a system level mbuf registry.  Allows the system to share
- * packet buffers amongst the various networking stacks that can be running
- * simultaeneously.
- *
- * Mbuf pools are created in the system initialization code, and then when
- * a mbuf is allocated out of msys, it will try and find the best fit based
- * upon estimated mbuf size.
- *
- * os_msys_register() registers a mbuf pool with MSYS, and allows MSYS to
- * allocate mbufs out of it.
- *
- * @param new_pool The pool to register with MSYS
- *
- * @return 0 on success, non-zero on failure
- */
-int r_os_msys_register(struct os_mbuf_pool *);
-#define os_msys_register r_os_msys_register
-
-
-/**
- * Allocate a mbuf from msys.  Based upon the data size requested,
- * os_msys_get() will choose the mbuf pool that has the best fit.
- *
- * @param dsize The estimated size of the data being stored in the mbuf
- * @param leadingspace The amount of leadingspace to allocate in the mbuf
- *
- * @return A freshly allocated mbuf on success, NULL on failure.
- */
-struct os_mbuf *r_os_msys_get(uint16_t dsize, uint16_t leadingspace);
-#define os_msys_get r_os_msys_get
-/**
- * De-registers all mbuf pools from msys.
- */
-void r_os_msys_reset(void);
-#define os_msys_reset r_os_msys_reset
-
-
-/**
- * Allocate a packet header structure from the MSYS pool.  See
- * os_msys_register() for a description of MSYS.
- *
- * @param dsize The estimated size of the data being stored in the mbuf
- * @param user_hdr_len The length to allocate for the packet header structure
- *
- * @return A freshly allocated mbuf on success, NULL on failure.
- */
-struct os_mbuf *r_os_msys_get_pkthdr(uint16_t dsize, uint16_t user_hdr_len);
-#define os_msys_get_pkthdr r_os_msys_get_pkthdr
-/**
- * Count the number of blocks in all the mbuf pools that are allocated.
- *
- * @return total number of blocks allocated in Msys
- */
-int r_os_msys_count(void);
-#define os_msys_count r_os_msys_count
-
-
-/**
- * Return the number of free blocks in Msys
- *
- * @return Number of free blocks available in Msys
- */
-int r_os_msys_num_free(void);
-#define os_msys_num_free r_os_msys_num_free
-
-
-/**
- * Initialize a pool of mbufs.
- *
- * @param omp     The mbuf pool to initialize
- * @param mp      The memory pool that will hold this mbuf pool
- * @param buf_len The length of the buffer itself.
- * @param nbufs   The number of buffers in the pool
- *
- * @return 0 on success, error code on failure.
- */
-int r_os_mbuf_pool_init(struct os_mbuf_pool *, struct os_mempool *mp,
-                      uint16_t, uint16_t);
-#define os_mbuf_pool_init r_os_mbuf_pool_init
-/**
- * Get an mbuf from the mbuf pool.  The mbuf is allocated, and initialized
- * prior to being returned.
- *
- * @param omp The mbuf pool to return the packet from
- * @param leadingspace The amount of leadingspace to put before the data
- *     section by default.
- *
- * @return An initialized mbuf on success, and NULL on failure.
- */
-struct os_mbuf *r_os_mbuf_get(struct os_mbuf_pool *omp, uint16_t);
-#define os_mbuf_get r_os_mbuf_get
-/**
- * Allocate a new packet header mbuf out of the os_mbuf_pool.
- *
- * @param omp The mbuf pool to allocate out of
- * @param user_pkthdr_len The packet header length to reserve for the caller.
- *
- * @return A freshly allocated mbuf on success, NULL on failure.
- */
-struct os_mbuf *r_os_mbuf_get_pkthdr(struct os_mbuf_pool *omp,
-                                   uint8_t pkthdr_len);
-#define os_mbuf_get_pkthdr r_os_mbuf_get_pkthdr
-/**
- * Duplicate a chain of mbufs.  Return the start of the duplicated chain.
- *
- * @param omp The mbuf pool to duplicate out of
- * @param om  The mbuf chain to duplicate
- *
- * @return A pointer to the new chain of mbufs
- */
-struct os_mbuf *r_os_mbuf_dup(struct os_mbuf *m);
-#define os_mbuf_dup r_os_mbuf_dup
-/**
- * Locates the specified absolute offset within an mbuf chain.  The offset
- * can be one past than the total length of the chain, but no greater.
- *
- * @param om                    The start of the mbuf chain to seek within.
- * @param off                   The absolute address to find.
- * @param out_off               On success, this points to the relative offset
- *                                  within the returned mbuf.
- *
- * @return                      The mbuf containing the specified offset on
- *                                  success.
- *                              NULL if the specified offset is out of bounds.
- */
-struct os_mbuf *r_os_mbuf_off(const struct os_mbuf *om, int off,
-                            uint16_t *out_off);
-#define os_mbuf_off r_os_mbuf_off
-
-/*
- * Copy data from an mbuf chain starting "off" bytes from the beginning,
- * continuing for "len" bytes, into the indicated buffer.
- *
- * @param m The mbuf chain to copy from
- * @param off The offset into the mbuf chain to begin copying from
- * @param len The length of the data to copy
- * @param dst The destination buffer to copy into
- *
- * @return                      0 on success;
- *                              -1 if the mbuf does not contain enough data.
- */
-int r_os_mbuf_copydata(const struct os_mbuf *m, int off, int len, void *dst);
-#define os_mbuf_copydata r_os_mbuf_copydata
-
-
-/**
- * @brief Calculates the length of an mbuf chain.
- *
- * Calculates the length of an mbuf chain.  If the mbuf contains a packet
- * header, you should use `OS_MBUF_PKTLEN()` as a more efficient alternative to
- * this function.
- *
- * @param om                    The mbuf to measure.
- *
- * @return                      The length, in bytes, of the provided mbuf
- *                                  chain.
- */
-uint16_t r_os_mbuf_len(const struct os_mbuf *om);
-#define os_mbuf_len r_os_mbuf_len
-
-
-/**
- * Append data onto a mbuf
- *
- * @param om   The mbuf to append the data onto
- * @param data The data to append onto the mbuf
- * @param len  The length of the data to append
- *
- * @return 0 on success, and an error code on failure
- */
-int r_os_mbuf_append(struct os_mbuf *m, const void *, uint16_t);
-#define os_mbuf_append r_os_mbuf_append
-
-
-/**
- * Reads data from one mbuf and appends it to another.  On error, the specified
- * data range may be partially appended.  Neither mbuf is required to contain
- * an mbuf packet header.
- *
- * @param dst                   The mbuf to append to.
- * @param src                   The mbuf to copy data from.
- * @param src_off               The absolute offset within the source mbuf
- *                                  chain to read from.
- * @param len                   The number of bytes to append.
- *
- * @return                      0 on success;
- *                              OS_EINVAL if the specified range extends beyond
- *                                  the end of the source mbuf chain.
- */
-int r_os_mbuf_appendfrom(struct os_mbuf *dst, const struct os_mbuf *src,
-                       uint16_t src_off, uint16_t len);
-#define os_mbuf_appendfrom r_os_mbuf_appendfrom
-/**
- * Release a mbuf back to the pool
- *
- * @param omp The Mbuf pool to release back to
- * @param om  The Mbuf to release back to the pool
- *
- * @return 0 on success, -1 on failure
- */
-int r_os_mbuf_free(struct os_mbuf *mb);
-#define os_mbuf_free r_os_mbuf_free
-
-
-/**
- * Free a chain of mbufs
- *
- * @param omp The mbuf pool to free the chain of mbufs into
- * @param om  The starting mbuf of the chain to free back into the pool
- *
- * @return 0 on success, -1 on failure
- */
-int r_os_mbuf_free_chain(struct os_mbuf *om);
-#define os_mbuf_free_chain r_os_mbuf_free_chain
-
-
-/**
- * Adjust the length of a mbuf, trimming either from the head or the tail
- * of the mbuf.
- *
- * @param mp The mbuf chain to adjust
- * @param req_len The length to trim from the mbuf.  If positive, trims
- *                from the head of the mbuf, if negative, trims from the
- *                tail of the mbuf.
- */
-void r_os_mbuf_adj(struct os_mbuf *mp, int req_len);
-#define os_mbuf_adj r_os_mbuf_adj
-
-
-
-/**
- * Performs a memory compare of the specified region of an mbuf chain against a
- * flat buffer.
- *
- * @param om                    The start of the mbuf chain to compare.
- * @param off                   The offset within the mbuf chain to start the
- *                                  comparison.
- * @param data                  The flat buffer to compare.
- * @param len                   The length of the flat buffer.
- *
- * @return                      0 if both memory regions are identical;
- *                              A memcmp return code if there is a mismatch;
- *                              INT_MAX if the mbuf is too short.
- */
-int r_os_mbuf_cmpf(const struct os_mbuf *om, int off, const void *data, int len);
-#define os_mbuf_cmpf r_os_mbuf_cmpf
-
-
-/**
- * Compares the contents of two mbuf chains.  The ranges of the two chains to
- * be compared are specified via the two offset parameters and the len
- * parameter.  Neither mbuf chain is required to contain a packet header.
- *
- * @param om1                   The first mbuf chain to compare.
- * @param offset1               The absolute offset within om1 at which to
- *                                  start the comparison.
- * @param om2                   The second mbuf chain to compare.
- * @param offset2               The absolute offset within om2 at which to
- *                                  start the comparison.
- * @param len                   The number of bytes to compare.
- *
- * @return                      0 if both mbuf segments are identical;
- *                              A memcmp() return code if the segment contents
- *                                  differ;
- *                              INT_MAX if a specified range extends beyond the
- *                                  end of its corresponding mbuf chain.
- */
-int r_os_mbuf_cmpm(const struct os_mbuf *om1, uint16_t offset1,
-                 const struct os_mbuf *om2, uint16_t offset2,
-                 uint16_t len);
-#define os_mbuf_cmpm r_os_mbuf_cmpm
-/**
- * Increases the length of an mbuf chain by adding data to the front.  If there
- * is insufficient room in the leading mbuf, additional mbufs are allocated and
- * prepended as necessary.  If this function fails to allocate an mbuf, the
- * entire chain is freed.
- *
- * The specified mbuf chain does not need to contain a packet header.
- *
- * @param omp                   The mbuf pool to allocate from.
- * @param om                    The head of the mbuf chain.
- * @param len                   The number of bytes to prepend.
- *
- * @return                      The new head of the chain on success;
- *                              NULL on failure.
- */
-struct os_mbuf *r_os_mbuf_prepend(struct os_mbuf *om, int len);
-#define os_mbuf_prepend r_os_mbuf_prepend
-/**
- * Prepends a chunk of empty data to the specified mbuf chain and ensures the
- * chunk is contiguous.  If either operation fails, the specified mbuf chain is
- * freed and NULL is returned.
- *
- * @param om                    The mbuf chain to prepend to.
- * @param len                   The number of bytes to prepend and pullup.
- *
- * @return                      The modified mbuf on success;
- *                              NULL on failure (and the mbuf chain is freed).
- */
-struct os_mbuf *r_os_mbuf_prepend_pullup(struct os_mbuf *om, uint16_t len);
-#define os_mbuf_prepend_pullup r_os_mbuf_prepend_pullup
-/**
- * Copies the contents of a flat buffer into an mbuf chain, starting at the
- * specified destination offset.  If the mbuf is too small for the source data,
- * it is extended as necessary.  If the destination mbuf contains a packet
- * header, the header length is updated.
- *
- * @param omp                   The mbuf pool to allocate from.
- * @param om                    The mbuf chain to copy into.
- * @param off                   The offset within the chain to copy to.
- * @param src                   The source buffer to copy from.
- * @param len                   The number of bytes to copy.
- *
- * @return                      0 on success; nonzero on failure.
- */
-int r_os_mbuf_copyinto(struct os_mbuf *om, int off, const void *src, int len);
-#define os_mbuf_copyinto r_os_mbuf_copyinto
-
-
-/**
- * Attaches a second mbuf chain onto the end of the first.  If the first chain
- * contains a packet header, the header's length is updated.  If the second
- * chain has a packet header, its header is cleared.
- *
- * @param first                 The mbuf chain being attached to.
- * @param second                The mbuf chain that gets attached.
- */
-void r_os_mbuf_concat(struct os_mbuf *first, struct os_mbuf *second);
-#define os_mbuf_concat r_os_mbuf_concat
-
-
-
-/**
- * Increases the length of an mbuf chain by the specified amount.  If there is
- * not sufficient room in the last buffer, a new buffer is allocated and
- * appended to the chain.  It is an error to request more data than can fit in
- * a single buffer.
- *
- * @param omp
- * @param om                    The head of the chain to extend.
- * @param len                   The number of bytes to extend by.
- *
- * @return                      A pointer to the new data on success;
- *                              NULL on failure.
- */
-void *r_os_mbuf_extend(struct os_mbuf *om, uint16_t len);
-#define os_mbuf_extend r_os_mbuf_extend
-/**
- * Rearrange a mbuf chain so that len bytes are contiguous,
- * and in the data area of an mbuf (so that OS_MBUF_DATA() will
- * work on a structure of size len.)  Returns the resulting
- * mbuf chain on success, free's it and returns NULL on failure.
- *
- * If there is room, it will add up to "max_protohdr - len"
- * extra bytes to the contiguous region, in an attempt to avoid being
- * called next time.
- *
- * @param omp The mbuf pool to take the mbufs out of
- * @param om The mbuf chain to make contiguous
- * @param len The number of bytes in the chain to make contiguous
- *
- * @return The contiguous mbuf chain on success, NULL on failure.
- */
-struct os_mbuf *r_os_mbuf_pullup(struct os_mbuf *om, uint16_t len);
-#define os_mbuf_pullup r_os_mbuf_pullup
-
-/**
- * Removes and frees empty mbufs from the front of a chain.  If the chain
- * contains a packet header, it is preserved.
- *
- * @param om                    The mbuf chain to trim.
- *
- * @return                      The head of the trimmed mbuf chain.
- */
-struct os_mbuf *r_os_mbuf_trim_front(struct os_mbuf *om);
-#define os_mbuf_trim_front r_os_mbuf_trim_front
-/**
- * Increases the length of an mbuf chain by inserting a gap at the specified
- * offset.  The contents of the gap are indeterminate.  If the mbuf chain
- * contains a packet header, its total length is increased accordingly.
- *
- * This function never frees the provided mbuf chain.
- *
- * @param om                    The mbuf chain to widen.
- * @param off                   The offset at which to insert the gap.
- * @param len                   The size of the gap to insert.
- *
- * @return                      0 on success; SYS_[...] error code on failure.
- */
-int r_os_mbuf_widen(struct os_mbuf *om, uint16_t off, uint16_t len);
-#define os_mbuf_widen r_os_mbuf_widen
-
-
-
-/**
- * Creates a single chained mbuf from m1 and m2 utilizing all
- * the available buffer space in all mbufs in the resulting
- * chain. In other words, ensures there is no leading space in
- * any mbuf in the resulting chain and trailing space only in
- * the last mbuf in the chain. Mbufs from either chain may be
- * freed if not needed. No mbufs are allocated. Note that mbufs
- * from m2 are added to the end of m1. If m1 has a packet
- * header, it is retained and length updated. If m2 has a packet
- * header it is discarded. If m1 is NULL, NULL is returned and
- * m2 is left untouched.
- *
- * @param m1 Pointer to first mbuf chain to pack
- * @param m2 Pointer to second mbuf chain to pack
- *
- * @return struct os_mbuf* Pointer to resulting mbuf chain
- */
-struct os_mbuf *r_os_mbuf_pack_chains(struct os_mbuf *m1, struct os_mbuf *m2);
-#define os_mbuf_pack_chains r_os_mbuf_pack_chains
-
-#else
-/**
- * Initializes an mqueue.  An mqueue is a queue of mbufs that ties to a
- * particular task's event queue.  Mqueues form a helper API around a common
- * paradigm: wait on an event queue until at least one packet is available,
- * then process a queue of packets.
- *
- * When mbufs are available on the queue, an event OS_EVENT_T_MQUEUE_DATA
- * will be posted to the task's mbuf queue.
- *
- * @param mq                    The mqueue to initialize
- * @param ev_cb                 The callback to associate with the mqeueue
- *                                  event.  Typically, this callback pulls each
- *                                  packet off the mqueue and processes them.
- * @param arg                   The argument to associate with the mqueue event.
- *
- * @return                      0 on success, non-zero on failure.
- */
-int os_mqueue_init(struct os_mqueue *mq, ble_npl_event_fn *ev_cb, void *arg);
-
-/**
- * Remove and return a single mbuf from the mbuf queue.  Does not block.
- *
- * @param mq The mbuf queue to pull an element off of.
- *
- * @return The next mbuf in the queue, or NULL if queue has no mbufs.
- */
-struct os_mbuf *os_mqueue_get(struct os_mqueue *);
-
-/**
- * Adds a packet (i.e. packet header mbuf) to an mqueue. The event associated
- * with the mqueue gets posted to the specified eventq.
- *
- * @param mq                    The mbuf queue to append the mbuf to.
- * @param evq                   The event queue to post an event to.
- * @param m                     The mbuf to append to the mbuf queue.
- *
- * @return 0 on success, non-zero on failure.
- */
-int os_mqueue_put(struct os_mqueue *, struct ble_npl_eventq *, struct os_mbuf *);
-
-/**
- * MSYS is a system level mbuf registry.  Allows the system to share
- * packet buffers amongst the various networking stacks that can be running
- * simultaeneously.
- *
- * Mbuf pools are created in the system initialization code, and then when
- * a mbuf is allocated out of msys, it will try and find the best fit based
- * upon estimated mbuf size.
- *
- * os_msys_register() registers a mbuf pool with MSYS, and allows MSYS to
- * allocate mbufs out of it.
- *
- * @param new_pool The pool to register with MSYS
- *
- * @return 0 on success, non-zero on failure
- */
-int os_msys_register(struct os_mbuf_pool *);
-
-/**
- * Allocate a mbuf from msys.  Based upon the data size requested,
- * os_msys_get() will choose the mbuf pool that has the best fit.
- *
- * @param dsize The estimated size of the data being stored in the mbuf
- * @param leadingspace The amount of leadingspace to allocate in the mbuf
- *
- * @return A freshly allocated mbuf on success, NULL on failure.
- */
-struct os_mbuf *os_msys_get(uint16_t dsize, uint16_t leadingspace);
-
-/**
- * De-registers all mbuf pools from msys.
- */
-void os_msys_reset(void);
-
-/**
- * Allocate a packet header structure from the MSYS pool.  See
- * os_msys_register() for a description of MSYS.
- *
- * @param dsize The estimated size of the data being stored in the mbuf
- * @param user_hdr_len The length to allocate for the packet header structure
- *
- * @return A freshly allocated mbuf on success, NULL on failure.
- */
-struct os_mbuf *os_msys_get_pkthdr(uint16_t dsize, uint16_t user_hdr_len);
-
-/**
- * Count the number of blocks in all the mbuf pools that are allocated.
- *
- * @return total number of blocks allocated in Msys
- */
-int os_msys_count(void);
-
-/**
- * Return the number of free blocks in Msys
- *
- * @return Number of free blocks available in Msys
- */
-int os_msys_num_free(void);
-
-/**
- * Initialize a pool of mbufs.
- *
- * @param omp     The mbuf pool to initialize
- * @param mp      The memory pool that will hold this mbuf pool
- * @param buf_len The length of the buffer itself.
- * @param nbufs   The number of buffers in the pool
- *
- * @return 0 on success, error code on failure.
- */
-int os_mbuf_pool_init(struct os_mbuf_pool *, struct os_mempool *mp,
-                      uint16_t, uint16_t);
-
-/**
- * Get an mbuf from the mbuf pool.  The mbuf is allocated, and initialized
- * prior to being returned.
- *
- * @param omp The mbuf pool to return the packet from
- * @param leadingspace The amount of leadingspace to put before the data
- *     section by default.
- *
- * @return An initialized mbuf on success, and NULL on failure.
- */
-struct os_mbuf *os_mbuf_get(struct os_mbuf_pool *omp, uint16_t);
-
-/**
- * Allocate a new packet header mbuf out of the os_mbuf_pool.
- *
- * @param omp The mbuf pool to allocate out of
- * @param user_pkthdr_len The packet header length to reserve for the caller.
- *
- * @return A freshly allocated mbuf on success, NULL on failure.
- */
-struct os_mbuf *os_mbuf_get_pkthdr(struct os_mbuf_pool *omp,
-                                   uint8_t pkthdr_len);
-
-/**
- * Duplicate a chain of mbufs.  Return the start of the duplicated chain.
- *
- * @param omp The mbuf pool to duplicate out of
- * @param om  The mbuf chain to duplicate
- *
- * @return A pointer to the new chain of mbufs
- */
-struct os_mbuf *os_mbuf_dup(struct os_mbuf *m);
-
-/**
- * Locates the specified absolute offset within an mbuf chain.  The offset
- * can be one past than the total length of the chain, but no greater.
- *
- * @param om                    The start of the mbuf chain to seek within.
- * @param off                   The absolute address to find.
- * @param out_off               On success, this points to the relative offset
- *                                  within the returned mbuf.
- *
- * @return                      The mbuf containing the specified offset on
- *                                  success.
- *                              NULL if the specified offset is out of bounds.
- */
-struct os_mbuf *os_mbuf_off(const struct os_mbuf *om, int off,
-                            uint16_t *out_off);
-
-
-/*
- * Copy data from an mbuf chain starting "off" bytes from the beginning,
- * continuing for "len" bytes, into the indicated buffer.
- *
- * @param m The mbuf chain to copy from
- * @param off The offset into the mbuf chain to begin copying from
- * @param len The length of the data to copy
- * @param dst The destination buffer to copy into
- *
- * @return                      0 on success;
- *                              -1 if the mbuf does not contain enough data.
- */
-int os_mbuf_copydata(const struct os_mbuf *m, int off, int len, void *dst);
-
-/**
- * @brief Calculates the length of an mbuf chain.
- *
- * Calculates the length of an mbuf chain.  If the mbuf contains a packet
- * header, you should use `OS_MBUF_PKTLEN()` as a more efficient alternative to
- * this function.
- *
- * @param om                    The mbuf to measure.
- *
- * @return                      The length, in bytes, of the provided mbuf
- *                                  chain.
- */
-uint16_t os_mbuf_len(const struct os_mbuf *om);
-
-/**
- * Append data onto a mbuf
- *
- * @param om   The mbuf to append the data onto
- * @param data The data to append onto the mbuf
- * @param len  The length of the data to append
- *
- * @return 0 on success, and an error code on failure
- */
-int os_mbuf_append(struct os_mbuf *m, const void *, uint16_t);
-
-/**
- * Reads data from one mbuf and appends it to another.  On error, the specified
- * data range may be partially appended.  Neither mbuf is required to contain
- * an mbuf packet header.
- *
- * @param dst                   The mbuf to append to.
- * @param src                   The mbuf to copy data from.
- * @param src_off               The absolute offset within the source mbuf
- *                                  chain to read from.
- * @param len                   The number of bytes to append.
- *
- * @return                      0 on success;
- *                              OS_EINVAL if the specified range extends beyond
- *                                  the end of the source mbuf chain.
- */
-int os_mbuf_appendfrom(struct os_mbuf *dst, const struct os_mbuf *src,
-                       uint16_t src_off, uint16_t len);
-
-/**
- * Release a mbuf back to the pool
- *
- * @param omp The Mbuf pool to release back to
- * @param om  The Mbuf to release back to the pool
- *
- * @return 0 on success, -1 on failure
- */
-int os_mbuf_free(struct os_mbuf *mb);
-
-/**
- * Free a chain of mbufs
- *
- * @param omp The mbuf pool to free the chain of mbufs into
- * @param om  The starting mbuf of the chain to free back into the pool
- *
- * @return 0 on success, -1 on failure
- */
-int os_mbuf_free_chain(struct os_mbuf *om);
-
-/**
- * Adjust the length of a mbuf, trimming either from the head or the tail
- * of the mbuf.
- *
- * @param mp The mbuf chain to adjust
- * @param req_len The length to trim from the mbuf.  If positive, trims
- *                from the head of the mbuf, if negative, trims from the
- *                tail of the mbuf.
- */
-void os_mbuf_adj(struct os_mbuf *mp, int req_len);
-
-
-/**
- * Performs a memory compare of the specified region of an mbuf chain against a
- * flat buffer.
- *
- * @param om                    The start of the mbuf chain to compare.
- * @param off                   The offset within the mbuf chain to start the
- *                                  comparison.
- * @param data                  The flat buffer to compare.
- * @param len                   The length of the flat buffer.
- *
- * @return                      0 if both memory regions are identical;
- *                              A memcmp return code if there is a mismatch;
- *                              INT_MAX if the mbuf is too short.
- */
-int os_mbuf_cmpf(const struct os_mbuf *om, int off, const void *data, int len);
-
-/**
- * Compares the contents of two mbuf chains.  The ranges of the two chains to
- * be compared are specified via the two offset parameters and the len
- * parameter.  Neither mbuf chain is required to contain a packet header.
- *
- * @param om1                   The first mbuf chain to compare.
- * @param offset1               The absolute offset within om1 at which to
- *                                  start the comparison.
- * @param om2                   The second mbuf chain to compare.
- * @param offset2               The absolute offset within om2 at which to
- *                                  start the comparison.
- * @param len                   The number of bytes to compare.
- *
- * @return                      0 if both mbuf segments are identical;
- *                              A memcmp() return code if the segment contents
- *                                  differ;
- *                              INT_MAX if a specified range extends beyond the
- *                                  end of its corresponding mbuf chain.
- */
-int os_mbuf_cmpm(const struct os_mbuf *om1, uint16_t offset1,
-                 const struct os_mbuf *om2, uint16_t offset2,
-                 uint16_t len);
-
-/**
- * Increases the length of an mbuf chain by adding data to the front.  If there
- * is insufficient room in the leading mbuf, additional mbufs are allocated and
- * prepended as necessary.  If this function fails to allocate an mbuf, the
- * entire chain is freed.
- *
- * The specified mbuf chain does not need to contain a packet header.
- *
- * @param omp                   The mbuf pool to allocate from.
- * @param om                    The head of the mbuf chain.
- * @param len                   The number of bytes to prepend.
- *
- * @return                      The new head of the chain on success;
- *                              NULL on failure.
- */
-struct os_mbuf *os_mbuf_prepend(struct os_mbuf *om, int len);
-
-/**
- * Prepends a chunk of empty data to the specified mbuf chain and ensures the
- * chunk is contiguous.  If either operation fails, the specified mbuf chain is
- * freed and NULL is returned.
- *
- * @param om                    The mbuf chain to prepend to.
- * @param len                   The number of bytes to prepend and pullup.
- *
- * @return                      The modified mbuf on success;
- *                              NULL on failure (and the mbuf chain is freed).
- */
-struct os_mbuf *os_mbuf_prepend_pullup(struct os_mbuf *om, uint16_t len);
-
-/**
- * Copies the contents of a flat buffer into an mbuf chain, starting at the
- * specified destination offset.  If the mbuf is too small for the source data,
- * it is extended as necessary.  If the destination mbuf contains a packet
- * header, the header length is updated.
- *
- * @param omp                   The mbuf pool to allocate from.
- * @param om                    The mbuf chain to copy into.
- * @param off                   The offset within the chain to copy to.
- * @param src                   The source buffer to copy from.
- * @param len                   The number of bytes to copy.
- *
- * @return                      0 on success; nonzero on failure.
- */
-int os_mbuf_copyinto(struct os_mbuf *om, int off, const void *src, int len);
-
-/**
- * Attaches a second mbuf chain onto the end of the first.  If the first chain
- * contains a packet header, the header's length is updated.  If the second
- * chain has a packet header, its header is cleared.
- *
- * @param first                 The mbuf chain being attached to.
- * @param second                The mbuf chain that gets attached.
- */
-void os_mbuf_concat(struct os_mbuf *first, struct os_mbuf *second);
-
-
-/**
- * Increases the length of an mbuf chain by the specified amount.  If there is
- * not sufficient room in the last buffer, a new buffer is allocated and
- * appended to the chain.  It is an error to request more data than can fit in
- * a single buffer.
- *
- * @param omp
- * @param om                    The head of the chain to extend.
- * @param len                   The number of bytes to extend by.
- *
- * @return                      A pointer to the new data on success;
- *                              NULL on failure.
- */
-void *os_mbuf_extend(struct os_mbuf *om, uint16_t len);
-
-/**
- * Rearrange a mbuf chain so that len bytes are contiguous,
- * and in the data area of an mbuf (so that OS_MBUF_DATA() will
- * work on a structure of size len.)  Returns the resulting
- * mbuf chain on success, free's it and returns NULL on failure.
- *
- * If there is room, it will add up to "max_protohdr - len"
- * extra bytes to the contiguous region, in an attempt to avoid being
- * called next time.
- *
- * @param omp The mbuf pool to take the mbufs out of
- * @param om The mbuf chain to make contiguous
- * @param len The number of bytes in the chain to make contiguous
- *
- * @return The contiguous mbuf chain on success, NULL on failure.
- */
-struct os_mbuf *os_mbuf_pullup(struct os_mbuf *om, uint16_t len);
-
-
-/**
- * Removes and frees empty mbufs from the front of a chain.  If the chain
- * contains a packet header, it is preserved.
- *
- * @param om                    The mbuf chain to trim.
- *
- * @return                      The head of the trimmed mbuf chain.
- */
-struct os_mbuf *os_mbuf_trim_front(struct os_mbuf *om);
-
-/**
- * Increases the length of an mbuf chain by inserting a gap at the specified
- * offset.  The contents of the gap are indeterminate.  If the mbuf chain
- * contains a packet header, its total length is increased accordingly.
- *
- * This function never frees the provided mbuf chain.
- *
- * @param om                    The mbuf chain to widen.
- * @param off                   The offset at which to insert the gap.
- * @param len                   The size of the gap to insert.
- *
- * @return                      0 on success; SYS_[...] error code on failure.
- */
-int os_mbuf_widen(struct os_mbuf *om, uint16_t off, uint16_t len);
-
-
-/**
- * Creates a single chained mbuf from m1 and m2 utilizing all
- * the available buffer space in all mbufs in the resulting
- * chain. In other words, ensures there is no leading space in
- * any mbuf in the resulting chain and trailing space only in
- * the last mbuf in the chain. Mbufs from either chain may be
- * freed if not needed. No mbufs are allocated. Note that mbufs
- * from m2 are added to the end of m1. If m1 has a packet
- * header, it is retained and length updated. If m2 has a packet
- * header it is discarded. If m1 is NULL, NULL is returned and
- * m2 is left untouched.
- *
- * @param m1 Pointer to first mbuf chain to pack
- * @param m2 Pointer to second mbuf chain to pack
- *
- * @return struct os_mbuf* Pointer to resulting mbuf chain
- */
-struct os_mbuf *os_mbuf_pack_chains(struct os_mbuf *m1, struct os_mbuf *m2);
-
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _OS_MBUF_H */
-
-
-/**
- *   @} OSMbuf
- * @} OSKernel
- */
diff --git a/lib/bt/porting/nimble/include/os/os_mempool.h b/lib/bt/porting/nimble/include/os/os_mempool.h
deleted file mode 100644
index 3ef8e6d5..00000000
--- a/lib/bt/porting/nimble/include/os/os_mempool.h
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 The Apache Software Foundation (ASF)
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * SPDX-FileContributor: 2019-2022 Espressif Systems (Shanghai) CO LTD
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-/**
- * @addtogroup OSKernel
- * @{
- *   @defgroup OSMempool Memory Pools
- *   @{
- */
-
-
-#ifndef _OS_MEMPOOL_H_
-#define _OS_MEMPOOL_H_
-
-#include <stdbool.h>
-#include "os/os.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * A memory block structure. This simply contains a pointer to the free list
- * chain and is only used when the block is on the free list. When the block
- * has been removed from the free list the entire memory block is usable by the
- * caller.
- */
-struct os_memblock {
-    SLIST_ENTRY(os_memblock) mb_next;
-};
-
-/* XXX: Change this structure so that we keep the first address in the pool? */
-/* XXX: add memory debug structure and associated code */
-/* XXX: Change how I coded the SLIST_HEAD here. It should be named:
-   SLIST_HEAD(,os_memblock) mp_head; */
-
-/**
- * Memory pool
- */
-struct os_mempool {
-    /** Size of the memory blocks, in bytes. */
-    uint32_t mp_block_size;
-    /** The number of memory blocks. */
-    uint16_t mp_num_blocks;
-    /** The number of free blocks left */
-    uint16_t mp_num_free;
-    /** The lowest number of free blocks seen */
-    uint16_t mp_min_free;
-    /** Bitmap of OS_MEMPOOL_F_[...] values. */
-    uint8_t mp_flags;
-    /** Address of memory buffer used by pool */
-    uint32_t mp_membuf_addr;
-    STAILQ_ENTRY(os_mempool) mp_list;
-    SLIST_HEAD(,os_memblock);
-    /** Name for memory block */
-    const char *name;
-};
-
-/**
- * Indicates an extended mempool.  Address can be safely cast to
- * (struct os_mempool_ext *).
- */
-#define OS_MEMPOOL_F_EXT        0x01
-
-struct os_mempool_ext;
-
-/**
- * Block put callback function.  If configured, this callback gets executed
- * whenever a block is freed to the corresponding extended mempool.  Note: The
- * os_memblock_put() function calls this callback instead of freeing the block
- * itself.  Therefore, it is the callback's responsibility to free the block
- * via a call to os_memblock_put_from_cb().
- *
- * @param ome                   The extended mempool that a block is being
- *                                  freed back to.
- * @param data                  The block being freed.
- * @param arg                   Optional argument configured along with the
- *                                  callback.
- *
- * @return                      Indicates whether the block was successfully
- *                                  freed.  A non-zero value should only be
- *                                  returned if the block was not successfully
- *                                  released back to its pool.
- */
-typedef os_error_t os_mempool_put_fn(struct os_mempool_ext *ome, void *data,
-                                     void *arg);
-
-struct os_mempool_ext {
-    struct os_mempool mpe_mp;
-
-    /* Callback that is executed immediately when a block is freed. */
-    os_mempool_put_fn *mpe_put_cb;
-    void *mpe_put_arg;
-};
-
-#define OS_MEMPOOL_INFO_NAME_LEN (32)
-
-/**
- * Information describing a memory pool, used to return OS information
- * to the management layer.
- */
-struct os_mempool_info {
-    /** Size of the memory blocks in the pool */
-    int omi_block_size;
-    /** Number of memory blocks in the pool */
-    int omi_num_blocks;
-    /** Number of free memory blocks */
-    int omi_num_free;
-    /** Minimum number of free memory blocks ever */
-    int omi_min_free;
-    /** Name of the memory pool */
-    char omi_name[OS_MEMPOOL_INFO_NAME_LEN];
-};
-
-/**
- * Get information about the next system memory pool.
- *
- * @param mempool The current memory pool, or NULL if starting iteration.
- * @param info    A pointer to the structure to return memory pool information
- *                into.
- *
- * @return The next memory pool in the list to get information about, or NULL
- *         when at the last memory pool.
- */
-struct os_mempool *os_mempool_info_get_next(struct os_mempool *,
-                                            struct os_mempool_info *);
-
-#if (OS_ALIGNMENT == 4)
-typedef uint32_t os_membuf_t;
-#elif (OS_ALIGNMENT == 8)
-typedef uint64_t os_membuf_t;
-#elif (OS_ALIGNMENT == 16)
-typedef __uint128_t os_membuf_t;
-#else
-#error "Unhandled `OS_ALIGNMENT` for `os_membuf_t`"
-#endif /* OS_ALIGNMENT == * */
-#define OS_MEMPOOL_SIZE(n,blksize)      ((((blksize) + ((OS_ALIGNMENT)-1)) / (OS_ALIGNMENT)) * (n))
-
-/** Calculates the number of bytes required to initialize a memory pool. */
-#define OS_MEMPOOL_BYTES(n,blksize)     \
-    (sizeof (os_membuf_t) * OS_MEMPOOL_SIZE((n), (blksize)))
-
-#if SOC_ESP_NIMBLE_CONTROLLER && CONFIG_BT_CONTROLLER_ENABLED
-/**
- * Initialize a memory pool.
- *
- * @param mp            Pointer to a pointer to a mempool
- * @param blocks        The number of blocks in the pool
- * @param blocks_size   The size of the block, in bytes.
- * @param membuf        Pointer to memory to contain blocks.
- * @param name          Name of the pool.
- *
- * @return os_error_t
- */
-os_error_t r_os_mempool_init(struct os_mempool *mp, uint16_t blocks,
-                           uint32_t block_size, void *membuf, const char *name);
-#define os_mempool_init r_os_mempool_init
-/**
- * Initializes an extended memory pool.  Extended attributes (e.g., callbacks)
- * are not specified when this function is called; they are assigned manually
- * after initialization.
- *
- * @param mpe           The extended memory pool to initialize.
- * @param blocks        The number of blocks in the pool.
- * @param block_size    The size of each block, in bytes.
- * @param membuf        Pointer to memory to contain blocks.
- * @param name          Name of the pool.
- *
- * @return os_error_t
- */
-os_error_t r_os_mempool_ext_init(struct os_mempool_ext *mpe, uint16_t blocks,
-                               uint32_t block_size, void *membuf, const char *name);
-#define os_mempool_ext_init r_os_mempool_ext_init
-/**
- * Removes the specified mempool from the list of initialized mempools.
- *
- * @param mp                    The mempool to unregister.
- *
- * @return                      0 on success;
- *                              OS_INVALID_PARM if the mempool is not
- *                                  registered.
- */
-os_error_t r_os_mempool_unregister(struct os_mempool *mp);
-#define os_mempool_unregister r_os_mempool_unregister
-
-
-/**
- * Clears a memory pool.
- *
- * @param mp            The mempool to clear.
- *
- * @return os_error_t
- */
-os_error_t r_os_mempool_clear(struct os_mempool *mp);
-#define os_mempool_clear r_os_mempool_clear
-
-
-/**
- * Performs an integrity check of the specified mempool.  This function
- * attempts to detect memory corruption in the specified memory pool.
- *
- * @param mp                    The mempool to check.
- *
- * @return                      true if the memory pool passes the integrity
- *                                  check;
- *                              false if the memory pool is corrupt.
- */
-bool r_os_mempool_is_sane(const struct os_mempool *mp);
-#define os_mempool_is_sane r_os_mempool_is_sane
-
-
-/**
- * Checks if a memory block was allocated from the specified mempool.
- *
- * @param mp                    The mempool to check as parent.
- * @param block_addr            The memory block to check as child.
- *
- * @return                      0 if the block does not belong to the mempool;
- *                              1 if the block does belong to the mempool.
- */
-int r_os_memblock_from(const struct os_mempool *mp, const void *block_addr);
-#define os_memblock_from r_os_memblock_from
-
-
-/**
- * Get a memory block from a memory pool
- *
- * @param mp Pointer to the memory pool
- *
- * @return void* Pointer to block if available; NULL otherwise
- */
-void *r_os_memblock_get(struct os_mempool *mp);
-#define os_memblock_get r_os_memblock_get
-/**
- * Puts the memory block back into the pool, ignoring the put callback, if any.
- * This function should only be called from a put callback to free a block
- * without causing infinite recursion.
- *
- * @param mp Pointer to memory pool
- * @param block_addr Pointer to memory block
- *
- * @return os_error_t
- */
-os_error_t r_os_memblock_put_from_cb(struct os_mempool *mp, void *block_addr);
-#define os_memblock_put_from_cb r_os_memblock_put_from_cb
-
-
-/**
- * Puts the memory block back into the pool
- *
- * @param mp Pointer to memory pool
- * @param block_addr Pointer to memory block
- *
- * @return os_error_t
- */
-os_error_t r_os_memblock_put(struct os_mempool *mp, void *block_addr);
-#define os_memblock_put r_os_memblock_put
-
-#else
-/**
- * Initialize a memory pool.
- *
- * @param mp            Pointer to a pointer to a mempool
- * @param blocks        The number of blocks in the pool
- * @param blocks_size   The size of the block, in bytes.
- * @param membuf        Pointer to memory to contain blocks.
- * @param name          Name of the pool.
- *
- * @return os_error_t
- */
-os_error_t os_mempool_init(struct os_mempool *mp, uint16_t blocks,
-                           uint32_t block_size, void *membuf, const char *name);
-
-/**
- * Initializes an extended memory pool.  Extended attributes (e.g., callbacks)
- * are not specified when this function is called; they are assigned manually
- * after initialization.
- *
- * @param mpe           The extended memory pool to initialize.
- * @param blocks        The number of blocks in the pool.
- * @param block_size    The size of each block, in bytes.
- * @param membuf        Pointer to memory to contain blocks.
- * @param name          Name of the pool.
- *
- * @return os_error_t
- */
-os_error_t os_mempool_ext_init(struct os_mempool_ext *mpe, uint16_t blocks,
-                               uint32_t block_size, void *membuf, const char *name);
-
-/**
- * Removes the specified mempool from the list of initialized mempools.
- *
- * @param mp                    The mempool to unregister.
- *
- * @return                      0 on success;
- *                              OS_INVALID_PARM if the mempool is not
- *                                  registered.
- */
-os_error_t os_mempool_unregister(struct os_mempool *mp);
-
-/**
- * Clears a memory pool.
- *
- * @param mp            The mempool to clear.
- *
- * @return os_error_t
- */
-os_error_t os_mempool_clear(struct os_mempool *mp);
-
-/**
- * Clears an extended memory pool.
- *
- * @param mpe            The extended memory pool to clear.
- *
- * @return os_error_t
- */
-os_error_t os_mempool_ext_clear(struct os_mempool_ext *mpe);
-
-/**
- * Performs an integrity check of the specified mempool.  This function
- * attempts to detect memory corruption in the specified memory pool.
- *
- * @param mp                    The mempool to check.
- *
- * @return                      true if the memory pool passes the integrity
- *                                  check;
- *                              false if the memory pool is corrupt.
- */
-bool os_mempool_is_sane(const struct os_mempool *mp);
-
-/**
- * Checks if a memory block was allocated from the specified mempool.
- *
- * @param mp                    The mempool to check as parent.
- * @param block_addr            The memory block to check as child.
- *
- * @return                      0 if the block does not belong to the mempool;
- *                              1 if the block does belong to the mempool.
- */
-int os_memblock_from(const struct os_mempool *mp, const void *block_addr);
-
-/**
- * Get a memory block from a memory pool
- *
- * @param mp Pointer to the memory pool
- *
- * @return void* Pointer to block if available; NULL otherwise
- */
-void *os_memblock_get(struct os_mempool *mp);
-
-/**
- * Puts the memory block back into the pool, ignoring the put callback, if any.
- * This function should only be called from a put callback to free a block
- * without causing infinite recursion.
- *
- * @param mp Pointer to memory pool
- * @param block_addr Pointer to memory block
- *
- * @return os_error_t
- */
-os_error_t os_memblock_put_from_cb(struct os_mempool *mp, void *block_addr);
-
-/**
- * Puts the memory block back into the pool
- *
- * @param mp Pointer to memory pool
- * @param block_addr Pointer to memory block
- *
- * @return os_error_t
- */
-os_error_t os_memblock_put(struct os_mempool *mp, void *block_addr);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* _OS_MEMPOOL_H_ */
-
-
-/**
- *   @} OSMempool
- * @} OSKernel
- */
diff --git a/lib/bt/porting/nimble/include/os/queue.h b/lib/bt/porting/nimble/include/os/queue.h
deleted file mode 100644
index c184a394..00000000
--- a/lib/bt/porting/nimble/include/os/queue.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD: src/sys/sys/queue.h,v 1.32.2.7 2002/04/17 14:21:02 des Exp $
- */
-
-#ifndef _QUEUE_H_
-#define	_QUEUE_H_
-
-/* The common BSD linked list queue macros are already defined here for ESP-IDF */
-#include <sys/queue.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * This file defines circular queues. The other types of data structures:
- * singly-linked lists, singly-linked tail queues, lists and tail queues
- * are used from sys/queue.h
- *
- * A singly-linked list is headed by a single forward pointer. The elements
- * are singly linked for minimum space and pointer manipulation overhead at
- * the expense of O(n) removal for arbitrary elements. New elements can be
- * added to the list after an existing element or at the head of the list.
- * Elements being removed from the head of the list should use the explicit
- * macro for this purpose for optimum efficiency. A singly-linked list may
- * only be traversed in the forward direction.  Singly-linked lists are ideal
- * for applications with large datasets and few or no removals or for
- * implementing a LIFO queue.
- *
- * A singly-linked tail queue is headed by a pair of pointers, one to the
- * head of the list and the other to the tail of the list. The elements are
- * singly linked for minimum space and pointer manipulation overhead at the
- * expense of O(n) removal for arbitrary elements. New elements can be added
- * to the list after an existing element, at the head of the list, or at the
- * end of the list. Elements being removed from the head of the tail queue
- * should use the explicit macro for this purpose for optimum efficiency.
- * A singly-linked tail queue may only be traversed in the forward direction.
- * Singly-linked tail queues are ideal for applications with large datasets
- * and few or no removals or for implementing a FIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may be traversed in either direction.
- *
- * A circle queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or after
- * an existing element, at the head of the list, or at the end of the list.
- * A circle queue may be traversed in either direction, but has a more
- * complex end of list detection.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- *
- *
- *                      SLIST   LIST    STAILQ  TAILQ   CIRCLEQ
- * _HEAD                +       +       +       +       +
- * _HEAD_INITIALIZER    +       +       +       +       +
- * _ENTRY               +       +       +       +       +
- * _INIT                +       +       +       +       +
- * _EMPTY               +       +       +       +       +
- * _FIRST               +       +       +       +       +
- * _NEXT                +       +       +       +       +
- * _PREV                -       -       -       +       +
- * _LAST                -       -       +       +       +
- * _FOREACH             +       +       +       +       +
- * _FOREACH_REVERSE     -       -       -       +       +
- * _INSERT_HEAD         +       +       +       +       +
- * _INSERT_BEFORE       -       +       -       +       +
- * _INSERT_AFTER        +       +       +       +       +
- * _INSERT_TAIL         -       -       +       +       +
- * _REMOVE_HEAD         +       -       +       -       -
- * _REMOVE              +       +       +       +       +
- *
- */
-
-/*
- * Circular queue declarations.
- */
-#define	CIRCLEQ_HEAD(name, type)					\
-struct name {								\
-	struct type *cqh_first;		/* first element */		\
-	struct type *cqh_last;		/* last element */		\
-}
-
-#define	CIRCLEQ_HEAD_INITIALIZER(head)					\
-	{ (void *)&(head), (void *)&(head) }
-
-#define	CIRCLEQ_ENTRY(type)						\
-struct {								\
-	struct type *cqe_next;		/* next element */		\
-	struct type *cqe_prev;		/* previous element */		\
-}
-
-/*
- * Circular queue functions.
- */
-#define	CIRCLEQ_EMPTY(head)	((head)->cqh_first == (void *)(head))
-
-#define	CIRCLEQ_FIRST(head)	((head)->cqh_first)
-
-#define	CIRCLEQ_FOREACH(var, head, field)				\
-	for ((var) = CIRCLEQ_FIRST((head));				\
-	    (var) != (void *)(head) || ((var) = NULL);			\
-	    (var) = CIRCLEQ_NEXT((var), field))
-
-#define	CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
-	for ((var) = CIRCLEQ_LAST((head));				\
-	    (var) != (void *)(head) || ((var) = NULL);			\
-	    (var) = CIRCLEQ_PREV((var), field))
-
-#define	CIRCLEQ_INIT(head) do {						\
-	CIRCLEQ_FIRST((head)) = (void *)(head);				\
-	CIRCLEQ_LAST((head)) = (void *)(head);				\
-} while (0)
-
-#define	CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	CIRCLEQ_NEXT((elm), field) = CIRCLEQ_NEXT((listelm), field);	\
-	CIRCLEQ_PREV((elm), field) = (listelm);				\
-	if (CIRCLEQ_NEXT((listelm), field) == (void *)(head))		\
-		CIRCLEQ_LAST((head)) = (elm);				\
-	else								\
-		CIRCLEQ_PREV(CIRCLEQ_NEXT((listelm), field), field) = (elm);\
-	CIRCLEQ_NEXT((listelm), field) = (elm);				\
-} while (0)
-
-#define	CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {		\
-	CIRCLEQ_NEXT((elm), field) = (listelm);				\
-	CIRCLEQ_PREV((elm), field) = CIRCLEQ_PREV((listelm), field);	\
-	if (CIRCLEQ_PREV((listelm), field) == (void *)(head))		\
-		CIRCLEQ_FIRST((head)) = (elm);				\
-	else								\
-		CIRCLEQ_NEXT(CIRCLEQ_PREV((listelm), field), field) = (elm);\
-	CIRCLEQ_PREV((listelm), field) = (elm);				\
-} while (0)
-
-#define	CIRCLEQ_INSERT_HEAD(head, elm, field) do {			\
-	CIRCLEQ_NEXT((elm), field) = CIRCLEQ_FIRST((head));		\
-	CIRCLEQ_PREV((elm), field) = (void *)(head);			\
-	if (CIRCLEQ_LAST((head)) == (void *)(head))			\
-		CIRCLEQ_LAST((head)) = (elm);				\
-	else								\
-		CIRCLEQ_PREV(CIRCLEQ_FIRST((head)), field) = (elm);	\
-	CIRCLEQ_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	CIRCLEQ_INSERT_TAIL(head, elm, field) do {			\
-	CIRCLEQ_NEXT((elm), field) = (void *)(head);			\
-	CIRCLEQ_PREV((elm), field) = CIRCLEQ_LAST((head));		\
-	if (CIRCLEQ_FIRST((head)) == (void *)(head))			\
-		CIRCLEQ_FIRST((head)) = (elm);				\
-	else								\
-		CIRCLEQ_NEXT(CIRCLEQ_LAST((head)), field) = (elm);	\
-	CIRCLEQ_LAST((head)) = (elm);					\
-} while (0)
-
-#define	CIRCLEQ_LAST(head)	((head)->cqh_last)
-
-#define	CIRCLEQ_NEXT(elm,field)	((elm)->field.cqe_next)
-
-#define	CIRCLEQ_PREV(elm,field)	((elm)->field.cqe_prev)
-
-#define	CIRCLEQ_REMOVE(head, elm, field) do {				\
-	if (CIRCLEQ_NEXT((elm), field) == (void *)(head))		\
-		CIRCLEQ_LAST((head)) = CIRCLEQ_PREV((elm), field);	\
-	else								\
-		CIRCLEQ_PREV(CIRCLEQ_NEXT((elm), field), field) =	\
-		    CIRCLEQ_PREV((elm), field);				\
-	if (CIRCLEQ_PREV((elm), field) == (void *)(head))		\
-		CIRCLEQ_FIRST((head)) = CIRCLEQ_NEXT((elm), field);	\
-	else								\
-		CIRCLEQ_NEXT(CIRCLEQ_PREV((elm), field), field) =	\
-		    CIRCLEQ_NEXT((elm), field);				\
-} while (0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_SYS_QUEUE_H_ */
diff --git a/lib/bt/porting/nimble/include/os/util.h b/lib/bt/porting/nimble/include/os/util.h
deleted file mode 100644
index 2438373e..00000000
--- a/lib/bt/porting/nimble/include/os/util.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 The Apache Software Foundation (ASF)
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * SPDX-FileContributor: 2019-2022 Espressif Systems (Shanghai) CO LTD
- */
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 H_OS_UTIL_
-#define H_OS_UTIL_
-
-/* Helpers to pass integers as pointers and vice-versa */
-#define POINTER_TO_UINT(p) ((unsigned int) ((uintptr_t) (p)))
-#define UINT_TO_POINTER(u) ((void *) ((uintptr_t) (u)))
-#define POINTER_TO_INT(p) ((int) ((intptr_t) (p)))
-#define INT_TO_POINTER(u) ((void *) ((intptr_t) (u)))
-
-/* Helper to retrieve pointer to "parent" object in structure */
-#define CONTAINER_OF(ptr, type, field) \
-        ((type *)(((char *)(ptr)) - offsetof(type, field)))
-
-/* Helper to calculate number of elements in array */
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(array) \
-        (sizeof(array) / sizeof((array)[0]))
-#endif
-#endif
diff --git a/lib/bt/porting/nimble/src/os_msys_init.c b/lib/bt/porting/nimble/src/os_msys_init.c
deleted file mode 100644
index bf4f4145..00000000
--- a/lib/bt/porting/nimble/src/os_msys_init.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 The Apache Software Foundation (ASF)
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * SPDX-FileContributor: 2019-2022 Espressif Systems (Shanghai) CO LTD
- */
-
-#include <assert.h>
-
-#include "os/os.h"
-#include "mem_api.h"
-#include "bt_osi_mem.h"
-#include "esp_err.h"
-
-#if CONFIG_BT_NIMBLE_ENABLED
-#include "syscfg/syscfg.h"
-#endif
-
-#define SYSINIT_PANIC_ASSERT(rc)        assert(rc);
-
-static STAILQ_HEAD(, os_mbuf_pool) g_msys_pool_list =
-    STAILQ_HEAD_INITIALIZER(g_msys_pool_list);
-
-#if CONFIG_BT_NIMBLE_ENABLED
-#define OS_MSYS_1_BLOCK_COUNT MYNEWT_VAL(MSYS_1_BLOCK_COUNT)
-#define OS_MSYS_1_BLOCK_SIZE MYNEWT_VAL(MSYS_1_BLOCK_SIZE)
-#define OS_MSYS_2_BLOCK_COUNT MYNEWT_VAL(MSYS_2_BLOCK_COUNT)
-#define OS_MSYS_2_BLOCK_SIZE MYNEWT_VAL(MSYS_2_BLOCK_SIZE)
-
-#define OS_MSYS_1_SANITY_MIN_COUNT MYNEWT_VAL(MSYS_1_SANITY_MIN_COUNT)
-#define OS_MSYS_2_SANITY_MIN_COUNT MYNEWT_VAL(MSYS_2_SANITY_MIN_COUNT)
-#if CONFIG_BT_NIMBLE_MSYS_BUF_FROM_HEAP
-#define OS_MSYS_BLOCK_FROM_HEAP                 (1)
-#else
-#define OS_MSYS_BLOCK_FROM_HEAP                 (0)
-#endif // CONFIG_BT_NIMBLE_MSYS_BUF_FROM_HEAP
-#else
-#define OS_MSYS_1_BLOCK_COUNT CONFIG_BT_LE_MSYS_1_BLOCK_COUNT
-#define OS_MSYS_1_BLOCK_SIZE CONFIG_BT_LE_MSYS_1_BLOCK_SIZE
-#define OS_MSYS_2_BLOCK_COUNT CONFIG_BT_LE_MSYS_2_BLOCK_COUNT
-#define OS_MSYS_2_BLOCK_SIZE CONFIG_BT_LE_MSYS_2_BLOCK_SIZE
-
-#define OS_MSYS_1_SANITY_MIN_COUNT 0
-#define OS_MSYS_2_SANITY_MIN_COUNT 0
-
-#if CONFIG_BT_LE_MSYS_BUF_FROM_HEAP
-#define OS_MSYS_BLOCK_FROM_HEAP                 (1)
-#else
-#define OS_MSYS_BLOCK_FROM_HEAP                 (0)
-#endif // CONFIG_BT_LE_MSYS_BUF_FROM_HEAP
-#endif
-
-
-
-#if OS_MSYS_1_BLOCK_COUNT > 0
-#define SYSINIT_MSYS_1_MEMBLOCK_SIZE                \
-    OS_ALIGN(OS_MSYS_1_BLOCK_SIZE, 4)
-#define SYSINIT_MSYS_1_MEMPOOL_SIZE                 \
-    OS_MEMPOOL_SIZE(OS_MSYS_1_BLOCK_COUNT,  \
-                    SYSINIT_MSYS_1_MEMBLOCK_SIZE)
-
-#if !CONFIG_BT_LE_MSYS_INIT_IN_CONTROLLER
-static os_membuf_t *os_msys_init_1_data;
-static struct os_mbuf_pool os_msys_init_1_mbuf_pool;
-static struct os_mempool os_msys_init_1_mempool;
-#endif // !CONFIG_BT_LE_MSYS_INIT_IN_CONTROLLER
-#endif
-
-#if OS_MSYS_2_BLOCK_COUNT > 0
-#define SYSINIT_MSYS_2_MEMBLOCK_SIZE                \
-    OS_ALIGN(OS_MSYS_2_BLOCK_SIZE, 4)
-#define SYSINIT_MSYS_2_MEMPOOL_SIZE                 \
-    OS_MEMPOOL_SIZE(OS_MSYS_2_BLOCK_COUNT,  \
-                    SYSINIT_MSYS_2_MEMBLOCK_SIZE)
-
-#if !CONFIG_BT_LE_MSYS_INIT_IN_CONTROLLER
-static os_membuf_t *os_msys_init_2_data;
-static struct os_mbuf_pool os_msys_init_2_mbuf_pool;
-static struct os_mempool os_msys_init_2_mempool;
-#endif // !CONFIG_BT_LE_MSYS_INIT_IN_CONTROLLER
-#endif
-
-#if CONFIG_BT_LE_MSYS_INIT_IN_CONTROLLER
-extern int  esp_ble_msys_init(uint16_t msys_size1, uint16_t msys_size2, uint16_t msys_cnt1, uint16_t msys_cnt2, uint8_t from_heap);
-extern void esp_ble_msys_deinit(void);
-
-int os_msys_init(void)
-{
-    return esp_ble_msys_init(SYSINIT_MSYS_1_MEMBLOCK_SIZE,
-                             SYSINIT_MSYS_2_MEMBLOCK_SIZE,
-                             OS_MSYS_1_BLOCK_COUNT,
-                             OS_MSYS_2_BLOCK_COUNT,
-                             OS_MSYS_BLOCK_FROM_HEAP);
-}
-
-void os_msys_deinit(void)
-{
-    esp_ble_msys_deinit();
-}
-
-#else // CONFIG_BT_LE_MSYS_INIT_IN_CONTROLLER
-
-#if OS_MSYS_SANITY_ENABLED
-
-/**
- * Retrieves the minimum safe buffer count for an msys pool.  That is, the
- * lowest a pool's buffer count can be without causing the sanity check to
- * fail.
- *
- * @param idx                   The index of the msys pool to query.
- *
- * @return                      The msys pool's minimum safe buffer count.
- */
-static int
-IRAM_ATTR os_msys_sanity_min_count(int idx)
-{
-    switch (idx) {
-    case 0:
-        return OS_MSYS_1_SANITY_MIN_COUNT;
-
-    case 1:
-        return OS_MSYS_2_SANITY_MIN_COUNT;
-
-    default:
-        BLE_LL_ASSERT(0);
-        return ESP_OK;
-    }
-}
-
-static int
-IRAM_ATTR os_msys_sanity(struct os_sanity_check *sc, void *arg)
-{
-    const struct os_mbuf_pool *omp;
-    int min_count;
-    int idx;
-
-    idx = 0;
-    STAILQ_FOREACH(omp, &g_msys_pool_list, omp_next) {
-        min_count = os_msys_sanity_min_count(idx);
-        if (omp->omp_pool->mp_num_free < min_count) {
-            return OS_ENOMEM;
-        }
-
-        idx++;
-    }
-
-    return ESP_OK;
-}
-#endif
-
-static void
-os_msys_init_once(void *data, struct os_mempool *mempool,
-                  struct os_mbuf_pool *mbuf_pool,
-                  int block_count, int block_size, const char *name)
-{
-    int rc;
-
-    rc = mem_init_mbuf_pool(data, mempool, mbuf_pool, block_count, block_size,
-                            name);
-    SYSINIT_PANIC_ASSERT(rc == 0);
-
-    rc = os_msys_register(mbuf_pool);
-    SYSINIT_PANIC_ASSERT(rc == 0);
-}
-
-int
-os_msys_buf_alloc(void)
-{
-#if OS_MSYS_1_BLOCK_COUNT > 0
-    os_msys_init_1_data = (os_membuf_t *)bt_osi_mem_calloc(1, (sizeof(os_membuf_t) * SYSINIT_MSYS_1_MEMPOOL_SIZE));
-    if (!os_msys_init_1_data) {
-        return ESP_ERR_NO_MEM;
-    }
-#endif
-
-#if OS_MSYS_2_BLOCK_COUNT > 0
-    os_msys_init_2_data = (os_membuf_t *)bt_osi_mem_calloc(1, (sizeof(os_membuf_t) * SYSINIT_MSYS_2_MEMPOOL_SIZE));
-    if (!os_msys_init_2_data) {
-#if OS_MSYS_1_BLOCK_COUNT > 0
-       bt_osi_mem_free(os_msys_init_1_data);
-       os_msys_init_1_data = NULL;
-#endif
-        return ESP_ERR_NO_MEM;
-    }
-#endif
-
-    return ESP_OK;
-}
-
-void
-os_msys_buf_free(void)
-{
-#if OS_MSYS_1_BLOCK_COUNT > 0
-    bt_osi_mem_free(os_msys_init_1_data);
-    os_msys_init_1_data = NULL;
-#endif
-
-#if OS_MSYS_2_BLOCK_COUNT > 0
-    bt_osi_mem_free(os_msys_init_2_data);
-    os_msys_init_2_data = NULL;
-#endif
-
-}
-
-void os_msys_init(void)
-{
-#if OS_MSYS_SANITY_ENABLED
-    int rc;
-#endif
-
-    os_msys_reset();
-
-#if OS_MSYS_1_BLOCK_COUNT > 0
-    os_msys_init_once(os_msys_init_1_data,
-                      &os_msys_init_1_mempool,
-                      &os_msys_init_1_mbuf_pool,
-                      OS_MSYS_1_BLOCK_COUNT,
-                      SYSINIT_MSYS_1_MEMBLOCK_SIZE,
-                      "msys_1");
-#endif
-
-#if OS_MSYS_2_BLOCK_COUNT > 0
-    os_msys_init_once(os_msys_init_2_data,
-                      &os_msys_init_2_mempool,
-                      &os_msys_init_2_mbuf_pool,
-                      OS_MSYS_2_BLOCK_COUNT,
-                      SYSINIT_MSYS_2_MEMBLOCK_SIZE,
-                      "msys_2");
-#endif
-
-#if OS_MSYS_SANITY_ENABLED
-    os_msys_sc.sc_func = os_msys_sanity;
-    os_msys_sc.sc_checkin_itvl =
-        OS_TICKS_PER_SEC * MYNEWT_VAL(MSYS_SANITY_TIMEOUT) / 1000;
-    rc = os_sanity_check_register(&os_msys_sc);
-    SYSINIT_PANIC_ASSERT(rc == 0);
-#endif
-}
-#endif // CONFIG_BT_LE_MSYS_INIT_IN_CONTROLLER
diff --git a/lib/bt/porting/npl/freertos/src/npl_os_freertos.c b/lib/bt/porting/npl/freertos/src/npl_os_freertos.c
index 29e2567d..73f42526 100644
--- a/lib/bt/porting/npl/freertos/src/npl_os_freertos.c
+++ b/lib/bt/porting/npl/freertos/src/npl_os_freertos.c
@@ -21,6 +21,7 @@
 #include "esp_log.h"
 #include "soc/soc_caps.h"
 #include "esp_bt.h"
+#include "bt_osi_mem.h"
 
 portMUX_TYPE ble_port_mutex = portMUX_INITIALIZER_UNLOCKED;
 
@@ -95,7 +96,7 @@ IRAM_ATTR npl_freertos_event_init(struct ble_npl_event *ev, ble_npl_event_fn *fn
     }
 #else
     if(!ev->event) {
-        ev->event = malloc(sizeof(struct ble_npl_event_freertos));
+        ev->event = bt_osi_mem_malloc_internal(sizeof(struct ble_npl_event_freertos));
     }
 #endif
     event = (struct ble_npl_event_freertos *)ev->event;
@@ -109,11 +110,13 @@ IRAM_ATTR npl_freertos_event_init(struct ble_npl_event *ev, ble_npl_event_fn *fn
 void
 IRAM_ATTR npl_freertos_event_deinit(struct ble_npl_event *ev)
 {
-    BLE_LL_ASSERT(ev->event);
+    if (!ev->event) {
+        return;
+    }
 #if OS_MEM_ALLOC
     os_memblock_put(&ble_freertos_ev_pool,ev->event);
 #else
-    free(ev->event);
+    bt_osi_mem_free(ev->event);
 #endif
     ev->event = NULL;
 }
@@ -144,7 +147,7 @@ npl_freertos_eventq_init(struct ble_npl_eventq *evq)
     }
 #else
     if(!evq->eventq) {
-        evq->eventq = malloc(sizeof(struct ble_npl_eventq_freertos));
+        evq->eventq = bt_osi_mem_malloc_internal(sizeof(struct ble_npl_eventq_freertos));
         eventq = (struct ble_npl_eventq_freertos*)evq->eventq;
         BLE_LL_ASSERT(eventq);
         memset(eventq, 0, sizeof(*eventq));
@@ -167,7 +170,7 @@ npl_freertos_eventq_deinit(struct ble_npl_eventq *evq)
 #if OS_MEM_ALLOC
     os_memblock_put(&ble_freertos_evq_pool,eventq);
 #else
-    free((void *)eventq);
+    bt_osi_mem_free((void *)eventq);
 #endif
     evq->eventq = NULL;
 }
@@ -357,7 +360,7 @@ npl_freertos_mutex_init(struct ble_npl_mutex *mu)
     }
 #else
     if(!mu->mutex) {
-        mu->mutex = malloc(sizeof(struct ble_npl_mutex_freertos));
+        mu->mutex = bt_osi_mem_malloc_internal(sizeof(struct ble_npl_mutex_freertos));
         mutex = (struct ble_npl_mutex_freertos *)mu->mutex;
 
         if (!mutex) {
@@ -388,7 +391,7 @@ npl_freertos_mutex_deinit(struct ble_npl_mutex *mu)
 #if OS_MEM_ALLOC
     os_memblock_put(&ble_freertos_mutex_pool,mutex);
 #else
-    free((void *)mutex);
+    bt_osi_mem_free((void *)mutex);
 #endif
     mu->mutex = NULL;
 
@@ -494,7 +497,7 @@ npl_freertos_sem_init(struct ble_npl_sem *sem, uint16_t tokens)
     }
 #else
     if(!sem->sem) {
-        sem->sem = malloc(sizeof(struct ble_npl_sem_freertos));
+        sem->sem = bt_osi_mem_malloc_internal(sizeof(struct ble_npl_sem_freertos));
         semaphore = (struct ble_npl_sem_freertos *)sem->sem;
 
         if (!semaphore) {
@@ -525,7 +528,7 @@ npl_freertos_sem_deinit(struct ble_npl_sem *sem)
 #if OS_MEM_ALLOC
     os_memblock_put(&ble_freertos_sem_pool,semaphore);
 #else
-    free((void *)semaphore);
+    bt_osi_mem_free((void *)semaphore);
 #endif
     sem->sem = NULL;
 
@@ -684,7 +687,7 @@ npl_freertos_callout_init(struct ble_npl_callout *co, struct ble_npl_eventq *evq
 #else
 
     if(!co->co) {
-        co->co = malloc(sizeof(struct ble_npl_callout_freertos));
+        co->co = bt_osi_mem_malloc_internal(sizeof(struct ble_npl_callout_freertos));
         callout = (struct ble_npl_callout_freertos *)co->co;
         if (!callout) {
             return -1;
@@ -704,7 +707,7 @@ npl_freertos_callout_init(struct ble_npl_callout *co, struct ble_npl_eventq *evq
 
         if (esp_timer_create(&create_args, &callout->handle) != ESP_OK) {
             ble_npl_event_deinit(&callout->ev);
-            free((void *)callout);
+            bt_osi_mem_free((void *)callout);
             co->co = NULL;
             return -1;
         }
@@ -713,7 +716,7 @@ npl_freertos_callout_init(struct ble_npl_callout *co, struct ble_npl_eventq *evq
 
         if (!callout->handle) {
             ble_npl_event_deinit(&callout->ev);
-            free((void *)callout);
+            bt_osi_mem_free((void *)callout);
             co->co = NULL;
             return -1;
         }
@@ -761,7 +764,7 @@ npl_freertos_callout_deinit(struct ble_npl_callout *co)
 #if OS_MEM_ALLOC
     os_memblock_put(&ble_freertos_co_pool,callout);
 #else
-    free((void *)callout);
+    bt_osi_mem_free((void *)callout);
 #endif // OS_MEM_ALLOC
     co->co = NULL;
     memset(co, 0, sizeof(struct ble_npl_callout));
@@ -1089,7 +1092,7 @@ struct npl_funcs_t * npl_freertos_funcs_get(void)
 
 void npl_freertos_funcs_init(void)
 {
-    npl_funcs = (struct npl_funcs_t *)malloc(sizeof(struct npl_funcs_t));
+    npl_funcs = (struct npl_funcs_t *)bt_osi_mem_malloc_internal(sizeof(struct npl_funcs_t));
     if(!npl_funcs) {
         printf("npl funcs init failed\n");
         assert(0);
@@ -1123,7 +1126,7 @@ int npl_freertos_mempool_init(void)
     ble_freertos_total_event_cnt = ble_total_evt_count;
 
     if (ble_total_evt_count) {
-        ble_freertos_ev_buf  = malloc(OS_MEMPOOL_SIZE(ble_total_evt_count,
+        ble_freertos_ev_buf  = bt_osi_mem_malloc_internal(OS_MEMPOOL_SIZE(ble_total_evt_count,
                                       sizeof (struct ble_npl_event_freertos)) *
                                       sizeof(os_membuf_t));
         if (!ble_freertos_ev_buf) {
@@ -1138,7 +1141,7 @@ int npl_freertos_mempool_init(void)
     }
 
     if (ble_total_evtq_count) {
-        ble_freertos_evq_buf  = malloc(OS_MEMPOOL_SIZE(ble_total_evtq_count,
+        ble_freertos_evq_buf  = bt_osi_mem_malloc_internal(OS_MEMPOOL_SIZE(ble_total_evtq_count,
                                        sizeof (struct ble_npl_eventq_freertos)) *
                                        sizeof(os_membuf_t));
         if (!ble_freertos_evq_buf) {
@@ -1153,7 +1156,7 @@ int npl_freertos_mempool_init(void)
     }
 
     if (ble_total_co_count) {
-        ble_freertos_co_buf  = malloc(OS_MEMPOOL_SIZE(ble_total_co_count,
+        ble_freertos_co_buf  = bt_osi_mem_malloc_internal(OS_MEMPOOL_SIZE(ble_total_co_count,
                                       sizeof (struct ble_npl_callout_freertos)) *
                                       sizeof(os_membuf_t));
         if (!ble_freertos_co_buf) {
@@ -1168,7 +1171,7 @@ int npl_freertos_mempool_init(void)
     }
 
     if (ble_total_sem_count) {
-        ble_freertos_sem_buf  = malloc(OS_MEMPOOL_SIZE(ble_total_sem_count,
+        ble_freertos_sem_buf  = bt_osi_mem_malloc_internal(OS_MEMPOOL_SIZE(ble_total_sem_count,
                                        sizeof (struct ble_npl_sem_freertos)) *
                                        sizeof(os_membuf_t));
         if (!ble_freertos_sem_buf) {
@@ -1183,7 +1186,7 @@ int npl_freertos_mempool_init(void)
     }
 
     if (ble_total_mutex_count) {
-        ble_freertos_mutex_buf  = malloc(OS_MEMPOOL_SIZE(ble_total_mutex_count,
+        ble_freertos_mutex_buf  = bt_osi_mem_malloc_internal(OS_MEMPOOL_SIZE(ble_total_mutex_count,
                                          sizeof (struct ble_npl_mutex_freertos)) *
                                          sizeof(os_membuf_t));
         if (!ble_freertos_mutex_buf) {
@@ -1200,27 +1203,27 @@ int npl_freertos_mempool_init(void)
     return 0;
 _error:
     if (ble_freertos_ev_buf) {
-        free(ble_freertos_ev_buf);
+        bt_osi_mem_free(ble_freertos_ev_buf);
         ble_freertos_ev_buf = NULL;
     }
 
     if (ble_freertos_evq_buf) {
-        free(ble_freertos_evq_buf);
+        bt_osi_mem_free(ble_freertos_evq_buf);
         ble_freertos_evq_buf = NULL;
     }
 
     if (ble_freertos_co_buf) {
-        free(ble_freertos_co_buf);
+        bt_osi_mem_free(ble_freertos_co_buf);
         ble_freertos_co_buf = NULL;
     }
 
     if (ble_freertos_sem_buf) {
-        free(ble_freertos_sem_buf);
+        bt_osi_mem_free(ble_freertos_sem_buf);
         ble_freertos_sem_buf = NULL;
     }
 
     if (ble_freertos_mutex_buf) {
-        free(ble_freertos_mutex_buf);
+        bt_osi_mem_free(ble_freertos_mutex_buf);
         ble_freertos_mutex_buf = NULL;
     }
     return -1;
@@ -1229,23 +1232,23 @@ _error:
 void npl_freertos_mempool_deinit(void)
 {
     if (ble_freertos_ev_buf) {
-        free(ble_freertos_ev_buf);
+        bt_osi_mem_free(ble_freertos_ev_buf);
         ble_freertos_ev_buf = NULL;
     }
     if (ble_freertos_evq_buf) {
-        free(ble_freertos_evq_buf);
+        bt_osi_mem_free(ble_freertos_evq_buf);
         ble_freertos_evq_buf = NULL;
     }
     if (ble_freertos_co_buf) {
-        free(ble_freertos_co_buf);
+        bt_osi_mem_free(ble_freertos_co_buf);
         ble_freertos_co_buf = NULL;
     }
     if (ble_freertos_sem_buf) {
-        free(ble_freertos_sem_buf);
+        bt_osi_mem_free(ble_freertos_sem_buf);
         ble_freertos_sem_buf = NULL;
     }
     if (ble_freertos_mutex_buf) {
-        free(ble_freertos_mutex_buf);
+        bt_osi_mem_free(ble_freertos_mutex_buf);
         ble_freertos_mutex_buf = NULL;
     }
 }
@@ -1253,7 +1256,7 @@ void npl_freertos_mempool_deinit(void)
 void npl_freertos_funcs_deinit(void)
 {
     if (npl_funcs) {
-        free(npl_funcs);
+        bt_osi_mem_free(npl_funcs);
     }
     npl_funcs = NULL;
 }
diff --git a/lib/bt/porting/transport/driver/common/hci_driver_h4.c b/lib/bt/porting/transport/driver/common/hci_driver_h4.c
new file mode 100644
index 00000000..2911289c
--- /dev/null
+++ b/lib/bt/porting/transport/driver/common/hci_driver_h4.c
@@ -0,0 +1,421 @@
+/*
+ * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 <assert.h>
+#include <stdint.h>
+#include <string.h>
+#include <os/os.h>
+#include <os/os_mbuf.h>
+#include "esp_hci_driver.h"
+#include "common/hci_driver_h4.h"
+#include "common/hci_driver_util.h"
+
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef max
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
+#define HCI_H4_SM_W4_PKT_TYPE   0
+#define HCI_H4_SM_W4_HEADER     1
+#define HCI_H4_SM_W4_PAYLOAD    2
+#define HCI_H4_SM_COMPLETED     3
+
+struct hci_h4_input_buffer {
+    const uint8_t *buf;
+    uint16_t len;
+};
+
+static int
+hci_h4_frame_start(struct hci_h4_sm *rxs, uint8_t pkt_type)
+{
+    rxs->pkt_type = pkt_type;
+    rxs->len = 0;
+    rxs->exp_len = 0;
+
+    switch (rxs->pkt_type) {
+    case HCI_H4_CMD:
+        rxs->min_len = 3;
+        break;
+    case HCI_H4_ACL:
+    case HCI_H4_ISO:
+        rxs->min_len = 4;
+        break;
+#if (!CONFIG_BT_CONTROLLER_ENABLED)
+    case HCI_H4_EVT:
+        rxs->min_len = 2;
+        break;
+#endif // (!CONFIG_BT_CONTROLLER_ENABLED)
+    default:
+        /* !TODO: Sync loss. Need to wait for reset. */
+        return -1;
+    }
+
+    return 0;
+}
+
+static int
+hci_h4_ib_consume(struct hci_h4_input_buffer *ib, uint16_t len)
+{
+    HCI_TRANS_ASSERT((ib->len >= len), ib->len, len);
+
+    ib->buf += len;
+    ib->len -= len;
+
+    return len;
+}
+
+static int
+hci_h4_ib_pull_min_len(struct hci_h4_sm *rxs,
+                       struct hci_h4_input_buffer *ib)
+{
+    uint16_t len;
+
+    len = min(ib->len, rxs->min_len - rxs->len);
+    memcpy(&rxs->hdr[rxs->len], ib->buf, len);
+
+    rxs->len += len;
+    hci_h4_ib_consume(ib, len);
+
+
+    return rxs->len != rxs->min_len;
+}
+
+static int
+hci_h4_sm_w4_header(struct hci_h4_sm *h4sm, struct hci_h4_input_buffer *ib)
+{
+    int rc;
+
+    rc = hci_h4_ib_pull_min_len(h4sm, ib);
+    if (rc) {
+        /* need more data */
+        return 1;
+    }
+
+    switch (h4sm->pkt_type) {
+    case HCI_H4_CMD:
+        HCI_TRANS_ASSERT(h4sm->allocs && h4sm->allocs->cmd, 0, 0);
+        h4sm->buf = h4sm->allocs->cmd();
+        if (!h4sm->buf) {
+            return -1;
+        }
+
+        memcpy(h4sm->buf, h4sm->hdr, h4sm->len);
+        h4sm->exp_len = h4sm->hdr[2] + 3;
+
+        break;
+    case HCI_H4_ACL:
+        HCI_TRANS_ASSERT(h4sm->allocs && h4sm->allocs->acl, 0, 0);
+        h4sm->om = h4sm->allocs->acl();
+        if (!h4sm->om) {
+            return -1;
+        }
+
+        os_mbuf_append(h4sm->om, h4sm->hdr, h4sm->len);
+        h4sm->exp_len = get_le16(&h4sm->hdr[2]) + 4;
+        break;
+#if !CONFIG_BT_CONTROLLER_ENABLED
+    case HCI_H4_EVT:
+        if (h4sm->hdr[0] == BLE_HCI_EVCODE_LE_META) {
+            /* For LE Meta event we need 3 bytes to parse header */
+            h4sm->min_len = 3;
+            rc = hci_h4_ib_pull_min_len(h4sm, ib);
+            if (rc) {
+                /* need more data */
+                return 1;
+            }
+        }
+
+        HCI_TRANS_ASSERT(h4sm->allocs && h4sm->allocs->evt, 0, 0);
+
+        /* We can drop legacy advertising events if there's no free buffer in
+         * discardable pool.
+         */
+        if (h4sm->hdr[2] == BLE_HCI_LE_SUBEV_ADV_RPT) {
+            h4sm->buf = h4sm->allocs->evt(1);
+        } else {
+            h4sm->buf = h4sm->allocs->evt(0);
+            if (!h4sm->buf) {
+                return -1;
+            }
+        }
+
+        if (h4sm->buf) {
+            memcpy(h4sm->buf, h4sm->hdr, h4sm->len);
+        }
+
+        h4sm->exp_len = h4sm->hdr[1] + 2;
+        break;
+#endif // !CONFIG_BT_CONTROLLER_ENABLED
+    case HCI_H4_ISO:
+        HCI_TRANS_ASSERT(h4sm->allocs && h4sm->allocs->iso, 0, 0);
+        h4sm->om = h4sm->allocs->iso();
+        if (!h4sm->om) {
+            return -1;
+        }
+
+        os_mbuf_append(h4sm->om, h4sm->hdr, h4sm->len);
+        h4sm->exp_len = (get_le16(&h4sm->hdr[2]) & 0x7fff) + 4;
+        break;
+    default:
+        return -2;
+    }
+
+    return 0;
+}
+
+static int
+hci_h4_sm_w4_payload(struct hci_h4_sm *h4sm,
+                     struct hci_h4_input_buffer *ib)
+{
+    uint16_t mbuf_len;
+    uint16_t len;
+    int rc;
+
+    len = min(ib->len, h4sm->exp_len - h4sm->len);
+    switch (h4sm->pkt_type) {
+    case HCI_H4_CMD:
+#if (!CONFIG_BT_CONTROLLER_ENABLED)
+    case HCI_H4_EVT:
+#endif // (!CONFIG_BT_CONTROLLER_ENABLED)
+        if (h4sm->buf) {
+            memcpy(&h4sm->buf[h4sm->len], ib->buf, len);
+        }
+        break;
+    case HCI_H4_ACL:
+    case HCI_H4_ISO:
+        HCI_TRANS_ASSERT(h4sm->om, h4sm->pkt_type, len);
+        mbuf_len = OS_MBUF_PKTLEN(h4sm->om);
+        rc = os_mbuf_append(h4sm->om, ib->buf, len);
+        if (rc) {
+            /* Some data may already be appended so need to adjust h4sm only by
+             * the size of appended data.
+             */
+            len = OS_MBUF_PKTLEN(h4sm->om) - mbuf_len;
+            h4sm->len += len;
+            hci_h4_ib_consume(ib, len);
+            return -1;
+        }
+        break;
+    default:
+        return -2;
+    }
+
+    h4sm->len += len;
+    hci_h4_ib_consume(ib, len);
+
+    /* return 1 if need more data */
+    return h4sm->len != h4sm->exp_len;
+}
+
+static void
+hci_h4_sm_completed(struct hci_h4_sm *h4sm)
+{
+    int rc;
+
+    switch (h4sm->pkt_type) {
+#if CONFIG_BT_CONTROLLER_ENABLED
+    case HCI_H4_CMD:
+        if (h4sm->buf) {
+            HCI_TRANS_ASSERT(h4sm->frame_cb, 0, 0);
+            rc = h4sm->frame_cb(h4sm->pkt_type, h4sm->buf);
+            HCI_TRANS_ASSERT(rc == 0, rc, 0);
+            h4sm->buf = NULL;
+        }
+        break;
+    case HCI_H4_ACL:
+    case HCI_H4_ISO:
+        if (h4sm->om) {
+            HCI_TRANS_ASSERT(h4sm->frame_cb, 0, 0);
+            rc = h4sm->frame_cb(h4sm->pkt_type, h4sm->om);
+            HCI_TRANS_ASSERT(rc == 0, rc, 0);
+            h4sm->om = NULL;
+        }
+        break;
+#else
+    case HCI_H4_CMD:
+        if (h4sm->buf) {
+            HCI_TRANS_ASSERT(h4sm->frame_cb, 0, 0);
+            rc = h4sm->frame_cb(h4sm->pkt_type, h4sm->buf);
+            if (rc != 0) {
+                HCI_TRANS_ASSERT(h4sm->frees && h4sm->frees->cmd, rc, (uint32_t)h4sm->frees);
+                h4sm->frees->cmd(h4sm->buf);
+            }
+            h4sm->buf = NULL;
+        }
+        break;
+    case HCI_H4_EVT:
+        if (h4sm->buf) {
+            HCI_TRANS_ASSERT(h4sm->frame_cb, 0, 0);
+            rc = h4sm->frame_cb(h4sm->pkt_type, h4sm->buf);
+            if (rc != 0) {
+                HCI_TRANS_ASSERT(h4sm->frees && h4sm->frees->evt, rc, (uint32_t)h4sm->frees);
+                h4sm->frees->evt(h4sm->buf);
+            }
+            h4sm->buf = NULL;
+        }
+        break;
+    case HCI_H4_ACL:
+        if (h4sm->om) {
+            HCI_TRANS_ASSERT(h4sm->frame_cb, 0, 0);
+            rc = h4sm->frame_cb(h4sm->pkt_type, h4sm->om);
+            if (rc != 0) {
+                HCI_TRANS_ASSERT(h4sm->frees && h4sm->frees->acl, rc, (uint32_t)h4sm->frees);
+                h4sm->frees->acl(h4sm->om);
+            }
+            h4sm->om = NULL;
+        }
+        break;
+    case HCI_H4_ISO:
+        if (h4sm->om) {
+            HCI_TRANS_ASSERT(h4sm->frame_cb, 0, 0);
+            rc = h4sm->frame_cb(h4sm->pkt_type, h4sm->om);
+            if (rc != 0) {
+                HCI_TRANS_ASSERT(h4sm->frees && h4sm->frees->iso, rc, (uint32_t)h4sm->frees);
+                h4sm->frees->iso(h4sm->om);
+            }
+            h4sm->om = NULL;
+        }
+        break;
+#endif // CONFIG_BT_CONTROLLER_ENABLED
+    default:
+        HCI_TRANS_ASSERT(0, h4sm->pkt_type, 0);
+        break;
+    }
+}
+
+static int
+hci_h4_sm_free_buf(struct hci_h4_sm *h4sm)
+{
+    switch (h4sm->pkt_type) {
+        case HCI_H4_CMD:
+            if (h4sm->buf) {
+                h4sm->frees->cmd(h4sm->buf);
+                h4sm->buf = NULL;
+            }
+            break;
+#if (!CONFIG_BT_CONTROLLER_ENABLED)
+        case HCI_H4_EVT:
+            if (h4sm->buf) {
+                h4sm->frees->evt(h4sm->buf);
+                h4sm->buf = NULL;
+            }
+            break;
+#endif  // (!CONFIG_BT_CONTROLLER_ENABLED)
+        case HCI_H4_ACL:
+            if (h4sm->om) {
+                h4sm->frees->acl(h4sm->om);
+                h4sm->om = NULL;
+            }
+            break;
+        case HCI_H4_ISO:
+            if (h4sm->om) {
+                h4sm->frees->iso(h4sm->om);
+                h4sm->om = NULL;
+            }
+            break;
+        default:
+            break;
+    }
+
+    return 0;
+}
+
+int
+hci_h4_sm_rx(struct hci_h4_sm *h4sm, const uint8_t *buf, uint16_t len)
+{
+    struct hci_h4_input_buffer ib = {
+        .buf = buf,
+        .len = len,
+    };
+
+    int rc = 0;
+    while (ib.len && (rc >= 0)) {
+        rc = 0;
+        switch (h4sm->state) {
+        case HCI_H4_SM_W4_PKT_TYPE:
+            if (hci_h4_frame_start(h4sm, ib.buf[0]) < 0) {
+                return -1;
+            }
+
+            hci_h4_ib_consume(&ib, 1);
+            h4sm->state = HCI_H4_SM_W4_HEADER;
+        /* no break */
+        case HCI_H4_SM_W4_HEADER:
+            rc = hci_h4_sm_w4_header(h4sm, &ib);
+            if (rc) {
+                break;
+            }
+
+            h4sm->state = HCI_H4_SM_W4_PAYLOAD;
+        /* no break */
+        case HCI_H4_SM_W4_PAYLOAD:
+            rc = hci_h4_sm_w4_payload(h4sm, &ib);
+            if (rc) {
+                break;
+            }
+
+            h4sm->state = HCI_H4_SM_COMPLETED;
+        /* no break */
+        case HCI_H4_SM_COMPLETED:
+            hci_h4_sm_completed(h4sm);
+            h4sm->state = HCI_H4_SM_W4_PKT_TYPE;
+            break;
+        default:
+            return -1;
+        }
+    }
+
+    if (rc < 0) {
+        hci_h4_sm_free_buf(h4sm);
+        h4sm->state = HCI_H4_SM_W4_PKT_TYPE;
+        return -1;
+    }
+    /* Calculate consumed bytes
+     *
+     * Note: we should always consume some bytes unless there is an oom error.
+     * It's also possible that we have an oom error but already consumed some
+     * data, in such case just return success and error will be returned on next
+     * pass.
+     */
+    len = len - ib.len;
+    if (len == 0) {
+        HCI_TRANS_ASSERT((rc < 0), rc, ib.len);
+        return -1;
+    }
+
+    return len;
+}
+
+void
+hci_h4_sm_init(struct hci_h4_sm *h4sm, const struct hci_h4_allocators *allocs, const struct hci_h4_frees *frees,
+               hci_h4_frame_cb *frame_cb)
+{
+    memset(h4sm, 0, sizeof(*h4sm));
+    h4sm->allocs = allocs;
+    h4sm->frees = frees;
+    h4sm->frame_cb = frame_cb;
+}
diff --git a/lib/bt/porting/transport/driver/common/hci_driver_mem.c b/lib/bt/porting/transport/driver/common/hci_driver_mem.c
new file mode 100644
index 00000000..3505fa62
--- /dev/null
+++ b/lib/bt/porting/transport/driver/common/hci_driver_mem.c
@@ -0,0 +1,62 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdio.h>
+#include <string.h>
+#include "common/hci_driver_mem.h"
+#include "common/hci_driver_h4.h"
+#include "esp_hci_internal.h"
+
+void *
+hci_driver_mem_cmd_alloc(void)
+{
+    return r_ble_hci_trans_buf_alloc(ESP_HCI_INTERNAL_BUF_CMD);
+}
+
+void *
+hci_driver_mem_evt_alloc(int discardable)
+{
+    /* The controller shouldn't invoke this. */
+    assert(0);
+    return NULL;
+}
+
+struct os_mbuf *
+hci_driver_mem_acl_alloc(void)
+{
+    return os_msys_get_pkthdr(0, ESP_HCI_INTERNAL_ACL_MBUF_LEADINGSPCAE);
+}
+
+struct os_mbuf *
+hci_driver_mem_acl_len_alloc(uint32_t len)
+{
+    return os_msys_get_pkthdr(len, ESP_HCI_INTERNAL_ACL_MBUF_LEADINGSPCAE);
+}
+
+struct os_mbuf *
+hci_driver_mem_iso_alloc(void)
+{
+     return os_msys_get_pkthdr(0, ESP_HCI_INTERNAL_ACL_MBUF_LEADINGSPCAE);
+}
+
+struct os_mbuf *
+hci_driver_mem_iso_len_alloc(uint32_t len)
+{
+     return os_msys_get_pkthdr(len, ESP_HCI_INTERNAL_ACL_MBUF_LEADINGSPCAE);
+}
+
+const struct hci_h4_allocators s_hci_driver_mem_alloc = {
+    .cmd = hci_driver_mem_cmd_alloc,
+    .evt = hci_driver_mem_evt_alloc,
+    .acl = hci_driver_mem_acl_alloc,
+    .iso = hci_driver_mem_iso_alloc,
+};
+
+const struct hci_h4_frees s_hci_driver_mem_free = {
+    .cmd = r_ble_hci_trans_buf_free,
+    .evt = r_ble_hci_trans_buf_free,
+    .acl = os_mbuf_free_chain,
+    .iso = os_mbuf_free_chain,
+};
diff --git a/lib/bt/porting/transport/driver/common/hci_driver_util.c b/lib/bt/porting/transport/driver/common/hci_driver_util.c
new file mode 100644
index 00000000..3c3a49cd
--- /dev/null
+++ b/lib/bt/porting/transport/driver/common/hci_driver_util.c
@@ -0,0 +1,232 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdio.h>
+#include <string.h>
+#include "esp_log.h"
+#include "os/os.h"
+#include "os/os_mempool.h"
+#include "esp_hci_driver.h"
+#include "esp_hci_internal.h"
+#include "common/hci_driver_util.h"
+
+#define TAG                 "HCI_UTIL"
+#define HCI_DRIVER_UTIL_TX_POOL_NUM                                     \
+    (CONFIG_BT_LE_ACL_BUF_COUNT + CONFIG_BT_LE_HCI_EVT_HI_BUF_COUNT + CONFIG_BT_LE_HCI_EVT_LO_BUF_COUNT)
+
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+/**
+ * @brief Structure representing HCI TX data.
+ */
+typedef struct hci_driver_util_tx_entry {
+    hci_driver_data_type_t data_type;   ///< Type of the HCI TX data.
+    uint8_t *data;                         ///< Pointer to the TX data.
+    uint32_t length;                    ///< Length of the TX data.
+    STAILQ_ENTRY(hci_driver_util_tx_entry) next; ///< Next element in the linked list.
+} hci_driver_util_tx_entry_t;
+
+/* The list for hci_driver_util_tx_entry */
+STAILQ_HEAD(hci_driver_util_tx_list, hci_driver_util_tx_entry);
+
+typedef struct {
+    struct hci_driver_util_tx_list tx_head;
+    struct hci_driver_util_tx_entry *cur_tx_entry;
+    uint32_t cur_tx_off;
+    struct os_mempool *tx_entry_pool;
+    uint8_t *tx_entry_mem;
+} hci_driver_util_env_t;
+
+static hci_driver_util_env_t s_hci_driver_util_env;
+
+static void
+hci_driver_util_memory_deinit(void)
+{
+    if (s_hci_driver_util_env.tx_entry_pool) {
+        free(s_hci_driver_util_env.tx_entry_pool);
+        s_hci_driver_util_env.tx_entry_pool = NULL;
+    }
+    if (s_hci_driver_util_env.tx_entry_mem) {
+        free(s_hci_driver_util_env.tx_entry_mem);
+        s_hci_driver_util_env.tx_entry_mem = NULL;
+    }
+}
+
+static int
+hci_driver_util_memory_init(void)
+{
+    int rc;
+
+    s_hci_driver_util_env.tx_entry_pool = (struct os_mempool *)malloc(sizeof(struct os_mempool));
+    if (!s_hci_driver_util_env.tx_entry_pool) {
+        ESP_LOGE(TAG, "No memory for tx pool");
+        goto init_err;
+    }
+
+    s_hci_driver_util_env.tx_entry_mem = malloc(OS_MEMPOOL_SIZE(HCI_DRIVER_UTIL_TX_POOL_NUM,
+                                                sizeof(hci_driver_util_tx_entry_t)) * sizeof(os_membuf_t));
+    if (!s_hci_driver_util_env.tx_entry_mem) {
+        ESP_LOGE(TAG, "No memory for tx pool buffer");
+        goto init_err;
+    }
+
+    rc = os_mempool_init(s_hci_driver_util_env.tx_entry_pool, HCI_DRIVER_UTIL_TX_POOL_NUM,
+                         sizeof(hci_driver_util_tx_entry_t), s_hci_driver_util_env.tx_entry_mem,
+                         "hci_tx_entry_pool");
+    if (rc) {
+        ESP_LOGE(TAG, "Failed to initialize tx pool");
+        goto init_err;
+    }
+
+    return 0;
+
+init_err:
+    hci_driver_util_memory_deinit();
+    return -1;
+}
+
+void
+hci_driver_util_tx_list_enqueue(hci_driver_data_type_t type, uint8_t *data, uint32_t len)
+{
+    os_sr_t sr;
+    hci_driver_util_tx_entry_t *tx_entry;
+
+    tx_entry = os_memblock_get(s_hci_driver_util_env.tx_entry_pool);
+    HCI_TRANS_ASSERT((tx_entry != NULL), 0, 0);
+    tx_entry->data_type = type;
+    tx_entry->data = data;
+    tx_entry->length = len;
+    /* If the txbuf is command status event or command complete event, we should send firstly.
+     * The tx list maybe used in the controller task and hci task. Therefore, enter critical area.
+     */
+    if ((type == HCI_DRIVER_TYPE_EVT) && ((data[0] == 0x0E) || (data[0] == 0x0F))) {
+        OS_ENTER_CRITICAL(sr);
+        STAILQ_INSERT_HEAD(&s_hci_driver_util_env.tx_head, tx_entry, next);
+        OS_EXIT_CRITICAL(sr);
+    } else {
+        OS_ENTER_CRITICAL(sr);
+        STAILQ_INSERT_TAIL(&s_hci_driver_util_env.tx_head, tx_entry, next);
+        OS_EXIT_CRITICAL(sr);
+    }
+}
+
+uint32_t
+hci_driver_util_tx_list_dequeue(uint32_t max_tx_len, void **tx_data, bool *last_frame)
+{
+    os_sr_t sr;
+    uint32_t tx_len;
+    uint32_t data_len;
+    uint16_t out_off;
+    struct os_mbuf *om;
+    hci_driver_util_tx_entry_t *tx_entry;
+
+    /* Check if there is any remaining data that hasn't been sent completely. If it has been completed,
+     * free the corresponding memory. Therefore, the HCI TX entry needs to be sent one by one; multiple
+     * entries cannot be sent together.
+     */
+    tx_len = 0;
+    tx_entry = s_hci_driver_util_env.cur_tx_entry;
+    if (tx_entry) {
+        data_len = tx_entry->length;
+        if (tx_entry->data_type == HCI_DRIVER_TYPE_ACL) {
+            om = (struct os_mbuf *)tx_entry->data;
+            if (s_hci_driver_util_env.cur_tx_off >= data_len) {
+                os_mbuf_free_chain(om);
+            } else {
+                om = os_mbuf_off(om, s_hci_driver_util_env.cur_tx_off, &out_off);
+                tx_len = min(max_tx_len, om->om_len - out_off);
+                *tx_data = (void *)&om->om_data[out_off];
+            }
+        } else if (tx_entry->data_type == HCI_DRIVER_TYPE_EVT) {
+            if (s_hci_driver_util_env.cur_tx_off >= data_len) {
+                r_ble_hci_trans_buf_free(tx_entry->data);
+            } else {
+                tx_len = min(max_tx_len, data_len - s_hci_driver_util_env.cur_tx_off);
+                *tx_data = &tx_entry->data[s_hci_driver_util_env.cur_tx_off];
+            }
+        } else {
+            HCI_TRANS_ASSERT(0, tx_entry->data_type, data_len);
+        }
+        /* If this is the last frame, inform the invoker not to call this API until the current data
+         * has been completely sent.
+         */
+        if (tx_len) {
+            s_hci_driver_util_env.cur_tx_off += tx_len;
+
+            if (s_hci_driver_util_env.cur_tx_off >= data_len) {
+                *last_frame = true;
+            } else {
+                *last_frame = false;
+            }
+        } else {
+            os_memblock_put(s_hci_driver_util_env.tx_entry_pool, (void *)tx_entry);
+            s_hci_driver_util_env.cur_tx_entry = NULL;
+        }
+    }
+
+    /* Find a new entry. */
+    if (!tx_len && !STAILQ_EMPTY(&s_hci_driver_util_env.tx_head)) {
+        OS_ENTER_CRITICAL(sr);
+        tx_entry = STAILQ_FIRST(&s_hci_driver_util_env.tx_head);
+        STAILQ_REMOVE_HEAD(&s_hci_driver_util_env.tx_head, next);
+        OS_EXIT_CRITICAL(sr);
+
+        *tx_data = &tx_entry->data_type;
+        s_hci_driver_util_env.cur_tx_entry = tx_entry;
+        s_hci_driver_util_env.cur_tx_off = 0;
+        tx_len = 1;
+        *last_frame = false;
+    }
+
+    return tx_len;
+}
+
+int
+hci_driver_util_init(void)
+{
+    memset(&s_hci_driver_util_env, 0, sizeof(hci_driver_util_env_t));
+
+    if (hci_driver_util_memory_init()) {
+        return -1;
+    }
+
+    STAILQ_INIT(&s_hci_driver_util_env.tx_head);
+
+    return 0;
+}
+
+void
+hci_driver_util_deinit(void)
+{
+    hci_driver_util_tx_entry_t *tx_entry;
+    hci_driver_util_tx_entry_t *next_entry;
+
+    /* Free all of controller buffers which haven't been sent yet.  The whole mempool will be freed.
+     * Therefore, it's unnecessary to put the tx_entry into mempool.
+     */
+    tx_entry = STAILQ_FIRST(&s_hci_driver_util_env.tx_head);
+    while (tx_entry) {
+        next_entry = STAILQ_NEXT(tx_entry, next);
+        if (tx_entry->data_type == HCI_DRIVER_TYPE_ACL) {
+            os_mbuf_free_chain((struct os_mbuf *)tx_entry->data);
+        } else if (tx_entry->data_type == HCI_DRIVER_TYPE_EVT) {
+            r_ble_hci_trans_buf_free(tx_entry->data);
+        }
+        tx_entry = next_entry;
+    }
+
+    hci_driver_util_memory_deinit();
+
+    memset(&s_hci_driver_util_env, 0, sizeof(hci_driver_util_env_t));
+}
+
+
+void
+hci_driver_util_assert_check(const uint32_t ln, const char *fn, uint32_t param1, uint32_t param2)
+{
+    ESP_LOGE(TAG, "hci driver assert: line %d in function %s, param: 0x%x, 0x%x", ln, fn, param1, param2);
+}
diff --git a/lib/bt/porting/transport/driver/uart/hci_driver_uart.c b/lib/bt/porting/transport/driver/uart/hci_driver_uart.c
new file mode 100644
index 00000000..e78f5d27
--- /dev/null
+++ b/lib/bt/porting/transport/driver/uart/hci_driver_uart.c
@@ -0,0 +1,239 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "freertos/FreeRTOS.h"
+#include "freertos/queue.h"
+#include "freertos/task.h"
+#include "freertos/semphr.h"
+#include "esp_log.h"
+#include "driver/uart.h"
+#include "esp_hci_transport.h"
+#include "esp_hci_internal.h"
+#include "common/hci_driver_h4.h"
+#include "common/hci_driver_util.h"
+#include "common/hci_driver_mem.h"
+#include "hci_driver_uart.h"
+
+static const char *TAG = "hci_uart";
+
+#define CONFIG_BT_LE_HCI_RX_PROC_DATA_LEN       (256)
+
+typedef struct {
+    TaskHandle_t tx_task_handler;
+    TaskHandle_t rx_task_handler;
+    hci_driver_uart_params_config_t *hci_uart_params;
+    SemaphoreHandle_t tx_sem;
+    QueueHandle_t rx_event_queue;
+    uint8_t *rx_data;
+    struct hci_h4_sm *h4_sm;
+    hci_driver_forward_fn *forward_cb;
+} hci_driver_uart_env_t;
+
+static hci_driver_uart_env_t s_hci_driver_uart_env;
+static struct hci_h4_sm s_hci_driver_uart_h4_sm;
+static uint8_t s_hci_driver_uart_rx_data[CONFIG_BT_LE_HCI_RX_PROC_DATA_LEN];
+
+static int
+hci_driver_uart_tx(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length,
+                   hci_driver_direction_t dir)
+{
+    /* By now, this layer is only used by controller. */
+    assert(dir == HCI_DRIVER_DIR_C2H);
+    ESP_LOGD(TAG, "controller tx len:%d\n", length);
+
+    hci_driver_util_tx_list_enqueue(data_type, data, length);
+    xSemaphoreGive(s_hci_driver_uart_env.tx_sem);
+
+    return 0;
+}
+
+static int
+hci_driver_uart_h4_frame_cb(uint8_t pkt_type, void *data)
+{
+    hci_driver_forward_fn *forward_cb;
+
+    forward_cb = s_hci_driver_uart_env.forward_cb;
+    if (!forward_cb) {
+        return -1;
+    }
+    ESP_LOGD(TAG, "h4 frame\n");
+    return forward_cb(pkt_type, data, 0, HCI_DRIVER_DIR_H2C);
+}
+
+static void
+hci_driver_uart_tx_task(void *p)
+{
+    void *data;
+    bool last_frame;
+    uint32_t tx_len;
+    uart_port_t port;
+
+    port = s_hci_driver_uart_env.hci_uart_params->hci_uart_port;
+    while (true) {
+        xSemaphoreTake(s_hci_driver_uart_env.tx_sem, portMAX_DELAY);
+        while (true) {
+            tx_len = hci_driver_util_tx_list_dequeue(0xffffff, &data, &last_frame);
+            if (tx_len == 0) {
+                break;
+            }
+            ESP_LOGD(TAG, "uart tx");
+            ESP_LOG_BUFFER_HEXDUMP(TAG, data, tx_len, ESP_LOG_DEBUG);
+            uart_write_bytes(port, data, tx_len);
+        }
+    }
+}
+
+static void
+hci_driver_uart_rx_task(void *p)
+{
+    void *data;
+    int read_len;
+    int ret;
+    uart_port_t port;
+    uart_event_t uart_event;
+
+    port = s_hci_driver_uart_env.hci_uart_params->hci_uart_port;
+    while (true) {
+        xQueueReceive(s_hci_driver_uart_env.rx_event_queue, &uart_event, portMAX_DELAY);
+        data = s_hci_driver_uart_env.rx_data;
+        while (true) {
+            read_len = uart_read_bytes(port, data, CONFIG_BT_LE_HCI_RX_PROC_DATA_LEN, 0);
+            if (read_len == 0) {
+                break;
+            }
+            ESP_LOGD(TAG, "uart rx");
+            ESP_LOG_BUFFER_HEXDUMP(TAG, data, read_len, ESP_LOG_DEBUG);
+            ret = hci_h4_sm_rx(s_hci_driver_uart_env.h4_sm, data, read_len);
+            if (ret < 0) {
+                ESP_LOGE(TAG, "parse rx data error! sm_state:%d\n", s_hci_driver_uart_env.h4_sm->state);
+                r_ble_ll_hci_ev_hw_err(ESP_HCI_SYNC_LOSS_ERR);
+            }
+        }
+    }
+}
+
+static int
+hci_driver_uart_task_create(void)
+{
+    /* !TODO: Set the core id by menuconfig */
+    xTaskCreatePinnedToCore(hci_driver_uart_tx_task, "hci_driver_uart_tx_task",
+                            CONFIG_BT_LE_HCI_TRANS_TASK_STACK_SIZE, NULL,
+                            ESP_TASK_BT_CONTROLLER_PRIO, &s_hci_driver_uart_env.tx_task_handler,
+                            0);
+    assert(s_hci_driver_uart_env.tx_task_handler);
+
+    xTaskCreatePinnedToCore(hci_driver_uart_rx_task, "hci_driver_uart_rx_task",
+                            CONFIG_BT_LE_HCI_TRANS_TASK_STACK_SIZE, NULL,
+                            ESP_TASK_BT_CONTROLLER_PRIO, &s_hci_driver_uart_env.rx_task_handler,
+                            0);
+    assert(s_hci_driver_uart_env.rx_task_handler);
+
+    ESP_LOGI(TAG, "hci transport task create successfully, prio:%d, stack size: %ld",
+             ESP_TASK_BT_CONTROLLER_PRIO, CONFIG_BT_LE_HCI_TRANS_TASK_STACK_SIZE);
+
+    return 0;
+}
+
+static void
+hci_driver_uart_task_delete(void)
+{
+    if (s_hci_driver_uart_env.tx_task_handler) {
+        vTaskDelete(s_hci_driver_uart_env.tx_task_handler);
+        s_hci_driver_uart_env.tx_task_handler = NULL;
+    }
+
+    if (s_hci_driver_uart_env.rx_task_handler) {
+        vTaskDelete(s_hci_driver_uart_env.rx_task_handler);
+        s_hci_driver_uart_env.rx_task_handler = NULL;
+    }
+}
+
+static void
+hci_driver_uart_deinit(void)
+{
+    hci_driver_uart_task_delete();
+
+    ESP_ERROR_CHECK(uart_driver_delete(s_hci_driver_uart_env.hci_uart_params->hci_uart_port));
+
+    if (s_hci_driver_uart_env.tx_sem) {
+        vSemaphoreDelete(s_hci_driver_uart_env.tx_sem);
+    }
+
+    hci_driver_util_deinit();
+    memset(&s_hci_driver_uart_env, 0, sizeof(hci_driver_uart_env_t));
+}
+
+static int
+hci_driver_uart_init(hci_driver_forward_fn *cb)
+{
+    int rc;
+    memset(&s_hci_driver_uart_env, 0, sizeof(hci_driver_uart_env_t));
+
+    s_hci_driver_uart_env.h4_sm = &s_hci_driver_uart_h4_sm;
+    hci_h4_sm_init(s_hci_driver_uart_env.h4_sm, &s_hci_driver_mem_alloc, &s_hci_driver_mem_free, hci_driver_uart_h4_frame_cb);
+
+    rc = hci_driver_util_init();
+    if (rc) {
+        goto error;
+    }
+
+    s_hci_driver_uart_env.tx_sem = xSemaphoreCreateBinary();
+    if (!s_hci_driver_uart_env.tx_sem) {
+        goto error;
+    }
+
+    s_hci_driver_uart_env.rx_data = s_hci_driver_uart_rx_data;
+    s_hci_driver_uart_env.forward_cb = cb;
+    s_hci_driver_uart_env.hci_uart_params = hci_driver_uart_config_param_get();
+    hci_driver_uart_config(s_hci_driver_uart_env.hci_uart_params);
+    /* Currently, the queue size is set to 1. It will be considered as semaphore. */
+    ESP_ERROR_CHECK(uart_driver_install(s_hci_driver_uart_env.hci_uart_params->hci_uart_port,
+                                        CONFIG_BT_LE_HCI_UART_RX_BUFFER_SIZE,
+                                        CONFIG_BT_LE_HCI_UART_TX_BUFFER_SIZE,
+                                        1, &s_hci_driver_uart_env.rx_event_queue,
+                                        0));
+
+    rc = hci_driver_uart_task_create();
+    if (rc) {
+        goto error;
+    }
+
+    return 0;
+
+error:
+    hci_driver_uart_deinit();
+    return rc;
+}
+
+int
+hci_driver_uart_reconfig_pin(int tx_pin, int rx_pin, int cts_pin, int rts_pin)
+{
+    int rc;
+
+    hci_driver_uart_task_delete();
+    hci_driver_uart_pin_update(tx_pin, rx_pin, cts_pin, rts_pin);
+    /* Currently, the queue size is set to 1. It will be considered as semaphore. */
+    ESP_ERROR_CHECK(uart_driver_install(s_hci_driver_uart_env.hci_uart_params->hci_uart_port,
+                                        CONFIG_BT_LE_HCI_UART_RX_BUFFER_SIZE,
+                                        CONFIG_BT_LE_HCI_UART_TX_BUFFER_SIZE,
+                                        1, &s_hci_driver_uart_env.rx_event_queue,
+                                        0));
+    rc = hci_driver_uart_task_create();
+    if (rc) {
+        hci_driver_uart_task_delete();
+        return -2;
+    }
+
+    return 0;
+}
+
+hci_driver_ops_t hci_driver_uart_ops = {
+    .hci_driver_tx = hci_driver_uart_tx,
+    .hci_driver_init = hci_driver_uart_init,
+    .hci_driver_deinit = hci_driver_uart_deinit,
+};
diff --git a/lib/bt/porting/transport/driver/uart/hci_driver_uart.h b/lib/bt/porting/transport/driver/uart/hci_driver_uart.h
new file mode 100644
index 00000000..1cefb1d8
--- /dev/null
+++ b/lib/bt/porting/transport/driver/uart/hci_driver_uart.h
@@ -0,0 +1,87 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <inttypes.h>
+#include "driver/uart.h"
+#include "os/os_mbuf.h"
+#include "esp_bt.h"
+#include "esp_hci_transport.h"
+
+/**
+ * @brief UART configuration parameters for the HCI driver
+ */
+typedef struct hci_driver_uart_params_config
+{
+    uint8_t hci_uart_port;                   /*!< Port of UART for HCI */
+    uint8_t hci_uart_data_bits;              /*!< Data bits of UART for HCI */
+    uint8_t hci_uart_stop_bits;              /*!< Stop bits of UART for HCI */
+    uint8_t hci_uart_flow_ctrl;              /*!< Flow control of UART for HCI */
+    uint8_t hci_uart_parity;                 /*!< UART parity */
+    uint8_t hci_uart_driver_mode;            /*!< UART driver mode */
+    uint32_t hci_uart_baud;                  /*!< Baudrate of UART for HCI */
+    int hci_uart_tx_pin;                     /*!< Tx Pin number of UART for HCI */
+    int hci_uart_rx_pin;                     /*!< Rx Pin number of UART for HCI */
+    int hci_uart_rts_pin;                    /*!< RTS Pin number of UART for HCI */
+    int hci_uart_cts_pin;                    /*!< CTS Pin number of UART for HCI */
+}  hci_driver_uart_params_config_t;
+
+#define BT_HCI_DRIVER_UART_CONFIG_DEFAULT() {                                       \
+    .hci_uart_port          = DEFAULT_BT_LE_HCI_UART_PORT,                          \
+    .hci_uart_baud          = DEFAULT_BT_LE_HCI_UART_BAUD,                          \
+    .hci_uart_tx_pin        = DEFAULT_BT_LE_HCI_UART_TX_PIN ,                       \
+    .hci_uart_rx_pin        = DEFAULT_BT_LE_HCI_UART_RX_PIN,                        \
+    .hci_uart_cts_pin       = DEFAULT_BT_LE_HCI_UART_CTS_PIN,                       \
+    .hci_uart_rts_pin       = DEFAULT_BT_LE_HCI_UART_RTS_PIN,                       \
+    .hci_uart_data_bits     = DEFAULT_BT_LE_HCI_UART_DATA_BITS,                     \
+    .hci_uart_stop_bits     = DEFAULT_BT_LE_HCI_UART_STOP_BITS,                     \
+    .hci_uart_flow_ctrl     = DEFAULT_BT_LE_HCI_UART_FLOW_CTRL,                     \
+    .hci_uart_parity        = DEFAULT_BT_LE_HCI_UART_PARITY,                        \
+}
+
+/**
+ * @brief Configures the HCI driver UART parameters.
+ *        This function sets up the UART interface according to the specified configuration parameters.
+ *
+ * @param uart_config A pointer to a structure containing the UART configuration parameters.
+ *                    The structure should include details such as baud rate, parity, stop bits, and flow control.
+ *                    Ensure that the uart_config structure is correctly initialized before calling this function.
+ *
+ * @return int    Returns 0 on success, or a non-zero error code on failure.
+ *
+ * @note This function should be called before any UART communication is initiated.
+ */
+int hci_driver_uart_config(hci_driver_uart_params_config_t *uart_config);
+
+/**
+ * @brief Update the UART pin configuration for the HCI driver.
+ *
+ * This function updates the TX, RX, CTS, and RTS pin assignments for the HCI driver operating over UART.
+ * It allows dynamic reconfiguration of UART pins as needed.
+ *
+ * @param tx_pin  The GPIO number assigned to the UART TX pin.
+ * @param rx_pin  The GPIO number assigned to the UART RX pin.
+ * @param cts_pin The GPIO number assigned to the UART CTS pin.
+ * @param rts_pin The GPIO number assigned to the UART RTS pin.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+int hci_driver_uart_pin_update(int tx_pin, int rx_pin, int cts_pin, int rts_pin);
+
+/**
+ * @brief Retrieves the current UART configuration parameters for the HCI driver.
+ *
+ * @return hci_driver_uart_params_config_t* Pointer to the structure with UART configuration parameters.
+ */
+hci_driver_uart_params_config_t * hci_driver_uart_config_param_get(void);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/lib/bt/porting/transport/driver/uart/hci_driver_uart_config.c b/lib/bt/porting/transport/driver/uart/hci_driver_uart_config.c
new file mode 100644
index 00000000..ada3310b
--- /dev/null
+++ b/lib/bt/porting/transport/driver/uart/hci_driver_uart_config.c
@@ -0,0 +1,68 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "esp_log.h"
+#include "driver/uart.h"
+#include "hci_driver_uart.h"
+#include "esp_private/esp_gpio_reserve.h"
+
+static const char *TAG = "hci_uart_config";
+static uart_config_t s_uart_cfg;
+static hci_driver_uart_params_config_t s_hci_driver_uart_params = BT_HCI_DRIVER_UART_CONFIG_DEFAULT();
+
+int hci_driver_uart_config(hci_driver_uart_params_config_t *uart_config)
+{
+    uart_config_t *uart_cfg;
+    uart_cfg = &s_uart_cfg;
+    uart_cfg->baud_rate = uart_config->hci_uart_baud;
+    uart_cfg->data_bits = uart_config->hci_uart_data_bits;
+    uart_cfg->stop_bits = uart_config->hci_uart_stop_bits;
+    uart_cfg->parity    = uart_config->hci_uart_parity;
+    uart_cfg->flow_ctrl = uart_config->hci_uart_flow_ctrl;
+    uart_cfg->source_clk= UART_SCLK_DEFAULT;
+    uart_cfg->rx_flow_ctrl_thresh = UART_HW_FIFO_LEN(uart_config->hci_uart_port) - 1;
+
+    ESP_LOGI(TAG,"set uart pin tx:%d, rx:%d.\n", uart_config->hci_uart_tx_pin, uart_config->hci_uart_rx_pin);
+    ESP_LOGI(TAG,"set rts:%d, cts:%d.\n", uart_config->hci_uart_rts_pin, uart_config->hci_uart_cts_pin);
+    ESP_LOGI(TAG,"set baud_rate:%d.\n", uart_config->hci_uart_baud);
+    ESP_LOGI(TAG,"set flow_ctrl:%d.\n", uart_config->hci_uart_flow_ctrl);
+
+    ESP_ERROR_CHECK(uart_driver_delete(uart_config->hci_uart_port));
+    ESP_ERROR_CHECK(uart_param_config(uart_config->hci_uart_port, uart_cfg));
+    ESP_ERROR_CHECK(uart_set_pin(uart_config->hci_uart_port, uart_config->hci_uart_tx_pin, uart_config->hci_uart_rx_pin,
+                                 uart_config->hci_uart_rts_pin, uart_config->hci_uart_cts_pin));
+    return 0;
+}
+
+int
+hci_driver_uart_pin_update(int tx_pin, int rx_pin, int cts_pin, int rts_pin)
+{
+    hci_driver_uart_params_config_t *uart_param = &s_hci_driver_uart_params;
+    /* Fixed warning that the gpio is not usable, may be used by others */
+    esp_gpio_revoke(BIT64(uart_param->hci_uart_tx_pin));
+    esp_gpio_revoke(BIT64(uart_param->hci_uart_rx_pin));
+    if (uart_param->hci_uart_cts_pin != -1) {
+        esp_gpio_revoke(BIT64(uart_param->hci_uart_cts_pin));
+    }
+
+    if (uart_param->hci_uart_rts_pin != -1) {
+        esp_gpio_revoke(BIT64(uart_param->hci_uart_rts_pin));
+    }
+
+    uart_param->hci_uart_tx_pin = tx_pin;
+    uart_param->hci_uart_rx_pin = rx_pin;
+    uart_param->hci_uart_rts_pin = rts_pin;
+    uart_param->hci_uart_cts_pin = cts_pin;
+    return hci_driver_uart_config(uart_param);
+}
+
+hci_driver_uart_params_config_t *
+hci_driver_uart_config_param_get(void)
+{
+    return &s_hci_driver_uart_params;
+}
diff --git a/lib/bt/porting/transport/driver/uart/hci_driver_uart_dma.c b/lib/bt/porting/transport/driver/uart/hci_driver_uart_dma.c
new file mode 100644
index 00000000..7bc3cc7c
--- /dev/null
+++ b/lib/bt/porting/transport/driver/uart/hci_driver_uart_dma.c
@@ -0,0 +1,664 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "freertos/FreeRTOS.h"
+#include "freertos/queue.h"
+#include "freertos/task.h"
+#include "freertos/semphr.h"
+#include "esp_log.h"
+#include "driver/uart.h"
+#include "esp_hci_transport.h"
+#include "esp_hci_internal.h"
+#include "common/hci_driver_h4.h"
+#include "common/hci_driver_util.h"
+#include "common/hci_driver_mem.h"
+#include "hci_driver_uart.h"
+
+#include "esp_private/periph_ctrl.h"
+#include "esp_private/gdma.h"
+#include "hal/uhci_ll.h"
+
+/*
+ *  UART DMA Desc struct
+ *
+ * --------------------------------------------------------------
+ * | own | EoF | sub_sof | 5'b0   | length [11:0] | size [11:0] |
+ * --------------------------------------------------------------
+ * |            buf_ptr [31:0]                                  |
+ * --------------------------------------------------------------
+ * |            next_desc_ptr [31:0]                            |
+ * --------------------------------------------------------------
+ */
+
+/* this bitfield is start from the LSB!!! */
+typedef struct uhci_lldesc_s {
+    volatile uint32_t size  : 12,
+             length: 12,
+             offset: 5, /* h/w reserved 5bit, s/w use it as offset in buffer */
+             sosf  : 1, /* start of sub-frame */
+             eof   : 1, /* end of frame */
+             owner : 1; /* hw or sw */
+    volatile const uint8_t *buf;       /* point to buffer data */
+    union {
+        volatile uint32_t empty;
+        STAILQ_ENTRY(uhci_lldesc_s) qe;  /* pointing to the next desc */
+    };
+} uhci_lldesc_t;
+
+/**
+ * @brief Enumeration of HCI transport transmission states.
+ */
+typedef enum {
+    HCI_TRANS_TX_IDLE,    ///< HCI Transport TX is in idle state.
+    HCI_TRANS_TX_START,   ///< HCI Transport TX is starting transmission.
+    HCI_TRANS_TX_END,     ///< HCI Transport TX has completed transmission.
+} hci_trans_tx_state_t;
+
+typedef struct {
+    TaskHandle_t task_handler;
+    hci_driver_uart_params_config_t *hci_uart_params;
+    SemaphoreHandle_t process_sem;
+    struct hci_h4_sm *h4_sm;
+    hci_driver_forward_fn *forward_cb;
+    struct os_mempool *hci_rx_data_pool; /*!< Init a memory pool for rx_data cache */
+    uint8_t *hci_rx_data_buffer;
+    struct os_mempool *hci_rxinfo_pool; /*!< Init a memory pool for rxinfo cache */
+    os_membuf_t *hci_rxinfo_buffer;
+    volatile bool rxinfo_mem_exhausted; /*!< Indicate rxinfo memory does not exist */
+    volatile bool is_continue_rx; /*!< Continue to rx */
+    volatile hci_trans_tx_state_t hci_tx_state; /*!< HCI Tx State */
+    struct os_mempool lldesc_mem_pool;/*!< Init a memory pool for uhci_lldesc_t */
+    uhci_lldesc_t *lldesc_mem;
+} hci_driver_uart_dma_env_t;
+
+#define ESP_BT_HCI_TL_STATUS_OK            (0)   /*!< HCI_TL Tx/Rx operation status OK */
+/* The number of lldescs pool */
+#define HCI_LLDESCS_POOL_NUM                (CONFIG_BT_LE_HCI_LLDESCS_POOL_NUM)
+/* Default block size for HCI RX data  */
+#define HCI_RX_DATA_BLOCK_SIZE              (DEFAULT_BT_LE_ACL_BUF_SIZE + HCI_TRANSPORT_CMD_SZ)
+#define HCI_RX_DATA_POOL_NUM                (CONFIG_BT_LE_HCI_TRANS_RX_MEM_NUM)
+#define HCI_RX_INFO_POOL_NUM                (CONFIG_BT_LE_HCI_TRANS_RX_MEM_NUM + 1)
+
+/**
+ * @brief callback function for HCI Transport Layer send/receive operations
+ */
+typedef void (* esp_bt_hci_tl_callback_t) (void *arg, uint8_t status);
+
+struct uart_txrxchannel {
+    esp_bt_hci_tl_callback_t callback;
+    void *arg;
+    uhci_lldesc_t *link_head;
+};
+
+struct uart_env_tag {
+    struct uart_txrxchannel tx;
+    struct uart_txrxchannel rx;
+};
+
+typedef struct hci_message {
+    void *ptr;                   ///< Pointer to the message data.
+    uint32_t length;             ///< Length of the message data.
+    STAILQ_ENTRY(hci_message) next; ///< Next element in the linked list.
+} hci_message_t;
+
+static void hci_driver_uart_dma_recv_async(uint8_t *buf, uint32_t size, esp_bt_hci_tl_callback_t callback, void *arg);
+int hci_driver_uart_dma_rx_start(uint8_t *rx_data, uint32_t length);
+int hci_driver_uart_dma_tx_start(esp_bt_hci_tl_callback_t callback, void *arg);
+
+static const char *TAG = "uart_dma";
+static hci_driver_uart_dma_env_t s_hci_driver_uart_dma_env;
+static struct hci_h4_sm s_hci_driver_uart_h4_sm;
+
+/* The list for hci_rx_data */
+STAILQ_HEAD(g_hci_rxinfo_list, hci_message);
+
+DRAM_ATTR struct g_hci_rxinfo_list g_hci_rxinfo_head;
+static DRAM_ATTR struct uart_env_tag uart_env;
+static uhci_dev_t *s_uhci_hw = &UHCI0;
+static DRAM_ATTR gdma_channel_handle_t s_rx_channel;
+static DRAM_ATTR gdma_channel_handle_t s_tx_channel;
+
+static int hci_driver_uart_dma_memory_deinit(void)
+{
+
+    if (s_hci_driver_uart_dma_env.hci_rxinfo_buffer) {
+        free(s_hci_driver_uart_dma_env.hci_rxinfo_buffer);
+        s_hci_driver_uart_dma_env.hci_rxinfo_buffer = NULL;
+    }
+
+    if (s_hci_driver_uart_dma_env.hci_rxinfo_pool) {
+        free(s_hci_driver_uart_dma_env.hci_rxinfo_pool);
+        s_hci_driver_uart_dma_env.hci_rxinfo_pool = NULL;
+    }
+
+    if (s_hci_driver_uart_dma_env.hci_rx_data_buffer) {
+        free(s_hci_driver_uart_dma_env.hci_rx_data_buffer);
+        s_hci_driver_uart_dma_env.hci_rx_data_buffer = NULL;
+    }
+
+    if (s_hci_driver_uart_dma_env.hci_rx_data_pool) {
+        free(s_hci_driver_uart_dma_env.hci_rx_data_pool);
+        s_hci_driver_uart_dma_env.hci_rx_data_pool = NULL;
+    }
+
+    if (s_hci_driver_uart_dma_env.lldesc_mem) {
+        free(s_hci_driver_uart_dma_env.lldesc_mem);
+        s_hci_driver_uart_dma_env.lldesc_mem = NULL;
+    }
+
+    return 0;
+}
+
+static int hci_driver_uart_dma_memory_init(void)
+{
+    int rc = 0;
+
+    s_hci_driver_uart_dma_env.lldesc_mem = malloc(OS_MEMPOOL_SIZE(HCI_LLDESCS_POOL_NUM,
+                        sizeof (uhci_lldesc_t)) * sizeof(os_membuf_t));
+    if (!s_hci_driver_uart_dma_env.lldesc_mem) {
+        return -1;
+    }
+
+    rc = os_mempool_init(&s_hci_driver_uart_dma_env.lldesc_mem_pool, HCI_LLDESCS_POOL_NUM,
+                         sizeof (uhci_lldesc_t), s_hci_driver_uart_dma_env.lldesc_mem, "hci_lldesc_pool");
+    if (rc) {
+        goto init_err;
+    }
+
+    s_hci_driver_uart_dma_env.hci_rx_data_pool = (struct os_mempool *)malloc(sizeof(struct os_mempool));
+    if (!s_hci_driver_uart_dma_env.hci_rx_data_pool) {
+        goto init_err;
+    }
+
+    memset(s_hci_driver_uart_dma_env.hci_rx_data_pool, 0, sizeof(struct os_mempool));
+    s_hci_driver_uart_dma_env.hci_rx_data_buffer = malloc(OS_MEMPOOL_SIZE(HCI_RX_DATA_POOL_NUM,
+                                                    HCI_RX_DATA_BLOCK_SIZE) * sizeof(os_membuf_t));
+    if (!s_hci_driver_uart_dma_env.hci_rx_data_buffer) {
+        goto init_err;
+    }
+
+    memset(s_hci_driver_uart_dma_env.hci_rx_data_buffer, 0, OS_MEMPOOL_SIZE(HCI_RX_DATA_POOL_NUM,
+                                          HCI_RX_DATA_BLOCK_SIZE) * sizeof(os_membuf_t));
+    rc = os_mempool_init(s_hci_driver_uart_dma_env.hci_rx_data_pool, HCI_RX_DATA_POOL_NUM,
+                         HCI_RX_DATA_BLOCK_SIZE, s_hci_driver_uart_dma_env.hci_rx_data_buffer,
+                         "hci_rx_data_pool");
+    if (rc) {
+        goto init_err;
+    }
+
+
+    /* Malloc hci rxinfo pool */
+    s_hci_driver_uart_dma_env.hci_rxinfo_pool = (struct os_mempool *)malloc(sizeof(struct os_mempool));
+    if (!s_hci_driver_uart_dma_env.hci_rxinfo_pool) {
+        goto init_err;
+    }
+
+    memset(s_hci_driver_uart_dma_env.hci_rxinfo_pool, 0, sizeof(struct os_mempool));
+    s_hci_driver_uart_dma_env.hci_rxinfo_buffer = malloc(OS_MEMPOOL_SIZE(HCI_RX_INFO_POOL_NUM,
+                                         sizeof(hci_message_t)) * sizeof(os_membuf_t));
+    if (!s_hci_driver_uart_dma_env.hci_rxinfo_buffer) {
+        goto init_err;
+    }
+
+    memset(s_hci_driver_uart_dma_env.hci_rxinfo_buffer, 0, OS_MEMPOOL_SIZE(HCI_RX_INFO_POOL_NUM,
+           sizeof(hci_message_t)) * sizeof(os_membuf_t));
+    rc = os_mempool_init(s_hci_driver_uart_dma_env.hci_rxinfo_pool, HCI_RX_INFO_POOL_NUM,
+                         sizeof(hci_message_t), s_hci_driver_uart_dma_env.hci_rxinfo_buffer,
+                         "hci_rxinfo_pool");
+    if (rc) {
+        goto init_err;
+    }
+
+    return rc;
+init_err:
+    hci_driver_uart_dma_memory_deinit();
+    return rc;
+}
+
+static IRAM_ATTR bool hci_uart_tl_rx_eof_callback(gdma_channel_handle_t dma_chan, gdma_event_data_t *event_data, void *user_data)
+{
+    esp_bt_hci_tl_callback_t callback = uart_env.rx.callback;
+    void *arg = uart_env.rx.arg;
+    assert(dma_chan == s_rx_channel);
+    assert(uart_env.rx.callback != NULL);
+    // clear callback pointer
+    uart_env.rx.callback = NULL;
+    uart_env.rx.arg = NULL;
+    // call handler
+    callback(arg, ESP_BT_HCI_TL_STATUS_OK);
+    return true;
+}
+
+static IRAM_ATTR bool hci_uart_tl_tx_eof_callback(gdma_channel_handle_t dma_chan, gdma_event_data_t *event_data, void *user_data)
+{
+    esp_bt_hci_tl_callback_t callback = uart_env.tx.callback;
+    assert(dma_chan == s_tx_channel);
+    assert(uart_env.tx.callback != NULL);
+    // clear callback pointer
+    uart_env.tx.callback = NULL;
+    // call handler
+    callback(uart_env.tx.arg, ESP_BT_HCI_TL_STATUS_OK);
+    uart_env.tx.arg = NULL;
+    return true;
+}
+
+uint8_t * IRAM_ATTR hci_driver_uart_dma_rxdata_memory_get(void)
+{
+    uint8_t *rx_data;
+    rx_data = os_memblock_get(s_hci_driver_uart_dma_env.hci_rx_data_pool);
+    return rx_data;
+}
+
+hci_message_t * IRAM_ATTR hci_driver_uart_dma_rxinfo_memory_get(void)
+{
+    hci_message_t *rx_info;
+    rx_info = os_memblock_get(s_hci_driver_uart_dma_env.hci_rxinfo_pool);
+    return rx_info;
+}
+
+void IRAM_ATTR hci_driver_uart_dma_cache_rxinfo(hci_message_t *hci_rxinfo)
+{
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+    STAILQ_INSERT_TAIL(&g_hci_rxinfo_head, hci_rxinfo, next);
+    OS_EXIT_CRITICAL(sr);
+}
+
+void IRAM_ATTR hci_driver_uart_dma_continue_rx_enable(bool enable)
+{
+    os_sr_t sr;
+    OS_ENTER_CRITICAL(sr);
+    s_hci_driver_uart_dma_env.is_continue_rx = enable;
+    OS_EXIT_CRITICAL(sr);
+}
+
+void IRAM_ATTR hci_driver_uart_dma_rxinfo_mem_exhausted_set(bool is_exhausted)
+{
+    os_sr_t sr;
+    OS_ENTER_CRITICAL(sr);
+    s_hci_driver_uart_dma_env.rxinfo_mem_exhausted = is_exhausted;
+    OS_EXIT_CRITICAL(sr);
+}
+
+void IRAM_ATTR hci_driver_uart_dma_recv_callback(void *arg, uint8_t status)
+{
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+    hci_message_t *hci_rxinfo;
+    uint8_t *rx_data;
+
+    if (s_hci_driver_uart_dma_env.rxinfo_mem_exhausted) {
+        ESP_LOGE(TAG, "Will lost rx data, need adjust rxinfo memory count\n");
+        assert(0);
+    }
+
+    hci_rxinfo = hci_driver_uart_dma_rxinfo_memory_get();
+    if (!hci_rxinfo) {
+        ESP_LOGW(TAG, "set rxinfo mem exhausted flag\n");
+        hci_driver_uart_dma_rxinfo_mem_exhausted_set(true);
+        xSemaphoreGiveFromISR(s_hci_driver_uart_dma_env.process_sem, &xHigherPriorityTaskWoken);
+        return;
+    }
+
+    hci_rxinfo->ptr = (void *)uart_env.rx.link_head->buf;
+    hci_rxinfo->length = uart_env.rx.link_head->length;
+    hci_driver_uart_dma_cache_rxinfo(hci_rxinfo);
+    xSemaphoreGiveFromISR(s_hci_driver_uart_dma_env.process_sem, &xHigherPriorityTaskWoken);
+    rx_data = hci_driver_uart_dma_rxdata_memory_get();
+    if (!rx_data) {
+        hci_driver_uart_dma_continue_rx_enable(true);
+    }else {
+        hci_driver_uart_dma_rx_start(rx_data, HCI_RX_DATA_BLOCK_SIZE);
+    }
+}
+
+void IRAM_ATTR hci_driver_uart_dma_txstate_set(hci_trans_tx_state_t tx_state)
+{
+    os_sr_t sr;
+    OS_ENTER_CRITICAL(sr);
+    s_hci_driver_uart_dma_env.hci_tx_state = tx_state;
+    OS_EXIT_CRITICAL(sr);
+}
+
+void IRAM_ATTR hci_driver_uart_dma_send_callback(void *arg, uint8_t status)
+{
+    uhci_lldesc_t *lldesc_head;
+    uhci_lldesc_t *lldesc_nxt;
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+
+    lldesc_head = uart_env.tx.link_head;
+    while (lldesc_head) {
+        lldesc_nxt = lldesc_head->qe.stqe_next;
+        os_memblock_put(&s_hci_driver_uart_dma_env.lldesc_mem_pool, lldesc_head);
+        lldesc_head = lldesc_nxt;
+    }
+
+    uart_env.tx.link_head = NULL;
+    hci_driver_uart_dma_txstate_set(HCI_TRANS_TX_IDLE);
+    xSemaphoreGiveFromISR(s_hci_driver_uart_dma_env.process_sem, &xHigherPriorityTaskWoken);
+}
+
+static IRAM_ATTR void hci_driver_uart_dma_recv_async(uint8_t *buf, uint32_t size, esp_bt_hci_tl_callback_t callback, void *arg)
+{
+    uhci_lldesc_t *lldesc_head;
+    assert(buf != NULL);
+    assert(size != 0);
+    assert(callback != NULL);
+    uart_env.rx.callback = callback;
+    uart_env.rx.arg = arg;
+    lldesc_head = uart_env.rx.link_head;
+
+    while (lldesc_head) {
+        os_memblock_put(&s_hci_driver_uart_dma_env.lldesc_mem_pool, lldesc_head),
+        lldesc_head = lldesc_head->qe.stqe_next;
+    }
+
+    uart_env.rx.link_head = NULL;
+    lldesc_head = os_memblock_get(&s_hci_driver_uart_dma_env.lldesc_mem_pool);
+    assert(lldesc_head);
+    memset(lldesc_head, 0, sizeof(uhci_lldesc_t));
+    lldesc_head->buf = buf;
+    lldesc_head->size = size;
+    lldesc_head->eof = 0;
+    s_uhci_hw->pkt_thres.pkt_thrs = size;
+    uart_env.rx.link_head = lldesc_head;
+    gdma_start(s_rx_channel, (intptr_t)(uart_env.rx.link_head));
+}
+
+int IRAM_ATTR hci_driver_uart_dma_rx_start(uint8_t *rx_data, uint32_t length)
+{
+    hci_driver_uart_dma_recv_async(rx_data, length, hci_driver_uart_dma_recv_callback, NULL);
+    return 0;
+}
+
+int hci_driver_uart_dma_tx_start(esp_bt_hci_tl_callback_t callback, void *arg)
+{
+    void *data;
+    bool last_frame;
+    bool head_is_setted;
+    uint32_t tx_len;
+    uhci_lldesc_t *lldesc_data;
+    uhci_lldesc_t *lldesc_head;
+    uhci_lldesc_t *lldesc_tail;
+
+    lldesc_head = NULL;
+    lldesc_tail = NULL;
+    head_is_setted = false;
+    last_frame = false;
+    while (true) {
+        tx_len = hci_driver_util_tx_list_dequeue(0xffffff, &data, &last_frame);
+        if (!tx_len) {
+            break;
+        }
+
+        lldesc_data = os_memblock_get(&s_hci_driver_uart_dma_env.lldesc_mem_pool);
+        /* According to the current processing logic， It should not be empty */
+        assert(lldesc_data);
+        memset(lldesc_data, 0, sizeof(uhci_lldesc_t));
+        lldesc_data->length = tx_len;
+        lldesc_data->buf = data;
+        lldesc_data->eof = 0;
+        if (!head_is_setted) {
+            lldesc_head = lldesc_data;
+            head_is_setted = true;
+        } else {
+            lldesc_tail->qe.stqe_next = lldesc_data;
+        }
+
+        lldesc_tail = lldesc_data;
+        if (last_frame) {
+            break;
+        }
+    }
+
+    if (lldesc_head) {
+        lldesc_tail->eof = 1;
+        uart_env.tx.link_head = lldesc_head;
+        uart_env.tx.callback = callback;
+        uart_env.tx.arg = arg;
+        /* The DMA interrupt may have been triggered before setting the tx_state,
+         * So we set it first.
+         */
+        hci_driver_uart_dma_txstate_set(HCI_TRANS_TX_START);
+        gdma_start(s_tx_channel, (intptr_t)(uart_env.tx.link_head));
+        return 0;
+    } else {
+        return -1;
+    }
+}
+
+static void hci_driver_uart_dma_install(void)
+{
+    periph_module_enable(PERIPH_UHCI0_MODULE);
+    periph_module_reset(PERIPH_UHCI0_MODULE);
+    // install DMA driver
+    gdma_channel_alloc_config_t tx_channel_config = {
+        .flags.reserve_sibling = 1,
+        .direction = GDMA_CHANNEL_DIRECTION_TX,
+    };
+
+    ESP_ERROR_CHECK(gdma_new_ahb_channel(&tx_channel_config, &s_tx_channel));
+    gdma_channel_alloc_config_t rx_channel_config = {
+        .direction = GDMA_CHANNEL_DIRECTION_RX,
+        .sibling_chan = s_tx_channel,
+    };
+
+    ESP_ERROR_CHECK(gdma_new_ahb_channel(&rx_channel_config, &s_rx_channel));
+    gdma_connect(s_tx_channel, GDMA_MAKE_TRIGGER(GDMA_TRIG_PERIPH_UHCI, 0));
+    gdma_connect(s_rx_channel, GDMA_MAKE_TRIGGER(GDMA_TRIG_PERIPH_UHCI, 0));
+    gdma_strategy_config_t strategy_config = {
+        .auto_update_desc = false,
+        .owner_check = false
+    };
+
+    gdma_apply_strategy(s_tx_channel, &strategy_config);
+    gdma_apply_strategy(s_rx_channel, &strategy_config);
+    gdma_rx_event_callbacks_t rx_cbs = {
+        .on_recv_eof = hci_uart_tl_rx_eof_callback
+    };
+
+    gdma_register_rx_event_callbacks(s_rx_channel, &rx_cbs, NULL);
+    gdma_tx_event_callbacks_t tx_cbs = {
+        .on_trans_eof = hci_uart_tl_tx_eof_callback
+    };
+
+    gdma_register_tx_event_callbacks(s_tx_channel, &tx_cbs, NULL);
+    // configure UHCI
+    uhci_ll_init((uhci_dev_t *)s_uhci_hw);
+    // uhci_ll_rx_set_eof_mode((uhci_dev_t *)s_uhci_hw, UHCI_RX_LEN_EOF);
+    uhci_ll_rx_set_eof_mode((uhci_dev_t *)s_uhci_hw, UHCI_RX_IDLE_EOF);
+    // disable software flow control
+    s_uhci_hw->escape_conf.val = 0;
+    uhci_ll_attach_uart_port((uhci_dev_t *)s_uhci_hw, s_hci_driver_uart_dma_env.hci_uart_params->hci_uart_port);
+}
+
+static int
+hci_driver_uart_dma_tx(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length,
+                   hci_driver_direction_t dir)
+{
+    /* By now, this layer is only used by controller. */
+    assert(dir == HCI_DRIVER_DIR_C2H);
+    ESP_LOGD(TAG, "dma tx:");
+    ESP_LOG_BUFFER_HEXDUMP(TAG, data, length, ESP_LOG_DEBUG);
+
+    hci_driver_util_tx_list_enqueue(data_type, data, length);
+    xSemaphoreGive(s_hci_driver_uart_dma_env.process_sem);
+    return 0;
+}
+
+static int
+hci_driver_uart_dma_h4_frame_cb(uint8_t pkt_type, void *data)
+{
+    hci_driver_forward_fn *forward_cb;
+    forward_cb = s_hci_driver_uart_dma_env.forward_cb;
+    if (!forward_cb) {
+        return -1;
+    }
+    ESP_LOGD(TAG, "h4 frame\n");
+    return forward_cb(pkt_type, data, 0, HCI_DRIVER_DIR_H2C);
+}
+
+static void
+hci_driver_uart_dma_process_task(void *p)
+{
+    hci_message_t *rxinfo_container;
+    os_sr_t sr;
+    int ret;
+    uint8_t* rx_data;
+    uint32_t rx_len;
+
+    while (true) {
+        xSemaphoreTake(s_hci_driver_uart_dma_env.process_sem, portMAX_DELAY);
+        ESP_LOGD(TAG, "task run:%d\n",s_hci_driver_uart_dma_env.hci_tx_state);
+        /* Process Tx data */
+        if (s_hci_driver_uart_dma_env.hci_tx_state == HCI_TRANS_TX_IDLE) {
+            hci_driver_uart_dma_tx_start(hci_driver_uart_dma_send_callback, (void*)&uart_env);
+        }
+
+        if (s_hci_driver_uart_dma_env.rxinfo_mem_exhausted) {
+            rx_data = (void *)uart_env.rx.link_head->buf;
+            rx_len = uart_env.rx.link_head->length;
+            ESP_LOGD(TAG, "rxinfo exhausted:");
+            ESP_LOG_BUFFER_HEXDUMP(TAG, rx_data, rx_len, ESP_LOG_DEBUG);
+            ret  = hci_h4_sm_rx(s_hci_driver_uart_dma_env.h4_sm, rx_data, rx_len);
+            hci_driver_uart_dma_rx_start(rx_data, HCI_RX_DATA_BLOCK_SIZE);
+            hci_driver_uart_dma_rxinfo_mem_exhausted_set(false);
+            if (ret < 0) {
+               ESP_LOGW(TAG, "parse rx data error!\n");
+               r_ble_ll_hci_ev_hw_err(ESP_HCI_SYNC_LOSS_ERR);
+            }
+        }
+
+        while (!STAILQ_EMPTY(&g_hci_rxinfo_head)) {
+            OS_ENTER_CRITICAL(sr);
+            rxinfo_container = STAILQ_FIRST(&g_hci_rxinfo_head);
+            STAILQ_REMOVE_HEAD(&g_hci_rxinfo_head, next);
+            OS_EXIT_CRITICAL(sr);
+
+            rx_data = rxinfo_container->ptr;
+            rx_len = rxinfo_container->length;
+            ESP_LOGD(TAG, "uart rx");
+            ESP_LOG_BUFFER_HEXDUMP(TAG, rx_data, rx_len, ESP_LOG_DEBUG);
+            ret  = hci_h4_sm_rx(s_hci_driver_uart_dma_env.h4_sm, rx_data, rx_len);
+            if (ret < 0) {
+                ESP_LOGW(TAG, "parse rx data error!\n");
+                r_ble_ll_hci_ev_hw_err(ESP_HCI_SYNC_LOSS_ERR);
+            }
+
+            os_memblock_put(s_hci_driver_uart_dma_env.hci_rxinfo_pool, rxinfo_container);
+            /* No need to enter CRITICAL */
+            if (s_hci_driver_uart_dma_env.is_continue_rx) {
+                /* We should set continux rx flag first, RX interrupted may happened when rx start soon */
+                hci_driver_uart_dma_continue_rx_enable(false);
+                hci_driver_uart_dma_rx_start(rx_data, HCI_RX_DATA_BLOCK_SIZE);
+            } else {
+                os_memblock_put(s_hci_driver_uart_dma_env.hci_rx_data_pool, rx_data);
+            }
+        }
+    }
+}
+
+static int
+hci_driver_uart_dma_task_create(void)
+{
+    /* !TODO: Set the core id by menuconfig */
+    xTaskCreatePinnedToCore(hci_driver_uart_dma_process_task, "hci_driver_uart_dma_process_task",
+                            CONFIG_BT_LE_HCI_TRANS_TASK_STACK_SIZE, NULL,
+                            ESP_TASK_BT_CONTROLLER_PRIO, &s_hci_driver_uart_dma_env.task_handler,
+                            0);
+    assert(s_hci_driver_uart_dma_env.task_handler);
+
+    ESP_LOGI(TAG, "hci transport task create successfully, prio:%d, stack size: %ld",
+             ESP_TASK_BT_CONTROLLER_PRIO, CONFIG_BT_LE_HCI_TRANS_TASK_STACK_SIZE);
+
+    return 0;
+}
+
+
+static void
+hci_driver_uart_dma_deinit(void)
+{
+    if (s_hci_driver_uart_dma_env.task_handler) {
+        vTaskDelete(s_hci_driver_uart_dma_env.task_handler);
+        s_hci_driver_uart_dma_env.task_handler = NULL;
+    }
+
+    ESP_ERROR_CHECK(uart_driver_delete(s_hci_driver_uart_dma_env.hci_uart_params->hci_uart_port));
+    hci_driver_uart_dma_memory_deinit();
+    if (!s_hci_driver_uart_dma_env.process_sem) {
+        vSemaphoreDelete(s_hci_driver_uart_dma_env.process_sem);
+    }
+
+    hci_driver_util_deinit();
+    memset(&s_hci_driver_uart_dma_env, 0, sizeof(hci_driver_uart_dma_env_t));
+}
+
+
+static int
+hci_driver_uart_dma_init(hci_driver_forward_fn *cb)
+{
+    int rc;
+
+    memset(&s_hci_driver_uart_dma_env, 0, sizeof(hci_driver_uart_dma_env_t));
+
+    s_hci_driver_uart_dma_env.h4_sm = &s_hci_driver_uart_h4_sm;
+    hci_h4_sm_init(s_hci_driver_uart_dma_env.h4_sm, &s_hci_driver_mem_alloc, &s_hci_driver_mem_free, hci_driver_uart_dma_h4_frame_cb);
+
+    rc = hci_driver_util_init();
+    if (rc) {
+        goto error;
+    }
+
+    s_hci_driver_uart_dma_env.process_sem = xSemaphoreCreateBinary();
+    if (!s_hci_driver_uart_dma_env.process_sem) {
+        goto error;
+    }
+
+    rc = hci_driver_uart_dma_memory_init();
+    if (rc) {
+        goto error;
+    }
+
+    s_hci_driver_uart_dma_env.forward_cb = cb;
+    s_hci_driver_uart_dma_env.hci_uart_params = hci_driver_uart_config_param_get();
+    hci_driver_uart_config(s_hci_driver_uart_dma_env.hci_uart_params);
+
+    ESP_LOGI(TAG, "uart attach uhci!");
+    hci_driver_uart_dma_install();
+
+    STAILQ_INIT(&g_hci_rxinfo_head);
+
+    rc = hci_driver_uart_dma_task_create();
+    if (rc) {
+        goto error;
+    }
+
+    s_hci_driver_uart_dma_env.hci_tx_state = HCI_TRANS_TX_IDLE;
+    s_hci_driver_uart_dma_env.rxinfo_mem_exhausted = false;
+    s_hci_driver_uart_dma_env.is_continue_rx = false;
+    hci_driver_uart_dma_rx_start(os_memblock_get(s_hci_driver_uart_dma_env.hci_rx_data_pool),
+                                HCI_RX_DATA_BLOCK_SIZE);
+    return 0;
+
+error:
+    hci_driver_uart_dma_deinit();
+    return rc;
+}
+
+int
+hci_driver_uart_dma_reconfig_pin(int tx_pin, int rx_pin, int cts_pin, int rts_pin)
+{
+    return hci_driver_uart_pin_update(tx_pin, rx_pin, cts_pin, rts_pin);
+}
+
+
+hci_driver_ops_t hci_driver_uart_dma_ops = {
+    .hci_driver_tx = hci_driver_uart_dma_tx,
+    .hci_driver_init = hci_driver_uart_dma_init,
+    .hci_driver_deinit = hci_driver_uart_dma_deinit,
+};
diff --git a/lib/bt/porting/transport/driver/vhci/hci_driver_nimble.c b/lib/bt/porting/transport/driver/vhci/hci_driver_nimble.c
new file mode 100644
index 00000000..9a117eb8
--- /dev/null
+++ b/lib/bt/porting/transport/driver/vhci/hci_driver_nimble.c
@@ -0,0 +1,61 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <string.h>
+#include <stdio.h>
+#include "esp_hci_internal.h"
+#include "esp_hci_driver.h"
+
+typedef struct {
+    hci_driver_forward_fn *forward_cb;
+} hci_driver_vhci_env_t;
+
+static hci_driver_vhci_env_t s_hci_driver_vhci_env;
+
+static int
+hci_driver_vhci_controller_tx(hci_driver_data_type_t data_type, uint8_t *data)
+{
+    /* The length is contained in the data. */
+    return s_hci_driver_vhci_env.forward_cb(data_type, data, 0, HCI_DRIVER_DIR_C2H);
+}
+
+static int
+hci_driver_vhci_host_tx(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length)
+{
+    return s_hci_driver_vhci_env.forward_cb(data_type, data, length, HCI_DRIVER_DIR_H2C);
+}
+
+static int
+hci_driver_vhci_tx(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length,
+                       hci_driver_direction_t dir)
+{
+    int rc;
+
+    if (dir == HCI_DRIVER_DIR_C2H) {
+        rc = hci_driver_vhci_controller_tx(data_type, data);
+    } else {
+        rc = hci_driver_vhci_host_tx(data_type, data, length);
+    }
+    return rc;
+}
+
+static int
+hci_driver_vhci_init(hci_driver_forward_fn *cb)
+{
+    s_hci_driver_vhci_env.forward_cb = cb;
+    return 0;
+}
+
+static void
+hci_driver_vhci_deinit(void)
+{
+    memset(&s_hci_driver_vhci_env, 0, sizeof(hci_driver_vhci_env_t));
+}
+
+hci_driver_ops_t hci_driver_vhci_ops = {
+    .hci_driver_tx = hci_driver_vhci_tx,
+    .hci_driver_init = hci_driver_vhci_init,
+    .hci_driver_deinit = hci_driver_vhci_deinit,
+};
diff --git a/lib/bt/porting/transport/driver/vhci/hci_driver_standard.c b/lib/bt/porting/transport/driver/vhci/hci_driver_standard.c
new file mode 100644
index 00000000..82626057
--- /dev/null
+++ b/lib/bt/porting/transport/driver/vhci/hci_driver_standard.c
@@ -0,0 +1,161 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <string.h>
+#include <stdio.h>
+#include "os/os_mbuf.h"
+#include "esp_hci_transport.h"
+#include "esp_hci_internal.h"
+#include "esp_hci_driver.h"
+#include "esp_bt.h"
+
+typedef struct {
+    hci_driver_forward_fn *forward_cb;
+    const esp_vhci_host_callback_t *host_recv_cb;
+} hci_driver_vhci_env_t;
+
+static hci_driver_vhci_env_t s_hci_driver_vhci_env;
+
+static int
+hci_driver_vhci_controller_tx(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length)
+{
+    int rc;
+    uint16_t buf_len = 0;
+    uint8_t *buf = NULL;
+    struct os_mbuf *om;
+
+    if (data_type == HCI_DRIVER_TYPE_ACL) {
+        om = (struct os_mbuf *)data;
+        buf_len = length + 1;
+        buf = malloc(buf_len);
+        /* TODO: If there is no memory, should handle it in the controller. */
+        assert(buf);
+        buf[0] = HCI_DRIVER_TYPE_ACL;
+        os_mbuf_copydata(om, 0, length, &buf[1]);
+        os_mbuf_free_chain(om);
+    } else if (data_type == HCI_DRIVER_TYPE_EVT) {
+        buf_len = length + 1;
+        buf = malloc(buf_len);
+        /* TODO: If there is no memory, should handle it in the controller. */
+        assert(buf != NULL);
+        buf[0] = HCI_DRIVER_TYPE_EVT;
+        memcpy(&buf[1], data, length);
+        r_ble_hci_trans_buf_free(data);
+    } else if (data_type == HCI_DRIVER_TYPE_ISO) {
+        buf_len = length + 1;
+        buf = malloc(buf_len);
+        /* TODO: If there is no memory, should handle it in the controller. */
+        assert(buf);
+        buf[0] = HCI_DRIVER_TYPE_ISO;
+        memcpy(&buf[1], data, length);
+        free(data);
+    }
+
+    rc = s_hci_driver_vhci_env.forward_cb(data_type, buf, buf_len, HCI_DRIVER_DIR_C2H);
+    free(buf);
+
+    return rc;
+}
+
+static int
+hci_driver_vhci_host_tx(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length)
+{
+    uint8_t *cmd;
+    struct os_mbuf *om;
+
+    if (data_type == HCI_DRIVER_TYPE_ACL) {
+        om = os_msys_get_pkthdr(length, ESP_HCI_INTERNAL_ACL_MBUF_LEADINGSPCAE);
+        assert(om);
+        assert(os_mbuf_append(om, &data[1], length - 1) == 0);
+        data = (uint8_t *)om;
+    } else if (data_type == HCI_DRIVER_TYPE_CMD) {
+        cmd = r_ble_hci_trans_buf_alloc(ESP_HCI_INTERNAL_BUF_CMD);
+        assert(cmd);
+        memcpy(cmd, data + 1, length - 1);
+        data = cmd;
+    }
+
+    return s_hci_driver_vhci_env.forward_cb(data_type, data, length, HCI_DRIVER_DIR_H2C);
+}
+
+static int
+hci_driver_vhci_tx(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length,
+                   hci_driver_direction_t dir)
+{
+    int rc;
+
+    if (dir == HCI_DRIVER_DIR_C2H) {
+        rc = hci_driver_vhci_controller_tx(data_type, data, length);
+    } else {
+        rc = hci_driver_vhci_host_tx(data_type, data, length);
+    }
+    return rc;
+}
+
+static int
+hci_driver_vhci_init(hci_driver_forward_fn *cb)
+{
+    memset(&s_hci_driver_vhci_env, 0, sizeof(hci_driver_vhci_env_t));
+    s_hci_driver_vhci_env.forward_cb = cb;
+    return 0;
+}
+
+static void
+hci_driver_vhci_deinit(void)
+{
+    memset(&s_hci_driver_vhci_env, 0, sizeof(hci_driver_vhci_env_t));
+}
+
+hci_driver_ops_t hci_driver_vhci_ops = {
+    .hci_driver_tx = hci_driver_vhci_tx,
+    .hci_driver_init = hci_driver_vhci_init,
+    .hci_driver_deinit = hci_driver_vhci_deinit,
+};
+
+/* Special APIs declared in the `esp_bt.h'. */
+static int
+hci_driver_vhci_host_recv_cb(hci_trans_pkt_ind_t type, uint8_t *data, uint16_t len)
+{
+    static const esp_vhci_host_callback_t *host_recv_cb;
+
+    host_recv_cb = s_hci_driver_vhci_env.host_recv_cb;
+    if (host_recv_cb) {
+        return host_recv_cb->notify_host_recv(data, len);
+    }
+
+    return -1;
+}
+
+esp_err_t
+esp_vhci_host_register_callback(const esp_vhci_host_callback_t *callback)
+{
+    if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) {
+        return ESP_FAIL;
+    }
+
+    s_hci_driver_vhci_env.host_recv_cb = callback;
+    if(hci_transport_host_callback_register(hci_driver_vhci_host_recv_cb)) {
+        s_hci_driver_vhci_env.host_recv_cb = NULL;
+        return ESP_FAIL;
+    }
+
+    return ESP_OK;
+}
+
+void
+esp_vhci_host_send_packet(uint8_t *data, uint16_t len)
+{
+    if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) {
+        return;
+    }
+
+    hci_driver_vhci_tx(data[0], data, len, HCI_DRIVER_DIR_H2C);
+}
+
+bool
+esp_vhci_host_check_send_available(void)
+{
+    return true;
+}
diff --git a/lib/bt/porting/transport/driver/vhci/hci_driver_tamplete.c b/lib/bt/porting/transport/driver/vhci/hci_driver_tamplete.c
new file mode 100644
index 00000000..63feb934
--- /dev/null
+++ b/lib/bt/porting/transport/driver/vhci/hci_driver_tamplete.c
@@ -0,0 +1,133 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <string.h>
+#include <stdio.h>
+#include "os/os_mbuf.h"
+#include "esp_hci_transport.h"
+#include "esp_hci_internal.h"
+#include "esp_hci_driver.h"
+
+typedef struct {
+    hci_driver_forward_fn *forward_cb;
+} hci_driver_vhci_env_t;
+
+static hci_driver_vhci_env_t s_hci_driver_vhci_env;
+
+static int
+hci_driver_vhci_controller_tx(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length)
+{
+    int rc;
+    uint16_t len = 0;
+    uint8_t *buf = NULL;
+    struct os_mbuf *om;
+
+    if (data_type == HCI_DRIVER_TYPE_ACL) {
+        /* The ACL data will be packaged as structure of `os_mbuf`.
+         * 1. Allocate a buffer suitable for the host. Use the following method to copy the data
+         * from the os_mbuf to the newly allocated memory.
+         * ```c
+         *      buf = malloc(length);
+         *      os_mbuf_copydata(om, 0, length, buf);
+         * ```
+         * 2. Free the controller's os_mbuf
+         * ```c
+         *      os_mbuf_free_chain(om);
+         * ```
+         */
+    } else if (data_type == HCI_DRIVER_TYPE_EVT) {
+        /* The event data will be packaged as an array.
+         * 1. Allocate a buffer suitable for the host. Use the following method to copy the data
+         * from the controller buffer to the newly allocated memory.
+         * ```c
+         *      buf = malloc(length);
+         *      memcpy(buf, data, length);
+         * ```
+         * 2. Free the controller's buffer.
+         * ```c
+         *      r_ble_hci_trans_buf_free(data);
+         * ```
+         */
+    } else {
+        assert(0);
+    }
+
+    rc = s_hci_driver_vhci_env.forward_cb(data_type, buf, len, HCI_DRIVER_DIR_C2H);
+    free(buf);
+
+    return rc;
+}
+
+static int
+hci_driver_vhci_host_tx(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length)
+{
+    uint8_t *hci_data;
+    struct os_mbuf *om;
+
+    if (data_type == HCI_DRIVER_TYPE_ACL) {
+        /* The ACL data needs to be packaged as structure of `os_mbuf`.
+         * 1. Get an os_mbuf in the following way.
+         * ```c
+         *      om = os_msys_get_pkthdr(length, ESP_HCI_INTERNAL_ACL_MBUF_LEADINGSPCAE);
+         * ```
+         * 2. Copy the host's data into this os_mbuf using the following method.
+         * ```c
+         *      assert(os_mbuf_append(om, data, length) == 0);
+         *      hci_data = (uint8_t *)om;
+         * ```
+         * 3. Free the host's buffer if needed.
+         */
+    } else if (data_type == HCI_DRIVER_TYPE_CMD) {
+        /* The COMMAND data needs to be packaged as an array.
+         * 1. Get a command buffer from the controller.
+         * ```c
+         *      hci_data = r_ble_hci_trans_buf_alloc(ESP_HCI_INTERNAL_BUF_CMD);
+         * ```
+         * 2. Copy the host's data into this buffer.
+         * ```c
+         *      memcpy(hci_data, data, length);
+         * ```
+         * 3. Free the host's buffer if needed.
+         */
+    } else {
+        assert(0);
+    }
+
+    return s_hci_driver_vhci_env.forward_cb(data_type, hci_data, length, HCI_DRIVER_DIR_H2C);
+}
+
+static int
+hci_driver_vhci_tx(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length,
+                   hci_driver_direction_t dir)
+{
+    int rc;
+
+    if (dir == HCI_DRIVER_DIR_C2H) {
+        rc = hci_driver_vhci_controller_tx(data_type, data, length);
+    } else {
+        rc = hci_driver_vhci_host_tx(data_type, data, length);
+    }
+    return rc;
+}
+
+static int
+hci_driver_vhci_init(hci_driver_forward_fn *cb)
+{
+    memset(&s_hci_driver_vhci_env, 0, sizeof(hci_driver_vhci_env_t));
+    s_hci_driver_vhci_env.forward_cb = cb;
+    return 0;
+}
+
+static void
+hci_driver_vhci_deinit(void)
+{
+    memset(&s_hci_driver_vhci_env, 0, sizeof(hci_driver_vhci_env_t));
+}
+
+hci_driver_ops_t hci_driver_vhci_ops = {
+    .hci_driver_tx = hci_driver_vhci_tx,
+    .hci_driver_init = hci_driver_vhci_init,
+    .hci_driver_deinit = hci_driver_vhci_deinit,
+};
diff --git a/lib/bt/porting/transport/include/common/hci_driver_h4.h b/lib/bt/porting/transport/include/common/hci_driver_h4.h
new file mode 100644
index 00000000..4c8424c7
--- /dev/null
+++ b/lib/bt/porting/transport/include/common/hci_driver_h4.h
@@ -0,0 +1,88 @@
+/*
+ * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 _HCI_H4_H_
+#define _HCI_H4_H_
+
+#include <stdint.h>
+
+#define HCI_H4_NONE      0x00
+#define HCI_H4_CMD       0x01
+#define HCI_H4_ACL       0x02
+#define HCI_H4_EVT       0x04
+#define HCI_H4_ISO       0x05
+
+typedef void *(hci_h4_alloc_cmd)(void);
+typedef void *(hci_h4_alloc_evt)(int);
+typedef struct os_mbuf *(hci_h4_alloc_acl)(void);
+typedef struct os_mbuf *(hci_h4_alloc_iso)(void);
+
+struct hci_h4_allocators {
+    hci_h4_alloc_cmd *cmd;
+    hci_h4_alloc_acl *acl;
+    hci_h4_alloc_evt *evt;
+    hci_h4_alloc_iso *iso;
+};
+
+extern const struct hci_h4_allocators hci_h4_allocs_from_ll;
+extern const struct hci_h4_allocators hci_h4_allocs_from_hs;
+
+typedef void (hci_h4_free_cmd)(uint8_t *buf);
+typedef void (hci_h4_free_evt)(uint8_t *buf);
+typedef int  (hci_h4_free_acl)(struct os_mbuf *om);
+typedef int  (hci_h4_free_iso)(struct os_mbuf *om);
+struct hci_h4_frees {
+    hci_h4_free_cmd *cmd;
+    hci_h4_free_acl *acl;
+    hci_h4_free_evt *evt;
+    hci_h4_free_iso *iso;
+};
+
+typedef int (hci_h4_frame_cb)(uint8_t pkt_type, void *data);
+
+struct hci_h4_sm {
+    uint8_t state;
+    uint8_t pkt_type;
+    uint8_t min_len;
+    uint16_t len;
+    uint16_t exp_len;
+    uint8_t hdr[4];
+    union {
+        uint8_t *buf;
+        struct os_mbuf *om;
+    };
+
+    const struct hci_h4_allocators *allocs;
+    const struct hci_h4_frees *frees;
+    hci_h4_frame_cb *frame_cb;
+};
+
+void hci_h4_sm_init(struct hci_h4_sm *h4sm,
+                    const struct hci_h4_allocators *allocs,
+                    const struct hci_h4_frees *frees,
+                    hci_h4_frame_cb *frame_cb);
+
+int hci_h4_sm_rx(struct hci_h4_sm *h4sm, const uint8_t *buf, uint16_t len);
+
+#endif /* _HCI_H4_H_ */
diff --git a/lib/bt/porting/transport/include/common/hci_driver_mem.h b/lib/bt/porting/transport/include/common/hci_driver_mem.h
new file mode 100644
index 00000000..8a2180e5
--- /dev/null
+++ b/lib/bt/porting/transport/include/common/hci_driver_mem.h
@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef _H_HCI_DRIVER_MEM_
+#define _H_HCI_DRIVER_MEM_
+#include <stdint.h>
+#include "os/os_mbuf.h"
+
+void *hci_driver_mem_cmd_alloc(void);
+
+void *hci_driver_mem_evt_alloc(int discardable);
+
+struct os_mbuf *hci_driver_mem_acl_alloc(void);
+
+struct os_mbuf *hci_driver_mem_acl_len_alloc(uint32_t len);
+
+struct os_mbuf *hci_driver_mem_iso_alloc(void);
+
+struct os_mbuf *hci_driver_mem_iso_len_alloc(uint32_t len);
+
+extern const struct hci_h4_allocators s_hci_driver_mem_alloc;
+extern const struct hci_h4_frees s_hci_driver_mem_free;
+#endif // _H_HCI_DRIVER_MEM_
diff --git a/lib/bt/porting/transport/include/common/hci_driver_util.h b/lib/bt/porting/transport/include/common/hci_driver_util.h
new file mode 100644
index 00000000..2e186e11
--- /dev/null
+++ b/lib/bt/porting/transport/include/common/hci_driver_util.h
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef _H_HCI_DRIVER_UTIL_
+#define _H_HCI_DRIVER_UTIL_
+#include <stdint.h>
+
+int hci_driver_util_init(void);
+
+void hci_driver_util_deinit(void);
+
+void hci_driver_util_tx_list_enqueue(hci_driver_data_type_t type, uint8_t *data, uint32_t len);
+
+uint32_t hci_driver_util_tx_list_dequeue(uint32_t max_tx_len, void **tx_data, bool *last_frame);
+
+void hci_driver_util_assert_check(const uint32_t ln, const char *fn, uint32_t param1, uint32_t param2);
+#define HCI_TRANS_ASSERT(cond, p1, p2)                                  \
+        if (!(cond)) {                                                  \
+            hci_driver_util_assert_check(__LINE__, __func__, p1, p2);   \
+        }
+#endif // _H_HCI_DRIVER_UTIL_
diff --git a/lib/bt/porting/transport/include/esp_hci_driver.h b/lib/bt/porting/transport/include/esp_hci_driver.h
new file mode 100644
index 00000000..04bf9297
--- /dev/null
+++ b/lib/bt/porting/transport/include/esp_hci_driver.h
@@ -0,0 +1,81 @@
+/*
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef H_ESP_HCI_DRIVER_
+#define H_ESP_HCI_DRIVER_
+#include <stdint.h>
+
+/**
+ * @brief Enumeration of HCI transport direction.
+ */
+typedef enum {
+    HCI_DRIVER_DIR_C2H = 0x00,  ///< From controller to host.
+    HCI_DRIVER_DIR_H2C,         ///< From host to controller.
+} hci_driver_direction_t;
+
+typedef enum {
+    HCI_DRIVER_TYPE_CMD = 0x01, ///< HCI Command Indicator.
+    HCI_DRIVER_TYPE_ACL,        ///< HCI ACL Data Indicator.
+    HCI_DRIVER_TYPE_SYNC,       ///< HCI Synchronous Data Indicator.
+    HCI_DRIVER_TYPE_EVT,        ///< HCI Event Indicator.
+    HCI_DRIVER_TYPE_ISO,        ///< HCI Isochronous Data Indicator.
+    HCI_DRIVER_TYPE_VENDOR,     ///< HCI Vendor data Indicator.
+} hci_driver_data_type_t;
+
+typedef int hci_driver_forward_fn(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length,
+                                  hci_driver_direction_t dir);
+
+/**
+ *  @brief Structure of HCI driver operations.
+ */
+typedef struct hci_driver_ops {
+    int (*hci_driver_tx)(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length,
+                         hci_driver_direction_t dir);
+    int (*hci_driver_init)(hci_driver_forward_fn *cb);
+    void (*hci_driver_deinit)(void);
+} hci_driver_ops_t;
+
+
+#if CONFIG_BT_LE_HCI_INTERFACE_USE_RAM
+extern hci_driver_ops_t hci_driver_vhci_ops;
+#endif // CONFIG_BT_LE_HCI_INTERFACE_USE_RAM
+
+#if CONFIG_BT_LE_HCI_INTERFACE_USE_UART
+#if CONFIG_BT_LE_UART_HCI_DMA_MODE
+extern hci_driver_ops_t hci_driver_uart_dma_ops;
+/**
+ * @brief Reconfigure the UART pins for the HCI driver.
+ *
+ * This function changes the UART pin configuration for the HCI driver.
+ *
+ * @param tx_pin   The pin number for the UART TX (transmit) line.
+ * @param rx_pin   The pin number for the UART RX (receive) line.
+ * @param cts_pin  The pin number for the UART CTS (clear to send) line.
+ * @param rts_pin  The pin number for the UART RTS (request to send) line.
+ *
+ * @return int     Returns 0 on success, or a negative error code on failure.
+ */
+int hci_driver_uart_dma_reconfig_pin(int tx_pin, int rx_pin, int cts_pin, int rts_pin);
+#define hci_uart_reconfig_pin               hci_driver_uart_dma_reconfig_pin
+#else
+extern hci_driver_ops_t hci_driver_uart_ops;
+/**
+ * @brief Reconfigure the UART pins for the HCI driver.
+ *
+ * This function changes the UART pin configuration for the HCI driver.
+ *
+ * @param tx_pin   The pin number for the UART TX (transmit) line.
+ * @param rx_pin   The pin number for the UART RX (receive) line.
+ * @param cts_pin  The pin number for the UART CTS (clear to send) line.
+ * @param rts_pin  The pin number for the UART RTS (request to send) line.
+ *
+ * @return int     Returns 0 on success, or a negative error code on failure.
+ */
+int hci_driver_uart_reconfig_pin(int tx_pin, int rx_pin, int cts_pin, int rts_pin);
+#define hci_uart_reconfig_pin               hci_driver_uart_reconfig_pin
+#endif // CONFIG_BT_LE_UART_HCI_DMA_MODE
+#endif // CONFIG_BT_LE_HCI_INTERFACE_USE_UART
+
+#endif // H_ESP_HCI_DRIVER_
diff --git a/lib/bt/porting/transport/include/esp_hci_internal.h b/lib/bt/porting/transport/include/esp_hci_internal.h
new file mode 100644
index 00000000..2b1c3353
--- /dev/null
+++ b/lib/bt/porting/transport/include/esp_hci_internal.h
@@ -0,0 +1,121 @@
+/*
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef H_ESP_HCI_INTERNAL_
+#define H_ESP_HCI_INTERNAL_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <stdint.h>
+#include "os/os_mbuf.h"
+
+
+/* The leadingspace in user info header for ACL data */
+#define ESP_HCI_INTERNAL_ACL_MBUF_LEADINGSPCAE  (4)
+
+#define ESP_HCI_INTERNAL_BUF_CMD                (3)
+
+/**
+ * @brief Define the HCI hardware error code for synchronization loss.
+ *        This error code is used to indicate a loss of synchronization between the controller and the host.
+ */
+#define ESP_HCI_SYNC_LOSS_ERR                   (0x1)
+/** Callback function types; executed when HCI packets are received. */
+typedef int esp_hci_internal_rx_cmd_fn(uint8_t *cmd, void *arg);
+typedef int esp_hci_internal_rx_acl_fn(struct os_mbuf *om, void *arg);
+
+/**
+ * Configures the HCI transport to operate with a host.  The transport will
+ * execute specified callbacks upon receiving HCI packets from the controller.
+ *
+ * @param evt_cb                The callback to execute upon receiving an HCI
+ *                                  event.
+ * @param evt_arg               Optional argument to pass to the event
+ *                                  callback.
+ * @param acl_cb                The callback to execute upon receiving ACL
+ *                                  data.
+ * @param acl_arg               Optional argument to pass to the ACL
+ *                                  callback.
+ */
+void r_ble_hci_trans_cfg_hs(esp_hci_internal_rx_cmd_fn *evt_cb, void *evt_arg,
+                            esp_hci_internal_rx_acl_fn *acl_cb, void *acl_arg);
+/**
+ * Sends ACL data from host to controller.
+ *
+ * @param om                    The ACL data packet to send.
+ *
+ * @return                      0 on success;
+ *                              A BLE_ERR_[...] error code on failure.
+ */
+int r_ble_hci_trans_hs_acl_tx(struct os_mbuf *om);
+
+/**
+ * Sends an HCI command from the host to the controller.
+ *
+ * @param cmd                   The HCI command to send.  This buffer must be
+ *                                  allocated via ble_hci_trans_buf_alloc().
+ *
+ * @return                      0 on success;
+ *                              A BLE_ERR_[...] error code on failure.
+ */
+int r_ble_hci_trans_hs_cmd_tx(uint8_t *cmd);
+
+/**
+ * Allocates a flat buffer of the specified type.
+ *
+ * @param type                  The type of buffer to allocate; one of the
+ *                                  BLE_HCI_TRANS_BUF_[...] constants.
+ *
+ * @return                      The allocated buffer on success;
+ *                              NULL on buffer exhaustion.
+ */
+uint8_t * r_ble_hci_trans_buf_alloc(int type);
+
+/**
+ * Frees the specified flat buffer.  The buffer must have been allocated via
+ * ble_hci_trans_buf_alloc().
+ *
+ * @param buf                   The buffer to free.
+ */
+void r_ble_hci_trans_buf_free(uint8_t *buf);
+
+/**
+ * Configures a callback to get executed whenever an ACL data packet is freed.
+ * The function is called immediately before the free occurs.
+ *
+ * @param cb                    The callback to configure.
+ * @param arg                   An optional argument to pass to the callback.
+ *
+ * @return                      0 on success;
+ *                              BLE_ERR_UNSUPPORTED if the transport does not
+ *                                  support this operation.
+ */
+int r_ble_hci_trans_set_acl_free_cb(os_mempool_put_fn *cb, void *arg);
+
+/**
+ * @brief Handle an HCI hardware error event.
+ *        This function processes a hardware error code and generates the appropriate HCI hardware error event.
+ *
+ * @param hw_err The hardware error code that needs to be processed. The specific meaning of the error code
+ *               depends on the implementation and the hardware.
+ *
+ * @return int   Returns 0 on success, or a non-zero error code on failure.
+ *
+ * @note This function should be called whenever a hardware error is detected in the HCI Layer.
+ */
+int r_ble_ll_hci_ev_hw_err(uint8_t hw_err);
+
+//!TODO: Check what this API is used for
+int r_ble_hci_trans_reset(void);
+
+//!TODO: Should we initialize the hci layer in IDF ?
+void esp_ble_hci_trans_init(uint8_t);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* H_ESP_HCI_INTERNAL_ */
diff --git a/lib/bt/porting/transport/include/esp_hci_transport.h b/lib/bt/porting/transport/include/esp_hci_transport.h
new file mode 100644
index 00000000..c811a09a
--- /dev/null
+++ b/lib/bt/porting/transport/include/esp_hci_transport.h
@@ -0,0 +1,83 @@
+/*
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef H_ESP_HCI_TRANSPORT_
+#define H_ESP_HCI_TRANSPORT_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <stdint.h>
+#include "os/os_mbuf.h"
+#include "esp_hci_driver.h"
+
+/**
+ * @brief Enumeration of HCI packet indicators
+ */
+typedef enum {
+    HCI_CMD_IND = 0x01,   /*!< HCI Command Indicator */
+    HCI_ACL_IND,          /*!< HCI ACL Data Indicator */
+    HCI_SYNC_IND,         /*!< HCI Synchronous Data Indicator */
+    HCI_EVT_IND,          /*!< HCI Event Indicator */
+    HCI_ISO_IND,          /*!< HCI Isochronous Data Indicator */
+    HCI_VENDOR_IND,       /*!< HCI Vendor data Indicator */
+} hci_trans_pkt_ind_t;
+
+/**
+ * @brief Enumeration of HCI Transport Mode
+ */
+typedef enum {
+    HCI_TRANSPORT_VHCI,         /*!< VHCI Transport Mode */
+    HCI_TRANSPORT_UART_NO_DMA,  /*!< UART_NO_DMA Transport Mode */
+    HCI_TRANSPORT_UART_UHCI,    /*!< UART_UHCI Transport Mode */
+    HCI_TRANSPORT_SDIO,         /*!< SDIO Transport Mode */
+    HCI_TRANSPORT_USB,          /*!< USB Transport Mode */
+} hci_trans_mode_t;
+
+typedef int hci_transport_host_recv_fn(hci_trans_pkt_ind_t type, uint8_t *data, uint16_t len);
+#define HCI_TRANSPORT_CMD_SZ                            (260)
+/**
+ * @brief Initialize the HCI transport layer.
+ *        It should be called before using any other functions in the transport layer.
+ *
+ * @param hci_transport_mode The mode in which the HCI transport should operate.
+ *
+ * @return int    Returns 0 on success, or a non-zero error code on failure.
+ */
+int hci_transport_init(uint8_t hci_transport_mode);
+
+/**
+ * @brief Deinitialize the HCI transport layer for releasing any allocated resources.
+ */
+void hci_transport_deinit(void);
+
+/**
+ * @brief Set the host's HCI callback which will be invoked when receiving ACL/Events from controller.
+ * @param callback  hci_transport_host_recv_fn type variable
+ * @return int 0 on success, non-zero error code on failure.
+ */
+int hci_transport_host_callback_register(hci_transport_host_recv_fn *callback);
+
+/**
+ * @brief Called to send HCI commands form host to controller.
+ * @param data      Point to the commands data
+ * @param length    Length of data
+ * @return int 0 on success, non-zero error code on failure.
+ */
+int hci_transport_host_cmd_tx(uint8_t *data, uint32_t length);
+
+/**
+ * @brief Called to send HCI ACL form host to controller.
+ * @param data      Point to the ACL data
+ * @param length    Length of data
+ * @return int 0 on success, non-zero error code on failure.
+ */
+int hci_transport_host_acl_tx(uint8_t *data, uint32_t length);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* H_ESP_HCI_TRANSPORT_ */
diff --git a/lib/bt/porting/transport/include/hci_uart.h b/lib/bt/porting/transport/include/hci_uart.h
deleted file mode 100644
index 02bc91b4..00000000
--- a/lib/bt/porting/transport/include/hci_uart.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <inttypes.h>
-#include "driver/uart.h"
-
-/**
- * Function prototype for UART driver to ask for more data to send.
- * Returns -1 if no more data is available for TX.
- * Driver must call this with interrupts disabled.
- */
-typedef int (*hci_uart_tx_char)(void *arg);
-
-/**
- * Function prototype for UART driver to report that transmission is
- * complete. This should be called when transmission of last byte is
- * finished.
- * Driver must call this with interrupts disabled.
- */
-typedef void (*hci_uart_tx_done)(void *arg);
-
-/**
- * Function prototype for UART driver to report incoming byte of data.
- * Returns -1 if data was dropped.
- * Driver must call this with interrupts disabled.
- */
-typedef int (*hci_uart_rx_char)(void *arg, uint8_t byte);
-
-
-/**
- * Initializes given uart. Mapping of logical UART number to physical
- * UART/GPIO pins is in BSP.
- */
-int hci_uart_init_cbs(int uart, hci_uart_tx_char tx_func,
-                      hci_uart_tx_done tx_done, hci_uart_rx_char rx_func, void *arg);
-
-
-/**
- * Applies given configuration to UART.
- *
- * @param port_num The UART number to configure
- * @param speed The baudrate in bps to configure
- * @param databits The number of databits to send per byte
- * @param stopbits The number of stop bits to send
- * @param parity The UART parity
- * @param flow_ctl Flow control settings on the UART
- *
- * @return 0 on success, non-zero error code on failure
- */
-int hci_uart_config(int port_num, int32_t baud_rate, uint8_t data_bits, uint8_t stop_bits,
-                    uart_parity_t parity, uart_hw_flowcontrol_t flow_ctl);
-
-/**
- * Close UART port. Can call hal_uart_config() with different settings after
- * calling this.
- *
- * @param port_num The UART number to close
- */
-int hci_uart_close(int port_num);
-
-/**
- * More data queued for transmission. UART driver will start asking for that
- * data.
- *
- * @param port_num The UART number to start TX on
- */
-void hci_uart_start_tx(int port_num);
-
-/**
- * Upper layers have consumed some data, and are now ready to receive more.
- * This is meaningful after uart_rx_char callback has returned -1 telling
- * that no more data can be accepted.
- *
- * @param port_num The UART number to begin RX on
- */
-void hci_uart_start_rx(int port_num);
-
-/**
- * @brief reconfig hci uart pin
- *
- * @param tx_pin  The Tx pin
- * @param rx_pin  The Rx pin
- * @param cts_pin The CTS pin
- * @param rts_pin The RTS pin
- * @return int  0 on success, non-zero error code on failure
- */
-int hci_uart_reconfig_pin(int tx_pin, int rx_pin, int cts_pin, int rts_pin);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/lib/bt/porting/transport/src/hci_transport.c b/lib/bt/porting/transport/src/hci_transport.c
new file mode 100644
index 00000000..29c2e001
--- /dev/null
+++ b/lib/bt/porting/transport/src/hci_transport.c
@@ -0,0 +1,177 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdio.h>
+#include <string.h>
+#include "esp_log.h"
+#include "esp_hci_transport.h"
+#include "esp_hci_internal.h"
+#include "esp_bt.h"
+
+typedef struct hci_transport_env
+{
+    hci_transport_host_recv_fn *host_recv_cb;
+    hci_driver_ops_t *driver_ops;
+} hci_transport_env_t;
+
+static hci_transport_env_t s_hci_transport_env;
+
+/* Functions for packets Rx. */
+static int
+hci_transport_controller_packet_rx(hci_driver_data_type_t data_type, uint8_t *data)
+{
+    if (data_type == HCI_DRIVER_TYPE_CMD) {
+        r_ble_hci_trans_hs_cmd_tx(data);
+    }
+
+    if (data_type == HCI_DRIVER_TYPE_ACL) {
+        r_ble_hci_trans_hs_acl_tx((struct os_mbuf *) data);
+    }
+    return 0;
+}
+
+static int
+hci_transport_host_packet_rx(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length)
+{
+    if (!s_hci_transport_env.host_recv_cb) {
+        return -1;
+    }
+    return s_hci_transport_env.host_recv_cb((hci_trans_pkt_ind_t)data_type, data, length);
+}
+
+static int
+hci_transport_packet_rx(hci_driver_data_type_t data_type, uint8_t *data, uint32_t length,
+                        hci_driver_direction_t dir)
+{
+    int rc;
+    if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) {
+        return -1;
+    }
+
+    if (dir == HCI_DRIVER_DIR_C2H) {
+        rc = hci_transport_host_packet_rx(data_type, data, length);
+    } else {
+        rc = hci_transport_controller_packet_rx(data_type, data);
+    }
+
+    return rc;
+}
+
+/* Functions for controller Tx. */
+static int
+hci_transport_controller_tx_dummy(void *data, void *arg)
+{
+    return -1;
+}
+
+static int
+hci_transport_controller_evt_tx(uint8_t *hci_ev, void *arg)
+{
+    uint32_t len;
+
+    if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) {
+        r_ble_hci_trans_buf_free(hci_ev);
+        return -1;
+    }
+
+    len = hci_ev[1] + 2;
+    return s_hci_transport_env.driver_ops->hci_driver_tx(HCI_DRIVER_TYPE_EVT, hci_ev, len,
+                                                         HCI_DRIVER_DIR_C2H);
+}
+
+static int
+hci_transport_controller_acl_tx(struct os_mbuf *om, void *arg)
+{
+    uint16_t len;
+    if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) {
+        os_mbuf_free_chain(om);
+        return -1;
+    }
+
+    len = OS_MBUF_PKTHDR(om)->omp_len;
+    return s_hci_transport_env.driver_ops->hci_driver_tx(HCI_DRIVER_TYPE_ACL, (uint8_t *)om, len,
+                                                         HCI_DRIVER_DIR_C2H);
+}
+
+/* Functions for host Tx. */
+int
+hci_transport_host_cmd_tx(uint8_t *data, uint32_t length)
+{
+    return s_hci_transport_env.driver_ops->hci_driver_tx(HCI_DRIVER_TYPE_CMD, data, length,
+                                                         HCI_DRIVER_DIR_H2C);
+}
+
+int
+hci_transport_host_acl_tx(uint8_t *data, uint32_t length)
+{
+    return s_hci_transport_env.driver_ops->hci_driver_tx(HCI_DRIVER_TYPE_ACL, data, length,
+                                                         HCI_DRIVER_DIR_H2C);
+}
+
+int
+hci_transport_host_callback_register(hci_transport_host_recv_fn *callback)
+{
+    s_hci_transport_env.host_recv_cb = callback;
+    return 0;
+}
+
+int
+hci_transport_init(uint8_t hci_transport_mode)
+{
+    int rc;
+    hci_driver_ops_t *ops;
+
+    memset(&s_hci_transport_env, 0, sizeof(hci_transport_env_t));
+
+    switch(hci_transport_mode) {
+#if CONFIG_BT_LE_HCI_INTERFACE_USE_RAM
+        case HCI_TRANSPORT_VHCI:
+            ops = &hci_driver_vhci_ops;
+            break;
+#endif // CONFIG_BT_LE_HCI_INTERFACE_USE_RAM
+#if CONFIG_BT_LE_HCI_INTERFACE_USE_UART
+#if CONFIG_BT_LE_UART_HCI_DMA_MODE
+        case HCI_TRANSPORT_UART_UHCI:
+            ops = &hci_driver_uart_dma_ops;
+            break;
+#else
+        case HCI_TRANSPORT_UART_NO_DMA:
+            ops = &hci_driver_uart_ops;
+            break;
+#endif // CONFIG_BT_LE_UART_HCI_DMA_MODE
+#endif // CONFIG_BT_LE_HCI_INTERFACE_USE_UART
+        default:
+            assert(0);
+    }
+
+    rc = ops->hci_driver_init(hci_transport_packet_rx);
+    if (rc) {
+        goto error;
+    }
+
+    s_hci_transport_env.driver_ops = ops;
+    r_ble_hci_trans_cfg_hs(hci_transport_controller_evt_tx, NULL, hci_transport_controller_acl_tx, NULL);
+
+    return 0;
+
+error:
+    hci_transport_deinit();
+    return rc;
+}
+
+void
+hci_transport_deinit(void)
+{
+    hci_driver_ops_t *ops;
+
+    r_ble_hci_trans_cfg_hs((esp_hci_internal_rx_cmd_fn *)hci_transport_controller_tx_dummy, NULL,
+                           (esp_hci_internal_rx_acl_fn *)hci_transport_controller_tx_dummy, NULL);
+
+    ops = s_hci_transport_env.driver_ops;
+    if (ops) {
+        ops->hci_driver_deinit();
+    }
+    memset(&s_hci_transport_env, 0, sizeof(hci_transport_env_t));
+}
diff --git a/lib/bt/porting/transport/uart/hci_uart.c b/lib/bt/porting/transport/uart/hci_uart.c
deleted file mode 100644
index c202e0a5..00000000
--- a/lib/bt/porting/transport/uart/hci_uart.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stdio.h>
-#include <string.h>
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "freertos/queue.h"
-#include "driver/uart.h"
-#include "hci_uart.h"
-#include "esp_log.h"
-#include "esp_attr.h"
-
-#ifdef CONFIG_BT_LE_HCI_INTERFACE_USE_UART
-
-static const char *TAG = "hci_uart";
-
-#define BUF_SIZE (1024)
-#define RD_BUF_SIZE (BUF_SIZE)
-
-#define HCI_UART_TX_PIN CONFIG_BT_LE_HCI_UART_TX_PIN
-#define HCI_UART_RX_PIN CONFIG_BT_LE_HCI_UART_RX_PIN
-
-
-#ifdef CONFIG_BT_LE_HCI_UART_FLOWCTRL
-#define HCI_UART_FLOWCTRL UART_HW_FLOWCTRL_CTS_RTS
-#define HCI_UART_RTS_PIN CONFIG_BT_LE_HCI_UART_RTS_PIN
-#define HCI_UART_CTS_PIN CONFIG_BT_LE_HCI_UART_CTS_PIN
-#else
-#define HCI_UART_FLOWCTRL UART_HW_FLOWCTRL_DISABLE
-#define HCI_UART_RTS_PIN (-1)
-#define HCI_UART_CTS_PIN (-1)
-#endif
-
-
-typedef struct {
-    bool uart_opened;
-    uart_port_t port;
-    uart_config_t cfg;
-    QueueHandle_t evt_queue;
-    TaskHandle_t rx_task_handler;
-    hci_uart_tx_char tx_char;
-    hci_uart_tx_done tx_done;
-    hci_uart_rx_char rx_char;
-    void *u_func_arg;
-
-} hci_uart_t;
-
-static hci_uart_t hci_uart;
-
-static void IRAM_ATTR hci_uart_rx_task(void *pvParameters)
-{
-    uart_event_t event;
-    uint8_t *dtmp = (uint8_t *) malloc(RD_BUF_SIZE);
-    while (hci_uart.uart_opened) {
-        //Waiting for UART event.
-        if (xQueueReceive(hci_uart.evt_queue, (void * )&event, (TickType_t)portMAX_DELAY)) {
-            bzero(dtmp, RD_BUF_SIZE);
-            ESP_LOGD(TAG, "uart[%d] event:", hci_uart.port);
-            switch (event.type) {
-            //Event of UART receving data
-            /*We'd better handler data event fast, there would be much more data events than
-            other types of events. If we take too much time on data event, the queue might
-            be full.*/
-            case UART_DATA:
-                // ESP_LOGI(TAG, "[UART DATA]: %d", event.size);
-                uart_read_bytes(hci_uart.port, dtmp, event.size, portMAX_DELAY);
-                for (int i = 0 ; i < event.size; i++) {
-                    hci_uart.rx_char(hci_uart.u_func_arg, dtmp[i]);
-                }
-                break;
-            //Event of HW FIFO overflow detected
-            case UART_FIFO_OVF:
-                ESP_LOGI(TAG, "hw fifo overflow");
-                // If fifo overflow happened, you should consider adding flow control for your application.
-                // The ISR has already reset the rx FIFO,
-                uart_flush_input(hci_uart.port);
-                xQueueReset(hci_uart.evt_queue);
-                break;
-            //Event of UART ring buffer full
-            case UART_BUFFER_FULL:
-                ESP_LOGI(TAG, "ring buffer full");
-                // If buffer full happened, you should consider encreasing your buffer size
-                uart_flush_input(hci_uart.port);
-                xQueueReset(hci_uart.evt_queue);
-                break;
-            //Event of UART RX break detected
-            case UART_BREAK:
-                ESP_LOGI(TAG, "uart rx break");
-                break;
-            //Event of UART parity check error
-            case UART_PARITY_ERR:
-                ESP_LOGI(TAG, "uart parity error");
-                break;
-            //Event of UART frame error
-            case UART_FRAME_ERR:
-                ESP_LOGI(TAG, "uart frame error");
-                break;
-            //Others
-            default:
-                ESP_LOGI(TAG, "uart event type: %d", event.type);
-                break;
-            }
-        }
-    }
-    free(dtmp);
-    dtmp = NULL;
-    hci_uart.rx_task_handler = NULL;
-    vTaskDelete(NULL);
-}
-
-int hci_uart_config(int port_num, int32_t baud_rate, uint8_t data_bits, uint8_t stop_bits,
-                    uart_parity_t parity, uart_hw_flowcontrol_t flow_ctl)
-{
-    uart_config_t uart_cfg = {
-        .baud_rate = baud_rate,
-        .data_bits = data_bits,
-        .parity    = parity,
-        .stop_bits = stop_bits,
-        .flow_ctrl = HCI_UART_FLOWCTRL,
-        .source_clk = UART_SCLK_DEFAULT,
-        .rx_flow_ctrl_thresh = UART_HW_FIFO_LEN(port_num) - 1,
-    };
-    hci_uart.port = port_num;
-    hci_uart.cfg = uart_cfg;
-
-    int intr_alloc_flags = 0;
-    intr_alloc_flags = ESP_INTR_FLAG_IRAM;
-
-    printf("set uart pin tx:%d, rx:%d.\n", HCI_UART_TX_PIN, HCI_UART_RX_PIN);
-    printf("set rts:%d, cts:%d.\n", HCI_UART_RTS_PIN, HCI_UART_CTS_PIN);
-    printf("set baud_rate:%d.\n", baud_rate);
-
-    ESP_ERROR_CHECK(uart_driver_delete(port_num));
-    ESP_ERROR_CHECK(uart_driver_install(port_num, BUF_SIZE * 2, BUF_SIZE * 2, 20, &hci_uart.evt_queue, intr_alloc_flags));
-    ESP_ERROR_CHECK(uart_param_config(port_num, &hci_uart.cfg));
-    ESP_ERROR_CHECK(uart_set_pin(port_num, HCI_UART_TX_PIN, HCI_UART_RX_PIN, HCI_UART_RTS_PIN, HCI_UART_CTS_PIN));
-
-    hci_uart.uart_opened = true;
-
-    //Create a task to handler UART event from ISR
-    xTaskCreate(hci_uart_rx_task, "hci_uart_rx_task", 2048, NULL, 12, &hci_uart.rx_task_handler);
-    return 0;
-}
-
-void IRAM_ATTR hci_uart_start_tx(int port_num)
-{
-    int data;
-    uint8_t u8_data = 0;
-    while (1) {
-        data = hci_uart.tx_char(hci_uart.u_func_arg);
-        if (data >= 0) {
-            u8_data = data;
-            uart_write_bytes(port_num, (char *)&u8_data, 1);
-        } else {
-            break;
-        }
-    }
-    if (hci_uart.tx_done) {
-        hci_uart.tx_done(hci_uart.u_func_arg);
-    }
-}
-
-int hci_uart_init_cbs(int port_num, hci_uart_tx_char tx_func,
-                      hci_uart_tx_done tx_done, hci_uart_rx_char rx_func, void *arg)
-{
-    hci_uart.tx_char = tx_func;
-    hci_uart.rx_char = rx_func;
-    hci_uart.tx_done = tx_done;
-    hci_uart.u_func_arg = arg;
-    return 0;
-}
-
-int hci_uart_close(int port_num)
-{
-    uart_event_t uart_event;
-    uart_event.type = UART_BREAK;
-    hci_uart.uart_opened = false;
-    // Stop uart rx task
-    if (hci_uart.rx_task_handler != NULL) {
-        xQueueSend(hci_uart.evt_queue, (void *)&uart_event, 1000);
-        ESP_LOGW(TAG, "Waiting for uart task finish...");
-    }
-    while (hci_uart.rx_task_handler != NULL);
-
-    uart_driver_delete(port_num);
-    ESP_LOGI(TAG, "hci uart close success.");
-    return 0;
-}
-
-int hci_uart_reconfig_pin(int tx_pin, int rx_pin, int cts_pin, int rts_pin)
-{
-    int port_num = hci_uart.port;
-    int32_t baud_rate = hci_uart.cfg.baud_rate;
-    uint8_t data_bits = hci_uart.cfg.data_bits;
-    uint8_t stop_bits = hci_uart.cfg.stop_bits;
-    uart_parity_t parity = hci_uart.cfg.parity;
-    uart_hw_flowcontrol_t flow_ctl = hci_uart.cfg.flow_ctrl;
-    hci_uart_close(port_num);
-    hci_uart_config(port_num, baud_rate, data_bits, stop_bits, parity, flow_ctl);
-    ESP_ERROR_CHECK(uart_set_pin(port_num, tx_pin, rx_pin, rts_pin, cts_pin));
-    return 0;
-}
-#endif //CONFIG_BT_LE_HCI_INTERFACE_USE_UART