Skip to content

Commit d912f37

Browse files
committed
Restyled changes.
1 parent 5bbc1ca commit d912f37

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

src/platform/Infineon/crypto/trustm/CHIPCryptoPALHsm_P256_trustm.cpp

+17-18
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,20 @@ CHIP_ERROR P256Keypair::Initialize(ECPKeyTarget key_target)
123123
}
124124
else
125125
{
126-
#if !ENABLE_TRUSTM_NOC_KEYGEN
126+
#if !ENABLE_TRUSTM_NOC_KEYGEN
127127
if (CHIP_NO_ERROR == Initialize_H(this, &mPublicKey, &mKeypair))
128-
{
129-
mInitialized = true;
130-
}
131-
error = CHIP_NO_ERROR;
132-
return error;
128+
{
129+
mInitialized = true;
130+
}
131+
error = CHIP_NO_ERROR;
132+
return error;
133133
#else
134134
// Add the logic to use different keyid
135135
keyid = TRUSTM_NODE_OID_KEY_START;
136136
// Trust M ECC 256 Key Gen
137137
ChipLogDetail(Crypto, "Generating NIST256 key in TrustM !");
138138
key_usage = (optiga_key_usage_t) (OPTIGA_KEY_USAGE_SIGN | OPTIGA_KEY_USAGE_AUTHENTICATION);
139-
#endif //!ENABLE_TRUSTM_NOC_KEYGEN
139+
#endif //! ENABLE_TRUSTM_NOC_KEYGEN
140140
}
141141
// Trust M init
142142
trustm_Open();
@@ -168,7 +168,7 @@ CHIP_ERROR P256Keypair::Initialize(ECPKeyTarget key_target)
168168
CHIP_ERROR P256Keypair::ECDSA_sign_msg(const uint8_t * msg, size_t msg_length, P256ECDSASignature & out_signature) const
169169
{
170170
VerifyOrReturnError(mInitialized, CHIP_ERROR_UNINITIALIZED);
171-
uint16_t keyid = (mKeypair.mBytes[CRYPTO_KEYPAIR_KEYID_OFFSET]) | (mKeypair.mBytes[CRYPTO_KEYPAIR_KEYID_OFFSET+1] << 8);
171+
uint16_t keyid = (mKeypair.mBytes[CRYPTO_KEYPAIR_KEYID_OFFSET]) | (mKeypair.mBytes[CRYPTO_KEYPAIR_KEYID_OFFSET + 1] << 8);
172172

173173
CHIP_ERROR error = CHIP_ERROR_INTERNAL;
174174
optiga_lib_status_t return_status = OPTIGA_LIB_BUSY;
@@ -207,9 +207,9 @@ CHIP_ERROR P256Keypair::ECDSA_sign_msg(const uint8_t * msg, size_t msg_length, P
207207
ChipLogDetail(Crypto, "TrustM: ECDSA_sign_msg");
208208
return_status = trustm_ecdsa_sign(OPTIGA_KEY_ID_E0F2, digest, digest_length, signature_trustm, &signature_trustm_len);
209209
}
210-
#endif //!ENABLE_TRUSTM_NOC_KEYGEN
210+
#endif //! ENABLE_TRUSTM_NOC_KEYGEN
211211
}
212-
212+
213213
VerifyOrExit(return_status == OPTIGA_LIB_SUCCESS, error = CHIP_ERROR_INTERNAL);
214214

215215
error = EcdsaAsn1SignatureToRaw(kP256_FE_Length, ByteSpan{ signature_trustm, signature_trustm_len }, out_raw_sig_span);
@@ -220,12 +220,12 @@ CHIP_ERROR P256Keypair::ECDSA_sign_msg(const uint8_t * msg, size_t msg_length, P
220220

221221
error = CHIP_NO_ERROR;
222222

223-
exit:
224-
if (error != CHIP_NO_ERROR)
225-
{
226-
trustm_close();
227-
}
228-
return error;
223+
exit:
224+
if (error != CHIP_NO_ERROR)
225+
{
226+
trustm_close();
227+
}
228+
return error;
229229
}
230230

231231
CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_key, P256ECDHDerivedSecret & out_secret) const
@@ -313,12 +313,11 @@ CHIP_ERROR P256Keypair::Serialize(P256SerializedKeypair & output) const
313313
uint8_t privkey[kP256_PrivateKey_Length] = {
314314
0,
315315
};
316-
316+
317317
if (0 != memcmp(&mKeypair.mBytes[0], trustm_magic_no, sizeof(trustm_magic_no)))
318318
{
319319
VerifyOrReturnError(mInitialized, CHIP_ERROR_UNINITIALIZED);
320320
return Serialize_H(mKeypair, mPublicKey, output);
321-
322321
}
323322

324323
/* Set the public key */

src/platform/Infineon/crypto/trustm/CHIPCryptoPALHsm_config_trustm.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
*/
4848
#define ENABLE_TRUSTM_DEVICE_ATTESTATION 1
4949

50-
5150
/*
5251
* Enable trustm for NOC key-pair generation
5352
*/
54-
#define ENABLE_TRUSTM_NOC_KEYGEN 0
53+
#define ENABLE_TRUSTM_NOC_KEYGEN 0

src/platform/Infineon/crypto/trustm/CHIPCryptoPALHsm_utils_trustm.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ extern optiga_util_t * p_local_util;
5151
}
5252

5353
static const uint8_t trustm_magic_no[] = IFX_CRYPTO_KEY_MAGIC;
54-
static const uint8_t DA_KEY_ID[] = { 0xF0, 0xE0 }; //OID --> 0xE0F0
54+
static const uint8_t DA_KEY_ID[] = { 0xF0, 0xE0 }; // OID --> 0xE0F0
5555
/* Open session to trustm */
5656
void trustm_Open(void);
5757
void read_certificate_from_optiga(uint16_t optiga_oid, char * cert_pem, uint16_t * cert_pem_length);

0 commit comments

Comments
 (0)