Merge pull request #413 from dgarske/cryptocb_hmac

Improve TLS crypto callback examples

Author: SparkiDev

.gitignore

@@ -73,13 +73,15 @@ android/wolfssljni-ndk-sample/proguard-project.txt
 /psk/server-psk
 /psk/server-tcp
 
+/tls/client-async
 /tls/client-tcp
 /tls/client-tls
 /tls/client-tls13
 /tls/client-tls13-resume
 /tls/client-tls-bio
 /tls/client-tls-cacb
 /tls/client-tls-callback
+/tls/client-tls-cryptocb
 /tls/client-tls-ecdhe
 /tls/client-tls-nonblocking
 /tls/client-tls-perf
@@ -89,10 +91,12 @@ android/wolfssljni-ndk-sample/proguard-project.txt
 
 /tls/memory-tls
 
+/tls/server-async
 /tls/server-tcp
 /tls/server-tls
 /tls/server-tls13
 /tls/server-tls-callback
+/tls/server-tls-cryptocb
 /tls/server-tls-ecdhe
 /tls/server-tls-epoll-perf
 /tls/server-tls-epoll-threaded

tls/Makefile

@@ -10,6 +10,7 @@ STATIC_LIB      = $(LIB_PATH)/lib/libwolfssl.a
 DEBUG_FLAGS     = -g -DDEBUG
 DEBUG_INC_PATHS = -MD
 OPTIMIZE        = -Os
+DEPS            =
 
 # Options
 #CFLAGS+=$(DEBUG_FLAGS)
@@ -19,9 +20,14 @@ CFLAGS+=$(OPTIMIZE)
 #LIBS+=$(STATIC_LIB)
 LIBS+=$(DYN_LIB)
 
+# Openssl Option
+#CFLAGS+=-DUSE_OPENSSL
+#LIBS+=-lcrypto
+
 # build targets
 SRC=$(wildcard *.c)
-TARGETS=$(patsubst %.c, %, $(SRC))
+IGNORE_FILES=cryptocb-common
+TARGETS=$(filter-out $(IGNORE_FILES), $(patsubst %.c, %, $(SRC)))
 LINUX_SPECIFIC=client-tls-perf \
                server-tls-poll-perf \
                server-tls-epoll-perf \
@@ -97,9 +103,11 @@ memory-tls: CFLAGS+=-pthread
 # compile tcp examples without the LIBS variable
 %-tcp: LIBS=
 
+%-cryptocb: DEPS+=cryptocb-common.c
+
 # build template
 %: %.c
-	$(CC) -o $@ $< $(CFLAGS) $(LIBS)
+	$(CC) -o $@ $(DEPS) $< $(CFLAGS) $(LIBS)
 
 clean:
 	rm -f $(TARGETS)

tls/client-tls-cacb.c

@@ -97,7 +97,7 @@ static void CaCb(unsigned char* der, int sz, int type)
         }
 
         ret = wolfSSL_X509_get_serial_number(x509, serial, &sz);
-        if (ret == SSL_SUCCESS) {
+        if (ret == WOLFSSL_SUCCESS) {
             int  i;
             int  strLen;
             char serialMsg[80];
@@ -134,28 +134,28 @@ int Security(int sock)
     /* create and initialize WOLFSSL_CTX structure */
     if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == NULL) {
         printf("SSL_CTX_new error.\n");
-        ret = EXIT_FAILURE;  
+        ret = EXIT_FAILURE;
         goto exit;
     }
 
     /* set callback for action when CA's are added */
     wolfSSL_CTX_SetCACb(ctx, CaCb);
 
     /* load CA certificates into wolfSSL_CTX. which will verify the server */
-    if ((ret = wolfSSL_CTX_load_verify_locations(ctx, cert, 0)) 
+    if ((ret = wolfSSL_CTX_load_verify_locations(ctx, cert, 0))
             != WOLFSSL_SUCCESS) {
         printf("Error loading %s. Please check the file.\n", cert);
         goto exit;
     }
     if ((ssl = wolfSSL_new(ctx)) == NULL) {
         printf("wolfSSL_new error.\n");
-        ret = EXIT_FAILURE; 
+        ret = EXIT_FAILURE;
         goto exit;
     }
     wolfSSL_set_fd(ssl, sock);
 
     ret = wolfSSL_connect(ssl);
-    if (ret == SSL_SUCCESS) {
+    if (ret == WOLFSSL_SUCCESS) {
         ret = ClientGreet(sock, ssl);
     }
 
@@ -190,7 +190,7 @@ int main(int argc, char** argv)
 
     if (sockfd < 0) {
         printf("Failed to create socket. Error: %i\n", errno);
-        ret = EXIT_FAILURE; 
+        ret = EXIT_FAILURE;
         goto exit;
     }