Merge pull request #153 from kaleb-himes/examples-update

resolve compiler warnings and remove executable from tracking
pull/155/head
David Garske 2019-05-24 13:14:02 -06:00 committed by GitHub
commit bf1b79a603
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions

View File

@ -282,7 +282,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 = NULL;
FILE* outFile = NULL; FILE* outFile = NULL;
const char* in; const char* in;
@ -333,7 +333,7 @@ int main(int argc, char** argv)
printf("Must have both input and output file"); printf("Must have both input and output file");
printf(": -i filename -o filename\n"); printf(": -i filename -o filename\n");
} }
else if (ret == 0 && choice != 'n') { else if (ret == 0 && choice != 'n' && inFile != NULL) {
key = malloc(size); /* sets size memory of key */ key = malloc(size); /* sets size memory of key */
ret = NoEcho((char*)key, size); ret = NoEcho((char*)key, size);
if (choice == 'e') if (choice == 'e')

View File

@ -268,11 +268,14 @@ exit:
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
int ret = 0; int ret = 0;
int fileLen; int fileLen = 0;
int verifyFileLen = 0;
byte* fileBuf = NULL; byte* fileBuf = NULL;
int verifyFileLen;
byte* verifyFileBuf = NULL; byte* verifyFileBuf = NULL;
const char* verify_file = NULL; const char* verify_file = NULL;
enum wc_SignatureType sig_type = WC_SIGNATURE_TYPE_NONE; enum wc_SignatureType sig_type = WC_SIGNATURE_TYPE_NONE;
enum wc_HashType hash_type = WC_HASH_TYPE_NONE; enum wc_HashType hash_type = WC_HASH_TYPE_NONE;

Binary file not shown.