Merge pull request #67 from SparkiDev/params_get_uint_fix

Params get uint: fix setting 'set'

Author: ColtonWilley

README.md

@@ -71,7 +71,7 @@ sudo make install
 git clone https://github.com/wolfssl/wolfssl.git
 cd wolfssl
 ./autogen.sh
-./configure --enable-opensslcoexist --enable-cmac --enable-keygen --enable-sha --enable-des3 --enable-aesctr --enable-aesccm --enable-x963kdf --enable-compkey CPPFLAGS="-DHAVE_AES_ECB -DWOLFSSL_AES_DIRECT -DWC_RSA_NO_PADDING -DWOLFSSL_PUBLIC_MP -DECC_MIN_KEY_SZ=192 -DHAVE_PUBLIC_FFDHE -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_LONG_SALT -DWOLFSSL_PSS_SALT_LEN_DISCOVER -DRSA_MIN_SIZE=1024" --enable-certgen --enable-aeskeywrap --enable-enckeys --enable-base16
+./configure --enable-opensslcoexist --enable-cmac --enable-keygen --enable-sha --enable-des3 --enable-aesctr --enable-aesccm --enable-x963kdf --enable-compkey CPPFLAGS="-DHAVE_AES_ECB -DWOLFSSL_AES_DIRECT -DWC_RSA_NO_PADDING -DWOLFSSL_PUBLIC_MP -DHAVE_PUBLIC_FFDHE -DWOLFSSL_DH_EXTRA -DWOLFSSL_PSS_LONG_SALT -DWOLFSSL_PSS_SALT_LEN_DISCOVER -DRSA_MIN_SIZE=1024" --enable-certgen --enable-aeskeywrap --enable-enckeys --enable-base16 --with-eccminsz=192
 make
 sudo make install
 ```
@@ -90,6 +90,8 @@ Add `--enable-sp=yes,asm' '--enable-sp-math-all'` to use SP Integer maths. Repla
 
 Remove `-DWOLFSSL_PSS_LONG_SALT -DWOLFSSL_PSS_SALT_LEN_DISCOVER` and add `--enable-fips=v2` to the configure command above if building from a FIPS v2 bundle and not the git repository. Change `--enable-fips=v2` to `--enable-fips=ready` if using a FIPS Ready bundle.
 
+If '--with-eccminsz=192' is not supported by wolfSSL, add '-DECC_MIN_KEY_SZ=192' to the CPPFLAGS.
+
 ### wolfProvider
 
 ```

src/wp_fips.c

@@ -30,7 +30,7 @@ static long fipsChecks = WP_FIPS_CHECKS_DEFAULT;
  * Default FIPS checks for wolfProvider is WE_FIPS_CHECKS_DEFAULT.
  *
  * @param checksMask  [in]  Bitmask of FIPS checks from wolfProvider_FipsCheck
- *                          in we_fips.h.
+ *                          in wp_fips.h.
  */
 void wolfProvider_SetFipsChecks(long checksMask)
 {

src/wp_logging.c

@@ -104,7 +104,7 @@ void wolfProv_Debugging_OFF(void)
  * Default logging level for wolfProv is WP_LOG_LEVEL_DEFAULT.
  *
  * @param levelMask [IN] Bitmask of logging levels from wolfProv_LogType
- *                  in we_logging.h.
+ *                  in wp_logging.h.
  * @return 0 on success, NOT_COMPILED_IN if debugging has not been enabled.
  */
 int wolfProv_SetLogLevel(int levelMask)
@@ -123,7 +123,7 @@ int wolfProv_SetLogLevel(int levelMask)
  * Default component level for wolfProv is WP_LOG_COMPONENT_DEFAULT.
  *
  * @param componentMask [IN] Bitmask of components from
- *                      wolfProv_LogComponents in we_logging.h.
+ *                      wolfProv_LogComponents in wp_logging.h.
  * @return 0 on success, NOT_COMPILED_IN if debugging has not been enabled.
  */
 int wolfProv_SetLogComponents(int componentMask)

src/wp_params.c

@@ -554,13 +554,13 @@ int wp_params_get_uint(const OSSL_PARAM* params, const char* key,
     const OSSL_PARAM* p;
 
     if (set != NULL) {
-        *set = 1;
+        *set = 0;
     }
     p = OSSL_PARAM_locate_const(params, key);
     if ((p != NULL) && (!OSSL_PARAM_get_uint(p, val))) {
         ok = 0;
     }
-    if (ok && (set != NULL)) {
+    if (ok && (p != NULL) && (set != NULL)) {
         *set = 1;
     }