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

warning fixes, 2.0.1 pre

Browse Source
This commit is contained in:
toddouska
2011-11-01 16:17:45 -07:00
parent ef72bae2ff
commit 8ddd2185c2
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -6,7 +6,7 @@
# #
# #
AC_INIT([cyassl],[2.0.0rc3d],[http://www.yassl.com]) AC_INIT([cyassl],[2.0.1],[http://www.yassl.com])
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)

4
ctaocrypt/src/asn.c
View File

@ -927,7 +927,7 @@ int DhParamsLoad(const byte* input, word32 inSz, byte* p, word32* pInOutSz,
else else
i--; i--;
if (length <= *pInOutSz) { if (length <= (int)*pInOutSz) {
XMEMCPY(p, &input[i], length); XMEMCPY(p, &input[i], length);
*pInOutSz = length; *pInOutSz = length;
} }
@ -943,7 +943,7 @@ int DhParamsLoad(const byte* input, word32 inSz, byte* p, word32* pInOutSz,
if (GetLength(input, &i, &length, inSz) < 0) if (GetLength(input, &i, &length, inSz) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
if (length <= *gInOutSz) { if (length <= (int)*gInOutSz) {
XMEMCPY(g, &input[i], length); XMEMCPY(g, &input[i], length);
*gInOutSz = length; *gInOutSz = length;
} }

6
examples/echoserver/echoserver.c
View File

@ -149,10 +149,10 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
ssl = SSL_new(ctx); ssl = SSL_new(ctx);
if (ssl == NULL) err_sys("SSL_new failed"); if (ssl == NULL) err_sys("SSL_new failed");
SSL_set_fd(ssl, clientfd); SSL_set_fd(ssl, clientfd);
#ifdef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && defined(OPENSSL_EXTRA)
SetDH(ssl);
#else
CyaSSL_SetTmpDH_file(ssl, dhParam, SSL_FILETYPE_PEM); CyaSSL_SetTmpDH_file(ssl, dhParam, SSL_FILETYPE_PEM);
#else
SetDH(ssl); /* will repick suites with DHE, higher than PSK */
#endif #endif
if (SSL_accept(ssl) != SSL_SUCCESS) { if (SSL_accept(ssl) != SSL_SUCCESS) {
printf("SSL_accept failed\n"); printf("SSL_accept failed\n");

6
examples/server/server.c
View File

@ -150,10 +150,10 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
SSL_set_fd(ssl, clientfd); SSL_set_fd(ssl, clientfd);
#ifdef NO_PSK #ifdef NO_PSK
#ifdef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && defined(OPENSSL_EXTRA)
SetDH(ssl); /* will repick suites with DHE, higher priority than PSK */
#else
CyaSSL_SetTmpDH_file(ssl, dhParam, SSL_FILETYPE_PEM); CyaSSL_SetTmpDH_file(ssl, dhParam, SSL_FILETYPE_PEM);
#else
SetDH(ssl); /* will repick suites with DHE, higher priority than PSK */
#endif #endif
#endif #endif

2
src/ssl.c
View File

@ -1202,7 +1202,7 @@ static int CyaSSL_SetTmpDH_buffer_wrapper(CYASSL_CTX* ctx, CYASSL* ssl,
word32 pSz = sizeof(p); word32 pSz = sizeof(p);
word32 gSz = sizeof(g); word32 gSz = sizeof(g);
der.buffer = buf; der.buffer = (byte*)buf;
der.length = sz; der.length = sz;
if (format != SSL_FILETYPE_ASN1 && format != SSL_FILETYPE_PEM) if (format != SSL_FILETYPE_ASN1 && format != SSL_FILETYPE_PEM)