public/libsxmp
public/libsxmp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

Core: SXT: libsodium dependency added;

Browse Source
This commit is contained in:
Alexander Vdolainen 2018-06-12 17:19:27 +03:00
parent a01dd93bb8
commit bd8069058e
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -55,6 +55,7 @@ dnl checking fpr dependencies
PKG_CHECK_MODULES(OPENSSL, [openssl])
PKG_CHECK_MODULES(LIBTDATA, [libtdata >= 0.2.2])
PKG_CHECK_MODULES(LIBSEXPR, [libsexpr >= 1.3.1])
PKG_CHECK_MODULES(LIBSODIUM, [libsodium >= 1.0.15])
PKG_CHECK_MODULES(LIBNDBUF, [libndbuf])
case $host_os in

2
sxt/Makefile.am
View File

@ -21,7 +21,7 @@ libsxt_la_SOURCES = \
libsxt_la_LDFLAGS =
libsxt_la_LIBADD = -lpthread -lcrypto $(OPENSSL_LIBS)
libsxt_la_LIBADD = -lpthread -lcrypto $(OPENSSL_LIBS) $(LIBSODIUM_LIBS)
if COND_WIN32

12
sxt/core.c
View File

@ -44,6 +44,7 @@
#include <uuid/uuid.h>
#endif
#include <sodium.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
@ -68,6 +69,8 @@ int sxt_init(void)
OpenSSL_add_all_algorithms();
if(sodium_init() == -1) return SXT_ERROR;
return lcrypt_init_ciphers();
}
@ -85,14 +88,7 @@ int sxt_reseed(void)
int sxt_get_random(void *data, int len, int pseudo)
{
if(pseudo) return RAND_bytes(data, len);
else {
#if OPENSSL_API_COMPAT < 0x10100000L
RAND_pseudo_bytes(data, len);
#else
RAND_bytes(data, len);
#endif
}
randombytes_buf(data, (size_t) len);
return 1;
}

9
sxt/lcrypt.c
View File

@ -29,6 +29,8 @@
#include <string.h>
#include <sys/time.h>
#include <sodium.h>
#include <openssl/aes.h>
#include <openssl/blowfish.h>
#include <openssl/rand.h>
@ -176,10 +178,7 @@ int lcrypt_init_ciphers(void)
/* misc */
int lcrypt_reseed(void)
{
#ifndef WIN32
struct timeval tv;
gettimeofday(&tv, NULL);
RAND_add(&tv, sizeof(struct timeval), 0.0);
#endif
randombytes_stir();
return SXT_SUCCESS;
}