wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 19:54:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

templates wolfSSL_ctrl and wolfSSL_CTX_ctrl

Browse Source
This commit is contained in:
Jacob Barthelmeh
2016-11-11 14:41:00 -07:00
parent 79472e11a1
commit 5f3fa171cd
4 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ssl.c
View File

@@ -5684,6 +5684,27 @@ int wolfSSL_CTX_SetTmpDH_file(WOLFSSL_CTX* ctx, const char* fname, int format)
#ifdef OPENSSL_EXTRA
/* put SSL type in extra for now, not very common */
long wolfSSL_ctrl(WOLFSSL* ssl, int cmd, long opt, void* pt)
{
WOLFSSL_STUB("wolfSSL_ctrl");
(void)ssl;
(void)cmd;
(void)opt;
(void)pt;
return SSL_FAILURE;
}
long wolfSSL_CTX_ctrl(WOLFSSL_CTX* ctx, int cmd, long opt, void* pt)
{
WOLFSSL_STUB("wolfSSL_CTX_ctrl");
(void)ctx;
(void)cmd;
(void)opt;
(void)pt;
return SSL_FAILURE;
}
#ifndef NO_CERTS
int wolfSSL_check_private_key(const WOLFSSL* ssl)
{

17
tests/api.c
View File

@@ -2268,8 +2268,10 @@ static void test_wolfSSL_certs(void)
AssertNotNull(x509);
AssertIntEQ(SSL_use_certificate(ssl, x509), SSL_SUCCESS);
#ifndef HAVE_USER_RSA
/* with loading in a new cert the check on private key should now fail */
AssertIntNE(wolfSSL_check_private_key(ssl), SSL_SUCCESS);
#endif
#if defined(USE_CERT_BUFFERS_2048)
@@ -2294,6 +2296,20 @@ static void test_wolfSSL_certs(void)
#endif /* defined(OPENSSL_EXTRA) && !defined(NO_CERTS) */
}
static void test_wolfSSL_ctrl(void)
{
#if defined(OPENSSL_EXTRA)
printf(testingFmt, "wolfSSL_crtl()");
/* needs tested after stubs filled out @TODO
SSL_ctrl
SSL_CTX_ctrl
*/
printf(resultFmt, passed);
#endif /* defined(OPENSSL_EXTRA) */
}
/*----------------------------------------------------------------------------*
| Main
*----------------------------------------------------------------------------*/
@@ -2341,6 +2357,7 @@ void ApiTest(void)
/* compatibility tests */
test_wolfSSL_DES();
test_wolfSSL_certs();
test_wolfSSL_ctrl();
AssertIntEQ(test_wolfSSL_Cleanup(), SSL_SUCCESS);
printf(" End API Tests\n");

3
wolfssl/openssl/ssl.h
View File

@@ -574,6 +574,9 @@ typedef WOLFSSL_X509_NAME_ENTRY X509_NAME_ENTRY;
#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG 64
#define SSL_ctrl wolfSSL_ctrl
#define SSL_CTX_ctrl wolfSSL_CTX_ctrl
#ifdef HAVE_STUNNEL
#include <wolfssl/openssl/asn1.h>

2
wolfssl/ssl.h
View File

@@ -1892,6 +1892,8 @@ WOLFSSL_API char* wolfSSL_ASN1_TIME_to_string(WOLFSSL_ASN1_TIME* time,
#endif /* WOLFSSL_MYSQL_COMPATIBLE */
#ifdef OPENSSL_EXTRA
WOLFSSL_API long wolfSSL_ctrl(WOLFSSL* ssl, int cmd, long opt, void* pt);
WOLFSSL_API long wolfSSL_CTX_ctrl(WOLFSSL_CTX* ctx, int cmd, long opt,void* pt);
#ifndef NO_CERTS
WOLFSSL_API int wolfSSL_check_private_key(const WOLFSSL* ssl);