Merge pull request #18 from bandi13/IDE-XCODE

Ide xcode

Author: SparkiDev

IDE/XCODE/build-all.sh

@@ -21,6 +21,7 @@ cd ${WOLFPROV_DIR}/wolfssl-source && ${XCODE_SCRIPTS_DIR}/build-wolfssl-framewor
 
 cd ${WOLFPROV_DIR} && ${XCODE_SCRIPTS_DIR}/build-wolfprovider-framework.sh
 
-clang ${WOLFPROV_DIR}/examples/openssl_example.c -I ${WOLFPROV_DIR}/openssl-source/artifacts/xcframework/libopenssl.xcframework/macos-arm64_x86_64/Headers -L ${WOLFPROV_DIR}/openssl-source/artifacts/xcframework/libopenssl.xcframework/macos-arm64_x86_64/ -lcrypto -o ${WOLFPROV_DIR}/artifacts/openssl_example
+ARCH=$(uname -m)
+clang ${WOLFPROV_DIR}/examples/openssl_example.c -I ${OPENSSL_SOURCE_DIR}/artifacts/openssl-install-macosx-${ARCH}/include -L ${OPENSSL_SOURCE_DIR}/artifacts/openssl-install-macosx-${ARCH}/lib -lcrypto -o ${OUTDIR}/openssl_example
 
 echo "Script ran for $SECONDS seconds"

IDE/XCODE/build-openssl-framework.sh

@@ -30,6 +30,7 @@ SDK_OUTPUT_DIR=${OUTDIR}/xcframework
 CFLAGS_COMMON=""
 # Base configure flags
 CONF_OPTS=""
