feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix naming conflict in stunnel psk_XXX_callback

Browse Source
This commit is contained in:
Nickolas Lapp
2015-09-14 18:00:38 -06:00
parent 274be55679
commit d70e0422a7
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ssl.c
View File

@@ -6945,7 +6945,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
#ifndef NO_PSK #ifndef NO_PSK
void wolfSSL_CTX_set_psk_client_callback(WOLFSSL_CTX* ctx, 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"); WOLFSSL_ENTER("SSL_CTX_set_psk_client_callback");
ctx->havePSK = 1; ctx->havePSK = 1;
@@ -6953,7 +6953,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; byte haveRSA = 1;
@@ -6972,7 +6972,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
void wolfSSL_CTX_set_psk_server_callback(WOLFSSL_CTX* ctx, 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"); WOLFSSL_ENTER("SSL_CTX_set_psk_server_callback");
ctx->havePSK = 1; ctx->havePSK = 1;
@@ -6980,7 +6980,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; byte haveRSA = 1;

12
wolfssl/internal.h
View File

@@ -1209,9 +1209,9 @@ WOLFSSL_LOCAL
int SetCipherList(Suites*, const char* list); int SetCipherList(Suites*, const char* list);
#ifndef PSK_TYPES_DEFINED #ifndef PSK_TYPES_DEFINED
typedef unsigned int (*psk_client_callback)(WOLFSSL*, const char*, char*, typedef unsigned int (*wc_psk_client_callback)(WOLFSSL*, const char*, char*,
unsigned int, unsigned char*, unsigned int); unsigned int, unsigned char*, unsigned int);
typedef unsigned int (*psk_server_callback)(WOLFSSL*, const char*, typedef unsigned int (*wc_psk_server_callback)(WOLFSSL*, const char*,
unsigned char*, unsigned int); unsigned char*, unsigned int);
#endif /* PSK_TYPES_DEFINED */ #endif /* PSK_TYPES_DEFINED */
@@ -1666,8 +1666,8 @@ struct WOLFSSL_CTX {
#endif #endif
#ifndef NO_PSK #ifndef NO_PSK
byte havePSK; /* psk key set by user */ byte havePSK; /* psk key set by user */
psk_client_callback client_psk_cb; /* client callback */ wc_psk_client_callback client_psk_cb; /* client callback */
psk_server_callback server_psk_cb; /* server callback */ wc_psk_server_callback server_psk_cb; /* server callback */
char server_hint[MAX_PSK_ID_LEN]; char server_hint[MAX_PSK_ID_LEN];
#endif /* NO_PSK */ #endif /* NO_PSK */
#ifdef HAVE_ANON #ifdef HAVE_ANON
@@ -2009,8 +2009,8 @@ typedef struct Buffers {
typedef struct Options { typedef struct Options {
#ifndef NO_PSK #ifndef NO_PSK
psk_client_callback client_psk_cb; wc_psk_client_callback client_psk_cb;
psk_server_callback server_psk_cb; wc_psk_server_callback server_psk_cb;
word16 havePSK:1; /* psk key set by user */ word16 havePSK:1; /* psk key set by user */
#endif /* NO_PSK */ #endif /* NO_PSK */

14
wolfssl/ssl.h
View File

@@ -723,11 +723,12 @@ enum { /* ssl Constants */
#ifndef NO_PSK #ifndef NO_PSK
typedef unsigned int (*psk_client_callback)(WOLFSSL*, const char*, char*, typedef unsigned int (*wc_psk_client_callback)(WOLFSSL*, const char*, char*,
unsigned int, unsigned char*, unsigned int); unsigned int, unsigned char*, unsigned int);
WOLFSSL_API void wolfSSL_CTX_set_psk_client_callback(WOLFSSL_CTX*, WOLFSSL_API void wolfSSL_CTX_set_psk_client_callback(WOLFSSL_CTX*,
psk_client_callback); wc_psk_client_callback);
WOLFSSL_API void wolfSSL_set_psk_client_callback(WOLFSSL*,psk_client_callback); WOLFSSL_API void wolfSSL_set_psk_client_callback(WOLFSSL*,
wc_psk_client_callback);
WOLFSSL_API const char* wolfSSL_get_psk_identity_hint(const WOLFSSL*); WOLFSSL_API const char* wolfSSL_get_psk_identity_hint(const WOLFSSL*);
WOLFSSL_API const char* wolfSSL_get_psk_identity(const WOLFSSL*); WOLFSSL_API const char* wolfSSL_get_psk_identity(const WOLFSSL*);
@@ -735,11 +736,12 @@ enum { /* ssl Constants */
WOLFSSL_API int wolfSSL_CTX_use_psk_identity_hint(WOLFSSL_CTX*, const char*); WOLFSSL_API int wolfSSL_CTX_use_psk_identity_hint(WOLFSSL_CTX*, const char*);
WOLFSSL_API int wolfSSL_use_psk_identity_hint(WOLFSSL*, const char*); WOLFSSL_API int wolfSSL_use_psk_identity_hint(WOLFSSL*, const char*);
typedef unsigned int (*psk_server_callback)(WOLFSSL*, const char*, typedef unsigned int (*wc_psk_server_callback)(WOLFSSL*, const char*,
unsigned char*, unsigned int); unsigned char*, unsigned int);
WOLFSSL_API void wolfSSL_CTX_set_psk_server_callback(WOLFSSL_CTX*, WOLFSSL_API void wolfSSL_CTX_set_psk_server_callback(WOLFSSL_CTX*,
psk_server_callback); wc_psk_server_callback);
WOLFSSL_API void wolfSSL_set_psk_server_callback(WOLFSSL*,psk_server_callback); WOLFSSL_API void wolfSSL_set_psk_server_callback(WOLFSSL*,
wc_psk_server_callback);
#define PSK_TYPES_DEFINED #define PSK_TYPES_DEFINED
#endif /* NO_PSK */ #endif /* NO_PSK */