aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2019-05-21 17:29:24 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2019-05-21 17:29:24 +0200
commit84fc645605827d53aa3e749dfff309978b1bc73d (patch)
treefaf841135de862f1173c8661a80de7640894f485
parent831844c13931f14bd0433c1eb848c863288a8c06 (diff)
downloadbusybox-w32-84fc645605827d53aa3e749dfff309978b1bc73d.tar.gz
busybox-w32-84fc645605827d53aa3e749dfff309978b1bc73d.tar.bz2
busybox-w32-84fc645605827d53aa3e749dfff309978b1bc73d.zip
*: slap on a few ALIGN1/2s where appropriate
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@googlemail.com>
-rw-r--r--networking/libiproute/ll_proto.c2
-rw-r--r--networking/tls.c6
-rw-r--r--networking/tls_aes.c2
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 @@
15 15
16/* Please conditionalize exotic protocols on CONFIG_something */ 16/* Please conditionalize exotic protocols on CONFIG_something */
17 17
18static const uint16_t llproto_ids[] = { 18static const uint16_t llproto_ids[] ALIGN2 = {
19#define __PF(f,n) ETH_P_##f, 19#define __PF(f,n) ETH_P_##f,
20__PF(LOOP,loop) 20__PF(LOOP,loop)
21__PF(PUP,pup) 21__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)
1387 /* enter subjectPublicKeyInfo */ 1387 /* enter subjectPublicKeyInfo */
1388 der = enter_der_item(der, &end); 1388 der = enter_der_item(der, &end);
1389 { /* check subjectPublicKeyInfo.algorithm */ 1389 { /* check subjectPublicKeyInfo.algorithm */
1390 static const uint8_t OID_RSA_KEY_ALG[] = { 1390 static const uint8_t OID_RSA_KEY_ALG[] ALIGN1 = {
1391 0x30,0x0d, // SEQ 13 bytes 1391 0x30,0x0d, // SEQ 13 bytes
1392 0x06,0x09, 0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01, //OID_RSA_KEY_ALG 42.134.72.134.247.13.1.1.1 1392 0x06,0x09, 0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01, //OID_RSA_KEY_ALG 42.134.72.134.247.13.1.1.1
1393 //0x05,0x00, // NULL 1393 //0x05,0x00, // NULL
1394 }; 1394 };
1395 static const uint8_t OID_ECDSA_KEY_ALG[] = { 1395 static const uint8_t OID_ECDSA_KEY_ALG[] ALIGN1 = {
1396 0x30,0x13, // SEQ 0x13 bytes 1396 0x30,0x13, // SEQ 0x13 bytes
1397 0x06,0x07, 0x2a,0x86,0x48,0xce,0x3d,0x02,0x01, //OID_ECDSA_KEY_ALG 42.134.72.206.61.2.1 1397 0x06,0x07, 0x2a,0x86,0x48,0xce,0x3d,0x02,0x01, //OID_ECDSA_KEY_ALG 42.134.72.206.61.2.1
1398 //allow any curve code for now... 1398 //allow any curve code for now...
@@ -2083,7 +2083,7 @@ static void send_client_key_exchange(tls_state_t *tls)
2083 } 2083 }
2084} 2084}
2085 2085
2086static const uint8_t rec_CHANGE_CIPHER_SPEC[] = { 2086static const uint8_t rec_CHANGE_CIPHER_SPEC[] ALIGN1 = {
2087 RECORD_TYPE_CHANGE_CIPHER_SPEC, TLS_MAJ, TLS_MIN, 00, 01, 2087 RECORD_TYPE_CHANGE_CIPHER_SPEC, TLS_MAJ, TLS_MIN, 00, 01,
2088 01 2088 01
2089}; 2089};
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)
130 // The round constant word array, Rcon[i], contains the values given by 130 // The round constant word array, Rcon[i], contains the values given by
131 // x to th e power (i-1) being powers of x (x is denoted as {02}) in the field GF(2^8). 131 // x to th e power (i-1) being powers of x (x is denoted as {02}) in the field GF(2^8).
132 // Note that i starts at 2, not 0. 132 // Note that i starts at 2, not 0.
133 static const uint8_t Rcon[] = { 133 static const uint8_t Rcon[] ALIGN1 = {
134 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36 134 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36
135 //..... 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6,... 135 //..... 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6,...
136 // but aes256 only uses values up to 0x36 136 // but aes256 only uses values up to 0x36