Skip to content

Commit

Permalink
Fix AES_CTR32_BUNDLE and update C files in gcc-compatible/
Browse files Browse the repository at this point in the history
  • Loading branch information
@mamonet
mamonet committed May 29, 2024
1 parent b6568ae commit f5a7543
Show file tree
Hide file tree
Showing 8 changed files with 176 additions and 112 deletions.
2 changes: 1 addition & 1 deletion Makefile.common
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ BIGNUM_BUNDLE= \
-bundle Hacl.Bignum.Base,Hacl.Bignum.Addition,Hacl.Bignum.Convert,Hacl.Bignum.Lib,Hacl.Bignum.Multiplication[rename=Hacl_Bignum_Base] \
-static-header Hacl.Bignum.Base,Hacl.Bignum.Addition,Hacl.Bignum.Convert,Hacl.Bignum.Lib,Hacl.Bignum.Multiplication \
-bundle Hacl.Bignum,Hacl.Bignum.*[rename=Hacl_Bignum]
AES_CTR32_BUNDLE=-bundle Hacl.AES_128.CTR32.NI=Hacl.Impl.AES.* -bundle Hacl.AES_256.CTR32.NI
AES_CTR32_BUNDLE=-bundle Hacl.AES_128.CTR32.NI=Hacl.Impl.AES.* -bundle Hacl.AES_256.CTR32.NI=Hacl.Impl.AES.*

# 3. OCaml

Expand Down
92 changes: 46 additions & 46 deletions dist/gcc-compatible/Hacl_AES_128_CTR32_NI.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,31 @@

#include "Hacl_AES_128_CTR32_NI.h"

inline void
/**
Allocate AES-128 context buffer using malloc for key expansion and nonce
*/
Lib_IntVector_Intrinsics_vec128 *Hacl_AES_128_CTR32_NI_context_malloc(void)
{
Lib_IntVector_Intrinsics_vec128
*buf =
(Lib_IntVector_Intrinsics_vec128 *)KRML_ALIGNED_MALLOC(16,
sizeof (Lib_IntVector_Intrinsics_vec128) * 12U);
memset(buf, 0U, 12U * sizeof (Lib_IntVector_Intrinsics_vec128));
return buf;
}

/**
Free AES-128 context buffer
*/
void Hacl_AES_128_CTR32_NI_context_free(Lib_IntVector_Intrinsics_vec128 *s)
{
KRML_ALIGNED_FREE(s);
}

