Commit 82ca6ef6 authored by Jouni Malinen's avatar Jouni Malinen Committed by Johannes Berg

mac80211: Fix misplaced return in AES-GMAC key setup

Commit 8ade538b ("mac80111: Add BIP-GMAC-128 and BIP-GMAC-256
ciphers") had the success return in incorrect place before the
crypto_aead_setauthsize() call which practically ended up skipping that
call unconditionally.

The missing call did not actually change any functionality since
GMAC_MIC_LEN (16) is identical to the maxauthsize in gcm(aes) and as
such, the default value used for the authsize parameter.
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6bab2e19
...@@ -69,10 +69,10 @@ struct crypto_aead *ieee80211_aes_gmac_key_setup(const u8 key[], ...@@ -69,10 +69,10 @@ struct crypto_aead *ieee80211_aes_gmac_key_setup(const u8 key[],
return tfm; return tfm;
err = crypto_aead_setkey(tfm, key, key_len); err = crypto_aead_setkey(tfm, key, key_len);
if (!err)
return tfm;
if (!err) if (!err)
err = crypto_aead_setauthsize(tfm, GMAC_MIC_LEN); err = crypto_aead_setauthsize(tfm, GMAC_MIC_LEN);
if (!err)
return tfm;
crypto_free_aead(tfm); crypto_free_aead(tfm);
return ERR_PTR(err); return ERR_PTR(err);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment