Merge pull request #371 from tmael/file_enc

Add AES GCM file encryptions

Author: dgarske

crypto/aes/Makefile

@@ -1,8 +1,8 @@
 CC=gcc
 CFLAGS=-Wall
-LIBS= -lwolfssl
+LIBS= -lwolfssl -lm
 
-all: aes-file-encrypt aescfb-file-encrypt aesctr-file-encrypt
+all: aes-file-encrypt aescfb-file-encrypt aesctr-file-encrypt aesgcm-file-encrypt
 
 aes-file-encrypt: aes-file-encrypt.o
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS) 
@@ -13,7 +13,10 @@ aescfb-file-encrypt: aescfb-file-encrypt.o
 aesctr-file-encrypt: aesctr-file-encrypt.o
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
 
+aesgcm-file-encrypt: aesgcm-file-encrypt.o
+	$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
+
 .PHONY: clean
 
 clean:
-	rm -f *.o aes-file-encrypt aescfb-file-encrypt aesctr-file-encrypt
+	rm -f *.o aes-file-encrypt aescfb-file-encrypt aesctr-file-encrypt aesgcm-file-encrypt text*

crypto/aes/aes-file-encrypt.c

@@ -22,13 +22,18 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <termios.h>
-#include <wolfssl/options.h>
+
+#ifndef WOLFSSL_USER_SETTINGS
+    #include <wolfssl/options.h>
+#endif
+#include <wolfssl/wolfcrypt/settings.h>
 #include <wolfssl/wolfcrypt/aes.h>
 #include <wolfssl/wolfcrypt/sha256.h>
 #include <wolfssl/wolfcrypt/random.h>
 #include <wolfssl/wolfcrypt/pwdbased.h>
 
 #if defined(HAVE_PBKDF2) && !defined(NO_PWDBASED)
+
 #define SALT_SIZE 8
 
 /*