github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-20 13:33:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify and finish GMAC Key Generation

Browse source
This commit is contained in:
Florian Märkl 2019-04-04 22:02:41 +02:00
commit 8c158815e7
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
2 changed files with 41 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/include/chiaki/gkcrypt.h
View file

@ -40,7 +40,7 @@ typedef struct chiaki_gkcrypt_t {
uint8_t key_base[CHIAKI_GKCRYPT_BLOCK_SIZE]; uint8_t key_base[CHIAKI_GKCRYPT_BLOCK_SIZE];
uint8_t key_gmac_base[CHIAKI_GKCRYPT_BLOCK_SIZE]; uint8_t key_gmac_base[CHIAKI_GKCRYPT_BLOCK_SIZE];
uint8_t key_gmac_current[CHIAKI_GKCRYPT_BLOCK_SIZE]; uint8_t key_gmac_current[CHIAKI_GKCRYPT_BLOCK_SIZE];
uint64_t key_gmac_index_next; uint64_t key_gmac_index_current;
ChiakiLog *log; ChiakiLog *log;
} ChiakiGKCrypt; } ChiakiGKCrypt;
@ -53,6 +53,7 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_gkcrypt_decrypt(ChiakiGKCrypt *gkcrypt, siz
static inline ChiakiErrorCode chiaki_gkcrypt_encrypt(ChiakiGKCrypt *gkcrypt, size_t key_pos, uint8_t *buf, size_t buf_size) { return chiaki_gkcrypt_decrypt(gkcrypt, key_pos, buf, buf_size); } static inline ChiakiErrorCode chiaki_gkcrypt_encrypt(ChiakiGKCrypt *gkcrypt, size_t key_pos, uint8_t *buf, size_t buf_size) { return chiaki_gkcrypt_decrypt(gkcrypt, key_pos, buf, buf_size); }
CHIAKI_EXPORT void chiaki_gkcrypt_gen_gmac_key(uint64_t index, const uint8_t *key_base, const uint8_t *iv, uint8_t *key_out); CHIAKI_EXPORT void chiaki_gkcrypt_gen_gmac_key(uint64_t index, const uint8_t *key_base, const uint8_t *iv, uint8_t *key_out);
CHIAKI_EXPORT void chiaki_gkcrypt_gen_new_gmac_key(ChiakiGKCrypt *gkcrypt, uint64_t index); CHIAKI_EXPORT void chiaki_gkcrypt_gen_new_gmac_key(ChiakiGKCrypt *gkcrypt, uint64_t index);
CHIAKI_EXPORT void chiaki_gkcrypt_gen_tmp_gmac_key(ChiakiGKCrypt *gkcrypt, uint64_t index, uint8_t *key_out);
CHIAKI_EXPORT ChiakiErrorCode chiaki_gkcrypt_gmac(ChiakiGKCrypt *gkcrypt, size_t key_pos, const uint8_t *buf, size_t buf_size, uint8_t *gmac_out); CHIAKI_EXPORT ChiakiErrorCode chiaki_gkcrypt_gmac(ChiakiGKCrypt *gkcrypt, size_t key_pos, const uint8_t *buf, size_t buf_size, uint8_t *gmac_out);
static inline ChiakiGKCrypt *chiaki_gkcrypt_new(ChiakiLog *log, size_t key_buf_blocks, uint8_t index, const uint8_t *handshake_key, const uint8_t *ecdh_secret) static inline ChiakiGKCrypt *chiaki_gkcrypt_new(ChiakiLog *log, size_t key_buf_blocks, uint8_t index, const uint8_t *handshake_key, const uint8_t *ecdh_secret)

60
lib/src/gkcrypt.c
View file

@ -48,7 +48,7 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_gkcrypt_init(ChiakiGKCrypt *gkcrypt, Chiaki
} }
chiaki_gkcrypt_gen_gmac_key(0, gkcrypt->key_base, gkcrypt->iv, gkcrypt->key_gmac_base); chiaki_gkcrypt_gen_gmac_key(0, gkcrypt->key_base, gkcrypt->iv, gkcrypt->key_gmac_base);
gkcrypt->key_gmac_index_next = 1; gkcrypt->key_gmac_index_current = 0;
memcpy(gkcrypt->key_gmac_current, gkcrypt->key_gmac_base, sizeof(gkcrypt->key_gmac_current)); memcpy(gkcrypt->key_gmac_current, gkcrypt->key_gmac_base, sizeof(gkcrypt->key_gmac_current));
return CHIAKI_ERR_SUCCESS; return CHIAKI_ERR_SUCCESS;
@ -111,7 +111,14 @@ CHIAKI_EXPORT void chiaki_gkcrypt_gen_gmac_key(uint64_t index, const uint8_t *ke
CHIAKI_EXPORT void chiaki_gkcrypt_gen_new_gmac_key(ChiakiGKCrypt *gkcrypt, uint64_t index) CHIAKI_EXPORT void chiaki_gkcrypt_gen_new_gmac_key(ChiakiGKCrypt *gkcrypt, uint64_t index)
{ {
assert(index > 0);
chiaki_gkcrypt_gen_gmac_key(index, gkcrypt->key_gmac_base, gkcrypt->iv, gkcrypt->key_gmac_current); chiaki_gkcrypt_gen_gmac_key(index, gkcrypt->key_gmac_base, gkcrypt->iv, gkcrypt->key_gmac_current);
gkcrypt->key_gmac_index_current = index;
}
CHIAKI_EXPORT void chiaki_gkcrypt_gen_tmp_gmac_key(ChiakiGKCrypt *gkcrypt, uint64_t index, uint8_t *key_out)
{
chiaki_gkcrypt_gen_gmac_key(index, index ? gkcrypt->key_gmac_base : gkcrypt->key_base, gkcrypt->iv, key_out);
} }
CHIAKI_EXPORT ChiakiErrorCode chiaki_gkcrypt_gen_key_stream(ChiakiGKCrypt *gkcrypt, size_t key_pos, uint8_t *buf, size_t buf_size) CHIAKI_EXPORT ChiakiErrorCode chiaki_gkcrypt_gen_key_stream(ChiakiGKCrypt *gkcrypt, size_t key_pos, uint8_t *buf, size_t buf_size)
@ -179,56 +186,67 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_gkcrypt_gmac(ChiakiGKCrypt *gkcrypt, size_t
uint8_t iv[CHIAKI_GKCRYPT_BLOCK_SIZE]; uint8_t iv[CHIAKI_GKCRYPT_BLOCK_SIZE];
counter_add(iv, gkcrypt->iv, key_pos / 0x10); counter_add(iv, gkcrypt->iv, key_pos / 0x10);
if(key_pos > gkcrypt->key_gmac_index_next * CHIAKI_GKCRYPT_GMAC_KEY_REFRESH_KEY_POS) uint8_t *gmac_key = gkcrypt->key_gmac_current;
uint8_t gmac_key_tmp[CHIAKI_GKCRYPT_BLOCK_SIZE];
uint64_t key_index = key_pos / CHIAKI_GKCRYPT_GMAC_KEY_REFRESH_KEY_POS;
if(key_index > gkcrypt->key_gmac_index_current)
{ {
uint64_t key_index_new = key_pos / CHIAKI_GKCRYPT_GMAC_KEY_REFRESH_KEY_POS; chiaki_gkcrypt_gen_new_gmac_key(gkcrypt, key_index);
chiaki_gkcrypt_gen_new_gmac_key(gkcrypt, key_index_new); }
gkcrypt->key_gmac_index_next = key_index_new+1; else if(key_pos < gkcrypt->key_gmac_index_current)
{
chiaki_gkcrypt_gen_tmp_gmac_key(gkcrypt, key_index, gmac_key_tmp);
gmac_key = gmac_key_tmp;
} }
// TODO: key_pos smaller than current index ChiakiErrorCode ret = CHIAKI_ERR_SUCCESS;
EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
if(!ctx) if(!ctx)
return CHIAKI_ERR_MEMORY; {
ret = CHIAKI_ERR_MEMORY;
goto fail;
}
if(!EVP_CipherInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL, 1)) if(!EVP_CipherInit_ex(ctx, EVP_aes_128_gcm(), NULL, NULL, NULL, 1))
{ {
EVP_CIPHER_CTX_free(ctx); ret = CHIAKI_ERR_UNKNOWN;
return CHIAKI_ERR_UNKNOWN; goto fail_cipher;
} }
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, CHIAKI_GKCRYPT_BLOCK_SIZE, NULL)) if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, CHIAKI_GKCRYPT_BLOCK_SIZE, NULL))
{ {
EVP_CIPHER_CTX_free(ctx); ret = CHIAKI_ERR_UNKNOWN;
return CHIAKI_ERR_UNKNOWN; goto fail_cipher;
} }
if(!EVP_CipherInit_ex(ctx, NULL, NULL, gkcrypt->key_gmac_current, iv, 1)) if(!EVP_CipherInit_ex(ctx, NULL, NULL, gmac_key, iv, 1))
{ {
EVP_CIPHER_CTX_free(ctx); ret = CHIAKI_ERR_UNKNOWN;
return CHIAKI_ERR_UNKNOWN; goto fail_cipher;
} }
int len; int len;
if(!EVP_EncryptUpdate(ctx, NULL, &len, buf, (int)buf_size)) if(!EVP_EncryptUpdate(ctx, NULL, &len, buf, (int)buf_size))
{ {
EVP_CIPHER_CTX_free(ctx); ret = CHIAKI_ERR_UNKNOWN;
return CHIAKI_ERR_UNKNOWN; goto fail_cipher;
} }
if(!EVP_EncryptFinal_ex(ctx, NULL, &len)) if(!EVP_EncryptFinal_ex(ctx, NULL, &len))
{ {
EVP_CIPHER_CTX_free(ctx); ret = CHIAKI_ERR_UNKNOWN;
return CHIAKI_ERR_UNKNOWN; goto fail_cipher;
} }
if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG, CHIAKI_GKCRYPT_GMAC_SIZE, gmac_out)) if(!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG, CHIAKI_GKCRYPT_GMAC_SIZE, gmac_out))
{ {
EVP_CIPHER_CTX_free(ctx); ret = CHIAKI_ERR_UNKNOWN;
return CHIAKI_ERR_UNKNOWN; goto fail_cipher;
} }
fail_cipher:
EVP_CIPHER_CTX_free(ctx); EVP_CIPHER_CTX_free(ctx);
return CHIAKI_ERR_SUCCESS; fail:
return ret;
} }