OK?
---
sys/crypto/cmac.c | 12 ++++++------
sys/crypto/cmac.h | 2 +-
sys/crypto/key_wrap.c | 10 +++++-----
sys/crypto/key_wrap.h | 2 +-
sys/net80211/ieee80211_crypto.c | 2 +-
sys/net80211/ieee80211_crypto_bip.c | 2 +-
sys/net80211/ieee80211_crypto_ccmp.c | 36 ++++++++++++++++++------------------
7 files changed, 33 insertions(+), 33 deletions(-)
diff --git sys/crypto/cmac.c sys/crypto/cmac.c
index 366f30f5749..7cddfb9aaf7 100644
--- sys/crypto/cmac.c
+++ sys/crypto/cmac.c
@@ -22,11 +22,11 @@
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <crypto/rijndael.h>
+#include <crypto/aes.h>
#include <crypto/cmac.h>
#define LSHIFT(v, r) do { \
int i; \
for (i = 0; i < 15; i++) \
@@ -48,11 +48,11 @@ AES_CMAC_Init(AES_CMAC_CTX *ctx)
}
void
AES_CMAC_SetKey(AES_CMAC_CTX *ctx, const u_int8_t key[AES_CMAC_KEY_LENGTH])
{
- rijndael_set_key_enc_only(&ctx->rijndael, key, 128);
+ AES_Setkey(&ctx->aesctx, key, 16);
}
void
AES_CMAC_Update(AES_CMAC_CTX *ctx, const u_int8_t *data, u_int len)
{
@@ -63,17 +63,17 @@ AES_CMAC_Update(AES_CMAC_CTX *ctx, const u_int8_t *data,
u_int len)
memcpy(ctx->M_last + ctx->M_n, data, mlen);
ctx->M_n += mlen;
if (ctx->M_n < 16 || len == mlen)
return;
XOR(ctx->M_last, ctx->X);
- rijndael_encrypt(&ctx->rijndael, ctx->X, ctx->X);
+ AES_Encrypt(&ctx->aesctx, ctx->X, ctx->X);
data += mlen;
len -= mlen;
}
while (len > 16) { /* not last block */
XOR(data, ctx->X);
- rijndael_encrypt(&ctx->rijndael, ctx->X, ctx->X);
+ AES_Encrypt(&ctx->aesctx, ctx->X, ctx->X);
data += 16;
len -= 16;
}
/* potential last block, save it */
memcpy(ctx->M_last, data, len);
@@ -85,11 +85,11 @@ AES_CMAC_Final(u_int8_t digest[AES_CMAC_DIGEST_LENGTH],
AES_CMAC_CTX *ctx)
{
u_int8_t K[16];
/* generate subkey K1 */
memset(K, 0, sizeof K);
- rijndael_encrypt(&ctx->rijndael, K, K);
+ AES_Encrypt(&ctx->aesctx, K, K);
if (K[0] & 0x80) {
LSHIFT(K, K);
K[15] ^= 0x87;
} else
@@ -112,9 +112,9 @@ AES_CMAC_Final(u_int8_t digest[AES_CMAC_DIGEST_LENGTH],
AES_CMAC_CTX *ctx)
ctx->M_last[ctx->M_n] = 0;
XOR(K, ctx->M_last);
}
XOR(ctx->M_last, ctx->X);
- rijndael_encrypt(&ctx->rijndael, ctx->X, digest);
+ AES_Encrypt(&ctx->aesctx, ctx->X, digest);
explicit_bzero(K, sizeof K);
}
diff --git sys/crypto/cmac.h sys/crypto/cmac.h
index de0ec840d42..45798d4f8a1 100644
--- sys/crypto/cmac.h
+++ sys/crypto/cmac.h
@@ -21,11 +21,11 @@
#define AES_CMAC_KEY_LENGTH 16
#define AES_CMAC_DIGEST_LENGTH 16
typedef struct _AES_CMAC_CTX {
- rijndael_ctx rijndael;
+ AES_CTX aesctx;
u_int8_t X[16];
u_int8_t M_last[16];
u_int M_n;
} AES_CMAC_CTX;
diff --git sys/crypto/key_wrap.c sys/crypto/key_wrap.c
index 26c197eebbc..913639bb8a7 100644
--- sys/crypto/key_wrap.c
+++ sys/crypto/key_wrap.c
@@ -21,27 +21,27 @@
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <crypto/rijndael.h>
+#include <crypto/aes.h>
#include <crypto/key_wrap.h>
static const u_int8_t IV[8] =
{ 0xa6, 0xa6, 0xa6, 0xa6, 0xa6, 0xa6, 0xa6, 0xa6 };
void
aes_key_wrap_set_key(aes_key_wrap_ctx *ctx, const u_int8_t *K, size_t K_len)
{
- rijndael_set_key(&ctx->ctx, K, K_len * NBBY);
+ AES_Setkey(&ctx->ctx, K, K_len);
}
void
aes_key_wrap_set_key_wrap_only(aes_key_wrap_ctx *ctx, const u_int8_t *K,
size_t K_len)
{
- rijndael_set_key_enc_only(&ctx->ctx, K, K_len * NBBY);
+ AES_Setkey(&ctx->ctx, K, K_len);
}
void
aes_key_wrap(aes_key_wrap_ctx *ctx, const u_int8_t *P, size_t n, u_int8_t *C)
{
@@ -59,11 +59,11 @@ aes_key_wrap(aes_key_wrap_ctx *ctx, const u_int8_t *P,
size_t n, u_int8_t *C)
for (i = 1; i <= n; i++, t++) {
/* B = A | R[i] */
memcpy(&B[0], A, 8);
memcpy(&B[1], R, 8);
/* B = AES(K, B) */
- rijndael_encrypt(&ctx->ctx, (caddr_t)B, (caddr_t)B);
+ AES_Encrypt(&ctx->ctx, (caddr_t)B, (caddr_t)B);
/* MSB(64, B) = MSB(64, B) ^ t */
B[0] ^= htobe64(t);
/* A = MSB(64, B) */
memcpy(A, &B[0], 8);
/* R[i] = LSB(64, B) */
@@ -94,11 +94,11 @@ aes_key_unwrap(aes_key_wrap_ctx *ctx, const u_int8_t *C,
u_int8_t *P, size_t n)
/* MSB(64, B) = MSB(64, B) ^ t */
B[0] ^= htobe64(t);
/* B = MSB(64, B) | R[i] */
memcpy(&B[1], R, 8);
/* B = AES-1(K, B) */
- rijndael_decrypt(&ctx->ctx, (caddr_t)B, (caddr_t)B);
+ AES_Decrypt(&ctx->ctx, (caddr_t)B, (caddr_t)B);
/* A = MSB(64, B) */
memcpy(A, &B[0], 8);
/* R[i] = LSB(64, B) */
memcpy(R, &B[1], 8);
diff --git sys/crypto/key_wrap.h sys/crypto/key_wrap.h
index f91ce5f4c06..619ed6382c0 100644
--- sys/crypto/key_wrap.h
+++ sys/crypto/key_wrap.h
@@ -18,11 +18,11 @@
#ifndef _KEY_WRAP_H_
#define _KEY_WRAP_H_
typedef struct _aes_key_wrap_ctx {
- rijndael_ctx ctx;
+ AES_CTX ctx;
} aes_key_wrap_ctx;
__BEGIN_DECLS
void aes_key_wrap_set_key(aes_key_wrap_ctx *, const u_int8_t *, size_t);
diff --git sys/net80211/ieee80211_crypto.c sys/net80211/ieee80211_crypto.c
index 7450e62a642..9fb5037e0fc 100644
--- sys/net80211/ieee80211_crypto.c
+++ sys/net80211/ieee80211_crypto.c
@@ -40,11 +40,11 @@
#include <crypto/arc4.h>
#include <crypto/md5.h>
#include <crypto/sha1.h>
#include <crypto/sha2.h>
#include <crypto/hmac.h>
-#include <crypto/rijndael.h>
+#include <crypto/aes.h>
#include <crypto/cmac.h>
#include <crypto/key_wrap.h>
typedef union _ANY_CTX {
HMAC_MD5_CTX md5;
diff --git sys/net80211/ieee80211_crypto_bip.c
sys/net80211/ieee80211_crypto_bip.c
index 307c05b1bce..bbcd48ae486 100644
--- sys/net80211/ieee80211_crypto_bip.c
+++ sys/net80211/ieee80211_crypto_bip.c
@@ -38,11 +38,11 @@
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_crypto.h>
#include <net80211/ieee80211_priv.h>
-#include <crypto/rijndael.h>
+#include <crypto/aes.h>
#include <crypto/cmac.h>
/* BIP software crypto context */
struct ieee80211_bip_ctx {
AES_CMAC_CTX cmac;
diff --git sys/net80211/ieee80211_crypto_ccmp.c
sys/net80211/ieee80211_crypto_ccmp.c
index acd60a6da2e..6bf6a76974c 100644
--- sys/net80211/ieee80211_crypto_ccmp.c
+++ sys/net80211/ieee80211_crypto_ccmp.c
@@ -37,15 +37,15 @@
#include <netinet/if_ether.h>
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_crypto.h>
-#include <crypto/rijndael.h>
+#include <crypto/aes.h>
/* CCMP software crypto context */
struct ieee80211_ccmp_ctx {
- rijndael_ctx rijndael;
+ AES_CTX aesctx;
};
/*
* Initialize software crypto context. This function can be overridden
* by drivers doing hardware crypto.
@@ -56,11 +56,11 @@ ieee80211_ccmp_set_key(struct ieee80211com *ic, struct
ieee80211_key *k)
struct ieee80211_ccmp_ctx *ctx;
ctx = malloc(sizeof(*ctx), M_DEVBUF, M_NOWAIT | M_ZERO);
if (ctx == NULL)
return ENOMEM;
- rijndael_set_key_enc_only(&ctx->rijndael, k->k_key, 128);
+ AES_Setkey(&ctx->aesctx, k->k_key, 16);
k->k_priv = ctx;
return 0;
}
void
@@ -76,11 +76,11 @@ ieee80211_ccmp_delete_key(struct ieee80211com *ic, struct
ieee80211_key *k)
/*-
* Counter with CBC-MAC (CCM) - see RFC3610.
* CCMP uses the following CCM parameters: M = 8, L = 2
*/
static void
-ieee80211_ccmp_phase1(rijndael_ctx *ctx, const struct ieee80211_frame *wh,
+ieee80211_ccmp_phase1(AES_CTX *ctx, const struct ieee80211_frame *wh,
u_int64_t pn, int lm, u_int8_t b[16], u_int8_t a[16], u_int8_t s0[16])
{
u_int8_t auth[32], nonce[13];
u_int8_t *aad;
u_int8_t tid = 0;
@@ -144,24 +144,24 @@ ieee80211_ccmp_phase1(rijndael_ctx *ctx, const struct
ieee80211_frame *wh,
/* construct first block B_0 */
b[ 0] = 89; /* Flags = 64*Adata + 8*((M-2)/2) + (L-1) */
memcpy(&b[1], nonce, 13);
b[14] = lm >> 8;
b[15] = lm & 0xff;
- rijndael_encrypt(ctx, b, b);
+ AES_Encrypt(ctx, b, b);
for (i = 0; i < 16; i++)
b[i] ^= auth[i];
- rijndael_encrypt(ctx, b, b);
+ AES_Encrypt(ctx, b, b);
for (i = 0; i < 16; i++)
b[i] ^= auth[16 + i];
- rijndael_encrypt(ctx, b, b);
+ AES_Encrypt(ctx, b, b);
/* construct S_0 */
a[ 0] = 1; /* Flags = L' = (L-1) */
memcpy(&a[1], nonce, 13);
a[14] = a[15] = 0;
- rijndael_encrypt(ctx, a, s0);
+ AES_Encrypt(ctx, a, s0);
}
struct mbuf *
ieee80211_ccmp_encrypt(struct ieee80211com *ic, struct mbuf *m0,
struct ieee80211_key *k)
@@ -208,18 +208,18 @@ ieee80211_ccmp_encrypt(struct ieee80211com *ic, struct
mbuf *m0,
ivp[5] = k->k_tsc >> 24; /* PN3 */
ivp[6] = k->k_tsc >> 32; /* PN4 */
ivp[7] = k->k_tsc >> 40; /* PN5 */
/* construct initial B, A and S_0 blocks */
- ieee80211_ccmp_phase1(&ctx->rijndael, wh, k->k_tsc,
+ ieee80211_ccmp_phase1(&ctx->aesctx, wh, k->k_tsc,
m0->m_pkthdr.len - hdrlen, b, a, s0);
/* construct S_1 */
ctr = 1;
a[14] = ctr >> 8;
a[15] = ctr & 0xff;
- rijndael_encrypt(&ctx->rijndael, a, s);
+ AES_Encrypt(&ctx->aesctx, a, s);
/* encrypt frame body and compute MIC */
j = 0;
m = m0;
n = n0;
@@ -258,25 +258,25 @@ ieee80211_ccmp_encrypt(struct ieee80211com *ic, struct
mbuf *m0,
/* encrypt message */
dst[i] = src[i] ^ s[j];
if (++j < 16)
continue;
/* we have a full block, encrypt MIC */
- rijndael_encrypt(&ctx->rijndael, b, b);
+ AES_Encrypt(&ctx->aesctx, b, b);
/* construct a new S_ctr block */
ctr++;
a[14] = ctr >> 8;
a[15] = ctr & 0xff;
- rijndael_encrypt(&ctx->rijndael, a, s);
+ AES_Encrypt(&ctx->aesctx, a, s);
j = 0;
}
moff += len;
noff += len;
left -= len;
}
if (j != 0) /* partial block, encrypt MIC */
- rijndael_encrypt(&ctx->rijndael, b, b);
+ AES_Encrypt(&ctx->aesctx, b, b);
/* reserve trailing space for MIC */
if (M_TRAILINGSPACE(n) < IEEE80211_CCMP_MICLEN) {
MGET(n->m_next, M_DONTWAIT, n->m_type);
if (n->m_next == NULL)
@@ -368,11 +368,11 @@ ieee80211_ccmp_decrypt(struct ieee80211com *ic, struct
mbuf *m0,
}
if (n0->m_len > n0->m_pkthdr.len)
n0->m_len = n0->m_pkthdr.len;
/* construct initial B, A and S_0 blocks */
- ieee80211_ccmp_phase1(&ctx->rijndael, wh, pn,
+ ieee80211_ccmp_phase1(&ctx->aesctx, wh, pn,
n0->m_pkthdr.len - hdrlen, b, a, s0);
/* copy 802.11 header and clear protected bit */
memcpy(mtod(n0, caddr_t), wh, hdrlen);
wh = mtod(n0, struct ieee80211_frame *);
@@ -380,11 +380,11 @@ ieee80211_ccmp_decrypt(struct ieee80211com *ic, struct
mbuf *m0,
/* construct S_1 */
ctr = 1;
a[14] = ctr >> 8;
a[15] = ctr & 0xff;
- rijndael_encrypt(&ctx->rijndael, a, s);
+ AES_Encrypt(&ctx->aesctx, a, s);
/* decrypt frame body and compute MIC */
j = 0;
m = m0;
n = n0;
@@ -423,25 +423,25 @@ ieee80211_ccmp_decrypt(struct ieee80211com *ic, struct
mbuf *m0,
/* update MIC with clear text */
b[j] ^= dst[i];
if (++j < 16)
continue;
/* we have a full block, encrypt MIC */
- rijndael_encrypt(&ctx->rijndael, b, b);
+ AES_Encrypt(&ctx->aesctx, b, b);
/* construct a new S_ctr block */
ctr++;
a[14] = ctr >> 8;
a[15] = ctr & 0xff;
- rijndael_encrypt(&ctx->rijndael, a, s);
+ AES_Encrypt(&ctx->aesctx, a, s);
j = 0;
}
moff += len;
noff += len;
left -= len;
}
if (j != 0) /* partial block, encrypt MIC */
- rijndael_encrypt(&ctx->rijndael, b, b);
+ AES_Encrypt(&ctx->aesctx, b, b);
/* finalize MIC, U := T XOR first-M-bytes( S_0 ) */
for (i = 0; i < IEEE80211_CCMP_MICLEN; i++)
b[i] ^= s0[i];
--
2.12.2
