From 84ae9a9ae57ee06a4d25345bfdf1977ab9214655 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Thu, 31 Dec 2015 12:05:45 -0700
Subject: [PATCH 1/3] Also account for 32-bit users

---
 examples/client/client.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/examples/client/client.c b/examples/client/client.c
index d225da2ea..bbb9bcb8f 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -753,6 +753,14 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
             done = 1;
         #endif
 
+        /* www.globalsign.com only supports static RSA or ECDHE with AES */
+        /* We cannot expect users to have on static RSA so test for ECC only
+         * as some users will most likely be on 32-bit systems where ECC
+         * is not enabled by default */
+        #if defined(HAVE_OCSP) && !defined(HAVE_ECC)
+            done = 1;
+        #endif
+
         #ifndef NO_PSK
             done = 1;
         #endif

From 99539b88757e3895f22ffe8abed4a8dfb9159e85 Mon Sep 17 00:00:00 2001
From: toddouska <todd@wolfssl.com>
Date: Thu, 31 Dec 2015 11:19:47 -0800
Subject: [PATCH 2/3] fix aesni 192bit key expansion over read of 64bits

---
 wolfcrypt/src/aes_asm.asm | 2 +-
 wolfcrypt/src/aes_asm.s   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wolfcrypt/src/aes_asm.asm b/wolfcrypt/src/aes_asm.asm
index 921d89a73..5453d2e45 100644
--- a/wolfcrypt/src/aes_asm.asm
+++ b/wolfcrypt/src/aes_asm.asm
@@ -794,7 +794,7 @@ AES_192_Key_Expansion PROC
 	movdqa [rsp+0], xmm6
 
 	movdqu  xmm1,[rdi]
-	movdqu	xmm3,16[rdi]
+	movq	xmm3,qword ptr 16[rdi]
 	movdqa	[rsi],xmm1
 	movdqa	xmm5,xmm3
 
diff --git a/wolfcrypt/src/aes_asm.s b/wolfcrypt/src/aes_asm.s
index 92d670416..46f7e29e6 100644
--- a/wolfcrypt/src/aes_asm.s
+++ b/wolfcrypt/src/aes_asm.s
@@ -657,7 +657,7 @@ AES_192_Key_Expansion:
 # parameter 2: %rsi
 
 movdqu (%rdi), %xmm1
-movdqu 16(%rdi), %xmm3
+movq 16(%rdi), %xmm3
 movdqa %xmm1, (%rsi)
 movdqa %xmm3, %xmm5
 

From b78fb311bb0bd6a199a7cf1823287a5c32994533 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Thu, 31 Dec 2015 13:18:37 -0700
Subject: [PATCH 3/3] Fix cases that were not detected in Jenkins

---
 src/ssl.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/ssl.c b/src/ssl.c
index b00daae7f..f1cd2d4c1 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -17053,6 +17053,10 @@ int wolfSSL_EC25519_generate_key(unsigned char *priv, unsigned int *privSz,
 {
 #ifndef WOLFSSL_KEY_GEN
     WOLFSSL_MSG("No Key Gen built in");
+    (void) priv;
+    (void) privSz;
+    (void) pub;
+    (void) pubSz;
     return SSL_FAILURE;
 #else /* WOLFSSL_KEY_GEN */
     int ret = SSL_FAILURE;
@@ -17127,6 +17131,12 @@ int wolfSSL_EC25519_shared_key(unsigned char *shared, unsigned int *sharedSz,
 {
 #ifndef WOLFSSL_KEY_GEN
     WOLFSSL_MSG("No Key Gen built in");
+    (void) shared;
+    (void) sharedSz;
+    (void) priv;
+    (void) privSz;
+    (void) pub;
+    (void) pubSz;
     return SSL_FAILURE;
 #else /* WOLFSSL_KEY_GEN */
     int ret = SSL_FAILURE;