diff --git a/src/ssl.c b/src/ssl.c
index f4fe18be6..b70765246 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -24983,17 +24983,15 @@ int wolfSSL_version(WOLFSSL* ssl)
     return WOLFSSL_FAILURE;
 }
 
-
-WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_get_peer_cert_chain(const WOLFSSL* ssl)
+STACK_OF(WOLFSSL_X509)* wolfSSL_get_peer_cert_chain(const WOLFSSL* ssl)
 {
-    (void)ssl;
     WOLFSSL_ENTER("wolfSSL_get_peer_cert_chain");
-    WOLFSSL_STUB("wolfSSL_get_peer_cert_chain");
-
-    return NULL;
+    if (ssl == NULL)
+        return NULL;
+    else
+        return (STACK_OF(WOLFSSL_X509)* )&ssl->session.chain;
 }
 
-
 WOLFSSL_CTX* wolfSSL_get_SSL_CTX(WOLFSSL* ssl)
 {
     WOLFSSL_ENTER("wolfSSL_get_SSL_CTX");
@@ -26403,7 +26401,7 @@ int wolfSSL_set_msg_callback_arg(WOLFSSL *ssl, void* arg)
 {
     WOLFSSL_ENTER("wolfSSL_set_msg_callback_arg");
     ssl->protoMsgCtx = arg;
-    return SSL_FAILURE;
+    return SSL_SUCCESS;
 }
 
 #endif