hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: refresh patches

Browse Source 
Signed-off-by: Mathias Kresin <dev@kresin.me>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
master
Mathias Kresin 8 years ago committed by Felix Fietkau
parent 76d09dcb01
commit cbfeb7796e
3 changed files with 57 additions and 51 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 90
      package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
  2. 12
      package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
  3. 6
      package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch

90
package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
Unescape View File

@ -34,9 +34,12 @@
#include "aes_ccm.h" #include "aes_ccm.h"
-void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, -void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,
- u8 *data, size_t data_len, u8 *mic,
- size_t mic_len)
+static void aes_ccm_prepare(struct crypto_cipher *tfm, u8 *b_0, u8 *aad, u8 *s_0, +static void aes_ccm_prepare(struct crypto_cipher *tfm, u8 *b_0, u8 *aad, u8 *s_0,
+ u8 *a, u8 *b) + u8 *a, u8 *b)
+{ {
- struct scatterlist sg[3];
+ int i; + int i;
+ +
+ crypto_cipher_encrypt_one(tfm, b, b_0); + crypto_cipher_encrypt_one(tfm, b, b_0);
@ -51,56 +54,55 @@
+ for (i = 0; i < AES_BLOCK_SIZE; i++) + for (i = 0; i < AES_BLOCK_SIZE; i++)
+ aad[i] ^= b[i]; + aad[i] ^= b[i];
+ crypto_cipher_encrypt_one(tfm, a, aad); + crypto_cipher_encrypt_one(tfm, a, aad);
+
- char aead_req_data[sizeof(struct aead_request) +
- crypto_aead_reqsize(tfm)]
- __aligned(__alignof__(struct aead_request));
- struct aead_request *aead_req = (void *) aead_req_data;
+ /* Mask out bits from auth-only-b_0 */ + /* Mask out bits from auth-only-b_0 */
+ b_0[0] &= 0x07; + b_0[0] &= 0x07;
+
- memset(aead_req, 0, sizeof(aead_req_data));
+ /* S_0 is used to encrypt T (= MIC) */ + /* S_0 is used to encrypt T (= MIC) */
+ b_0[14] = 0; + b_0[14] = 0;
+ b_0[15] = 0; + b_0[15] = 0;
+ crypto_cipher_encrypt_one(tfm, s_0, b_0); + crypto_cipher_encrypt_one(tfm, s_0, b_0);
+} +}
+
+ - sg_init_table(sg, 3);
- sg_set_buf(&sg[0], &aad[2], be16_to_cpup((__be16 *)aad));
- sg_set_buf(&sg[1], data, data_len);
- sg_set_buf(&sg[2], mic, mic_len);
- aead_request_set_tfm(aead_req, tfm);
- aead_request_set_crypt(aead_req, sg, sg, data_len, b_0);
- aead_request_set_ad(aead_req, sg[0].length);
+void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad, +void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *b_0, u8 *aad,
u8 *data, size_t data_len, u8 *mic, + u8 *data, size_t data_len, u8 *mic,
size_t mic_len) + size_t mic_len)
{ +{
- struct scatterlist sg[3];
+ int i, j, last_len, num_blocks; + int i, j, last_len, num_blocks;
+ u8 b[AES_BLOCK_SIZE]; + u8 b[AES_BLOCK_SIZE];
+ u8 s_0[AES_BLOCK_SIZE]; + u8 s_0[AES_BLOCK_SIZE];
+ u8 e[AES_BLOCK_SIZE]; + u8 e[AES_BLOCK_SIZE];
+ u8 *pos, *cpos; + u8 *pos, *cpos;
+
- char aead_req_data[sizeof(struct aead_request) +
- crypto_aead_reqsize(tfm)]
- __aligned(__alignof__(struct aead_request));
- struct aead_request *aead_req = (void *) aead_req_data;
+ num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE); + num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
+ last_len = data_len % AES_BLOCK_SIZE; + last_len = data_len % AES_BLOCK_SIZE;
+ aes_ccm_prepare(tfm, b_0, aad, s_0, b, b); + aes_ccm_prepare(tfm, b_0, aad, s_0, b, b);
+
- memset(aead_req, 0, sizeof(aead_req_data));
+ /* Process payload blocks */ + /* Process payload blocks */
+ pos = data; + pos = data;
+ cpos = data; + cpos = data;
+ for (j = 1; j <= num_blocks; j++) { + for (j = 1; j <= num_blocks; j++) {
+ int blen = (j == num_blocks && last_len) ? + int blen = (j == num_blocks && last_len) ?
+ last_len : AES_BLOCK_SIZE; + last_len : AES_BLOCK_SIZE;
+
- sg_init_table(sg, 3);
- sg_set_buf(&sg[0], &aad[2], be16_to_cpup((__be16 *)aad));
- sg_set_buf(&sg[1], data, data_len);
- sg_set_buf(&sg[2], mic, mic_len);
+ /* Authentication followed by encryption */ + /* Authentication followed by encryption */
+ for (i = 0; i < blen; i++) + for (i = 0; i < blen; i++)
+ b[i] ^= pos[i]; + b[i] ^= pos[i];
+ crypto_cipher_encrypt_one(tfm, b, b); + crypto_cipher_encrypt_one(tfm, b, b);
+
- aead_request_set_tfm(aead_req, tfm);
- aead_request_set_crypt(aead_req, sg, sg, data_len, b_0);
- aead_request_set_ad(aead_req, sg[0].length);
+ b_0[14] = (j >> 8) & 0xff; + b_0[14] = (j >> 8) & 0xff;
+ b_0[15] = j & 0xff; + b_0[15] = j & 0xff;
+ crypto_cipher_encrypt_one(tfm, e, b_0); + crypto_cipher_encrypt_one(tfm, e, b_0);
@ -123,30 +125,37 @@
- crypto_aead_reqsize(tfm)] - crypto_aead_reqsize(tfm)]
- __aligned(__alignof__(struct aead_request)); - __aligned(__alignof__(struct aead_request));
- struct aead_request *aead_req = (void *) aead_req_data; - struct aead_request *aead_req = (void *) aead_req_data;
-
- if (data_len == 0)
- return -EINVAL;
-
- memset(aead_req, 0, sizeof(aead_req_data));
-
- sg_init_table(sg, 3);
- sg_set_buf(&sg[0], &aad[2], be16_to_cpup((__be16 *)aad));
- sg_set_buf(&sg[1], data, data_len);
- sg_set_buf(&sg[2], mic, mic_len);
-
- aead_request_set_tfm(aead_req, tfm);
- aead_request_set_crypt(aead_req, sg, sg, data_len + mic_len, b_0);
- aead_request_set_ad(aead_req, sg[0].length);
+ int i, j, last_len, num_blocks; + int i, j, last_len, num_blocks;
+ u8 *pos, *cpos; + u8 *pos, *cpos;
+ u8 a[AES_BLOCK_SIZE]; + u8 a[AES_BLOCK_SIZE];
+ u8 b[AES_BLOCK_SIZE]; + u8 b[AES_BLOCK_SIZE];
+ u8 s_0[AES_BLOCK_SIZE]; + u8 s_0[AES_BLOCK_SIZE];
+
- if (data_len == 0)
- return -EINVAL;
+ num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE); + num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_SIZE);
+ last_len = data_len % AES_BLOCK_SIZE; + last_len = data_len % AES_BLOCK_SIZE;
+ aes_ccm_prepare(tfm, b_0, aad, s_0, a, b); + aes_ccm_prepare(tfm, b_0, aad, s_0, a, b);
+
- memset(aead_req, 0, sizeof(aead_req_data));
+ /* Process payload blocks */ + /* Process payload blocks */
+ cpos = data; + cpos = data;
+ pos = data; + pos = data;
+ for (j = 1; j <= num_blocks; j++) { + for (j = 1; j <= num_blocks; j++) {
+ int blen = (j == num_blocks && last_len) ? + int blen = (j == num_blocks && last_len) ?
+ last_len : AES_BLOCK_SIZE; + last_len : AES_BLOCK_SIZE;
+
- sg_init_table(sg, 3);
- sg_set_buf(&sg[0], &aad[2], be16_to_cpup((__be16 *)aad));
- sg_set_buf(&sg[1], data, data_len);
- sg_set_buf(&sg[2], mic, mic_len);
+ /* Decryption followed by authentication */ + /* Decryption followed by authentication */
+ b_0[14] = (j >> 8) & 0xff; + b_0[14] = (j >> 8) & 0xff;
+ b_0[15] = j & 0xff; + b_0[15] = j & 0xff;
@ -157,10 +166,7 @@
+ } + }
+ crypto_cipher_encrypt_one(tfm, a, a); + crypto_cipher_encrypt_one(tfm, a, a);
+ } + }
+
- aead_request_set_tfm(aead_req, tfm);
- aead_request_set_crypt(aead_req, sg, sg, data_len + mic_len, b_0);
- aead_request_set_ad(aead_req, sg[0].length);
+ for (i = 0; i < mic_len; i++) { + for (i = 0; i < mic_len; i++) {
+ if ((mic[i] ^ s_0[i]) != a[i]) + if ((mic[i] ^ s_0[i]) != a[i])
+ return -1; + return -1;
@ -179,12 +185,12 @@
{ {
- struct crypto_aead *tfm; - struct crypto_aead *tfm;
- int err; - int err;
- + struct crypto_cipher *tfm;
- tfm = crypto_alloc_aead("ccm(aes)", 0, CRYPTO_ALG_ASYNC); - tfm = crypto_alloc_aead("ccm(aes)", 0, CRYPTO_ALG_ASYNC);
- if (IS_ERR(tfm)) - if (IS_ERR(tfm))
- return tfm; - return tfm;
+ struct crypto_cipher *tfm; -
- err = crypto_aead_setkey(tfm, key, key_len); - err = crypto_aead_setkey(tfm, key, key_len);
- if (err) - if (err)
- goto free_aead; - goto free_aead;

12
package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
Unescape View File

@ -112,8 +112,7 @@
+ GFP_KERNEL); + GFP_KERNEL);
+ if (!led) + if (!led)
+ return -ENOMEM; + return -ENOMEM;
+
- ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, val);
+ led->gpio = gpio = (struct gpio_led *) (led + 1); + led->gpio = gpio = (struct gpio_led *) (led + 1);
+ _name = (char *) (led->gpio + 1); + _name = (char *) (led->gpio + 1);
+ +
@ -126,7 +125,8 @@
+ ret = ath_add_led(sc, led); + ret = ath_add_led(sc, led);
+ if (unlikely(ret < 0)) + if (unlikely(ret < 0))
+ kfree(led); + kfree(led);
+
- ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, val);
+ return ret; + return ret;
} }
@ -134,11 +134,11 @@
{ {
- if (!sc->led_registered) - if (!sc->led_registered)
- return; - return;
-
- ath_led_brightness(&sc->led_cdev, LED_OFF);
- led_classdev_unregister(&sc->led_cdev);
+ struct ath_led *led; + struct ath_led *led;
- ath_led_brightness(&sc->led_cdev, LED_OFF);
- led_classdev_unregister(&sc->led_cdev);
-
- ath9k_hw_gpio_free(sc->sc_ah, sc->sc_ah->led_pin); - ath9k_hw_gpio_free(sc->sc_ah, sc->sc_ah->led_pin);
+ while (!list_empty(&sc->leds)) { + while (!list_empty(&sc->leds)) {
+ led = list_first_entry(&sc->leds, struct ath_led, list); + led = list_first_entry(&sc->leds, struct ath_led, list);

6
package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
Unescape View File

@ -91,8 +91,7 @@
+ rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM_MT7620, word); + rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM_MT7620, word);
+ rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE_MT7620, 1); + rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE_MT7620, 1);
+ rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY_MT7620, 1); + rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY_MT7620, 1);
+
- rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
+ rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg); + rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
+ } + }
+ break; + break;
@ -104,7 +103,8 @@
+ rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM, word); + rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM, word);
+ rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE, 1); + rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE, 1);
+ rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY, 1); + rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY, 1);
+
- rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
+ rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg); + rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
+ } + }
+ break; + break;

Write Preview
Loading…
Cancel
Save