diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rwxr-xr-x | debian/rules | 7 | ||||
| -rw-r--r-- | src/utils.c | 15 |
3 files changed, 17 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index eeb6634..6d907bd 100644 --- a/configure.ac +++ b/configure.ac @@ -149,11 +149,7 @@ dnl Check for more secure randomization functions AC_CHECK_HEADERS([bsd/stdlib.h],, [random_enabled=yes]) AC_SEARCH_LIBS([arc4random], [bsd],,,) AC_CHECK_FUNCS([arc4random], [random_enabled=],) -if test x"${random_enabled}" != x; then - AC_CHECK_FUNCS([timespec_get srandom random], - [random_enabled=yes], - [random_enabled=]) -else +if test x"${random_enabled}" = x; then arc4random_enabled=yes fi diff --git a/debian/rules b/debian/rules index 2a24ea5..89a0767 100755 --- a/debian/rules +++ b/debian/rules @@ -8,4 +8,9 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) dh $@ --with autoreconf override_dh_auto_build: - dh_auto_build -- CFLAGS="-Wall $(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" + dh_auto_build -- CFLAGS="-Wall -Werror $(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" + +override_dh_auto_install: + dh_auto_install + install -D -m644 contrib/ptunnel-ng.conf debian/ptunnel-ng/etc/conf.d/ptunnel-ng + install -D -m644 contrib/ptunnel-ng.service debian/ptunnel-ng/etc/systemd/system/ptunnel-ng.service diff --git a/src/utils.c b/src/utils.c index bd3ea0e..5647d24 100644 --- a/src/utils.c +++ b/src/utils.c @@ -48,6 +48,8 @@ #endif #include <stdio.h> #include <stdlib.h> +#include <unistd.h> +#include <fcntl.h> #include <stdarg.h> #include <string.h> #include <time.h> @@ -59,6 +61,7 @@ #ifndef WIN32 #include <syslog.h> #include <sys/types.h> +#include <sys/stat.h> #include <sys/socket.h> #include <netdb.h> #include <netinet/in.h> @@ -161,11 +164,13 @@ int pt_random(void) { #ifndef TIME_UTC #define TIME_UTC 1 #endif - struct timespec ts; - - assert(timespec_get(&ts, TIME_UTC)); - srandom(ts.tv_nsec ^ ts.tv_sec); - return random(); + static int rng_fd = -1; + int rnd_val; + if (rng_fd < 0) + rng_fd = open("/dev/random", O_RDONLY); + assert(rng_fd >= 0); + assert( read(rng_fd, &rnd_val, sizeof rnd_val) == sizeof rnd_val ); + return rnd_val; #else srand(time(0)); return rand(); |