Fix Coverity #305800

Plus some minor style fix

diff --git a/benchmark/sign.c b/benchmark/sign.c
index 7696b9123273cda6cc3ce5164d59c7c92392716b..d9b08bb725890a35d4ac1aa2d879177eecc3c905 100644 (file)
--- a/benchmark/sign.c
+++ b/benchmark/sign.c
@@ -40,27 +40,24 @@ static EVP_PKEY *create_key(const char *algname, const char *param)
        EVP_PKEY *key1 = EVP_PKEY_new(), *newkey = NULL;
        EVP_PKEY_CTX *ctx = NULL;
 
-       if(EVP_PKEY_set_type_str(key1, algname, strlen(algname)) <= 0)
-       {
-               goto err;
-       }
-       if(!(ctx = EVP_PKEY_CTX_new(key1, NULL)))
-       {
-               goto err;
-       }
-       EVP_PKEY_keygen_init(ctx);
-       if(ERR_peek_last_error())
-       {
-               goto err;
-       }
-       if(EVP_PKEY_CTX_ctrl_str(ctx, "paramset", param) <= 0)
-       {
-               goto err;
-       }
-       if(EVP_PKEY_keygen(ctx, &newkey) <= 0)
-       {
-               goto err;
-       }
+       if (EVP_PKEY_set_type_str(key1, algname, strlen(algname)) <= 0)
+                 goto err;
+
+       if (!(ctx = EVP_PKEY_CTX_new(key1, NULL)))
+                 goto err;
+
+       if (EVP_PKEY_keygen_init(ctx) == 0)
+                 goto err;
+
+       if (ERR_peek_last_error())
+                 goto err;
+
+       if (EVP_PKEY_CTX_ctrl_str(ctx, "paramset", param) <= 0)
+                 goto err;
+
+       if (EVP_PKEY_keygen(ctx, &newkey) <= 0)
+                 goto err;
+
 err:
        if(ctx)
                EVP_PKEY_CTX_free(ctx);