From b0e88e32ff52633b49296d33160b1150bbc3826f Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Tue, 20 Jan 2015 12:36:20 -0700 Subject: [PATCH] Error printouts name changed --- examples/echoclient/echoclient.c | 4 ++-- examples/echoserver/echoserver.c | 14 +++++++------- examples/server/server.c | 12 ++++++------ wolfcrypt/benchmark/benchmark.c | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c index 5875ade1b..759961e83 100644 --- a/examples/echoclient/echoclient.c +++ b/examples/echoclient/echoclient.c @@ -117,11 +117,11 @@ void echoclient_test(void* args) #ifndef NO_FILESYSTEM #ifndef NO_RSA 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 #ifdef HAVE_ECC 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 #elif !defined(NO_CERTS) if (!doPSK) diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c index b1d04cb74..18b39100d 100644 --- a/examples/echoserver/echoserver.c +++ b/examples/echoserver/echoserver.c @@ -154,23 +154,23 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args) if (CyaSSL_CTX_use_certificate_file(ctx, ntruCert, SSL_FILETYPE_PEM) != SSL_SUCCESS) 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) != SSL_SUCCESS) err_sys("can't load ntru key file, " - "Please run from CyaSSL home dir"); + "Please run from wolfSSL home dir"); #elif defined(HAVE_ECC) /* ecc */ if (CyaSSL_CTX_use_certificate_file(ctx, eccCert, SSL_FILETYPE_PEM) != SSL_SUCCESS) 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) != SSL_SUCCESS) err_sys("can't load server key file, " - "Please run from CyaSSL home dir"); + "Please run from wolfSSL home dir"); #elif defined(NO_CERTS) /* do nothing, just don't load cert files */ #else @@ -178,12 +178,12 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args) if (CyaSSL_CTX_use_certificate_file(ctx, svrCert, SSL_FILETYPE_PEM) != SSL_SUCCESS) 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) != SSL_SUCCESS) err_sys("can't load server key file, " - "Please run from CyaSSL home dir"); + "Please run from wolfSSL home dir"); #endif } /* doPSK */ #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:" " text/html\r\n\r\n"; char header[] = "\n
\n";
-                char body[]   = "greetings from CyaSSL\n";
+                char body[]   = "greetings from wolfSSL\n";
                 char footer[] = "\r\n\r\n";
             
                 strncpy(command, type, sizeof(type));
diff --git a/examples/server/server.c b/examples/server/server.c
index 1c4ae5d50..8374d376d 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -116,7 +116,7 @@ static void NonBlockingSSL_Accept(SSL* ssl)
 static void Usage(void)
 {
     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("-p     Port to listen on, not 0, default %d\n", yasslPort);
     printf("-v     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("-b          Bind to any interface instead of localhost only\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,"
            " add -v 2 for DTLSv1 (default), -v 3 for DTLSv1.2\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)
                                          != SSL_SUCCESS)
             err_sys("can't load server cert file, check file and run from"
-                    " CyaSSL home dir");
+                    " wolfSSL home dir");
     }
 #endif
 
@@ -418,7 +418,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
         if (CyaSSL_CTX_use_NTRUPrivateKey_file(ctx, ourKey)
                                                != SSL_SUCCESS)
             err_sys("can't load ntru key file, "
-                    "Please run from CyaSSL home dir");
+                    "Please run from wolfSSL home dir");
     }
 #endif
 
@@ -427,7 +427,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
         if (SSL_CTX_use_PrivateKey_file(ctx, ourKey, SSL_FILETYPE_PEM)
                                          != SSL_SUCCESS)
             err_sys("can't load server private key file, check file and run "
-                "from CyaSSL home dir");
+                "from wolfSSL home dir");
     }
 #endif
 
@@ -464,7 +464,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
         SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER |
                                 SSL_VERIFY_FAIL_IF_NO_PEER_CERT,0);
         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
 
diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c
index e15d292f4..4399fd2f5 100644
--- a/wolfcrypt/benchmark/benchmark.c
+++ b/wolfcrypt/benchmark/benchmark.c
@@ -975,7 +975,7 @@ void bench_rsa(void)
     FILE*  file = fopen(certRSAname, "rb");
 
     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;
     }
     
@@ -1086,7 +1086,7 @@ void bench_dh(void)
     FILE*  file = fopen(certDHname, "rb");
 
     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;
     }