Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

samples: drivers: crypto: Align buffers #78692

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+16 −16
Open

samples: drivers: crypto: Align buffers #78692

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1abc5e2
samples: drivers: crypto: Improve memory alignment
rettichschnidi Oct 3, 2024
1fca4fb
samples: drivers: crypto: Align buffers
rettichschnidi Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions samples/drivers/crypto/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
#error "You need to enable one crypto device"
#endif

const static uint8_t key[16] __aligned(32) = {
const static uint8_t key[16] __aligned(4) = {
0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88,
0x09, 0xcf, 0x4f, 0x3c
};

static uint8_t plaintext[64] = {
static uint8_t plaintext[64] __aligned(4) = {
0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11,
0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c,
0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46,
Expand All @@ -48,7 +48,7 @@
0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b,
0xe6, 0x6c, 0x37, 0x10
};

Check notice on line 51 in samples/drivers/crypto/src/main.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

samples/drivers/crypto/src/main.c:51 
-const static uint8_t key[16] __aligned(4) = {
-	0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88,
-	0x09, 0xcf, 0x4f, 0x3c
-};
+const static uint8_t key[16] __aligned(4) = {0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
+					     0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c};
 
 static uint8_t plaintext[64] __aligned(4) = {
-	0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11,
-	0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c,
-	0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46,
-	0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef,
-	0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b,
-	0xe6, 0x6c, 0x37, 0x10
-};
+	0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73,
+	0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7,
+	0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4,
+	0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, 0xf6, 0x9f, 0x24, 0x45,
+	0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10};
uint32_t cap_flags;

static void print_buffer_comparison(const uint8_t *wanted_result,
Expand Down Expand Up @@ -117,17 +117,17 @@
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
};
uint8_t ecb_plaintext[16] = {
uint8_t ecb_plaintext[16] __aligned(4) = {
0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF
};
uint8_t ecb_ciphertext[16] = {
uint8_t ecb_ciphertext[16] __aligned(4) = {
0x69, 0xC4, 0xE0, 0xD8, 0x6A, 0x7B, 0x04, 0x30,
0xD8, 0xCD, 0xB7, 0x80, 0x70, 0xB4, 0xC5, 0x5A
};

Check notice on line 128 in samples/drivers/crypto/src/main.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

samples/drivers/crypto/src/main.c:128 
-	uint8_t ecb_plaintext[16] __aligned(4) = {
-		0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-		0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF
-	};
-	uint8_t ecb_ciphertext[16] __aligned(4) = {
-		0x69, 0xC4, 0xE0, 0xD8, 0x6A, 0x7B, 0x04, 0x30,
-		0xD8, 0xCD, 0xB7, 0x80, 0x70, 0xB4, 0xC5, 0x5A
-	};
+	uint8_t ecb_plaintext[16] __aligned(4) = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+						  0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF};
+	uint8_t ecb_ciphertext[16] __aligned(4) = {0x69, 0xC4, 0xE0, 0xD8, 0x6A, 0x7B, 0x04, 0x30,
+						   0xD8, 0xCD, 0xB7, 0x80, 0x70, 0xB4, 0xC5, 0x5A};
uint8_t encrypted[16] = {0};
uint8_t decrypted[16] = {0};
uint8_t encrypted[16] __aligned(4) = {0};
uint8_t decrypted[16] __aligned(4) = {0};
struct cipher_ctx ini = {
.keylen = sizeof(ecb_key),
.key.bit_stream = ecb_key,
Expand Down Expand Up @@ -208,8 +208,8 @@

void cbc_mode(const struct device *dev)
{
uint8_t encrypted[80] = {0};
uint8_t decrypted[64] = {0};
uint8_t encrypted[80] __aligned(4) = {0};
uint8_t decrypted[64] __aligned(4) = {0};
struct cipher_ctx ini = {
.keylen = sizeof(key),
.key.bit_stream = key,
Expand Down Expand Up @@ -297,8 +297,8 @@

void ctr_mode(const struct device *dev)
{
uint8_t encrypted[64] = {0};
uint8_t decrypted[64] = {0};
uint8_t encrypted[64] __aligned(4) = {0};
uint8_t decrypted[64] __aligned(4) = {0};
struct cipher_ctx ini = {
.keylen = sizeof(key),
.key.bit_stream = key,
Expand Down Expand Up @@ -385,11 +385,11 @@
static uint8_t ccm_hdr[8] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
};
static uint8_t ccm_data[23] = {
static uint8_t ccm_data[23] __aligned(4) = {
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,
0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e
};
static const uint8_t ccm_expected[31] = {

Check notice on line 392 in samples/drivers/crypto/src/main.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

samples/drivers/crypto/src/main.c:392 
-static uint8_t ccm_data[23] __aligned(4) = {
-	0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,
-	0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e
-};
+static uint8_t ccm_data[23]
+	__aligned(4) = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13,
+			0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e};
0x58, 0x8c, 0x97, 0x9a, 0x61, 0xc6, 0x63, 0xd2, 0xf0, 0x66, 0xd0, 0xc2,
0xc0, 0xf9, 0x89, 0x80, 0x6d, 0x5f, 0x6b, 0x61, 0xda, 0xc3, 0x84, 0x17,
0xe8, 0xd1, 0x2c, 0xfd, 0xf9, 0x26, 0xe0
Expand All @@ -397,8 +397,8 @@

void ccm_mode(const struct device *dev)
{
uint8_t encrypted[50];
uint8_t decrypted[25];
uint8_t encrypted[50] __aligned(4);
uint8_t decrypted[25] __aligned(4);
struct cipher_ctx ini = {
.keylen = sizeof(ccm_key),
.key.bit_stream = ccm_key,
Expand Down Expand Up @@ -497,13 +497,13 @@
0xe2, 0x01, 0x06, 0xd7, 0xcd, 0x0d, 0xf0, 0x76, 0x1e, 0x8d, 0xcd, 0x3d,
0x88, 0xe5, 0x4c, 0x2a, 0x76, 0xd4, 0x57, 0xed
};
static uint8_t gcm_data[42] = {
static uint8_t gcm_data[42] __aligned(4) = {
0x08, 0x00, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24,
0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
0x31, 0x32, 0x33, 0x34, 0x00, 0x04
};
static const uint8_t gcm_expected[58] = {

Check notice on line 506 in samples/drivers/crypto/src/main.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

samples/drivers/crypto/src/main.c:506 
-	0x08, 0x00, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-	0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24,
-	0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
-	0x31, 0x32, 0x33, 0x34, 0x00, 0x04
-};
+	0x08, 0x00, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a,
+	0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
+	0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x00, 0x04};
0x13, 0xb4, 0xc7, 0x2b, 0x38, 0x9d, 0xc5, 0x01, 0x8e, 0x72, 0xa1, 0x71,
0xdd, 0x85, 0xa5, 0xd3, 0x75, 0x22, 0x74, 0xd3, 0xa0, 0x19, 0xfb, 0xca,
0xed, 0x09, 0xa4, 0x25, 0xcd, 0x9b, 0x2e, 0x1c, 0x9b, 0x72, 0xee, 0xe7,
Expand All @@ -514,8 +514,8 @@

void gcm_mode(const struct device *dev)
{
uint8_t encrypted[60] = {0};
uint8_t decrypted[44] = {0};
uint8_t encrypted[60] __aligned(4) = {0};
uint8_t decrypted[44] __aligned(4) = {0};
struct cipher_ctx ini = {
.keylen = sizeof(gcm_key),
.key.bit_stream = gcm_key,
Expand Down
Loading