Commit 075222ad authored by manastasova's avatar manastasova
Browse files

Update CatKDF and CasKDF Combiners

parent 4dc60091

README.md

+2 −2
Changes for README.md: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
## TS 103 744 Quantum-safe Hybrid Key Exchanges ##



 Informative reference implementation as reported in Annex C of ETSI TS 103 744,

 Informative reference implementation as reported in Annex D of ETSI TS 103 744,

 "CYBER; Quantum-safe Hybrid Key Exchanges. The code is not intended for production use.

 It is intended to be a reference implementation for test.
@@ -16,7 +16,7 @@ 
  

 ### Build instructions ###

 

This library requires OpenSSL version 1.1.1d libcrypto.

This library requires OpenSSL version 3.x.x libcrypto.

 

     gcc -Wall -o etsi-hkex-test main.c qshkex.c -lcrypto

     ./etsi-hkex-test

main.c

+1816 −494

File changed.

Preview size limit exceeded, changes collapsed.

qshkex.c

+459 −45

File changed.

Preview size limit exceeded, changes collapsed.

qshkex.h

+37 −4
Changes for qshkex.h: 37 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -26,18 +26,51 @@ 
#define MAX_SECRETS_BYTE_LEN      256

#define MAX_KEY_MATERIAL_BYTE_LEN 128



#define MAX_BUFFER_SIZE             4096

#define MAX_LABEL_BYTE_LEN          64

#define MAX_KEY_BYTE_LEN            128

#define MAX_LABEL_LEN               32

#define KMAC128_OUT_BYTE_LENGTH     32

#define KMAC256_OUT_BYTE_LENGTH     48

#define MAX_MSG_BYTE_LEN            8192



void print_array(const char *label, const uint8_t *array, const uint32_t alength);

void ascii_hex_strings_to_uint8(uint8_t *array, uint32_t *alength, const uint32_t scount, ...);



int hkex_concat_hkdf(const EVP_MD *md_type, uint8_t *key_material, const uint32_t klength, const uint8_t *psk,

                const uint32_t plength, const uint8_t *k1, const uint32_t k1length, const uint8_t *k2,

                const uint32_t k2length, const uint8_t *MA, const uint32_t malength, const uint8_t *MB,

                const uint32_t mblength, const uint8_t *info, const uint32_t ilength, const uint8_t *label,

                const uint32_t llength);



int hkex_concat_hmac(const EVP_MD *md_type, uint8_t *key_material, const uint32_t klength, const uint8_t *psk,

                const uint32_t plength, const uint8_t *k1, const uint32_t k1length, const uint8_t *k2,

                const uint32_t k2length, const uint8_t *MA, const uint32_t malength, const uint8_t *MB,

                const uint32_t mblength, const uint8_t *info, const uint32_t ilength, const uint8_t *label,

                const uint32_t llength);



int hkex_concat(const EVP_MD *md_type, uint8_t *key_material, const uint32_t klength, const uint8_t *psk,

int hkex_concat_kmac(const char *kmac, uint8_t *key_material, const uint32_t klength, const uint8_t *psk,

                const uint32_t plength, const uint8_t *k1, const uint32_t k1length, const uint8_t *k2,

                const uint32_t k2length, const uint8_t *MA, const uint32_t malength, const uint8_t *MB,

                const uint32_t mblength, const uint8_t *context, const uint32_t clength, const uint8_t *label,

                const uint32_t mblength, const uint8_t *info, const uint32_t ilength, const uint8_t *label,

                const uint32_t llength);



int hkex_cascade(const EVP_MD *md_type, uint8_t *chain_secret, const uint32_t cslength, uint8_t *key_material,

int hkex_cascade_hkdf(const EVP_MD *md_type, uint8_t *chain_secret, const uint32_t cslength, uint8_t *key_material,

                const uint32_t klength, const uint8_t *previous_chain_secret, const uint32_t pcslength,

                const uint8_t *ki, const uint32_t kilength, const uint8_t *MAi, const uint32_t mailength,

                const uint8_t *MBi, const uint32_t mbilength, const uint8_t *infoi, const uint32_t iilength,

                const uint8_t *labeli, const uint32_t lilength);



int hkex_cascade_hmac(const EVP_MD *md_type, uint8_t *chain_secret, const uint32_t cslength, uint8_t *key_material,

                const uint32_t klength, const uint8_t *previous_chain_secret, const uint32_t pcslength,

                const uint8_t *ki, const uint32_t kilength, const uint8_t *MAi, const uint32_t mailength,

                const uint8_t *MBi, const uint32_t mbilength, const uint8_t *infoi, const uint32_t iilength,

                const uint8_t *labeli, const uint32_t lilength);



int hkex_cascade_kmac(const char *kmac, uint8_t *chain_secret, const uint32_t cslength, uint8_t *key_material,

                const uint32_t klength, const uint8_t *previous_chain_secret, const uint32_t pcslength,

                const uint8_t *ki, const uint32_t kilength, const uint8_t *MAi, const uint32_t mailength,

                 const uint8_t *MBi, const uint32_t mbilength, const uint8_t *contexti, const uint32_t cilength,

                const uint8_t *MBi, const uint32_t mbilength, const uint8_t *infoi, const uint32_t iilength,

                const uint8_t *labeli, const uint32_t lilength);



#endif /*_QS_H_KEX_H_*/