X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fcrypto.c;h=3244a0b4628bdd2e6ddb6f49dbf1a0c30fab17ad;hb=be83b0af60449c7b35d17d97f2e6dc12f611e831;hp=b5309b0fee4d61092abf10f0fef2dcd2b471c288;hpb=b67296418c51784d39a24c3041e2cb199bee06f2;p=meshlink

diff --git a/src/crypto.c b/src/crypto.c
index b5309b0f..3244a0b4 100644
--- a/src/crypto.c
+++ b/src/crypto.c
@@ -28,6 +28,8 @@
 static int random_fd = -1;
 
 void crypto_init(void) {
+	assert(random_fd == -1);
+
 	random_fd = open("/dev/urandom", O_RDONLY);
 
 	if(random_fd < 0) {
@@ -41,12 +43,19 @@ void crypto_init(void) {
 }
 
 void crypto_exit(void) {
+	assert(random_fd != -1);
+
 	close(random_fd);
+	random_fd = -1;
 }
 
 void randomize(void *out, size_t outlen) {
+	assert(outlen);
+
+	char *ptr = out;
+
 	while(outlen) {
-		size_t len = read(random_fd, out, outlen);
+		size_t len = read(random_fd, ptr, outlen);
 
 		if(len <= 0) {
 			if(errno == EAGAIN || errno == EINTR) {
@@ -57,7 +66,7 @@ void randomize(void *out, size_t outlen) {
 			abort();
 		}
 
-		out += len;
+		ptr += len;
 		outlen -= len;
 	}
 }
@@ -79,6 +88,8 @@ void crypto_exit(void) {
 }
 
 void randomize(void *out, size_t outlen) {
+	assert(outlen);
+
 	if(!CryptGenRandom(prov, outlen, out)) {
 		fprintf(stderr, "CryptGenRandom() failed\n");
 		abort();