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

Cleanup for chunk processing. Fix makefile error with lib.

pull/229/head
David Garske 2020-09-28 10:39:22 -07:00
parent 096f157b22
commit 97fbb5eaa2
3 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -22,7 +22,6 @@
*.x86_64 *.x86_64
*.hex *.hex
*app *app
*run
# IDE Temp Files # IDE Temp Files
**/*.swp **/*.swp
@ -211,3 +210,5 @@ embedded/tls-sock-server-ca
embedded/tls-sock-threaded embedded/tls-sock-threaded
embedded/tls-threaded embedded/tls-threaded
server-tls-verifycallback server-tls-verifycallback
hash/sha256-hash

4
hash/Makefile
View File

@ -1,5 +1,5 @@
CC := gcc -fsanitize=address CC := gcc -fsanitize=address
program_NAME := run program_NAME := sha256-hash
program_C_SRCS := $(wildcard *.c) program_C_SRCS := $(wildcard *.c)
program_CXX_SRCS := $(wildcard *.cpp) program_CXX_SRCS := $(wildcard *.cpp)
program_C_OBJS := ${program_C_SRCS:.c=.o} program_C_OBJS := ${program_C_SRCS:.c=.o}
@ -9,7 +9,7 @@ program_INCLUDE_DIRS :=
program_LIBRARY_DIRS := program_LIBRARY_DIRS :=
program_LIBRARIES := program_LIBRARIES :=
WOLF_INSTALL_DIR := /usr/local/lib WOLF_INSTALL_DIR := /usr/local
program_INCLUDE_DIRS += $(WOLF_INSTALL_DIR)/include program_INCLUDE_DIRS += $(WOLF_INSTALL_DIR)/include
program_INCLUDE_DIRS += ./include program_INCLUDE_DIRS += ./include
program_LIBRARY_DIRS += $(WOLF_INSTALL_DIR)/lib program_LIBRARY_DIRS += $(WOLF_INSTALL_DIR)/lib

65
hash/sha256-hash.c
View File

@ -20,16 +20,22 @@
*/ */
#ifndef WOLFSSL_USER_SETTINGS
#include <wolfssl/options.h> #include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/settings.h>
#include <wolfssl/ssl.h> #include <wolfssl/ssl.h>
#include <wolfssl/wolfcrypt/sha256.h> #include <wolfssl/wolfcrypt/sha256.h>
#include <wolfssl/wolfcrypt/error-crypt.h>
#ifndef CHUNK_SIZE
#define CHUNK_SIZE 1024 #define CHUNK_SIZE 1024
#endif
#ifndef NO_SHA256 #ifndef NO_SHA256
void usage(void) void usage(void)
{ {
printf("./run <file to hash>\n"); printf("./sha256-hash <file to hash>\n");
exit(-99); exit(-99);
} }
#endif #endif
@ -40,12 +46,11 @@ int main(int argc, char** argv)
#ifndef NO_SHA256 #ifndef NO_SHA256
wc_Sha256 sha256; wc_Sha256 sha256;
byte hash[WC_SHA256_DIGEST_SIZE]; byte hash[WC_SHA256_DIGEST_SIZE];
byte* rawInput; byte rawInput[CHUNK_SIZE];
FILE* inputStream; FILE* inputStream;
char* fName = NULL; char* fName = NULL;
int numBytes = 0;
int fileLength = 0; int fileLength = 0;
int i, numberOfChunks, excess, currChunkSz; int i, chunkSz;
if (argc < 2) if (argc < 2)
usage(); usage();
@ -63,56 +68,38 @@ int main(int argc, char** argv)
fileLength = (int) ftell(inputStream); fileLength = (int) ftell(inputStream);
fseek(inputStream, 0, SEEK_SET); fseek(inputStream, 0, SEEK_SET);
/* determine numberOfChunks per file */
numberOfChunks = fileLength / CHUNK_SIZE;
excess = fileLength % CHUNK_SIZE;
/* allocate buffer based on CHUNK_SIZE size */
rawInput = (byte*) XMALLOC(CHUNK_SIZE*sizeof(byte), NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if (rawInput == NULL) {
printf("Failed to allocate buffer for reading chunks into\n");
return -2;
}
ret = wc_InitSha256(&sha256); ret = wc_InitSha256(&sha256);
if (ret != 0) { if (ret != 0) {
printf("Failed to initialize sha structure\n"); printf("Failed to initialize sha structure\n");
fclose(inputStream); fclose(inputStream);
XFREE(rawInput, NULL, DYNAMIC_TYPE_TMP_BUFFER);
} }
if (fileLength > CHUNK_SIZE)
currChunkSz = CHUNK_SIZE;
else
currChunkSz = excess;
/* Loop reading a block at a time, finishing with any excess */ /* Loop reading a block at a time, finishing with any excess */
for (i = 0; i < fileLength; i += currChunkSz) { for (i = 0; i < fileLength; i += CHUNK_SIZE) {
chunkSz = CHUNK_SIZE;
if (chunkSz > fileLength - i)
chunkSz = fileLength - i;
XMEMSET(rawInput, 0, CHUNK_SIZE); ret = fread(rawInput, 1, chunkSz, inputStream);
if (ret != chunkSz) {
numBytes = fread(rawInput, 1, CHUNK_SIZE, inputStream);
if (numBytes != CHUNK_SIZE && numBytes != excess) {
printf("ERROR: Failed to read the appropriate amount\n"); printf("ERROR: Failed to read the appropriate amount\n");
fclose(inputStream); ret = -1;
XFREE(rawInput, NULL, DYNAMIC_TYPE_TMP_BUFFER); break;
return -2;
} }
ret = wc_Sha256Update(&sha256, rawInput, numBytes); ret = wc_Sha256Update(&sha256, rawInput, chunkSz);
if (ret != 0) { if (ret != 0) {
printf("Failed to update the hash\n"); printf("Failed to update the hash\n");
fclose(inputStream); break;
XFREE(rawInput, NULL, DYNAMIC_TYPE_TMP_BUFFER);
} }
currChunkSz = ((fileLength - i) >= CHUNK_SIZE) ? CHUNK_SIZE:excess;
} }
ret = wc_Sha256Final(&sha256, hash); if (ret == 0) {
ret = wc_Sha256Final(&sha256, hash);
if (ret != 0) }
if (ret != 0) {
printf("ERROR: Hash operation failed"); printf("ERROR: Hash operation failed");
}
else { else {
printf("Hash result is: "); printf("Hash result is: ");
for (i = 0; i < WC_SHA256_DIGEST_SIZE; i++) for (i = 0; i < WC_SHA256_DIGEST_SIZE; i++)
@ -121,9 +108,9 @@ int main(int argc, char** argv)
} }
fclose(inputStream); fclose(inputStream);
XFREE(rawInput, NULL, DYNAMIC_TYPE_TMP_BUFFER); wc_Sha256Free(&sha256);
#else #else
printf("Please enable sha256 and then try again\n"); printf("Please enable sha256 (--enable-sha256) in wolfCrypt\n");
#endif #endif
return ret; return ret;
} }