From 3f82fb62a07308fb2a6caffad71ee88b62acd479 Mon Sep 17 00:00:00 2001
From: Go Hosohara <go@wolfssl.com>
Date: Wed, 4 Jul 2018 10:30:29 +0900
Subject: [PATCH] SSL_get_peer_cert_chain() count value check in api.c

---
 src/ssl.c                  | 5 +++--
 tests/api.c                | 3 +++
 wolfssl/wolfcrypt/memory.h | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index fc0c03189..624d6b634 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -30202,8 +30202,10 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
                 return NULL;
             }
             XMEMCPY(obj->obj, objBuf, obj->objSz);
-        } else /* static NAME_ENTR is for just type and grp */
+        } else {/* static NAME_ENTR is for just type and grp */
             obj->obj = NULL; 
+            obj->type = id;
+        }
 
         (void)type;
 
@@ -30584,7 +30586,6 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
         if (o == NULL) {
             return -1;
         }
-
         if ((id = GetObjectId(o->obj, &idx, &oid, o->grp, o->objSz)) < 0) {
             WOLFSSL_MSG("Issue getting OID of object");
             return -1;
diff --git a/tests/api.c b/tests/api.c
index e6e8e6552..f8dd99a3c 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -17690,6 +17690,9 @@ static void msg_cb(int write_p, int version, int content_type,
    !defined(NO_FILESYSTEM) && defined(DEBUG_WOLFSSL) && \
    defined(HAVE_IO_TESTS_DEPENDENCIES)
 #ifndef SINGLE_THREADED
+#if defined(SESSION_CERTS)
+#include "wolfssl/internal.h"
+#endif
 static int msgCb(SSL_CTX *ctx, SSL *ssl)
 {
     (void) ctx;
diff --git a/wolfssl/wolfcrypt/memory.h b/wolfssl/wolfcrypt/memory.h
index 47599bd6c..94ea1b019 100644
--- a/wolfssl/wolfcrypt/memory.h
+++ b/wolfssl/wolfcrypt/memory.h
@@ -107,6 +107,7 @@ WOLFSSL_API int wolfSSL_GetAllocators(wolfSSL_Malloc_cb*,
         #else
             /* having session certs enabled makes a 21k SSL struct */
             #define WOLFMEM_BUCKETS 64,128,256,512,1024,2432,3456,4544,21920
+            /* #define WOLFMEM_BUCKETS 64,128,256,512,1024,2432,3456,4544,23088 */
         #endif
     #endif
     #ifndef WOLFMEM_DIST