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

Error printouts name changed

Browse Source
This commit is contained in:
kaleb-himes
2015-01-20 12:36:20 -07:00
parent 859c22f2c2
commit b0e88e32ff
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/echoclient/echoclient.c
View File

@ -117,11 +117,11 @@ void echoclient_test(void* args)
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
#ifndef NO_RSA #ifndef NO_RSA
if (SSL_CTX_load_verify_locations(ctx, caCert, 0) != SSL_SUCCESS) if (SSL_CTX_load_verify_locations(ctx, caCert, 0) != SSL_SUCCESS)
err_sys("can't load ca file, Please run from CyaSSL home dir"); err_sys("can't load ca file, Please run from wolfSSL home dir");
#endif #endif
#ifdef HAVE_ECC #ifdef HAVE_ECC
if (SSL_CTX_load_verify_locations(ctx, eccCert, 0) != SSL_SUCCESS) if (SSL_CTX_load_verify_locations(ctx, eccCert, 0) != SSL_SUCCESS)
err_sys("can't load ca file, Please run from CyaSSL home dir"); err_sys("can't load ca file, Please run from wolfSSL home dir");
#endif #endif
#elif !defined(NO_CERTS) #elif !defined(NO_CERTS)
if (!doPSK) if (!doPSK)

14
examples/echoserver/echoserver.c
View File

