fix rebase miss

This commit is contained in:
Takashi Kojo
2017-11-24 08:21:27 +09:00
parent fce1b90b63
commit a320ca92fb
2 changed files with 3 additions and 2 deletions

View File

@@ -5874,13 +5874,13 @@ int wolfSSL_CertManagerDisableOCSPStapling(WOLFSSL_CERT_MANAGER* cm)
return ret; return ret;
} }
#if defined(SESSION_CERTS) #if defined(SESSION_CERTS)
STACK_OF(WOLFSSL_X509)* wolfSSL_get_peer_cert_chain(const WOLFSSL* ssl) WOLF_STACK_OF(WOLFSSL_X509)* wolfSSL_get_peer_cert_chain(const WOLFSSL* ssl)
{ {
WOLFSSL_ENTER("wolfSSL_get_peer_cert_chain"); WOLFSSL_ENTER("wolfSSL_get_peer_cert_chain");
if ((ssl == NULL) || (ssl->session.chain.count == 0)) if ((ssl == NULL) || (ssl->session.chain.count == 0))
return NULL; return NULL;
else else
return (STACK_OF(WOLFSSL_X509)* )&ssl->session.chain; return (WOLF_STACK_OF(WOLFSSL_X509)* )&ssl->session.chain;
} }
#endif #endif
#ifdef HAVE_OCSP #ifdef HAVE_OCSP

View File

@@ -160,6 +160,7 @@
#if defined(OPENSSL_EXTRA) && defined(WOLFCRYPT_HAVE_SRP) \ #if defined(OPENSSL_EXTRA) && defined(WOLFCRYPT_HAVE_SRP) \
&& !defined(NO_SHA256) && !defined(RC_NO_RNG) && !defined(NO_SHA256) && !defined(RC_NO_RNG)
#include <wolfssl/wolfcrypt/srp.h> #include <wolfssl/wolfcrypt/srp.h>
#endif
#if defined(SESSION_CERTS) #if defined(SESSION_CERTS)
#include "wolfssl/internal.h" /* for testing SSL_get_peer_cert_chain */ #include "wolfssl/internal.h" /* for testing SSL_get_peer_cert_chain */