Skip to content

Commit

Permalink
Merge e040539 into a6c29a7
Browse files Browse the repository at this point in the history
  • Loading branch information
@jimsch
jimsch committed May 22, 2020
2 parents a6c29a7 + e040539 commit 679b44c
Show file tree
Hide file tree
Showing 8 changed files with 236 additions and 15 deletions.
14 changes: 14 additions & 0 deletions include/cose/cose.h
View file
Expand Up @@ -2,10 +2,14 @@

#include <stdbool.h>
#include <cn-cbor/cn-cbor.h>

#include "cose/cose_configure.h"
#ifdef COSE_C_USE_OPENSSL
#include <openssl/evp.h>
#endif
#ifdef COSE_C_USE_MBEDTLS
#include <mbedtls/ecp.h>
#endif

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -218,6 +222,10 @@ typedef enum {
* Functions dealing with keys
*/

const int COSE_KEY_FL_OWN = 0x1; // Cede ownership of the key to the libraray
// Only neede for MBEDTLS as OpenSSL does reference counts


HCOSE_KEY COSE_KEY_FromCbor(cn_cbor* pcborKey,
CBOR_CONTEXT_COMMA cose_errback* perror);
bool COSE_KEY_Free(HCOSE_KEY h);
Expand All @@ -226,6 +234,12 @@ HCOSE_KEY COSE_KEY_FromEVP(EVP_PKEY* opensslKey,
cn_cbor* pcborKey,
CBOR_CONTEXT_COMMA cose_errback* perror);
#endif
#ifdef COSE_C_USE_MBEDTLS
HCOSE_KEY COSE_KEY_FromMbedKeypair(mbedtls_ecp_keypair *,
cn_cbor * pcborKey,
int flags,
CBOR_CONTEXT_COMMA cose_errback* perror);
#endif

/*
* messages dealing with the Enveloped message type
Expand Down
34 changes: 34 additions & 0 deletions src/CoseKey.cpp
View file
Expand Up @@ -136,3 +136,37 @@ HCOSE_KEY COSE_KEY_FromEVP(EVP_PKEY *opensslKey,
return (HCOSE_KEY)pkey;
}
#endif

#ifdef COSE_C_USE_MBEDTLS
HCOSE_KEY COSE_KEY_FromMbedKeypair(mbedtls_ecp_keypair * mbedtls_keypair,
cn_cbor *pcborKey,
int flags,
CBOR_CONTEXT_COMMA cose_errback *perror)
{
COSE_KEY *pkey = nullptr;

pkey = (COSE_KEY *)COSE_CALLOC(1, sizeof(COSE_KEY), context);

if (pkey == nullptr) {
perror->err = COSE_ERR_OUT_OF_MEMORY;
return nullptr;
}

#ifdef USE_CBOR_CONTEXT
if (context != nullptr) {
pkey->m_allocContext = *context;
}
#endif

pkey->m_refCount = 1;
pkey->m_cborKey = pcborKey;
pkey->m_mbedtls_keypair = mbedtls_keypair;
pkey->m_flags = flags;

pkey->m_nextKey = KeysRoot;
KeysRoot = pkey;

return (HCOSE_KEY)pkey;
}

#endif
20 changes: 19 additions & 1 deletion src/cose_int.h
View file
Expand Up @@ -6,6 +6,10 @@
#include <stdbool.h>
#ifdef COSE_C_USE_OPENSSL
#include <openssl/evp.h>
#include <openssl/ec.h>
#endif
#ifdef COSE_C_USE_MBEDTLS
#include <mbedtls/ecp.h>
#endif

// These definitions are here because they aren't required for the public
Expand All @@ -26,14 +30,17 @@ typedef struct CounterSign1 COSE_CounterSign1;
typedef struct _COSE_KEY {
int m_refCount;
cn_cbor *m_cborKey;
int flags;
int m_flags;
struct _COSE_KEY *m_nextKey;
#ifdef USE_CBOR_CONTEXT
cn_cbor_context m_allocContext;
#endif
#ifdef COSE_C_USE_OPENSSL
EVP_PKEY *m_opensslKey;
#endif
#ifdef COSE_C_USE_MBEDTLS
mbedtls_ecp_keypair * m_mbedtls_keypair;
#endif
} COSE_KEY;

typedef struct _COSE {
Expand Down Expand Up @@ -468,3 +475,14 @@ enum { COSE_Int_Alg_AES_CBC_MAC_256_64 = -22 };

#define COSE_CounterSign_object 1000
#define COSE_CounterSign1_object 1001


#if defined(COSE_C_USE_OPENSSL) && (OPENSSL_VERSION_NUMBER > 0x10100000L)
EC_KEY *ECKey_From(COSE_KEY *pKey, int *cbGroup, cose_errback *perr);
#endif

#ifdef COSE_C_USE_MBEDTLS
mbedtls_ecp_keypair * ECKey_From(COSE_KEY *pKey,
mbedtls_ecp_keypair *keypair,
cose_errback *perr);
#endif
28 changes: 18 additions & 10 deletions src/mbedtls.cpp
View file
Expand Up @@ -666,10 +666,14 @@ bool HMAC_Validate(COSE_MacMessage *pcose,
#define COSE_Key_EC_Y -3
#define COSE_Key_EC_d -4

bool ECKey_From(COSE_KEY *pKey,
mbedtls_ecp_keypair * ECKey_From(COSE_KEY *pKey,
mbedtls_ecp_keypair *keypair,
cose_errback *perr)
{
if (pKey->m_mbedtls_keypair != nullptr) {
return pKey->m_mbedtls_keypair;
}

byte rgbKey[MBEDTLS_ECP_MAX_PT_LEN];
int cbKey = 0;
int cbGroup = 0;
Expand Down Expand Up @@ -755,10 +759,10 @@ bool ECKey_From(COSE_KEY *pKey,
mbedtls_mpi_read_binary(&keypair->d, p->v.bytes, p->length) == 0,
COSE_ERR_CRYPTO_FAIL);
}
return true;
return keypair;

errorReturn:
return false;
return nullptr;
}

bool ECDSA_Sign(COSE *pSigner,
Expand All @@ -777,6 +781,7 @@ bool ECDSA_Sign(COSE *pSigner,
mbedtls_md_type_t mdType;
const mbedtls_md_info_t *pmdInfo;
mbedtls_ecp_keypair keypair;
mbedtls_ecp_keypair *useKey = nullptr;
mbedtls_mpi r;
mbedtls_mpi s;
#ifdef USE_CBOR_CONTEXT
Expand All @@ -789,11 +794,12 @@ bool ECDSA_Sign(COSE *pSigner,
mbedtls_mpi_init(&r);
mbedtls_mpi_init(&s);

if (!ECKey_From(pKey, &keypair, perr)) {
useKey = ECKey_From(pKey, &keypair, perr);
if (useKey == nullptr) {
goto errorReturn;
}

CHECK_CONDITION(keypair.d.n != 0, COSE_ERR_INVALID_PARAMETER);
CHECK_CONDITION(useKey->d.n != 0, COSE_ERR_INVALID_PARAMETER);

switch (cbitDigest) {
case 256:
Expand All @@ -816,11 +822,11 @@ bool ECDSA_Sign(COSE *pSigner,
CHECK_CONDITION(mbedtls_md(pmdInfo, rgbToSign, cbToSign, rgbDigest) == 0,
COSE_ERR_INVALID_PARAMETER);

CHECK_CONDITION(mbedtls_ecdsa_sign_det(&keypair.grp, &r, &s, &keypair.d,
CHECK_CONDITION(mbedtls_ecdsa_sign_det(&useKey->grp, &r, &s, &useKey->d,
rgbDigest, mbedtls_md_get_size(pmdInfo), mdType) == 0,
COSE_ERR_CRYPTO_FAIL);

cbR = (keypair.grp.nbits + 7) / 8;
cbR = (useKey->grp.nbits + 7) / 8;

pbSig = (byte *)COSE_CALLOC(cbR, 2, context);
CHECK_CONDITION(pbSig != nullptr, COSE_ERR_OUT_OF_MEMORY);
Expand Down Expand Up @@ -863,6 +869,7 @@ bool ECDSA_Verify(COSE *pSigner,
cose_errback *perr)
{
mbedtls_ecp_keypair keypair;
mbedtls_ecp_keypair* useKey = nullptr;
mbedtls_mpi r;
mbedtls_mpi s;
mbedtls_md_type_t mdType;
Expand All @@ -875,7 +882,8 @@ bool ECDSA_Verify(COSE *pSigner,
mbedtls_mpi_init(&r);
mbedtls_mpi_init(&s);

if (!ECKey_From(pKey, &keypair, perr)) {
useKey = ECKey_From(pKey, &keypair, perr);
if (useKey == nullptr) {
goto errorReturn;
}

Expand Down Expand Up @@ -911,8 +919,8 @@ bool ECDSA_Verify(COSE *pSigner,
mbedtls_mpi_read_binary(
&s, pSig->v.bytes + pSig->length / 2, pSig->length / 2) == 0,
COSE_ERR_OUT_OF_MEMORY);
CHECK_CONDITION(mbedtls_ecdsa_verify(&keypair.grp, rgbDigest,
mbedtls_md_get_size(pmdInfo), &keypair.Q, &r, &s) == 0,
CHECK_CONDITION(mbedtls_ecdsa_verify(&useKey->grp, rgbDigest,
mbedtls_md_get_size(pmdInfo), &useKey->Q, &r, &s) == 0,
COSE_ERR_CRYPTO_FAIL);

result = true;
Expand Down
19 changes: 19 additions & 0 deletions src/openssl.cpp
View file
Expand Up @@ -1084,6 +1084,7 @@ bool HMAC_Validate(COSE_MacMessage *pcose,
#define COSE_Key_EC_Y -3
#define COSE_Key_EC_d -4


EC_KEY *ECKey_From(COSE_KEY *pKey, int *cbGroup, cose_errback *perr)
{
EC_KEY *pNewKey = nullptr;
Expand All @@ -1099,6 +1100,24 @@ EC_KEY *ECKey_From(COSE_KEY *pKey, int *cbGroup, cose_errback *perr)
if (pKey->m_opensslKey != nullptr) {
EC_KEY *pKeyNew = EVP_PKEY_get1_EC_KEY(pKey->m_opensslKey);
CHECK_CONDITION(pKeyNew != nullptr, COSE_ERR_INVALID_PARAMETER);
int gid = EC_GROUP_get_curve_name(EC_KEY_get0_group(pKeyNew));
switch (gid) {
case NID_X9_62_prime256v1:
*cbGroup = 256 / 8;
break;

case NID_secp384r1:
*cbGroup = 384 / 8;
break;

case NID_secp521r1:
*cbGroup = (521 + 7) / 8;
break;

default:
FAIL_CONDITION(COSE_ERR_INVALID_PARAMETER);
}

return pKeyNew;
}

Expand Down
4 changes: 4 additions & 0 deletions test/CMakeLists.txt
View file
Expand Up @@ -65,6 +65,10 @@ add_test(
NAME ecdsa
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND cose_test --dir Examples/ecdsa-examples)
add_test(
NAME ecdsa-native
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND cose_test --dir Examples/ecdsa-examples --keyFormat=native)
add_test(
NAME eddsa
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
Expand Down

0 comments on commit 679b44c

Please sign in to comment.