Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Zephyr misc fixes for TLS #6353

Merged
merged 3 commits into from
Apr 28, 2023
Merged

Zephyr misc fixes for TLS #6353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b3feea
zephyr wolfssl_tls_sock: fix project name
julek-wolfssl Apr 28, 2023
203ce41
zephyr tls_sock.c: don't include options.h when using user settings
julek-wolfssl Apr 28, 2023
d5eec75
zephyr: define XSTAT_TYPE for use with XSTAT
julek-wolfssl Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion wolfssl/wolfcrypt/wc_port.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,6 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
#include <zephyr/fs/fs.h>

#define XFILE struct fs_file_t*
#define STAT struct fs_dirent

/* These are our wrappers for opening and closing files to
* make the API more POSIX like. */
Expand All @@ -537,6 +536,7 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
#define XFGETS(b,s,f) -2 /* Not ported yet */

#define XSTAT fs_stat
#define XSTAT_TYPE struct fs_dirent
#define XS_ISREG(s) (s == FS_DIR_ENTRY_FILE)
#define SEPARATOR_CHAR ':'

Expand Down
2 changes: 1 addition & 1 deletion zephyr/samples/wolfssl_tls_sock/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.13.1)
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
project(wolfssl_tls_threaded)
project(wolfssl_tls_sock)

FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources})
Expand Down
4 changes: 3 additions & 1 deletion zephyr/samples/wolfssl_tls_sock/src/tls_sock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
*/

#include <wolfssl/options.h>
#ifndef WOLFSSL_USER_SETTINGS
#include <wolfssl/options.h>
#endif
#include <wolfssl/ssl.h>
#define USE_CERT_BUFFERS_2048
#include <wolfssl/certs_test.h>
Expand Down