Remove unrequired bytesWritten

software/libinfnoise.c

@@ -41,7 +41,6 @@ bool initInfnoise(struct infnoise_context *context, char *serial, bool keccak, b
     context->entropyThisTime=0;
     context->errorFlag=false;
     context->keccakBytesGiven=0;
-    context->bytesWritten=0;
 
     prepareOutputBuffer();
 
@@ -292,7 +291,7 @@ bool initializeUSB(struct ftdi_context *ftdic, const char **message, char *seria
 // This allows a user to generate hundreds of MiB per second if needed, for use
 // as cryptographic keys.
 uint32_t processBytes(uint8_t *bytes, uint8_t *result, uint32_t *entropy,
-                      uint32_t *bytesGiven, uint32_t *bytesWritten,
+                      uint32_t *bytesGiven,
                       bool raw, uint32_t outputMultiplier) {
     //Use the lower of the measured entropy and the provable lower bound on
     //average entropy.
@@ -337,7 +336,6 @@ uint32_t processBytes(uint8_t *bytes, uint8_t *result, uint32_t *entropy,
     // only the first 1024 now,
     if (*bytesGiven == 0u) {
         *bytesGiven = outputMultiplier*256u / 8u;
-        *bytesWritten = 0u;
 
         // Output up to 1024 bits at a time.
         uint32_t bytesToWrite = 1024u / 8u;
@@ -347,9 +345,8 @@ uint32_t processBytes(uint8_t *bytes, uint8_t *result, uint32_t *entropy,
 
         KeccakExtract(keccakState, result, bytesToWrite / 8u);
         KeccakPermutation(keccakState);
-        *bytesWritten = bytesToWrite;
         *bytesGiven -= bytesToWrite;
-        return *bytesWritten;
+        return bytesToWrite;
     }
     return 0;
 }
@@ -369,7 +366,6 @@ uint32_t readData(struct infnoise_context *context, uint8_t *result, bool raw, u
         KeccakExtract(keccakState, result, bytesToWrite / 8u);
         KeccakPermutation(keccakState);
 
-        context->bytesWritten += bytesToWrite;
         context->keccakBytesGiven -= bytesToWrite;
         return bytesToWrite;
     } else { // collect new entropy
@@ -403,7 +399,7 @@ uint32_t readData(struct infnoise_context *context, uint8_t *result, bool raw, u
             }
             // call health check and return bytes if OK
             if (inmHealthCheckOkToUseData() && inmEntropyOnTarget(context->entropyThisTime, BUFLEN)) {
-                return processBytes(bytes, result, &context->entropyThisTime, &context->keccakBytesGiven, &context->bytesWritten,
+                return processBytes(bytes, result, &context->entropyThisTime, &context->keccakBytesGiven,
                 raw, outputMultiplier);
             }
         }

software/libinfnoise.h

@@ -25,7 +25,6 @@ struct infnoise_context {
 
     // used in multiplier mode to keep track of bytes to be put out
     uint32_t keccakBytesGiven;
-    uint32_t bytesWritten;
 };
 
 typedef struct _infnoise_devlist_node_t infnoise_devlist_node_t;