WolfSSL
/
wolfssl-examples
mirror of https://github.com/wolfSSL/wolfssl-examples.git
1
0
Fork 0
Code Issues Releases Wiki Activity

resolve merge conflicts

pull/109/head
kaleb-himes 2019-04-30 13:01:41 -06:00
parent ae7c43ce7e
commit 17ee6d51e6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crypto/aes/aes-file-encrypt.c
View File

@ -1,6 +1,6 @@
/* aes-file-encrypt.c /* aes-file-encrypt.c
* *
* Copyright (C) 2006-2015 wolfSSL Inc. * Copyright (C) 2006-2019 wolfSSL Inc.
* *
* This file is part of wolfSSL. (formerly known as CyaSSL) * This file is part of wolfSSL. (formerly known as CyaSSL)
* *
@ -31,7 +31,7 @@
#define SALT_SIZE 8 #define SALT_SIZE 8
/* /*
* Makes a cyptographically secure key by stretching a user entered key * Makes a cryptographically secure key by stretching a user entered key
*/ */
int GenerateKey(RNG* rng, byte* key, int size, byte* salt, int pad) int GenerateKey(RNG* rng, byte* key, int size, byte* salt, int pad)
{ {
@ -90,14 +90,14 @@ int AesEncrypt(Aes* aes, byte* key, int size, FILE* inFile, FILE* outFile)
return -1030; return -1030;
} }
/* reads from inFile and wrties whatever is there to the input array */ /* reads from inFile and writes whatever is there to the input array */
ret = fread(input, 1, inputLength, inFile); ret = fread(input, 1, inputLength, inFile);
if (ret == 0) { if (ret == 0) {
printf("Input file does not exist.\n"); printf("Input file does not exist.\n");
return -1010; return -1010;
} }
for (i = inputLength; i < length; i++) { for (i = inputLength; i < length; i++) {
/* padds the added characters with the number of pads */ /* pads the added characters with the number of pads */
input[i] = padCounter; input[i] = padCounter;
} }
@ -115,7 +115,7 @@ int AesEncrypt(Aes* aes, byte* key, int size, FILE* inFile, FILE* outFile)
if (ret != 0) if (ret != 0)
return -1001; return -1001;
/* encrypts the message to the ouput based on input length + padding */ /* encrypts the message to the output based on input length + padding */
ret = wc_AesCbcEncrypt(aes, output, input, length); ret = wc_AesCbcEncrypt(aes, output, input, length);
if (ret != 0) if (ret != 0)
return -1005; return -1005;
@ -140,7 +140,7 @@ int AesEncrypt(Aes* aes, byte* key, int size, FILE* inFile, FILE* outFile)
} }
/* /*
* Decryptsr a file using AES * Decrypts a file using AES
*/ */
int AesDecrypt(Aes* aes, byte* key, int size, FILE* inFile, FILE* outFile) int AesDecrypt(Aes* aes, byte* key, int size, FILE* inFile, FILE* outFile)
{ {
@ -165,7 +165,7 @@ int AesDecrypt(Aes* aes, byte* key, int size, FILE* inFile, FILE* outFile)
wc_InitRng(&rng); wc_InitRng(&rng);
/* reads from inFile and wrties whatever is there to the input array */ /* reads from inFile and writes whatever is there to the input array */
ret = fread(input, 1, length, inFile); ret = fread(input, 1, length, inFile);
if (ret == 0) { if (ret == 0) {
printf("Input file does not exist.\n"); printf("Input file does not exist.\n");
@ -236,7 +236,7 @@ void help()
} }
/* /*
* temporarily deisables echoing in terminal for secure key input * temporarily disables echoing in terminal for secure key input
*/ */
int NoEcho(char* key, int size) int NoEcho(char* key, int size)
{ {
@ -283,7 +283,7 @@ int main(int argc, char** argv)
Aes aes; Aes aes;
byte* key; /* user entered key */ byte* key; /* user entered key */
FILE* inFile; FILE* inFile;
FILE* outFile; FILE* outFile = NULL;
const char* in; const char* in;
const char* out; const char* out;