Merge pull request #509 from kkrentz/dead-pr

Removing dead code
This commit is contained in:
George Oikonomou 2018-05-12 13:42:50 +01:00 committed by GitHub
commit 54f51d5213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 23 deletions

View File

@ -166,16 +166,6 @@ encrypt(uint8_t *state)
}
}
/*---------------------------------------------------------------------------*/
void
aes_128_set_padded_key(uint8_t *key, uint8_t key_len)
{
uint8_t block[AES_128_BLOCK_SIZE];
memset(block, 0, AES_128_BLOCK_SIZE);
memcpy(block, key, key_len);
AES_128.set_key(block);
}
/*---------------------------------------------------------------------------*/
const struct aes_128_driver aes_128_driver = {
set_key,
encrypt

View File

@ -67,11 +67,6 @@ struct aes_128_driver {
void (* encrypt)(uint8_t *plaintext_and_result);
};
/**
* \brief Pads the key with zeroes before calling AES_128.set_key
*/
void aes_128_set_padded_key(uint8_t *key, uint8_t key_len);
extern const struct aes_128_driver AES_128;
#endif /* AES_128_H_ */

View File

@ -70,11 +70,6 @@ typedef union {
#endif /* LINKADDR_SIZE == 2 */
} linkaddr_t;
typedef union {
uint8_t u8[8];
uint16_t u16[4];
} linkaddr_extended_t;
/**
* \brief Copy a link-layer address
* \param dest The destination

View File

@ -171,7 +171,6 @@ framer_802154_setup_params(packetbuf_attr_t (*get_attr)(uint8_t type),
#if LLSEC802154_USES_EXPLICIT_KEYS
params->aux_hdr.security_control.key_id_mode = get_attr(PACKETBUF_ATTR_KEY_ID_MODE);
params->aux_hdr.key_index = get_attr(PACKETBUF_ATTR_KEY_INDEX);
params->aux_hdr.key_source.u16[0] = get_attr(PACKETBUF_ATTR_KEY_SOURCE_BYTES_0_1);
#endif /* LLSEC802154_USES_EXPLICIT_KEYS */
#else
params->fcf.security_enabled = 0;
@ -273,7 +272,6 @@ parse(void)
#if LLSEC802154_USES_EXPLICIT_KEYS
packetbuf_set_attr(PACKETBUF_ATTR_KEY_ID_MODE, frame.aux_hdr.security_control.key_id_mode);
packetbuf_set_attr(PACKETBUF_ATTR_KEY_INDEX, frame.aux_hdr.key_index);
packetbuf_set_attr(PACKETBUF_ATTR_KEY_SOURCE_BYTES_0_1, frame.aux_hdr.key_source.u16[0]);
#endif /* LLSEC802154_USES_EXPLICIT_KEYS */
}
#endif /* LLSEC802154_USES_AUX_HEADER */

View File

@ -236,7 +236,6 @@ enum {
#if LLSEC802154_USES_EXPLICIT_KEYS
PACKETBUF_ATTR_KEY_ID_MODE,
PACKETBUF_ATTR_KEY_INDEX,
PACKETBUF_ATTR_KEY_SOURCE_BYTES_0_1,
#endif /* LLSEC802154_USES_EXPLICIT_KEYS */
/* Scope 2 attributes: used between end-to-end nodes. */