Merge pull request #6402 from mieko/unstable

Seed SipHash with 128-bit key
This commit is contained in:
Salvatore Sanfilippo 2019-09-25 18:03:39 +02:00 committed by GitHub
commit f6cf08e582
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4788,9 +4788,9 @@ int main(int argc, char **argv) {
srand(time(NULL)^getpid()); srand(time(NULL)^getpid());
gettimeofday(&tv,NULL); gettimeofday(&tv,NULL);
char hashseed[16]; uint8_t hashseed[16];
getRandomHexChars(hashseed,sizeof(hashseed)); getRandomBytes(hashseed,sizeof(hashseed));
dictSetHashFunctionSeed((uint8_t*)hashseed); dictSetHashFunctionSeed(hashseed);
server.sentinel_mode = checkForSentinelMode(argc,argv); server.sentinel_mode = checkForSentinelMode(argc,argv);
initServerConfig(); initServerConfig();
ACLInit(); /* The ACL subsystem must be initialized ASAP because the ACLInit(); /* The ACL subsystem must be initialized ASAP because the