timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix random issue: increase random seed precision to micro sec

Browse source 
- previously the random seed was seconds based, and it could originate identical identity keys for different OlmAccount
This commit is contained in:
pedroGitt 2016-10-27 11:44:33 +02:00
parent 6204fcd128
commit 31f8fe23c5
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp
View file

@ -19,6 +19,7 @@
#include "olm_jni_helper.h" #include "olm_jni_helper.h"
#include "olm/olm.h" #include "olm/olm.h"
#include <sys/time.h>
using namespace AndroidOlmSdk; using namespace AndroidOlmSdk;
@ -31,6 +32,8 @@ using namespace AndroidOlmSdk;
bool setRandomInBuffer(uint8_t **aBuffer2Ptr, size_t aRandomSize) bool setRandomInBuffer(uint8_t **aBuffer2Ptr, size_t aRandomSize)
{ {
bool retCode = false; bool retCode = false;
struct timeval timeValue;
if(NULL == aBuffer2Ptr) if(NULL == aBuffer2Ptr)
{ {
LOGE("## setRandomInBuffer(): failure - aBuffer=NULL"); LOGE("## setRandomInBuffer(): failure - aBuffer=NULL");
@ -47,10 +50,14 @@ bool setRandomInBuffer(uint8_t **aBuffer2Ptr, size_t aRandomSize)
{ {
LOGD("## setRandomInBuffer(): randomSize=%lu",static_cast<long unsigned int>(aRandomSize)); LOGD("## setRandomInBuffer(): randomSize=%lu",static_cast<long unsigned int>(aRandomSize));
srand(time(NULL)); // init seed gettimeofday(&timeValue, NULL);
srand(timeValue.tv_usec); // init seed
for(size_t i=0;i<aRandomSize;i++) for(size_t i=0;i<aRandomSize;i++)
{ {
(*aBuffer2Ptr)[i] = (uint8_t)(rand()%ACCOUNT_CREATION_RANDOM_MODULO); (*aBuffer2Ptr)[i] = (uint8_t)(rand()%ACCOUNT_CREATION_RANDOM_MODULO);
// debug purpose
//LOGD("## setRandomInBuffer(): randomBuffPtr[%ld]=%d",i, (*aBuffer2Ptr)[i]);
} }
retCode = true; retCode = true;