Merge pull request #5169 from kareem-wolfssl/miscFixes

Misc. fixes
This commit is contained in:
David Garske
2022-05-26 12:52:39 -07:00
committed by GitHub
5 changed files with 22 additions and 22 deletions

View File

@ -54,10 +54,10 @@ Included Project Files
This project builds the zlib library for use in the wolfcrypt_test.X
and wolfcrypt_mcapi.X projects. This project expects the zlib sources
to be located under the wolfSSL root directory. Currently it is set up
to work with zlib 1.2.8, and looks for sources under:
to be located under the wolfSSL root directory. It is set up to work
with the latest zlib, and looks for sources under:
<wolfssl_root>/zlib-1.2.8
<wolfssl_root>/zlib
PIC32MX/PIC32MZ
---------------

View File

@ -12,21 +12,21 @@
<logicalFolder name="SourceFiles"
displayName="Source Files"
projectFiles="true">
<itemPath>../../zlib-1.2.8/adler32.c</itemPath>
<itemPath>../../zlib-1.2.8/compress.c</itemPath>
<itemPath>../../zlib-1.2.8/crc32.c</itemPath>
<itemPath>../../zlib-1.2.8/deflate.c</itemPath>
<itemPath>../../zlib-1.2.8/gzclose.c</itemPath>
<itemPath>../../zlib-1.2.8/gzlib.c</itemPath>
<itemPath>../../zlib-1.2.8/gzread.c</itemPath>
<itemPath>../../zlib-1.2.8/gzwrite.c</itemPath>
<itemPath>../../zlib-1.2.8/infback.c</itemPath>
<itemPath>../../zlib-1.2.8/inffast.c</itemPath>
<itemPath>../../zlib-1.2.8/inflate.c</itemPath>
<itemPath>../../zlib-1.2.8/inftrees.c</itemPath>
<itemPath>../../zlib-1.2.8/trees.c</itemPath>
<itemPath>../../zlib-1.2.8/uncompr.c</itemPath>
<itemPath>../../zlib-1.2.8/zutil.c</itemPath>
<itemPath>../../zlib/adler32.c</itemPath>
<itemPath>../../zlib/compress.c</itemPath>
<itemPath>../../zlib/crc32.c</itemPath>
<itemPath>../../zlib/deflate.c</itemPath>
<itemPath>../../zlib/gzclose.c</itemPath>
<itemPath>../../zlib/gzlib.c</itemPath>
<itemPath>../../zlib/gzread.c</itemPath>
<itemPath>../../zlib/gzwrite.c</itemPath>
<itemPath>../../zlib/infback.c</itemPath>
<itemPath>../../zlib/inffast.c</itemPath>
<itemPath>../../zlib/inflate.c</itemPath>
<itemPath>../../zlib/inftrees.c</itemPath>
<itemPath>../../zlib/trees.c</itemPath>
<itemPath>../../zlib/uncompr.c</itemPath>
<itemPath>../../zlib/zutil.c</itemPath>
</logicalFolder>
<logicalFolder name="ExternalFiles"
displayName="Important Files"
@ -76,7 +76,7 @@
<property key="enable-symbols" value="true"/>
<property key="enable-unroll-loops" value="false"/>
<property key="exclude-floating-point" value="false"/>
<property key="extra-include-directories" value="../../zlib-1.2.8"/>
<property key="extra-include-directories" value="../../zlib"/>
<property key="generate-16-bit-code" value="false"/>
<property key="generate-micro-compressed-code" value="false"/>
<property key="isolate-each-function" value="false"/>

View File

@ -293,7 +293,7 @@ typedef struct ecc_set_type {
} ecc_set_type;
#else
#define MAX_ECC_NAME 16
#define MAX_ECC_STRING ((MAX_ECC_BYTES * 2) + 1)
#define MAX_ECC_STRING ((MAX_ECC_BYTES * 2) + 2)
/* The values are stored as text strings. */
typedef struct ecc_set_type {

View File

@ -828,7 +828,7 @@ decouple library dependencies with standard string, memory and so on.
#endif
#ifndef OFFSETOF
#if defined(__clang__) || defined(__GNUC__)
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 4))
#define OFFSETOF(type, field) __builtin_offsetof(type, field)
#else
#define OFFSETOF(type, field) ((size_t)&(((type *)0)->field))

View File

@ -417,7 +417,7 @@ WOLFSSL_API int wolfCrypt_Cleanup(void);
#define XFGETS(b,s,f) -2 /* Not ported yet */
#elif defined(WOLFSSL_ZEPHYR)
#include <fs.h>
#include <fs/fs.h>
#define XFILE struct fs_file_t*
#define STAT struct fs_dirent