8000 Remove include dependency on underlying crypto libraries by pan-apple · Pull Request #2310 · project-chip/connectedhomeip · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Remove include dependency on underlying crypto libraries #2310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 26, 2020
Merged

Remove include dependency on underlying crypto libraries #2310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57227a6
Remove include dependency on underlying crypto libraries
pan-apple Aug 24, 2020
6db9c7e
Restyled by clang-format
restyled-commits Aug 24, 2020
e785103
Use nlassert, cpp style cast
pan-apple Aug 24, 2020
05efa44
Restyled by clang-format
restyled-commits Aug 24, 2020
2c5505f
use inline methods to cleanup the code
pan-apple Aug 24, 2020
2c74b87
Restyled by clang-format
restyled-commits Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 18 additions & 40 deletions src/crypto/CHIPCryptoPAL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,6 @@
#include <stddef.h>
#include <string.h>

#if CHIP_CRYPTO_OPENSSL
#include <openssl/ec.h>
#include <openssl/sha.h>
#elif CHIP_CRYPTO_MBEDTLS
#include <mbedtls/ecp.h>
#include <mbedtls/md.h>
#include <mbedtls/sha256.h>
#endif

namespace chip {
namespace Crypto {

Expand All @@ -49,6 +40,13 @@ const size_t kMAX_FE_Length = kP256_FE_Length;
const size_t kMAX_Point_Length = kP256_Point_Length;
const size_t kMAX_Hash_Length = kSHA256_Hash_Length;

/* These sizes are hardcoded here to remove header dependency on underlying crypto library
* in a public interface file. The validity of these sizes is verified by static_assert in
* the implementation files.
*/
const size_t kMAX_Spake2p_Context_Size = 1024;
const size_t kMAX_Hash_SHA256_Context_Size = 256;

/**
* Spake2+ parameters for P256
* Defined in https://www.ietf.org/id/draft-bar-cfrg-spake2plus-01.html#name-ciphersuites
Expand Down Expand Up @@ -143,6 +141,11 @@ CHIP_ERROR Hash_SHA256(const unsigned char * data, const size_t data_length, uns
* @brief A class that defines stream based implementation of SHA-256 hash
**/

struct HashSHA256OpaqueContext
{
uint8_t mOpaque[kMAX_Hash_SHA256_Context_Size];
};

class Hash_SHA256_stream
{
public:
Expand All @@ -155,13 +158,7 @@ class Hash_SHA256_stream
void Clear(void);

private:
#if CHIP_CRYPTO_OPENSSL
SHA256_CTX context;
#elif CHIP_CRYPTO_MBEDTLS
mbedtls_sha256_context context;
#else
SHA256_CTX_PLATFORM context; // To be defined by the platform specific implementation of sha256.
#endif
HashSHA256OpaqueContext mContext;
};

/**
Expand Down Expand Up @@ -637,36 +634,17 @@ class Spake2p
unsigned char * Ke;
};

struct Spake2p_Context
struct Spake2pOpaqueContext
{
#if CHIP_CRYPTO_OPENSSL
EC_GROUP * curve;
BN_CTX * bn_ctx;
const EVP_MD * md_info;
#elif CHIP_CRYPTO_MBEDTLS
mbedtls_ecp_group curve;
const mbedtls_md_info_t * md_info;
mbedtls_ecp_point M;
mbedtls_ecp_point N;
mbedtls_ecp_point X;
mbedtls_ecp_point Y;
mbedtls_ecp_point L;
mbedtls_ecp_point Z;
mbedtls_ecp_point V;

mbedtls_mpi w0;
mbedtls_mpi w1;
mbedtls_mpi xy;
mbedtls_mpi tempbn;
#endif
uint8_t mOpaque[kMAX_Spake2p_Context_Size];
};

class Spake2p_P256_SHA256_HKDF_HMAC : public Spake2p
{
public:
Spake2p_P256_SHA256_HKDF_HMAC(void) : Spake2p(kP256_FE_Length, kP256_Point_Length, kSHA256_Hash_Length)
{
memset(&context, 0, sizeof(context));
memset(&mSpake2pContext, 0, sizeof(mSpake2pContext));
}

virtual ~Spake2p_P256_SHA256_HKDF_HMAC(void) { FreeImpl(); }
Expand Down Expand Up @@ -702,9 +680,9 @@ class Spake2p_P256_SHA256_HKDF_HMAC : public Spake2p
void FreeImpl();

CHIP_ERROR InitInternal();
class Hash_SHA256_stream sha256_hash_ctx;
Hash_SHA256_stream sha256_hash_ctx;

struct Spake2p_Context context;
Spake2pOpaqueContext mSpake2pContext;
};

/** @brief Clears the first `len` bytes of memory area `buf`.
Expand Down
Loading
0