Merge pull request #136 from NickolasLapp/master

Fix GCC Compiler warning, fix stunnel naming conflict
This commit is contained in:
toddouska
2015-09-14 18:56:06 -07:00
3 changed files with 18 additions and 16 deletions

View File

@@ -6951,7 +6951,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
#ifndef NO_PSK
void wolfSSL_CTX_set_psk_client_callback(WOLFSSL_CTX* ctx,
psk_client_callback cb)
wc_psk_client_callback cb)
{
WOLFSSL_ENTER("SSL_CTX_set_psk_client_callback");
ctx->havePSK = 1;
@@ -6959,7 +6959,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
}
void wolfSSL_set_psk_client_callback(WOLFSSL* ssl, psk_client_callback cb)
void wolfSSL_set_psk_client_callback(WOLFSSL* ssl,wc_psk_client_callback cb)
{
byte haveRSA = 1;
@@ -6978,7 +6978,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
void wolfSSL_CTX_set_psk_server_callback(WOLFSSL_CTX* ctx,
psk_server_callback cb)
wc_psk_server_callback cb)
{
WOLFSSL_ENTER("SSL_CTX_set_psk_server_callback");
ctx->havePSK = 1;
@@ -6986,7 +6986,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
}
void wolfSSL_set_psk_server_callback(WOLFSSL* ssl, psk_server_callback cb)
void wolfSSL_set_psk_server_callback(WOLFSSL* ssl,wc_psk_server_callback cb)
{
byte haveRSA = 1;