Cleanup to address review comments

Author: ColtonWilley

src/wp_ecdsa_sig.c

@@ -185,11 +185,10 @@ static int wp_ecdsa_signverify_init(wp_EcdsaSigCtx *ctx, wp_Ecc* ecc,
 {
     int ok = 1;
 
-    if (ecc == NULL && ctx->ecc == NULL) {
+    if (ctx == NULL || (ecc == NULL && ctx->ecc == NULL)) {
         ok = 0;
     }
-
-    if (ok && ecc != NULL) {
+    else if (ecc != NULL) {
         if (!wp_ecc_up_ref(ecc)) {
             ok = 0;
         }

src/wp_ecx_sig.c

@@ -188,11 +188,10 @@ static int wp_ecx_digest_signverify_init(wp_EcxSigCtx *ctx,
         ok = 0;
     }
 
-    if (ctx->ecx == NULL && ecx == NULL) {
+    if (ok && (ctx == NULL || (ctx->ecx == NULL && ecx == NULL))) {
         ok = 0;
     }
-
-    if (ok && (ecx != NULL)) {
+    else if (ok && ecx != NULL) {
         if (!wp_ecx_up_ref(ecx)) {
             ok = 0;
         }

src/wp_rsa_sig.c

@@ -458,7 +458,7 @@ static int wp_rsa_signverify_init(wp_RsaSigCtx* ctx, wp_Rsa* rsa,
     if ((ctx == NULL) || (ctx->rsa == NULL && rsa == NULL)) {
         ok = 0;
     }
-    if (ok && (rsa != NULL)) {
+    else if (rsa != NULL) {
         if (!wp_rsa_up_ref(rsa)) {
             ok = 0;
         }

test/test_ecc.c

@@ -2007,20 +2007,16 @@ int test_ec_import(void* data)
 
 static int test_ec_null_sign_init_ex(OSSL_LIB_CTX *libCtx)
 {
+#ifndef WP_HAVE_EC_P256
+    (void)libCtx;
+    PRINT_MSG("Skipping test - WP_HAVE_EC_P256 not defined");
+    return 0;
+#else
     int err = 0;
     EVP_MD_CTX *ctx = NULL;
     EVP_MD *md = NULL;
     EVP_PKEY *pkey = NULL;
-#ifdef WP_HAVE_EC_P256
     const unsigned char *p = ecc_key_der_256;
-#endif
-
-#ifndef WP_HAVE_EC_P256
-    (void)libCtx;
-    (void)provider_name;
-    PRINT_MSG("Skipping test - WP_HAVE_EC_P256 not defined");
-    return 0;
-#endif
 
     err = (ctx = EVP_MD_CTX_new()) == NULL;
     if (err == 0) {
@@ -2043,6 +2039,7 @@ static int test_ec_null_sign_init_ex(OSSL_LIB_CTX *libCtx)
     EVP_MD_CTX_free(ctx);
 
     return err;
+#endif
 }
 
 int test_ec_null_init(void* data)