diff options
| -rw-r--r-- | util/nanoapp_encr/nanoapp_encr.c | 8 | ||||
| -rw-r--r-- | util/nanoapp_sign/nanoapp_sign.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/util/nanoapp_encr/nanoapp_encr.c b/util/nanoapp_encr/nanoapp_encr.c index 94ee818b..b92ece5e 100644 --- a/util/nanoapp_encr/nanoapp_encr.c +++ b/util/nanoapp_encr/nanoapp_encr.c @@ -146,10 +146,10 @@ int main(int argc, char **argv) fwrite(iv + i, 4, 1, stdout); //encrypt and emit data - _aesCbcInitForEncr(&ctx, key, iv); //todo + aesCbcInitForEncr(&ctx, key, iv); //todo for (i = 0; i < inputLen / sizeof(uint32_t); i += AES_BLOCK_WORDS) { uint32_t out[AES_BLOCK_WORDS]; - _aesCbcEncr(&ctx, inputData + i, out); + aesCbcEncr(&ctx, inputData + i, out); for (j = 0; j < AES_BLOCK_WORDS; j++) fwrite(out + j, 4, 1, stdout); } @@ -198,10 +198,10 @@ int main(int argc, char **argv) fprintf(stderr, "'\n"); //decrypt and emit data - _aesCbcInitForDecr(&ctx, key, iv); //todo + aesCbcInitForDecr(&ctx, key, iv); //todo for (i = 0; i < (inputLen - 32)/ sizeof(uint32_t); i += AES_BLOCK_WORDS) { uint32_t out[AES_BLOCK_WORDS]; - _aesCbcDecr(&ctx, inputData + i + 8, out); + aesCbcDecr(&ctx, inputData + i + 8, out); for (j = 0; j < AES_BLOCK_WORDS; j++) { uint32_t now = origLen >= 4 ? 4 : origLen; fwrite(out + j, now, 1, stdout); diff --git a/util/nanoapp_sign/nanoapp_sign.c b/util/nanoapp_sign/nanoapp_sign.c index 0a6661b6..65edc9ec 100644 --- a/util/nanoapp_sign/nanoapp_sign.c +++ b/util/nanoapp_sign/nanoapp_sign.c @@ -225,7 +225,7 @@ int main(int argc, char **argv) } //do rsa op - rsaResult = _rsaPubOp(&rsaState, rsanum, modulus); + rsaResult = rsaPubOp(&rsaState, rsanum, modulus); //update the user if (verbose) { @@ -294,17 +294,17 @@ int main(int argc, char **argv) } //hash input - _sha2init(&shaState); + sha2init(&shaState); fprintf(stderr, "Reading data to sign..."); while ((c = getchar()) != EOF) { //this is slow but our data is small, so deal with it! uint8_t byte = c; - _sha2processBytes(&shaState, &byte, 1); + sha2processBytes(&shaState, &byte, 1); fileSz++; } fprintf(stderr, " read %llu bytes\n", (unsigned long long)fileSz); //update the user on the progress - hash = _sha2finish(&shaState); + hash = sha2finish(&shaState); if (verbose) { fprintf(stderr, "SHA2 hash: 0x"); for (i = 0; i < 8; i++) @@ -332,7 +332,7 @@ int main(int argc, char **argv) //do the RSA thing fprintf(stderr, "Retriculating splines..."); - rsaResult = _rsaPrivOp(&rsaState, rsanum, exponent, modulus); + rsaResult = rsaPrivOp(&rsaState, rsanum, exponent, modulus); fprintf(stderr, "DONE\n"); //update the user |