+NUMCPU=$(sysctl -n hw.ncpu)
 
 helpFunction()
 {
@@ -67,7 +68,7 @@ build() { # <ARCH=arm64|x86_64> <TYPE=iphonesimulator|iphoneos|macosx|watchos|wa
     mkdir -p ${OUTDIR}/${TYPE}-${ARCH} && cd ${OUTDIR}/${TYPE}-${ARCH}
 
     CC="clang" CXX="clang" CFLAGS="${CFLAGS_COMMON} -Os -arch ${ARCH} -isysroot ${SDK_ROOT}" LDFLAGS="-arch ${ARCH} -isysroot ${SDK_ROOT}" ${WOLFSSL_DIR}/Configure no-asm ${TARGET} --prefix=${OUTDIR}/openssl-install-${TYPE}-${ARCH} ${CONF_OPTS}
-    make -j
+    make -j${NUMCPU}
     make install
 
     popd

IDE/XCODE/build-wolfprovider-framework.sh

@@ -65,7 +65,7 @@ build() { # <ARCH=arm64|x86_64> <TYPE=iphonesimulator|iphoneos|macosx|watchos|wa
     TYPE=$2
     SDK_ROOT=$(xcrun --sdk ${TYPE} --show-sdk-path)
 
-    ./configure -prefix=${OUTDIR}/wolfprov-${TYPE}-${ARCH} ${CONF_OPTS} --host=${HOST} \
+    ./configure -prefix=${OUTDIR}/wolfprov-install-${TYPE}-${ARCH} ${CONF_OPTS} --host=${HOST} \
 	--with-openssl=${WOLFPROV_DIR}/openssl-source/artifacts/openssl-install-${TYPE}-${ARCH} \
 	--with-wolfssl=${WOLFPROV_DIR}/wolfssl-source/artifacts/wolfssl-install-${TYPE}-${ARCH} \
         CFLAGS="${CFLAGS_COMMON} -arch ${ARCH} -isysroot ${SDK_ROOT}" \
@@ -84,8 +84,8 @@ for type in iphonesimulator macosx ; do
 
     # Create universal binaries from architecture-specific static libraries
     lipo \
-        "$OUTDIR/wolfprov-${type}-x86_64/lib/libwolfprov.dylib" \
-        "$OUTDIR/wolfprov-${type}-arm64/lib/libwolfprov.dylib" \
+        "$OUTDIR/wolfprov-install-${type}-x86_64/lib/libwolfprov.dylib" \
+        "$OUTDIR/wolfprov-install-${type}-arm64/lib/libwolfprov.dylib" \
         -create -output $LIPODIR/libwolfprov-${type}.dylib
 
     echo "Checking libraries"
@@ -98,7 +98,7 @@ for type in iphoneos ; do
 
     # Create universal binaries from architecture-specific static libraries
     lipo \
-        "$OUTDIR/wolfprov-${type}-arm64/lib/libwolfprov.dylib" \
+        "$OUTDIR/wolfprov-install-${type}-arm64/lib/libwolfprov.dylib" \
         -create -output $LIPODIR/libwolfprov-${type}.dylib
 
     echo "Checking libraries"

IDE/XCODE/run_openssl.sh

@@ -3,16 +3,14 @@
 set -e
 
 RUNDIR=$(pwd)
-OPENSSL_DIR=${RUNDIR}/openssl-source/artifacts/macosx-x86_64
-WOLFPROV_LIB=${RUNDIR}/artifacts/xcframework/libwolfprov.xcframework/macos-arm64_x86_64
-export LD_LIBRARY_PATH=${WOLFPROV_LIB}:${OPENSSL_DIR}
+ARCH=$(uname -m)
+OPENSSL_DIR=${RUNDIR}/openssl-source/artifacts/openssl-install-macosx-${ARCH}/
+WOLFPROV_LIB=${RUNDIR}/artifacts/wolfprov-install-macosx-${ARCH}/lib
+export LD_LIBRARY_PATH=${WOLFPROV_LIB}:${OPENSSL_DIR}/lib
 export OPENSSL_MODULES=${WOLFPROV_LIB}
 export OPENSSL_CONF=${RUNDIR}/provider.conf
 
-# Most places expect the file to be called 'libwolfprov.so/dll/dylib'
-ln -s ${WOLFPROV_LIB}/libwolfprov-macosx.dylib ${WOLFPROV_LIB}/libwolfprov.dylib || true
-
 # Run the tests
-${OPENSSL_DIR}/apps/openssl list -verbose -provider-path ${WOLFPROV_LIB} -providers
+${OPENSSL_DIR}/bin/openssl list -verbose -provider-path ${WOLFPROV_LIB} -providers
 
 ${RUNDIR}/artifacts/openssl_example

src/wp_fips.c

@@ -42,7 +42,7 @@ void wolfProvider_SetFipsChecks(long checksMask)
  *
  * @return  The FIPS checks mask.
  */
-long wolfProvider_GetFipsChecks()
+long wolfProvider_GetFipsChecks(void)
 {
     return fipsChecks;
 }

src/wp_rsa_asym.c

@@ -76,7 +76,7 @@ typedef struct wp_RsaAsymCtx {
     /** wolfSSL id of MGF operation to perform when padding mode is PSS. */
     int mgf;
     /** Indicates that the MGF id has been set explicitly. */
-    int mgfSet:1;
+    unsigned int mgfSet:1;
     /** Label to use with OAEP. */
     unsigned char* label;
     /** Length of label. */

src/wp_rsa_sig.c

@@ -89,7 +89,7 @@ typedef struct wp_RsaSigCtx {
     /** wolfSSL id of MGF operation to perform when padding mode is PSS. */
     int mgf;
     /** Indicates that the MGF id has been set explicitly. */
-    int mgfSet:1;
+    unsigned int mgfSet:1;
 
     /** Property query string. */
     char* propQuery;

test/unit.h

@@ -64,16 +64,16 @@ void print_buffer(const char *desc, const unsigned char *buffer, size_t len);
 
 typedef int (*TEST_FUNC)(void *data);
 typedef struct TEST_CASE {
-    const char *name;
-    TEST_FUNC   func;
-    void       *data;
-    int         err;
-    int         run:1;
-    int         done:1;
+    const char   *name;
+    TEST_FUNC     func;
+    void         *data;
+    int           err;
+    unsigned int  run:1;
+    unsigned int  done:1;
 #ifdef TEST_MULTITHREADED
-    int         attempted:1;
-    pthread_t   thread;
-    int         cnt;
+    unsigned int  attempted:1;
+    pthread_t     thread;
+    int           cnt;
 #endif
 } TEST_CASE;