@ -154,23 +154,23 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
if (CyaSSL_CTX_use_certificate_file(ctx, ntruCert, SSL_FILETYPE_PEM) if (CyaSSL_CTX_use_certificate_file(ctx, ntruCert, SSL_FILETYPE_PEM)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("can't load ntru cert file, " err_sys("can't load ntru cert file, "
"Please run from CyaSSL home dir"); "Please run from wolfSSL home dir");
if (CyaSSL_CTX_use_NTRUPrivateKey_file(ctx, ntruKey) if (CyaSSL_CTX_use_NTRUPrivateKey_file(ctx, ntruKey)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("can't load ntru key file, " err_sys("can't load ntru key file, "
"Please run from CyaSSL home dir"); "Please run from wolfSSL home dir");
#elif defined(HAVE_ECC) #elif defined(HAVE_ECC)
/* ecc */ /* ecc */
if (CyaSSL_CTX_use_certificate_file(ctx, eccCert, SSL_FILETYPE_PEM) if (CyaSSL_CTX_use_certificate_file(ctx, eccCert, SSL_FILETYPE_PEM)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("can't load server cert file, " err_sys("can't load server cert file, "
"Please run from CyaSSL home dir"); "Please run from wolfSSL home dir");
if (CyaSSL_CTX_use_PrivateKey_file(ctx, eccKey, SSL_FILETYPE_PEM) if (CyaSSL_CTX_use_PrivateKey_file(ctx, eccKey, SSL_FILETYPE_PEM)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("can't load server key file, " err_sys("can't load server key file, "
"Please run from CyaSSL home dir"); "Please run from wolfSSL home dir");
#elif defined(NO_CERTS) #elif defined(NO_CERTS)
/* do nothing, just don't load cert files */ /* do nothing, just don't load cert files */
#else #else
@ -178,12 +178,12 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
if (CyaSSL_CTX_use_certificate_file(ctx, svrCert, SSL_FILETYPE_PEM) if (CyaSSL_CTX_use_certificate_file(ctx, svrCert, SSL_FILETYPE_PEM)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("can't load server cert file, " err_sys("can't load server cert file, "
"Please run from CyaSSL home dir"); "Please run from wolfSSL home dir");
if (CyaSSL_CTX_use_PrivateKey_file(ctx, svrKey, SSL_FILETYPE_PEM) if (CyaSSL_CTX_use_PrivateKey_file(ctx, svrKey, SSL_FILETYPE_PEM)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("can't load server key file, " err_sys("can't load server key file, "
"Please run from CyaSSL home dir"); "Please run from wolfSSL home dir");
#endif #endif
} /* doPSK */ } /* doPSK */
#elif !defined(NO_CERTS) #elif !defined(NO_CERTS)
@ -285,7 +285,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
char type[] = "HTTP/1.0 200 ok\r\nContent-type:" char type[] = "HTTP/1.0 200 ok\r\nContent-type:"
" text/html\r\n\r\n"; " text/html\r\n\r\n";
char header[] = "<html><body BGCOLOR=\"#ffffff\">\n<pre>\n"; char header[] = "<html><body BGCOLOR=\"#ffffff\">\n<pre>\n";
char body[] = "greetings from CyaSSL\n"; char body[] = "greetings from wolfSSL\n";
char footer[] = "</body></html>\r\n\r\n"; char footer[] = "</body></html>\r\n\r\n";
strncpy(command, type, sizeof(type)); strncpy(command, type, sizeof(type));

12
examples/server/server.c
View File

@ -116,7 +116,7 @@ static void NonBlockingSSL_Accept(SSL* ssl)
static void Usage(void) static void Usage(void)
{ {
printf("server " LIBCYASSL_VERSION_STRING printf("server " LIBCYASSL_VERSION_STRING
" NOTE: All files relative to CyaSSL home dir\n"); " NOTE: All files relative to wolfSSL home dir\n");
printf("-? Help, print this usage\n"); printf("-? Help, print this usage\n");
printf("-p <num> Port to listen on, not 0, default %d\n", yasslPort); printf("-p <num> Port to listen on, not 0, default %d\n", yasslPort);
printf("-v <num> SSL version [0-3], SSLv3(0) - TLS1.2(3)), default %d\n", printf("-v <num> SSL version [0-3], SSLv3(0) - TLS1.2(3)), default %d\n",
@ -128,7 +128,7 @@ static void Usage(void)
printf("-d Disable client cert check\n"); printf("-d Disable client cert check\n");
printf("-b Bind to any interface instead of localhost only\n"); printf("-b Bind to any interface instead of localhost only\n");
printf("-s Use pre Shared keys\n"); printf("-s Use pre Shared keys\n");
printf("-t Track CyaSSL memory use\n"); printf("-t Track wolfSSL memory use\n");
printf("-u Use UDP DTLS," printf("-u Use UDP DTLS,"
" add -v 2 for DTLSv1 (default), -v 3 for DTLSv1.2\n"); " add -v 2 for DTLSv1 (default), -v 3 for DTLSv1.2\n");
printf("-f Fewer packets/group messages\n"); printf("-f Fewer packets/group messages\n");
@ -409,7 +409,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
if (SSL_CTX_use_certificate_file(ctx, ourCert, SSL_FILETYPE_PEM) if (SSL_CTX_use_certificate_file(ctx, ourCert, SSL_FILETYPE_PEM)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("can't load server cert file, check file and run from" err_sys("can't load server cert file, check file and run from"
" CyaSSL home dir"); " wolfSSL home dir");
} }
#endif #endif
@ -418,7 +418,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
if (CyaSSL_CTX_use_NTRUPrivateKey_file(ctx, ourKey) if (CyaSSL_CTX_use_NTRUPrivateKey_file(ctx, ourKey)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("can't load ntru key file, " err_sys("can't load ntru key file, "
"Please run from CyaSSL home dir"); "Please run from wolfSSL home dir");
} }
#endif #endif
@ -427,7 +427,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
if (SSL_CTX_use_PrivateKey_file(ctx, ourKey, SSL_FILETYPE_PEM) if (SSL_CTX_use_PrivateKey_file(ctx, ourKey, SSL_FILETYPE_PEM)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("can't load server private key file, check file and run " err_sys("can't load server private key file, check file and run "
"from CyaSSL home dir"); "from wolfSSL home dir");
} }
#endif #endif
@ -464,7 +464,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER |
SSL_VERIFY_FAIL_IF_NO_PEER_CERT,0); SSL_VERIFY_FAIL_IF_NO_PEER_CERT,0);
if (SSL_CTX_load_verify_locations(ctx, verifyCert, 0) != SSL_SUCCESS) if (SSL_CTX_load_verify_locations(ctx, verifyCert, 0) != SSL_SUCCESS)
err_sys("can't load ca file, Please run from CyaSSL home dir"); err_sys("can't load ca file, Please run from wolfSSL home dir");
} }
#endif #endif

4
wolfcrypt/benchmark/benchmark.c
View File

@ -975,7 +975,7 @@ void bench_rsa(void)
FILE* file = fopen(certRSAname, "rb"); FILE* file = fopen(certRSAname, "rb");
if (!file) { if (!file) {
printf("can't find %s, Please run from CyaSSL home dir\n", certRSAname); printf("can't find %s, Please run from wolfSSL home dir\n", certRSAname);
return; return;
} }
@ -1086,7 +1086,7 @@ void bench_dh(void)
FILE* file = fopen(certDHname, "rb"); FILE* file = fopen(certDHname, "rb");
if (!file) { if (!file) {
printf("can't find %s, Please run from CyaSSL home dir\n", certDHname); printf("can't find %s, Please run from wolfSSL home dir\n", certDHname);
return; return;
} }