Spelling fixes.

pull/129/head
David Garske 2019-02-28 09:40:17 -08:00 committed by Sean Parkinson
parent 7ed94abe13
commit b18ca7aec0
7 changed files with 24 additions and 24 deletions

View File

@ -164,7 +164,7 @@ static int wolfssl_client_new(WOLFSSL_CTX** ctx, WOLFSSL** ssl)
/* Load CA certificates into WOLFSSL_CTX */ /* Load CA certificates into WOLFSSL_CTX */
if (wolfSSL_CTX_load_verify_buffer(client_ctx, CA_CERTS, CA_CERTS_LEN, if (wolfSSL_CTX_load_verify_buffer(client_ctx, CA_CERTS, CA_CERTS_LEN,
WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
printf("ERROR: failed to load CA certiifcate\n"); printf("ERROR: failed to load CA certificate\n");
ret = -1; ret = -1;
} }
} }
@ -240,7 +240,7 @@ static int wolfssl_server_new(WOLFSSL_CTX** ctx, WOLFSSL** ssl)
/* Load client certificates into WOLFSSL_CTX */ /* Load client certificates into WOLFSSL_CTX */
if (wolfSSL_CTX_use_certificate_buffer(server_ctx, SERVER_CERT, if (wolfSSL_CTX_use_certificate_buffer(server_ctx, SERVER_CERT,
SERVER_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { SERVER_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
printf("ERROR: failed to load server certiifcate\n"); printf("ERROR: failed to load server certificate\n");
ret = -1; ret = -1;
} }
} }

View File

@ -47,7 +47,7 @@ static int wolfssl_client_ctx_new(WOLFSSL_CTX** ctx)
/* Load client certificates into WOLFSSL_CTX */ /* Load client certificates into WOLFSSL_CTX */
if (wolfSSL_CTX_load_verify_buffer(client_ctx, CA_CERTS, CA_CERTS_LEN, if (wolfSSL_CTX_load_verify_buffer(client_ctx, CA_CERTS, CA_CERTS_LEN,
WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
printf("ERROR: failed to load CA certiifcate\n"); printf("ERROR: failed to load CA certificate\n");
ret = -1; ret = -1;
} }
} }
@ -56,7 +56,7 @@ static int wolfssl_client_ctx_new(WOLFSSL_CTX** ctx)
/* Load client certificates into WOLFSSL_CTX */ /* Load client certificates into WOLFSSL_CTX */
if (wolfSSL_CTX_use_certificate_buffer(client_ctx, CLIENT_CERT, if (wolfSSL_CTX_use_certificate_buffer(client_ctx, CLIENT_CERT,
CLIENT_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { CLIENT_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
printf("ERROR: failed to load client certiifcate\n"); printf("ERROR: failed to load client certificate\n");
ret = -1; ret = -1;
} }
} }

View File

@ -45,7 +45,7 @@ static int wolfssl_client_ctx_new(WOLFSSL_CTX** ctx)
/* Load client certificates into WOLFSSL_CTX */ /* Load client certificates into WOLFSSL_CTX */
if (wolfSSL_CTX_load_verify_buffer(client_ctx, CA_CERTS, CA_CERTS_LEN, if (wolfSSL_CTX_load_verify_buffer(client_ctx, CA_CERTS, CA_CERTS_LEN,
WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
printf("ERROR: failed to load CA certiifcate\n"); printf("ERROR: failed to load CA certificate\n");
ret = -1; ret = -1;
} }
} }

View File

@ -60,7 +60,7 @@ static int wolfssl_server_ctx_new(WOLFSSL_CTX** ctx)
/* Load client certificates into WOLFSSL_CTX */ /* Load client certificates into WOLFSSL_CTX */
if (wolfSSL_CTX_use_certificate_buffer(server_ctx, SERVER_CERT, if (wolfSSL_CTX_use_certificate_buffer(server_ctx, SERVER_CERT,
SERVER_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { SERVER_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
printf("ERROR: failed to load server certiifcate\n"); printf("ERROR: failed to load server certificate\n");
ret = -1; ret = -1;
} }
} }
@ -81,7 +81,7 @@ static int wolfssl_server_ctx_new(WOLFSSL_CTX** ctx)
/* Load server certificates into WOLFSSL_CTX */ /* Load server certificates into WOLFSSL_CTX */
if (wolfSSL_CTX_load_verify_buffer(server_ctx, CLIENT_CERT, if (wolfSSL_CTX_load_verify_buffer(server_ctx, CLIENT_CERT,
CLIENT_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { CLIENT_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
printf("ERROR: failed to load CA certiifcate\n"); printf("ERROR: failed to load CA certificate\n");
ret = -1; ret = -1;
} }
} }
@ -201,11 +201,11 @@ static int wolfssl_server_listen_tcp(SOCKET_T* fd)
static int wolfssl_server_accept_tcp(WOLFSSL* ssl, SOCKET_T fd, static int wolfssl_server_accept_tcp(WOLFSSL* ssl, SOCKET_T fd,
SOCKET_T* acceptfd) SOCKET_T* acceptfd)
{ {
int ret = 0; int ret = 0;
SOCKET_T clientfd = WOLFSSL_SOCKET_INVALID; SOCKET_T clientfd = WOLFSSL_SOCKET_INVALID;
ret = tcp_accept(&fd, &clientfd); ret = tcp_accept(&fd, &clientfd);
if (ret == 0) { if (ret == 0) {
*acceptfd = clientfd; *acceptfd = clientfd;
ret = tcp_set_nonblocking(&clientfd); ret = tcp_set_nonblocking(&clientfd);
} }
@ -243,7 +243,7 @@ static int server(WOLFSSL_CTX* server_ctx, SOCKET_T sockfd)
/* Receive HTTP request */ /* Receive HTTP request */
if (ret == 0) if (ret == 0)
ret = wolfssl_recv(server_ssl); ret = wolfssl_recv(server_ssl);
/* Send HTTP repsonse */ /* Send HTTP response */
if (ret == 0) if (ret == 0)
ret = wolfssl_send(server_ssl, msgHTTPIndex); ret = wolfssl_send(server_ssl, msgHTTPIndex);

View File

@ -58,7 +58,7 @@ static int wolfssl_server_ctx_new(WOLFSSL_CTX** ctx)
/* Load client certificates into WOLFSSL_CTX */ /* Load client certificates into WOLFSSL_CTX */
if (wolfSSL_CTX_use_certificate_buffer(server_ctx, SERVER_CERT, if (wolfSSL_CTX_use_certificate_buffer(server_ctx, SERVER_CERT,
SERVER_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { SERVER_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
printf("ERROR: failed to load server certiifcate\n"); printf("ERROR: failed to load server certificate\n");
ret = -1; ret = -1;
} }
} }
@ -187,11 +187,11 @@ static int wolfssl_server_listen_tcp(SOCKET_T* fd)
static int wolfssl_server_accept_tcp(WOLFSSL* ssl, SOCKET_T fd, static int wolfssl_server_accept_tcp(WOLFSSL* ssl, SOCKET_T fd,
SOCKET_T* acceptfd) SOCKET_T* acceptfd)
{ {
int ret = 0; int ret = 0;
SOCKET_T clientfd = WOLFSSL_SOCKET_INVALID; SOCKET_T clientfd = WOLFSSL_SOCKET_INVALID;
ret = tcp_accept(&fd, &clientfd); ret = tcp_accept(&fd, &clientfd);
if (ret == 0) { if (ret == 0) {
*acceptfd = clientfd; *acceptfd = clientfd;
ret = tcp_set_nonblocking(&clientfd); ret = tcp_set_nonblocking(&clientfd);
} }
@ -229,7 +229,7 @@ static int server(WOLFSSL_CTX* server_ctx, SOCKET_T sockfd)
/* Receive HTTP request */ /* Receive HTTP request */
if (ret == 0) if (ret == 0)
ret = wolfssl_recv(server_ssl); ret = wolfssl_recv(server_ssl);
/* Send HTTP repsonse */ /* Send HTTP response */
if (ret == 0) if (ret == 0)
ret = wolfssl_send(server_ssl, msgHTTPIndex); ret = wolfssl_send(server_ssl, msgHTTPIndex);

View File

@ -65,7 +65,7 @@ static int wolfssl_client_new(WOLFSSL_CTX** ctx, WOLFSSL** ssl)
/* Load client certificates into WOLFSSL_CTX */ /* Load client certificates into WOLFSSL_CTX */
if (wolfSSL_CTX_load_verify_buffer(client_ctx, CA_CERTS, CA_CERTS_LEN, if (wolfSSL_CTX_load_verify_buffer(client_ctx, CA_CERTS, CA_CERTS_LEN,
WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
printf("ERROR: failed to load CA certiifcate\n"); printf("ERROR: failed to load CA certificate\n");
ret = -1; ret = -1;
} }
} }
@ -133,7 +133,7 @@ static int wolfssl_server_new(WOLFSSL_CTX** ctx, WOLFSSL** ssl)
/* Load client certificates into WOLFSSL_CTX */ /* Load client certificates into WOLFSSL_CTX */
if (wolfSSL_CTX_use_certificate_buffer(server_ctx, SERVER_CERT, if (wolfSSL_CTX_use_certificate_buffer(server_ctx, SERVER_CERT,
SERVER_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { SERVER_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
printf("ERROR: failed to load server certiifcate\n"); printf("ERROR: failed to load server certificate\n");
ret = -1; ret = -1;
} }
} }
@ -281,7 +281,7 @@ static void join_thread(THREAD_TYPE thread)
/* Accept the TCP connection from the client. */ /* Accept the TCP connection from the client. */
int wolfssl_server_accept_tcp(WOLFSSL* ssl, SOCKET_T* fd, SOCKET_T* acceptfd) int wolfssl_server_accept_tcp(WOLFSSL* ssl, SOCKET_T* fd, SOCKET_T* acceptfd)
{ {
int ret = 0; int ret = 0;
SOCKET_T sockfd = WOLFSSL_SOCKET_INVALID; SOCKET_T sockfd = WOLFSSL_SOCKET_INVALID;
SOCKET_T clientfd = WOLFSSL_SOCKET_INVALID; SOCKET_T clientfd = WOLFSSL_SOCKET_INVALID;
word16 port = wolfSSLPort; word16 port = wolfSSLPort;
@ -292,7 +292,7 @@ int wolfssl_server_accept_tcp(WOLFSSL* ssl, SOCKET_T* fd, SOCKET_T* acceptfd)
if (ret == 0) if (ret == 0)
ret = tcp_accept(&sockfd, &clientfd); ret = tcp_accept(&sockfd, &clientfd);
if (ret == 0) { if (ret == 0) {
*acceptfd = clientfd; *acceptfd = clientfd;
ret = tcp_set_nonblocking(&clientfd); ret = tcp_set_nonblocking(&clientfd);
} }
@ -335,7 +335,7 @@ static THREAD_RETURN WOLFSSL_THREAD server_thread(void* args)
} }
if (ret == 1) if (ret == 1)
ret = 0; ret = 0;
/* Send HTTP repsonse */ /* Send HTTP response */
if (ret == 0) if (ret == 0)
ret = wolfssl_send(server_ssl, msgHTTPIndex); ret = wolfssl_send(server_ssl, msgHTTPIndex);
@ -409,7 +409,7 @@ static int client()
printf("Client Return: %d\n", ret); printf("Client Return: %d\n", ret);
/* Free client conenction data */ /* Free client connection data */
wolfssl_free(client_ctx, client_ssl); wolfssl_free(client_ctx, client_ssl);
if (sockfd != WOLFSSL_SOCKET_INVALID) if (sockfd != WOLFSSL_SOCKET_INVALID)

View File

@ -158,7 +158,7 @@ static int wolfssl_client_new(WOLFSSL_CTX** ctx, WOLFSSL** ssl)
/* Load client certificates into WOLFSSL_CTX */ /* Load client certificates into WOLFSSL_CTX */
if (wolfSSL_CTX_load_verify_buffer(client_ctx, CA_CERTS, CA_CERTS_LEN, if (wolfSSL_CTX_load_verify_buffer(client_ctx, CA_CERTS, CA_CERTS_LEN,
WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
printf("ERROR: failed to load CA certiifcate\n"); printf("ERROR: failed to load CA certificate\n");
ret = -1; ret = -1;
} }
} }
@ -229,7 +229,7 @@ static int wolfssl_server_new(WOLFSSL_CTX** ctx, WOLFSSL** ssl)
/* Load client certificates into WOLFSSL_CTX */ /* Load client certificates into WOLFSSL_CTX */
if (wolfSSL_CTX_use_certificate_buffer(server_ctx, SERVER_CERT, if (wolfSSL_CTX_use_certificate_buffer(server_ctx, SERVER_CERT,
SERVER_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) { SERVER_CERT_LEN, WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
printf("ERROR: failed to load server certiifcate\n"); printf("ERROR: failed to load server certificate\n");
ret = -1; ret = -1;
} }
} }
@ -400,7 +400,7 @@ static THREAD_RETURN WOLFSSL_THREAD server_thread(void* args)
} }
if (ret == 1) if (ret == 1)
ret = 0; ret = 0;
/* Send HTTP repsonse */ /* Send HTTP response */
if (ret == 0) if (ret == 0)
ret = wolfssl_send(server_ssl, msgHTTPIndex); ret = wolfssl_send(server_ssl, msgHTTPIndex);
@ -447,7 +447,7 @@ static int client()
printf("Client Return: %d\n", ret); printf("Client Return: %d\n", ret);
/* Free client conenction data */ /* Free client connection data */
wolfssl_free(client_ctx, client_ssl); wolfssl_free(client_ctx, client_ssl);
return ret; return ret;