Resolved the build errors and compailance issue

Signed-off-by: Aasim Shaik <[email protected]>

Author: Aasimshaik11

tests/crypto/psa_crypto/src/aead.c

@@ -71,16 +71,15 @@ ZTEST(psa_crypto_test, test_aead_aes_ccm)
 		      PSA_SUCCESS, "Failed to encrypt");
 
 	zassert_equal(out_len, sizeof(expect_cipher_tag_buf));
-	zassert_mem_equal(cipher_tag_buf, expect_cipher_tag_buf, sizeof(expect_cipher_tag_buf));
-
+	zassert_mem_equal(cipher_tag_buf, expect_cipher_tag_buf,
+					sizeof(expect_cipher_tag_buf));
 	zassert_equal(psa_aead_decrypt(key_id, alg, aes_nonce_buf, sizeof(aes_nonce_buf),
-				       aes_ad_buf, sizeof(aes_ad_buf), cipher_tag_buf, out_len,
-				       decrypted, sizeof(decrypted), &out_len),
-		      PSA_SUCCESS, "Failed to decrypt");
+				    aes_ad_buf, sizeof(aes_ad_buf), cipher_tag_buf, out_len,
+				    decrypted, sizeof(decrypted), &out_len),
+		    		PSA_SUCCESS, "Failed to decrypt");
 
 	zassert_equal(out_len, sizeof(aes_plaintext));
 	zassert_mem_equal(decrypted, aes_plaintext, sizeof(aes_plaintext));
-
 	zassert_equal(psa_destroy_key(key_id), PSA_SUCCESS, "Failed to destroy key");
 }
 
@@ -103,21 +102,21 @@ ZTEST(psa_crypto_test, test_aead_aes_gcm)
 	psa_set_key_algorithm(&attributes, alg);
 
 	zassert_equal(psa_import_key(&attributes, aes_key_buf, sizeof(aes_key_buf), &key_id),
-		      PSA_SUCCESS, "Failed to import key");
+		    		PSA_SUCCESS, "Failed to import key");
 
 	zassert_equal(psa_aead_encrypt(key_id, alg, aes_nonce_buf, sizeof(aes_nonce_buf),
-				       aes_ad_buf, sizeof(aes_ad_buf), aes_plaintext,
-				       sizeof(aes_plaintext), cipher_tag_buf,
-				       sizeof(cipher_tag_buf), &out_len),
-		      PSA_SUCCESS, "Failed to encrypt");
+				    	aes_ad_buf, sizeof(aes_ad_buf), aes_plaintext,
+				    	sizeof(aes_plaintext), cipher_tag_buf,
+				    	sizeof(cipher_tag_buf), &out_len),
+		    			PSA_SUCCESS, "Failed to encrypt");
 
 	zassert_equal(out_len, sizeof(expect_cipher_tag_buf));
 	zassert_mem_equal(cipher_tag_buf, expect_cipher_tag_buf, sizeof(expect_cipher_tag_buf));
 
 	zassert_equal(psa_aead_decrypt(key_id, alg, aes_nonce_buf, sizeof(aes_nonce_buf),
-				       aes_ad_buf, sizeof(aes_ad_buf), cipher_tag_buf, out_len,
-				       decrypted, sizeof(decrypted), &out_len),
-		      PSA_SUCCESS, "Failed to decrypt");
+				    	aes_ad_buf, sizeof(aes_ad_buf), cipher_tag_buf, out_len,
+				    	decrypted, sizeof(decrypted), &out_len),
+		    			PSA_SUCCESS, "Failed to decrypt");
 
 	zassert_equal(out_len, sizeof(aes_plaintext));
 	zassert_mem_equal(decrypted, aes_plaintext, sizeof(aes_plaintext));
@@ -130,7 +129,6 @@ ZTEST(psa_crypto_test, test_aead_chacha20_poly1305)
 	uint8_t cipher_tag_buf[130]; /* Ciphertext + Tag */
 	uint8_t decrypted[sizeof(chachapoly_plaintext)] = {0};
 	size_t out_len;
-
 	psa_key_id_t key_id;
 	psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
 	psa_algorithm_t alg = PSA_ALG_CHACHA20_POLY1305;
@@ -162,6 +160,5 @@ ZTEST(psa_crypto_test, test_aead_chacha20_poly1305)
 
 	zassert_equal(out_len, sizeof(chachapoly_plaintext));
 	zassert_mem_equal(decrypted, chachapoly_plaintext, sizeof(chachapoly_plaintext));
-
 	zassert_equal(psa_destroy_key(key_id), PSA_SUCCESS, "Failed to destroy key");
 }

tests/crypto/psa_crypto/src/cipher.c

@@ -50,7 +50,6 @@ ZTEST(psa_crypto_test, test_cipher_aes_cbc_256_multipart)
 			      PSA_SUCCESS, "Failed to import key");
 	#endif
 	psa_reset_key_attributes(&attributes);
