diff options
author | Ron Yorston <rmy@pobox.com> | 2019-05-27 11:56:52 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2019-05-27 11:56:52 +0100 |
commit | a61949401890cbb33a9d6c4571b51c53460ad438 (patch) | |
tree | 64dedaddb89896d5b1670a421af123670ca2120b /networking/tls.c | |
parent | 03a7b173605a890e1db5177ecd5b8dd591081c41 (diff) | |
parent | bcb1fc3e6ca6fe902610f507eaf9b0b58a5c583a (diff) | |
download | busybox-w32-a61949401890cbb33a9d6c4571b51c53460ad438.tar.gz busybox-w32-a61949401890cbb33a9d6c4571b51c53460ad438.tar.bz2 busybox-w32-a61949401890cbb33a9d6c4571b51c53460ad438.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'networking/tls.c')
-rw-r--r-- | networking/tls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/tls.c b/networking/tls.c index d2385efe8..d1a0204ed 100644 --- a/networking/tls.c +++ b/networking/tls.c | |||
@@ -1393,12 +1393,12 @@ static void find_key_in_der_cert(tls_state_t *tls, uint8_t *der, int len) | |||
1393 | /* enter subjectPublicKeyInfo */ | 1393 | /* enter subjectPublicKeyInfo */ |
1394 | der = enter_der_item(der, &end); | 1394 | der = enter_der_item(der, &end); |
1395 | { /* check subjectPublicKeyInfo.algorithm */ | 1395 | { /* check subjectPublicKeyInfo.algorithm */ |
1396 | static const uint8_t OID_RSA_KEY_ALG[] = { | 1396 | static const uint8_t OID_RSA_KEY_ALG[] ALIGN1 = { |
1397 | 0x30,0x0d, // SEQ 13 bytes | 1397 | 0x30,0x0d, // SEQ 13 bytes |
1398 | 0x06,0x09, 0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01, //OID_RSA_KEY_ALG 42.134.72.134.247.13.1.1.1 | 1398 | 0x06,0x09, 0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01, //OID_RSA_KEY_ALG 42.134.72.134.247.13.1.1.1 |
1399 | //0x05,0x00, // NULL | 1399 | //0x05,0x00, // NULL |
1400 | }; | 1400 | }; |
1401 | static const uint8_t OID_ECDSA_KEY_ALG[] = { | 1401 | static const uint8_t OID_ECDSA_KEY_ALG[] ALIGN1 = { |
1402 | 0x30,0x13, // SEQ 0x13 bytes | 1402 | 0x30,0x13, // SEQ 0x13 bytes |
1403 | 0x06,0x07, 0x2a,0x86,0x48,0xce,0x3d,0x02,0x01, //OID_ECDSA_KEY_ALG 42.134.72.206.61.2.1 | 1403 | 0x06,0x07, 0x2a,0x86,0x48,0xce,0x3d,0x02,0x01, //OID_ECDSA_KEY_ALG 42.134.72.206.61.2.1 |
1404 | //allow any curve code for now... | 1404 | //allow any curve code for now... |
@@ -2089,7 +2089,7 @@ static void send_client_key_exchange(tls_state_t *tls) | |||
2089 | } | 2089 | } |
2090 | } | 2090 | } |
2091 | 2091 | ||
2092 | static const uint8_t rec_CHANGE_CIPHER_SPEC[] = { | 2092 | static const uint8_t rec_CHANGE_CIPHER_SPEC[] ALIGN1 = { |
2093 | RECORD_TYPE_CHANGE_CIPHER_SPEC, TLS_MAJ, TLS_MIN, 00, 01, | 2093 | RECORD_TYPE_CHANGE_CIPHER_SPEC, TLS_MAJ, TLS_MIN, 00, 01, |
2094 | 01 | 2094 | 01 |
2095 | }; | 2095 | }; |