@@ -123,20 +123,20 @@ CHIP_ERROR P256Keypair::Initialize(ECPKeyTarget key_target)
123
123
}
124
124
else
125
125
{
126
- #if !ENABLE_TRUSTM_NOC_KEYGEN
126
+ #if !ENABLE_TRUSTM_NOC_KEYGEN
127
127
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;
133
133
#else
134
134
// Add the logic to use different keyid
135
135
keyid = TRUSTM_NODE_OID_KEY_START;
136
136
// Trust M ECC 256 Key Gen
137
137
ChipLogDetail (Crypto, " Generating NIST256 key in TrustM !" );
138
138
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
140
140
}
141
141
// Trust M init
142
142
trustm_Open ();
@@ -168,7 +168,7 @@ CHIP_ERROR P256Keypair::Initialize(ECPKeyTarget key_target)
168
168
CHIP_ERROR P256Keypair::ECDSA_sign_msg (const uint8_t * msg, size_t msg_length, P256ECDSASignature & out_signature) const
169
169
{
170
170
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 );
172
172
173
173
CHIP_ERROR error = CHIP_ERROR_INTERNAL;
174
174
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
207
207
ChipLogDetail (Crypto, " TrustM: ECDSA_sign_msg" );
208
208
return_status = trustm_ecdsa_sign (OPTIGA_KEY_ID_E0F2, digest, digest_length, signature_trustm, &signature_trustm_len);
209
209
}
210
- #endif // !ENABLE_TRUSTM_NOC_KEYGEN
210
+ #endif // ! ENABLE_TRUSTM_NOC_KEYGEN
211
211
}
212
-
212
+
213
213
VerifyOrExit (return_status == OPTIGA_LIB_SUCCESS, error = CHIP_ERROR_INTERNAL);
214
214
215
215
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
220
220
221
221
error = CHIP_NO_ERROR;
222
222
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;
229
229
}
230
230
231
231
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
313
313
uint8_t privkey[kP256_PrivateKey_Length ] = {
314
314
0 ,
315
315
};
316
-
316
+
317
317
if (0 != memcmp (&mKeypair .mBytes [0 ], trustm_magic_no, sizeof (trustm_magic_no)))
318
318
{
319
319
VerifyOrReturnError (mInitialized , CHIP_ERROR_UNINITIALIZED);
320
320
return Serialize_H (mKeypair , mPublicKey , output);
321
-
322
321
}
323
322
324
323
/* Set the public key */
0 commit comments