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

Merge pull request #5169 from kareem-wolfssl/miscFixes

Browse Source 
Misc. fixes
This commit is contained in:
David Garske
2022-05-26 12:52:39 -07:00
committed by GitHub
parent 0b6f7c1533 bcb5ff5ed9
commit f93b23b524
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcapi/README
View File

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

32
mcapi/zlib.X/nbproject/configurations.xml
View File

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

2
wolfssl/wolfcrypt/ecc.h
View File

@@ -293,7 +293,7 @@ typedef struct ecc_set_type {
} ecc_set_type; } ecc_set_type;
#else #else
#define MAX_ECC_NAME 16 #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. */ /* The values are stored as text strings. */
typedef struct ecc_set_type { typedef struct ecc_set_type {

2
wolfssl/wolfcrypt/types.h
View File

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

2
wolfssl/wolfcrypt/wc_port.h
View File

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