Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-15 01:49:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

encrypted FT works. Fixed last bugs in ftServer

Browse source
This commit is contained in:
mr-alice 2016-10-30 15:11:22 +01:00
parent 34dcb410b4
commit def20a3f4c
3 changed files with 48 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libretroshare/src/crypto/chacha20.cpp
View file

@ -24,6 +24,7 @@
*/
#include <stdexcept>
#include <stdint.h>
#include <assert.h>
#include <string>
#include <stdio.h>
#include <string.h>
@ -524,7 +525,7 @@ bool AEAD_chacha20_poly1305(uint8_t key[32], uint8_t nonce[12],uint8_t *data,uin
}
}
bool AEAD_chacha20_sha256(uint8_t key[32], uint8_t nonce[12], uint8_t *data, uint32_t data_size, uint8_t tag[16], bool encrypt)
bool AEAD_chacha20_sha256(uint8_t key[32], uint8_t nonce[12],uint8_t *data,uint32_t data_size,uint8_t *aad,uint32_t aad_size,uint8_t tag[16],bool encrypt)
{
// encrypt + tag. See RFC7539-2.8
@ -534,7 +535,16 @@ bool AEAD_chacha20_sha256(uint8_t key[32], uint8_t nonce[12], uint8_t *data, uin
uint8_t computed_tag[EVP_MAX_MD_SIZE];
unsigned int md_size ;
HMAC(EVP_sha256(),key,32,data,data_size,computed_tag,&md_size) ;
HMAC_CTX hmac_ctx ;
HMAC_CTX_init(&hmac_ctx) ;
HMAC_Init(&hmac_ctx,key,32,EVP_sha256()) ;
HMAC_Update(&hmac_ctx,aad,aad_size) ;
HMAC_Update(&hmac_ctx,data,data_size) ;
HMAC_Final(&hmac_ctx,computed_tag,&md_size) ;
assert(md_size >= 16);
memcpy(tag,computed_tag,16) ;
@ -544,7 +554,14 @@ bool AEAD_chacha20_sha256(uint8_t key[32], uint8_t nonce[12], uint8_t *data, uin
{
uint8_t computed_tag[EVP_MAX_MD_SIZE];
unsigned int md_size ;
HMAC(EVP_sha256(),key,32,data,data_size,computed_tag,&md_size) ;
HMAC_CTX hmac_ctx ;
HMAC_CTX_init(&hmac_ctx) ;
HMAC_Init(&hmac_ctx,key,32,EVP_sha256()) ;
HMAC_Update(&hmac_ctx,aad,aad_size) ;
HMAC_Update(&hmac_ctx,data,data_size) ;
HMAC_Final(&hmac_ctx,computed_tag,&md_size) ;
// decrypt
@ -1207,7 +1224,7 @@ bool perform_tests()
}
{
RsScopeTimer s("AEAD3") ;
AEAD_chacha20_sha256(key,nonce,ten_megabyte_data,SIZE,received_tag,true) ;
AEAD_chacha20_sha256(key,nonce,ten_megabyte_data,SIZE,aad,12,received_tag,true) ;
std::cerr << " AEAD/sha256 encryption speed : " << SIZE / (1024.0*1024.0) / s.duration() << " MB/s" << std::endl;
}

5
libretroshare/src/crypto/chacha20.h
View file

@ -81,13 +81,16 @@ namespace librs
* \param nonce nonce. *Should be unique* in order to make chacha20 stream cipher unique.
* \param data data that is encrypted/decrypted in place
* \param data_size size of data to encrypt/authenticate
* \param aad additional authenticated data. Can be used to authenticate the nonce.
* \param aad_size
* \param tag 16 bytes authentication tag result
* \param encrypt true to encrypt, false to decrypt and check the tag.
* \return
* always true for encryption.
* authentication result for decryption. data is *always* xored to the cipher stream whatever the authentication result is.
*/
bool AEAD_chacha20_sha256(uint8_t key[32], uint8_t nonce[12],uint8_t *data,uint32_t data_size,uint8_t tag[16],bool encrypt);
bool AEAD_chacha20_sha256(uint8_t key[32], uint8_t nonce[12],uint8_t *data,uint32_t data_size,uint8_t *aad,uint32_t aad_size,uint8_t tag[16],bool encrypt_or_decrypt) ;
/*!
* \brief constant_time_memcmp
* Provides a constant time comparison of two memory chunks. Calls CRYPTO_memcmp.