Compare commits

...
Author SHA1 Message Date
Ben Schermel d36033ed4b add fix for centos builds 2020-05-27 11:21:02 -04:00
John Sully 5438397822 Merge branch 'unstable' into RELEASE_6 2020-05-26 01:31:55 -04:00
John Sully 1fe7970d30 Bump version 2020-05-24 18:36:00 -04:00
2 changed files with 2 additions and 2 deletions

No files matched your search

+1 -1
View File
@@ -129,7 +129,7 @@ static void initCryptoLocks(void) {
return;
}
nlocks = CRYPTO_num_locks();
openssl_locks = zmalloc(sizeof(*openssl_locks) * nlocks);
openssl_locks = (pthread_mutex_t*)zmalloc(sizeof(*openssl_locks) * nlocks);
for (i = 0; i < nlocks; i++) {
pthread_mutex_init(openssl_locks + i, NULL);
}
+1 -1
View File
@@ -1,3 +1,3 @@
#define KEYDB_REAL_VERSION "0.0.0"
#define KEYDB_REAL_VERSION "6.0.8"
extern const char *KEYDB_SET_VERSION; // Unlike real version, this can be overriden by the config