WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

change Init Free CyaSSL to CyaSSL_, more consistent

pull/1/head
Todd A Ouska 2011-06-08 13:19:39 -07:00
parent 1134f1c671
commit 0ef4919b43
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/client/client.c
View File

@ -287,12 +287,12 @@ void client_test(void* args)
args.argc = argc; args.argc = argc;
args.argv = argv; args.argv = argv;
InitCyaSSL(); CyaSSL_Init();
#ifdef DEBUG_CYASSL #ifdef DEBUG_CYASSL
CyaSSL_Debugging_ON(); CyaSSL_Debugging_ON();
#endif #endif
client_test(&args); client_test(&args);
FreeCyaSSL(); CyaSSL_Cleanup();
return args.return_code; return args.return_code;
} }

4
examples/echoclient/echoclient.c
View File

@ -141,9 +141,9 @@ void echoclient_test(void* args)
args.argc = argc; args.argc = argc;
args.argv = argv; args.argv = argv;
InitCyaSSL(); CyaSSL_Init();
echoclient_test(&args); echoclient_test(&args);
FreeCyaSSL(); CyaSSL_Cleanup();
return args.return_code; return args.return_code;
} }

4
examples/echoserver/echoserver.c
View File

@ -214,12 +214,12 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
args.argc = argc; args.argc = argc;
args.argv = argv; args.argv = argv;
InitCyaSSL(); CyaSSL_Init();
#ifdef DEBUG_CYASSL #ifdef DEBUG_CYASSL
CyaSSL_Debugging_ON(); CyaSSL_Debugging_ON();
#endif #endif
echoserver_test(&args); echoserver_test(&args);
FreeCyaSSL(); CyaSSL_Cleanup();
return args.return_code; return args.return_code;
} }

4
examples/server/server.c
View File

@ -171,12 +171,12 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
args.argc = argc; args.argc = argc;
args.argv = argv; args.argv = argv;
InitCyaSSL(); CyaSSL_Init();
#ifdef DEBUG_CYASSL #ifdef DEBUG_CYASSL
CyaSSL_Debugging_ON(); CyaSSL_Debugging_ON();
#endif #endif
server_test(&args); server_test(&args);
FreeCyaSSL(); CyaSSL_Cleanup();
return args.return_code; return args.return_code;
} }

6
include/openssl/ssl.h
View File

@ -622,9 +622,9 @@ CYASSL_API int SSL_CTX_get_ex_new_index(long, void*, void*, void*, void*);
CYASSL_API int CyaSSL_check_domain_name(SSL* ssl, const char* dn); CYASSL_API int CyaSSL_check_domain_name(SSL* ssl, const char* dn);
/* need to call once to load library (session cache) */ /* need to call once to load library (session cache) */
CYASSL_API int InitCyaSSL(void); CYASSL_API int CyaSSL_Init(void);
/* call when done to free session cache mutex */ /* call when done to cleanup/free session cache mutex / resources */
CYASSL_API int FreeCyaSSL(void); CYASSL_API int CyaSSL_Cleanup(void);
/* turn logging on, only if compiled in */ /* turn logging on, only if compiled in */
CYASSL_API int CyaSSL_Debugging_ON(void); CYASSL_API int CyaSSL_Debugging_ON(void);

12
src/ssl.c
View File

@ -1194,7 +1194,7 @@ void SSL_load_error_strings(void) /* compatibility only */
int SSL_library_init(void) int SSL_library_init(void)
{ {
CYASSL_ENTER("SSL_library_init"); CYASSL_ENTER("SSL_library_init");
if (InitCyaSSL() == 0) if (CyaSSL_Init() == 0)
return SSL_SUCCESS; return SSL_SUCCESS;
else else
return SSL_FATAL_ERROR; return SSL_FATAL_ERROR;
@ -1677,10 +1677,10 @@ int SSL_CTX_set_cipher_list(SSL_CTX* ctx, const char* list)
#endif /* NO_CYASSL_SERVER */ #endif /* NO_CYASSL_SERVER */
int InitCyaSSL(void) int CyaSSL_Init(void)
{ {
int ret = 0; int ret = 0;
CYASSL_ENTER("InitCyaSSL"); CYASSL_ENTER("CyaSSL_Init");
#ifndef NO_SESSION_CACHE #ifndef NO_SESSION_CACHE
if (InitMutex(&session_mutex) != 0) if (InitMutex(&session_mutex) != 0)
ret = BAD_MUTEX_ERROR; ret = BAD_MUTEX_ERROR;
@ -1692,10 +1692,10 @@ int InitCyaSSL(void)
} }
int FreeCyaSSL(void) int CyaSSL_Cleanup(void)
{ {
int ret = 0; int ret = 0;
CYASSL_ENTER("FreeCyaSSL"); CYASSL_ENTER("CyaSSL_Cleanup");
#ifndef NO_SESSION_CACHE #ifndef NO_SESSION_CACHE
if (FreeMutex(&session_mutex) != 0) if (FreeMutex(&session_mutex) != 0)
ret = BAD_MUTEX_ERROR; ret = BAD_MUTEX_ERROR;
@ -2382,7 +2382,7 @@ int CyaSSL_set_compression(SSL* ssl)
void OpenSSL_add_all_algorithms(void) void OpenSSL_add_all_algorithms(void)
{ {
CYASSL_ENTER("OpenSSL_add_all_algorithms"); CYASSL_ENTER("OpenSSL_add_all_algorithms");
InitCyaSSL(); CyaSSL_Init();
} }

4
testsuite/testsuite.c
View File

@ -43,7 +43,7 @@ int main(int argc, char** argv)
if (args.return_code != 0) return args.return_code; if (args.return_code != 0) return args.return_code;
/* Simple CyaSSL client server test */ /* Simple CyaSSL client server test */
InitCyaSSL(); CyaSSL_Init();
InitTcpReady(&ready); InitTcpReady(&ready);
server_args.signal = &ready; server_args.signal = &ready;
start_thread(server_test, &server_args, &serverThread); start_thread(server_test, &server_args, &serverThread);
@ -105,7 +105,7 @@ int main(int argc, char** argv)
return -1; return -1;
} }
FreeCyaSSL(); CyaSSL_Cleanup();
FreeTcpReady(&ready); FreeTcpReady(&ready);
printf("\nAll tests passed!\n"); printf("\nAll tests passed!\n");