feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5363 from dgarske/se050_curve25519

Browse Source 
Fixes for SE050 Curve25519 endianness
This commit is contained in:
Andrew Hutchings
2022-07-15 08:49:27 +01:00
committed by GitHub
parent 6cc2665a81 dec8a7fd93
commit 8a757ef7cf
3 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wolfcrypt/src/asn.c
View File

@ -22403,7 +22403,7 @@ enum {
* @return BAD_FUNC_ARG when key is NULL. * @return BAD_FUNC_ARG when key is NULL.
* @return MEMORY_E when dynamic memory allocation failed. * @return MEMORY_E when dynamic memory allocation failed.
*/ */
static int SetAsymKeyDerPublic(const byte* pubKey, word32 pubKeyLen, int SetAsymKeyDerPublic(const byte* pubKey, word32 pubKeyLen,
byte* output, word32 outLen, int keyType, int withHeader) byte* output, word32 outLen, int keyType, int withHeader)
{ {
int ret = 0; int ret = 0;
@ -29825,7 +29825,7 @@ static int DecodeAsymKey(const byte* input, word32* inOutIdx, word32 inSz,
#endif /* WOLFSSL_ASN_TEMPLATE */ #endif /* WOLFSSL_ASN_TEMPLATE */
} }
static int DecodeAsymKeyPublic(const byte* input, word32* inOutIdx, word32 inSz, int DecodeAsymKeyPublic(const byte* input, word32* inOutIdx, word32 inSz,
byte* pubKey, word32* pubKeyLen, int keyType) byte* pubKey, word32* pubKeyLen, int keyType)
{ {
int ret = 0; int ret = 0;
@ -30187,7 +30187,7 @@ int wc_Curve25519PublicKeyToDer(curve25519_key* key, byte* output, word32 inLen,
int withAlg) int withAlg)
{ {
int ret; int ret;
byte pubKey[CURVE25519_KEYSIZE]; byte pubKey[CURVE25519_PUB_KEY_SIZE];
word32 pubKeyLen = (word32)sizeof(pubKey); word32 pubKeyLen = (word32)sizeof(pubKey);
if (key == NULL || output == NULL) { if (key == NULL || output == NULL) {

43
wolfcrypt/src/port/nxp/se050_port.c
View File

@ -437,7 +437,7 @@ static int se050_map_curve(int curve_id, int keySize,
sss_cipher_type_t curve_type; sss_cipher_type_t curve_type;
*keySizeBits = keySize * 8; /* set default */ *keySizeBits = keySize * 8; /* set default */
switch (curve_id) { switch (curve_id) {
case ECC_SECP160K1: case ECC_SECP160K1:
case ECC_SECP192K1: case ECC_SECP192K1:
case ECC_SECP224K1: case ECC_SECP224K1:
case ECC_SECP256K1: case ECC_SECP256K1:
@ -1009,8 +1009,8 @@ int se050_ecc_shared_secret(ecc_key* private_key, ecc_key* public_key,
size_t outlenSz = (size_t)*outlen; size_t outlenSz = (size_t)*outlen;
size_t outlenSzBits = outlenSz * 8; size_t outlenSzBits = outlenSz * 8;
/* derived key export */ /* derived key export */
status = sss_key_store_get_key(&host_keystore, &deriveKey, out, status = sss_key_store_get_key(&host_keystore, &deriveKey,
&outlenSz, &outlenSzBits); out, &outlenSz, &outlenSzBits);
*outlen = (word32)outlenSz; *outlen = (word32)outlenSz;
(void)outlenSzBits; /* not used */ (void)outlenSzBits; /* not used */
} }
@ -1028,8 +1028,8 @@ int se050_ecc_shared_secret(ecc_key* private_key, ecc_key* public_key,
} }
else { else {
if (keyCreated) { if (keyCreated) {
sss_key_store_erase_key(&host_keystore, &public_key); sss_key_store_erase_key(&host_keystore, &ref_public_key);
sss_key_object_free(&public_key); sss_key_object_free(&ref_public_key);
} }
if (ret == 0) if (ret == 0)
ret = WC_HW_E; ret = WC_HW_E;
@ -1287,7 +1287,7 @@ int se050_ed25519_verify_msg(const byte* signature, word32 signatureLen,
if (keyId <= 0) { if (keyId <= 0) {
byte derBuf[ED25519_PUB_KEY_SIZE + 12]; /* seq + algo + bitstring */ byte derBuf[ED25519_PUB_KEY_SIZE + 12]; /* seq + algo + bitstring */
word32 derSz = 0; word32 derSz = 0;
ret = wc_Ed25519PublicKeyToDer(key, derBuf, (word32)sizeof(derBuf), 1); ret = wc_Ed25519PublicKeyToDer(key, derBuf, (word32)sizeof(derBuf), 1);
if (ret >= 0) { if (ret >= 0) {
derSz = ret; derSz = ret;
@ -1402,11 +1402,16 @@ int se050_curve25519_create_key(curve25519_key* key, int keySize)
} }
if (status == kStatus_SSS_Success) { if (status == kStatus_SSS_Success) {
word32 idx = 0; word32 idx = 0;
ret = wc_Curve25519PublicKeyDecode(derBuf, &idx, key, (word32)derSz); byte pubKey[CURVE25519_KEYSIZE];
word32 pubKeyLen = (word32)sizeof(pubKey);
ret = DecodeAsymKeyPublic(derBuf, &idx, (word32)derSz,
pubKey, &pubKeyLen, X25519k);
if (ret == 0) { if (ret == 0) {
key->p.point[CURVE25519_KEYSIZE-1] &= ~0x80; /* clear MSB */ ret = wc_curve25519_import_public_ex(pubKey, pubKeyLen, key,
EC25519_LITTLE_ENDIAN);
} }
else { if (ret != 0) {
status = kStatus_SSS_Fail; status = kStatus_SSS_Fail;
} }
} }
@ -1480,16 +1485,22 @@ int se050_curve25519_shared_secret(curve25519_key* private_key,
if (status == kStatus_SSS_Success) { if (status == kStatus_SSS_Success) {
keyId = public_key->keyId; keyId = public_key->keyId;
if (keyId <= 0) { if (keyId <= 0) {
byte derBuf[CURVE25519_PUB_KEY_SIZE + 12]; /* seq + algo + bitstring */ byte derBuf[CURVE25519_PUB_KEY_SIZE + 12]; /* seq + algo + bitstring */
word32 derSz; word32 derSz;
byte pubKey[CURVE25519_PUB_KEY_SIZE];
word32 pubKeyLen = (word32)sizeof(pubKey);
ret = wc_Curve25519PublicKeyToDer(public_key, derBuf, ret = wc_curve25519_export_public_ex(public_key, pubKey, &pubKeyLen,
(word32)sizeof(derBuf), 1); EC25519_LITTLE_ENDIAN);
if (ret >= 0) { if (ret == 0) {
derSz = ret; ret = SetAsymKeyDerPublic(pubKey, pubKeyLen, derBuf,
ret = 0; (word32)sizeof(derBuf), X25519k, 1);
if (ret >= 0) {
derSz = ret;
ret = 0;
}
} }
else { if (ret != 0) {
status = kStatus_SSS_Fail; status = kStatus_SSS_Fail;
} }
if (status == kStatus_SSS_Success) { if (status == kStatus_SSS_Success) {

5
wolfssl/wolfcrypt/asn.h
View File

@ -2144,6 +2144,11 @@ WOLFSSL_API int EccEnumToNID(int n);
WOLFSSL_LOCAL void InitSignatureCtx(SignatureCtx* sigCtx, void* heap, int devId); WOLFSSL_LOCAL void InitSignatureCtx(SignatureCtx* sigCtx, void* heap, int devId);
WOLFSSL_LOCAL void FreeSignatureCtx(SignatureCtx* sigCtx); WOLFSSL_LOCAL void FreeSignatureCtx(SignatureCtx* sigCtx);
WOLFSSL_LOCAL int SetAsymKeyDerPublic(const byte* pubKey, word32 pubKeyLen,
byte* output, word32 outLen, int keyType, int withHeader);
WOLFSSL_LOCAL int DecodeAsymKeyPublic(const byte* input, word32* inOutIdx, word32 inSz,
byte* pubKey, word32* pubKeyLen, int keyType);
#ifndef NO_CERTS #ifndef NO_CERTS
WOLFSSL_LOCAL int wc_EncryptedInfoParse(EncryptedInfo* info, WOLFSSL_LOCAL int wc_EncryptedInfoParse(EncryptedInfo* info,