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

Merge pull request #72 from 13-37-org/master

Browse Source 
optimzed buffer sized and error handling for --list-devices
This commit is contained in:
Manuel Domke
2018-09-10 17:34:01 +02:00
committed by GitHub
parent 738c915ab9 08976a6288
commit 228bafdfd9
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
software/Makefile.linux
View File

@@ -38,7 +38,7 @@ libinfnoise.a: libinfnoise.o healthcheck.o KeccakF-1600-reference.o writeentropy
# shared lib
libinfnoise.so: libinfnoise.o healthcheck.o KeccakF-1600-reference.o writeentropy.o
$(CC) $(CFLAGS) -fvisibility=hidden -o libinfnoise.so libinfnoise.o healthcheck.o KeccakF-1600-reference.o writeentropy.o -Wl,--version-script=libinfnoise.version $(FTDI) -lm -shared
$(CC) $(CFLAGS) -fvisibility=hidden -o libinfnoise.so libinfnoise.o healthcheck.o KeccakF-1600-reference.o writeentropy.o -Wl,--version-script=libinfnoise.version $(FTDI) -lm -shared
libs: libinfnoise.a

6
software/infnoise.c
View File

@@ -268,10 +268,8 @@ int main(int argc, char **argv) {
// calculate output size based on the parameters:
uint64_t resultSize;
if (opts.outputMultiplier <= 1 || opts.raw) {
resultSize = 32u;
} else if (opts.outputMultiplier==2) {
resultSize=64;
if (opts.outputMultiplier <= 2 || opts.raw) {
resultSize = 64u;
} else {
resultSize = 128u;
}

16
software/libinfnoise.c
View File

@@ -141,8 +141,14 @@ uint32_t processBytes(uint8_t *bytes, uint8_t *result, uint32_t *entropy,
// we instantly recover (reseed) from a state compromise, which is when an attacker
// gets a snapshot of the keccak state. BUFLEN must be a multiple of 64, since
// Keccak-1600 uses 64-bit "lanes".
uint8_t resultSize;
if (outputMultiplier <= 2) {
resultSize = 64u;
} else {
resultSize = 128u;
}
uint8_t dataOut[1024u];
uint8_t dataOut[resultSize];
KeccakAbsorb(keccakState, bytes, BUFLEN / 64u);
if (outputMultiplier == 0u) {
@@ -170,7 +176,7 @@ uint32_t processBytes(uint8_t *bytes, uint8_t *result, uint32_t *entropy,
KeccakPermutation(keccakState);
*bytesWritten = bytesToWrite;
*numBits -= bytesToWrite * 8u;
}
}
return *bytesWritten;
}
@@ -203,6 +209,7 @@ devlist_node listUSBDevices(char **message) {
} else {
*message = "Can't find Infinite Noise Multiplier.";
}
return NULL;
}
devlist_node return_list = malloc(sizeof(struct infnoise_devlist_node));
devlist_node current_entry = return_list;
@@ -212,11 +219,10 @@ devlist_node listUSBDevices(char **message) {
if (rc < 0) {
if (!isSuperUser()) {
*message = "Can't find Infinite Noise Multiplier. Try running as super user?";
return NULL;
} else {
//todo: *message = "ftdi_usb_get_strings failed: %d (%s)\n", rc, ftdi_get_error_string(&ftdic));
return NULL;
sprintf(*message, "ftdi_usb_get_strings failed: %d (%s)", rc, ftdi_get_error_string(&ftdic));
}
return NULL;
}
current_entry->id = i;
strcpy(current_entry->serial, serial);