[git commit] *: slap on a few ALIGN1/2s where appropriate

Denys Vlasenko vda.linux at googlemail.com
Tue May 21 15:29:24 UTC 2019


commit: https://git.busybox.net/busybox/commit/?id=84fc645605827d53aa3e749dfff309978b1bc73d
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

The result of looking at "grep -F -B2 '*fill*' busybox_unstripped.map"

   text	   data	    bss	    dec	    hex	filename
 952537	    485	   7296	 960318	  ea73e	busybox_old
 952527	    485	   7296	 960308	  ea734	busybox_unstripped

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/libiproute/ll_proto.c | 2 +-
 networking/tls.c                 | 6 +++---
 networking/tls_aes.c             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c
index 7d46221ac..611e0a2c9 100644
--- a/networking/libiproute/ll_proto.c
+++ b/networking/libiproute/ll_proto.c
@@ -15,7 +15,7 @@
 
 /* Please conditionalize exotic protocols on CONFIG_something */
 
-static const uint16_t llproto_ids[] = {
+static const uint16_t llproto_ids[] ALIGN2 = {
 #define __PF(f,n) ETH_P_##f,
 __PF(LOOP,loop)
 __PF(PUP,pup)
diff --git a/networking/tls.c b/networking/tls.c
index db0034e66..db7be07f3 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -1387,12 +1387,12 @@ static void find_key_in_der_cert(tls_state_t *tls, uint8_t *der, int len)
 	/* enter subjectPublicKeyInfo */
 	der = enter_der_item(der, &end);
 	{ /* check subjectPublicKeyInfo.algorithm */
-		static const uint8_t OID_RSA_KEY_ALG[] = {
+		static const uint8_t OID_RSA_KEY_ALG[] ALIGN1 = {
 			0x30,0x0d, // SEQ 13 bytes
 			0x06,0x09, 0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01, //OID_RSA_KEY_ALG 42.134.72.134.247.13.1.1.1
 			//0x05,0x00, // NULL
 		};
-		static const uint8_t OID_ECDSA_KEY_ALG[] = {
+		static const uint8_t OID_ECDSA_KEY_ALG[] ALIGN1 = {
 			0x30,0x13, // SEQ 0x13 bytes
 			0x06,0x07, 0x2a,0x86,0x48,0xce,0x3d,0x02,0x01,      //OID_ECDSA_KEY_ALG 42.134.72.206.61.2.1
 		//allow any curve code for now...
@@ -2083,7 +2083,7 @@ static void send_client_key_exchange(tls_state_t *tls)
 	}
 }
 
-static const uint8_t rec_CHANGE_CIPHER_SPEC[] = {
+static const uint8_t rec_CHANGE_CIPHER_SPEC[] ALIGN1 = {
 	RECORD_TYPE_CHANGE_CIPHER_SPEC, TLS_MAJ, TLS_MIN, 00, 01,
 	01
 };
diff --git a/networking/tls_aes.c b/networking/tls_aes.c
index cf6b5fe3d..5400ad9b5 100644
--- a/networking/tls_aes.c
+++ b/networking/tls_aes.c
@@ -130,7 +130,7 @@ static int KeyExpansion(uint32_t *RoundKey, const void *key, unsigned key_len)
 	// The round constant word array, Rcon[i], contains the values given by
 	// x to th e power (i-1) being powers of x (x is denoted as {02}) in the field GF(2^8).
 	// Note that i starts at 2, not 0.
-	static const uint8_t Rcon[] = {
+	static const uint8_t Rcon[] ALIGN1 = {
 		0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36
 	//..... 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6,...
 	// but aes256 only uses values up to 0x36


More information about the busybox-cvs mailing list