-
 	zassert_equal(psa_cipher_encrypt_setup(&operation, key_id, alg), PSA_SUCCESS,
 		      "Failed to begin encrypt operation");
 	zassert_equal(psa_cipher_generate_iv(&operation, iv, sizeof(iv), &iv_len), PSA_SUCCESS,

tests/crypto/psa_crypto/src/key_agreement.c

@@ -27,12 +27,13 @@ static const uint8_t server_public_key[] = {
 	0x8D, 0x49, 0x85, 0x8C, 0x7A, 0x9F, 0xC1, 0x46, 0xDA, 0xCC, 0x96,
 	0xEF, 0x6E, 0xD4, 0xDA, 0x71, 0xBF, 0xED, 0x32, 0x0D, 0x76,
 };
+#if defined(CONFIG_TEST_WRAPPED_KEYS)
 static const uint8_t expected_shared_secret[] = {
 	0xF2, 0xE6, 0x0E, 0x1C, 0xB7, 0x64, 0xBC, 0x48, 0xF2, 0x9D, 0xBB,
 	0x12, 0xFB, 0x12, 0x17, 0x31, 0x32, 0x1D, 0x79, 0xAF, 0x0A, 0x9F,
 	0xAB, 0xAD, 0x34, 0x05, 0xA2, 0x07, 0x39, 0x9C, 0x5F, 0x15,
 };
-
+#endif
 ZTEST(psa_crypto_test, test_key_agreement_ecdh_25519)
 {
 	uint8_t shared_secret_buf[32];
@@ -49,14 +50,14 @@ ZTEST(psa_crypto_test, test_key_agreement_ecdh_25519)
 							  PSA_KEY_PERSISTENCE_VOLATILE, 0));
 	#endif
 	zassert_equal(psa_import_key(&attributes, client_private_key, sizeof(client_private_key),
-				     &key_id),
-		      PSA_SUCCESS, "Failed to import client key");
+				    &key_id),
+		    		PSA_SUCCESS, "Failed to import client key");
 
 	/* Perform key agreement with server public key */
 	zassert_equal(psa_raw_key_agreement(PSA_ALG_ECDH, key_id, server_public_key,
 					    sizeof(server_public_key), shared_secret_buf,
 					    sizeof(shared_secret_buf), &shared_secret_len),
-		      PSA_SUCCESS, "Failed to perform key agreement with server");
+		    			PSA_SUCCESS, "Failed to perform key agreement with server");
 
 	zassert_equal(psa_destroy_key(key_id), PSA_SUCCESS, "Failed to destroy client key");
 
@@ -70,7 +71,7 @@ ZTEST(psa_crypto_test, test_key_agreement_ecdh_25519)
 							  PSA_KEY_PERSISTENCE_VOLATILE, 0));
 	#endif
 	zassert_equal(psa_import_key(&attributes, server_private_key, sizeof(server_private_key),
-				     &key_id),
+				    &key_id),
 		      PSA_SUCCESS, "Failed to import server key");
 
 	/* Perform key agreement with client public key */
@@ -80,7 +81,6 @@ ZTEST(psa_crypto_test, test_key_agreement_ecdh_25519)
 		      PSA_SUCCESS, "Failed to perform key agreement with client");
 
 	zassert_equal(psa_destroy_key(key_id), PSA_SUCCESS, "Failed to destroy server key");
-	
 	#if defined(CONFIG_TEST_WRAPPED_KEYS)
 	/* Verify shared secret */
 	zassert_mem_equal(shared_secret_buf, expected_shared_secret, sizeof(expected_shared_secret),

tests/crypto/psa_crypto/src/sign.c

@@ -28,13 +28,13 @@ ZTEST(psa_crypto_test, test_sign_ecdsa_secp256r1)
 				PSA_KEY_USAGE_SIGN_MESSAGE | PSA_KEY_USAGE_VERIFY_MESSAGE);
 	psa_set_key_algorithm(&attributes, PSA_ALG_ECDSA(PSA_ALG_ANY_HASH));
 	zassert_equal(psa_generate_key(&attributes, &key_id), PSA_SUCCESS,
-		      "Failed to generate private key");
+		    		"Failed to generate private key");
 
 	zassert_equal(psa_sign_message(key_id, PSA_ALG_ECDSA(PSA_ALG_SHA_256), plaintext,
-				       MESSAGE_SIZE, signature, sizeof(signature), &signature_len),
-		      PSA_SUCCESS, "Failed to hash-and-sign message");
+				    MESSAGE_SIZE, signature, sizeof(signature), &signature_len),
+		    		PSA_SUCCESS, "Failed to hash-and-sign message");
 	zassert_equal(psa_export_public_key(key_id, pubkey, sizeof(pubkey), &pubkey_len),
-		      PSA_SUCCESS, "Failed to export public key");
+		    		PSA_SUCCESS, "Failed to export public key");
 	zassert_equal(psa_destroy_key(key_id), PSA_SUCCESS, "Failed to destroy private key");
 
 	/* Set up attributes for a public key (secp256r1) */
@@ -46,6 +46,6 @@ ZTEST(psa_crypto_test, test_sign_ecdsa_secp256r1)
 	zassert_equal(psa_import_key(&attributes, pubkey, sizeof(pubkey), &key_id), PSA_SUCCESS,
 		      "Failed to import public key");
 	zassert_equal(psa_verify_message(key_id, PSA_ALG_ECDSA(PSA_ALG_SHA_256), plaintext,
-					 MESSAGE_SIZE, signature, signature_len),
-		      PSA_SUCCESS, "Failed to verify signature");
+					MESSAGE_SIZE, signature, signature_len),
+		    		PSA_SUCCESS, "Failed to verify signature");
 }