salfter/infnoise
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

introduced environment variables INFOISE_SERIAL and INFNOISE_MULTIPLIER to inject settings via config file

Browse Source
This commit is contained in:
Manuel Domke
2017-12-31 18:55:46 +01:00
parent 81f1c15995
commit 8224bdb69a
4 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
software/infnoise.c
View File

@@ -11,6 +11,7 @@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <time.h>
#include <ftdi.h>
@@ -290,8 +291,8 @@ int main(int argc, char **argv)
xArg++;
opts.serial = argv[xArg];
if(opts.serial == NULL || !strcmp("",opts.serial)) {
opts.serial = NULL;
fputs("WARNING: --serial without value\n", stderr);
return 1;
}
} else if(!strcmp(argv[xArg], "--daemon")) {
opts.daemon = true;
@@ -314,6 +315,25 @@ int main(int argc, char **argv)
}
}
// read environment variables, not overriding command line options
if (opts.serial == NULL) {
if (getenv("INFNOISE_SERIAL") != NULL) {
opts.serial = getenv("INFNOISE_SERIAL");
}
}
if (multiplierAssigned == false) {
if (getenv("INFNOISE_MULTIPLIER") != NULL) {
int tmpOutputMult = atoi(getenv("INFNOISE_MULTIPLIER"));
if (tmpOutputMult < 0) {
fputs("Multiplier must be >= 0\n", stderr);
return 1;
}
multiplierAssigned = true;
opts.outputMultiplier = tmpOutputMult;
}
}
if(!multiplierAssigned && opts.devRandom) {
opts.outputMultiplier = 2u; // Don't throw away entropy when writing to /dev/random unless told to do so
}
@@ -322,6 +342,7 @@ int main(int argc, char **argv)
listUSBDevices(&ftdic);
return 0;
}
// Optionally run in the background and optionally write a PID-file
startDaemon(&opts);

4
software/init_scripts/infnoise.conf.systemd
View File

@@ -1,7 +1,7 @@
# systemd configuration file for the Infinite Noise TRNG
INFNOISE_MULTIPLIER=1
#INFNOISE_MULTIPLIER=1
# keccak multiplier, default = 1
INFNOISE_SERIAL=
#INFNOISE_SERIAL=
# serial number of device, default: ""

2
software/init_scripts/infnoise.service.bin
View File

@@ -7,7 +7,7 @@ After=dev-infnoise.device
EnvironmentFile=/etc/infnoise.conf
Type=forking
WorkingDirectory=/tmp
ExecStart=/usr/bin/infnoise --dev-random --daemon --pidfile /var/run/infnoise.pid --multiplier ${INFNOISE_MULTIPLIER} --serial ${INFNOISE_SERIAL}
ExecStart=/usr/sbin/infnoise --dev-random --daemon --pidfile /var/run/infnoise.pid
User=root
Group=root
Restart=always

2
software/init_scripts/infnoise.service.sbin
View File

@@ -7,7 +7,7 @@ After=dev-infnoise.device
EnvironmentFile=/etc/infnoise.conf
Type=forking
WorkingDirectory=/tmp
ExecStart=/usr/sbin/infnoise --dev-random --daemon --pidfile /var/run/infnoise.pid --multiplier ${INFNOISE_MULTIPLIER} --serial ${INFNOISE_SERIAL}
ExecStart=/usr/sbin/infnoise --dev-random --daemon --pidfile /var/run/infnoise.pid
User=root
Group=root
Restart=always