/**
Initiate AES-128 context buffer with key expansion and nonce
*/
void
Hacl_AES_128_CTR32_NI_aes128_init(
Lib_IntVector_Intrinsics_vec128 *ctx,
uint8_t *key,
Expand Down Expand Up @@ -241,7 +265,10 @@ Hacl_AES_128_CTR32_NI_aes128_init(
next[0U] = Lib_IntVector_Intrinsics_vec128_xor(key48, next[0U]);
}

inline void
/**
Set nonce in AES-128 context buffer
*/
void
Hacl_AES_128_CTR32_NI_aes128_set_nonce(Lib_IntVector_Intrinsics_vec128 *ctx, uint8_t *nonce)
{
Lib_IntVector_Intrinsics_vec128 *n = ctx;
Expand All @@ -250,50 +277,14 @@ Hacl_AES_128_CTR32_NI_aes128_set_nonce(Lib_IntVector_Intrinsics_vec128 *ctx, uin
n[0U] = Lib_IntVector_Intrinsics_vec128_load128_le(nb);
}

inline void
Hacl_AES_128_CTR32_NI_aes128_key_block(
uint8_t *kb,
Lib_IntVector_Intrinsics_vec128 *ctx,
uint32_t counter
)
{
Lib_IntVector_Intrinsics_vec128 *kex = ctx + 1U;
Lib_IntVector_Intrinsics_vec128 *n = ctx;
KRML_PRE_ALIGN(16) Lib_IntVector_Intrinsics_vec128 st[4U] KRML_POST_ALIGN(16) = { 0U };
uint32_t counter0 = htobe32(counter);
uint32_t counter1 = htobe32(counter + 1U);
uint32_t counter2 = htobe32(counter + 2U);
uint32_t counter3 = htobe32(counter + 3U);
Lib_IntVector_Intrinsics_vec128 nonce0 = n[0U];
st[0U] = Lib_IntVector_Intrinsics_vec128_insert32(nonce0, counter0, 3U);
st[1U] = Lib_IntVector_Intrinsics_vec128_insert32(nonce0, counter1, 3U);
st[2U] = Lib_IntVector_Intrinsics_vec128_insert32(nonce0, counter2, 3U);
st[3U] = Lib_IntVector_Intrinsics_vec128_insert32(nonce0, counter3, 3U);
uint32_t klen = 1U;
Lib_IntVector_Intrinsics_vec128 *k0 = kex;
Lib_IntVector_Intrinsics_vec128 *kr = kex + klen;
Lib_IntVector_Intrinsics_vec128 *kn = kex + 10U * klen;
st[0U] = Lib_IntVector_Intrinsics_vec128_xor(st[0U], k0[0U]);
st[1U] = Lib_IntVector_Intrinsics_vec128_xor(st[1U], k0[0U]);
st[2U] = Lib_IntVector_Intrinsics_vec128_xor(st[2U], k0[0U]);
st[3U] = Lib_IntVector_Intrinsics_vec128_xor(st[3U], k0[0U]);
KRML_MAYBE_FOR9(i,
0U,
9U,
1U,
Lib_IntVector_Intrinsics_vec128 *k = kr + i * 1U;
st[0U] = Lib_IntVector_Intrinsics_ni_aes_enc(k[0U], st[0U]);
st[1U] = Lib_IntVector_Intrinsics_ni_aes_enc(k[0U], st[1U]);
st[2U] = Lib_IntVector_Intrinsics_ni_aes_enc(k[0U], st[2U]);
st[3U] = Lib_IntVector_Intrinsics_ni_aes_enc(k[0U], st[3U]););
st[0U] = Lib_IntVector_Intrinsics_ni_aes_enc_last(kn[0U], st[0U]);
st[1U] = Lib_IntVector_Intrinsics_ni_aes_enc_last(kn[0U], st[1U]);
st[2U] = Lib_IntVector_Intrinsics_ni_aes_enc_last(kn[0U], st[2U]);
st[3U] = Lib_IntVector_Intrinsics_ni_aes_enc_last(kn[0U], st[3U]);
Lib_IntVector_Intrinsics_vec128_store128_le(kb, st[0U]);
}
/**
Initiate AES-CTR32-128 context with key and nonce, and
inline void
encrypt number of bytes in AES-CTR32 mode.
`counter` is the initial value of counter state.
*/
void
Hacl_AES_128_CTR32_NI_aes128_ctr_encrypt(
uint32_t len,
uint8_t *out,
Expand Down Expand Up @@ -618,7 +609,16 @@ Hacl_AES_128_CTR32_NI_aes128_ctr_encrypt(
}
}

inline void
/**
Initiate AES-CTR32-128 context with key and nonce, and
decrypt number of bytes in AES-CTR32 mode.
`counter` is the initial value of counter state.
Decryption uses the forward version of AES cipher
*/
void
Hacl_AES_128_CTR32_NI_aes128_ctr_decrypt(
uint32_t len,
uint8_t *out,
Expand Down
37 changes: 31 additions & 6 deletions dist/gcc-compatible/Hacl_AES_128_CTR32_NI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,39 @@ typedef Lib_IntVector_Intrinsics_vec128 *Hacl_AES_128_CTR32_NI_aes_ctx;

typedef uint8_t *Hacl_AES_128_CTR32_NI_skey;

/**
Allocate AES-128 context buffer using malloc for key expansion and nonce
*/
Lib_IntVector_Intrinsics_vec128 *Hacl_AES_128_CTR32_NI_context_malloc(void);

/**
Free AES-128 context buffer
*/
void Hacl_AES_128_CTR32_NI_context_free(Lib_IntVector_Intrinsics_vec128 *s);

/**
Initiate AES-128 context buffer with key expansion and nonce
*/
void
Hacl_AES_128_CTR32_NI_aes128_init(
Lib_IntVector_Intrinsics_vec128 *ctx,
uint8_t *key,
uint8_t *nonce
);

/**
Set nonce in AES-128 context buffer
*/
void
Hacl_AES_128_CTR32_NI_aes128_set_nonce(Lib_IntVector_Intrinsics_vec128 *ctx, uint8_t *nonce);

void
Hacl_AES_128_CTR32_NI_aes128_key_block(
uint8_t *kb,
Lib_IntVector_Intrinsics_vec128 *ctx,
uint32_t counter
);
/**
Initiate AES-CTR32-128 context with key and nonce, and
encrypt number of bytes in AES-CTR32 mode.
`counter` is the initial value of counter state.
*/
void
Hacl_AES_128_CTR32_NI_aes128_ctr_encrypt(
uint32_t len,
Expand All @@ -68,6 +84,15 @@ Hacl_AES_128_CTR32_NI_aes128_ctr_encrypt(
uint32_t c
);

/**
Initiate AES-CTR32-128 context with key and nonce, and
decrypt number of bytes in AES-CTR32 mode.
`counter` is the initial value of counter state.
Decryption uses the forward version of AES cipher
*/
void
Hacl_AES_128_CTR32_NI_aes128_ctr_decrypt(
uint32_t len,
Expand Down
101 changes: 54 additions & 47 deletions dist/gcc-compatible/Hacl_AES_256_CTR32_NI.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,31 @@

#include "Hacl_AES_256_CTR32_NI.h"

inline void
/**
Allocate AES-256 context buffer using malloc for key expansion and nonce
*/
Lib_IntVector_Intrinsics_vec128 *Hacl_AES_256_CTR32_NI_context_malloc(void)
{
Lib_IntVector_Intrinsics_vec128
*buf =
(Lib_IntVector_Intrinsics_vec128 *)KRML_ALIGNED_MALLOC(16,
sizeof (Lib_IntVector_Intrinsics_vec128) * 16U);
memset(buf, 0U, 16U * sizeof (Lib_IntVector_Intrinsics_vec128));
return buf;
}

/**
Free AES-256 context buffer
*/
void Hacl_AES_256_CTR32_NI_context_free(Lib_IntVector_Intrinsics_vec128 *s)
{
KRML_ALIGNED_FREE(s);
}

/**
Initiate AES-256 context buffer with key expansion and nonce
*/
void
Hacl_AES_256_CTR32_NI_aes256_init(
Lib_IntVector_Intrinsics_vec128 *ctx,
uint8_t *key,
Expand Down Expand Up @@ -299,7 +323,10 @@ Hacl_AES_256_CTR32_NI_aes256_init(
next0[0U] = Lib_IntVector_Intrinsics_vec128_xor(key411, next0[0U]);
}

inline void
/**
Set nonce in AES-256 context buffer
*/
void
Hacl_AES_256_CTR32_NI_aes256_set_nonce(Lib_IntVector_Intrinsics_vec128 *ctx, uint8_t *nonce)
{
Lib_IntVector_Intrinsics_vec128 *n = ctx;
Expand All @@ -308,50 +335,14 @@ Hacl_AES_256_CTR32_NI_aes256_set_nonce(Lib_IntVector_Intrinsics_vec128 *ctx, uin
n[0U] = Lib_IntVector_Intrinsics_vec128_load128_le(nb);
}

inline void
Hacl_AES_256_CTR32_NI_aes256_key_block(
uint8_t *kb,
Lib_IntVector_Intrinsics_vec128 *ctx,
uint32_t counter
)
{
Lib_IntVector_Intrinsics_vec128 *kex = ctx + 1U;
Lib_IntVector_Intrinsics_vec128 *n = ctx;
KRML_PRE_ALIGN(16) Lib_IntVector_Intrinsics_vec128 st[4U] KRML_POST_ALIGN(16) = { 0U };
uint32_t counter0 = htobe32(counter);
uint32_t counter1 = htobe32(counter + 1U);
uint32_t counter2 = htobe32(counter + 2U);
uint32_t counter3 = htobe32(counter + 3U);
Lib_IntVector_Intrinsics_vec128 nonce0 = n[0U];
st[0U] = Lib_IntVector_Intrinsics_vec128_insert32(nonce0, counter0, 3U);
st[1U] = Lib_IntVector_Intrinsics_vec128_insert32(nonce0, counter1, 3U);
st[2U] = Lib_IntVector_Intrinsics_vec128_insert32(nonce0, counter2, 3U);
st[3U] = Lib_IntVector_Intrinsics_vec128_insert32(nonce0, counter3, 3U);
uint32_t klen = 1U;
Lib_IntVector_Intrinsics_vec128 *k0 = kex;
Lib_IntVector_Intrinsics_vec128 *kr = kex + klen;
Lib_IntVector_Intrinsics_vec128 *kn = kex + 14U * klen;
st[0U] = Lib_IntVector_Intrinsics_vec128_xor(st[0U], k0[0U]);
st[1U] = Lib_IntVector_Intrinsics_vec128_xor(st[1U], k0[0U]);
st[2U] = Lib_IntVector_Intrinsics_vec128_xor(st[2U], k0[0U]);
st[3U] = Lib_IntVector_Intrinsics_vec128_xor(st[3U], k0[0U]);
KRML_MAYBE_FOR13(i,
0U,
13U,
1U,
Lib_IntVector_Intrinsics_vec128 *k = kr + i * 1U;
st[0U] = Lib_IntVector_Intrinsics_ni_aes_enc(k[0U], st[0U]);
st[1U] = Lib_IntVector_Intrinsics_ni_aes_enc(k[0U], st[1U]);
st[2U] = Lib_IntVector_Intrinsics_ni_aes_enc(k[0U], st[2U]);
st[3U] = Lib_IntVector_Intrinsics_ni_aes_enc(k[0U], st[3U]););
st[0U] = Lib_IntVector_Intrinsics_ni_aes_enc_last(kn[0U], st[0U]);
st[1U] = Lib_IntVector_Intrinsics_ni_aes_enc_last(kn[0U], st[1U]);
st[2U] = Lib_IntVector_Intrinsics_ni_aes_enc_last(kn[0U], st[2U]);
st[3U] = Lib_IntVector_Intrinsics_ni_aes_enc_last(kn[0U], st[3U]);
Lib_IntVector_Intrinsics_vec128_store128_le(kb, st[0U]);
}
/**
Process number of bytes in AES-CTR32 mode.
inline void
Given that `ctx` is initiated with AES-256 key and nonce, and
`counter` is the initial value of counter state.
*/
void
Hacl_AES_256_CTR32_NI_aes256_ctr(
uint32_t len,
uint8_t *out,
Expand Down Expand Up @@ -468,7 +459,14 @@ Hacl_AES_256_CTR32_NI_aes256_ctr(
}
}

inline void
/**
Initiate AES-CTR32-256 context with key and nonce, and
encrypt number of bytes in AES-CTR32 mode.
`counter` is the initial value of counter state.
*/
void
Hacl_AES_256_CTR32_NI_aes256_ctr_encrypt(
uint32_t len,
uint8_t *out,
Expand Down Expand Up @@ -851,7 +849,16 @@ Hacl_AES_256_CTR32_NI_aes256_ctr_encrypt(
}
}

inline void
/**
Initiate AES-CTR32-256 context with key and nonce, and
decrypt number of bytes in AES-CTR32 mode.
`counter` is the initial value of counter state.
Decryption uses the forward version of AES cipher
*/
void
Hacl_AES_256_CTR32_NI_aes256_ctr_decrypt(
uint32_t len,
uint8_t *out,
Expand Down
Loading

0 comments on commit f5a7543

Please sign in to comment.