KNF.

1 files changed, 58 insertions, 67 deletions

diff --git a/src/lib/libcrypto/evp/m_sigver.c b/src/lib/libcrypto/evp/m_sigver.c
index 7e2731f4a4..0274a72c1c 100644
--- a/src/lib/libcrypto/evp/m_sigver.c
+++ b/src/lib/libcrypto/evp/m_sigver.c
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -63,50 +63,42 @@
 #include <openssl/x509.h>
 #include "evp_locl.h"
 
-static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                          const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey,
-                          int ver)
-        {
+static int
+do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
+    ENGINE *e, EVP_PKEY *pkey, int ver)
+{
         if (ctx->pctx == NULL)
                 ctx->pctx = EVP_PKEY_CTX_new(pkey, e);
         if (ctx->pctx == NULL)
                 return 0;
 
-        if (type == NULL)
-                {
+        if (type == NULL) {
                 int def_nid;
                 if (EVP_PKEY_get_default_digest_nid(pkey, &def_nid) > 0)
                         type = EVP_get_digestbynid(def_nid);
-                }
+        }
 
-        if (type == NULL)
-                {
+        if (type == NULL) {
                 EVPerr(EVP_F_DO_SIGVER_INIT, EVP_R_NO_DEFAULT_DIGEST);
                 return 0;
-                }
+        }
 
-        if (ver)
-                {
-                if (ctx->pctx->pmeth->verifyctx_init)
-                        {
-                        if (ctx->pctx->pmeth->verifyctx_init(ctx->pctx, ctx) <=0)
+        if (ver) {
+                if (ctx->pctx->pmeth->verifyctx_init) {
+                        if (ctx->pctx->pmeth->verifyctx_init(ctx->pctx,
+                            ctx) <=0)
                                 return 0;
                         ctx->pctx->operation = EVP_PKEY_OP_VERIFYCTX;
-                        }
-                else if (EVP_PKEY_verify_init(ctx->pctx) <= 0)
+                } else if (EVP_PKEY_verify_init(ctx->pctx) <= 0)
                         return 0;
-                }
-        else
-                {
-                if (ctx->pctx->pmeth->signctx_init)
-                        {
+        } else {
+                if (ctx->pctx->pmeth->signctx_init) {
                         if (ctx->pctx->pmeth->signctx_init(ctx->pctx, ctx) <= 0)
                                 return 0;
                         ctx->pctx->operation = EVP_PKEY_OP_SIGNCTX;
-                        }
-                else if (EVP_PKEY_sign_init(ctx->pctx) <= 0)
+                } else if (EVP_PKEY_sign_init(ctx->pctx) <= 0)
                         return 0;
-                }
+        }
         if (EVP_PKEY_CTX_set_signature_md(ctx->pctx, type) <= 0)
                 return 0;
         if (pctx)
@@ -114,65 +106,66 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
         if (!EVP_DigestInit_ex(ctx, type, e))
                 return 0;
         return 1;
-        }
+}
 
-int EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                        const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey)
-        {
+int
+EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
+    ENGINE *e, EVP_PKEY *pkey)
+{
         return do_sigver_init(ctx, pctx, type, e, pkey, 0);
-        }
+}
 
-int EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                        const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey)
-        {
+int
+EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, const EVP_MD *type,
+    ENGINE *e, EVP_PKEY *pkey)
+{
         return do_sigver_init(ctx, pctx, type, e, pkey, 1);
-        }
+}
 
-int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
-        {
+int
+EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
+{
         int sctx, r = 0;
+
         if (ctx->pctx->pmeth->signctx)
                 sctx = 1;
         else
                 sctx = 0;
-        if (sigret)
-                {
+        if (sigret) {
                 EVP_MD_CTX tmp_ctx;
                 unsigned char md[EVP_MAX_MD_SIZE];
                 unsigned int mdlen;
                 EVP_MD_CTX_init(&tmp_ctx);
-                if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
-                        return 0;
+                if (!EVP_MD_CTX_copy_ex(&tmp_ctx, ctx))
+                        return 0;
                 if (sctx)
                         r = tmp_ctx.pctx->pmeth->signctx(tmp_ctx.pctx,
-                                        sigret, siglen, &tmp_ctx);
+                            sigret, siglen, &tmp_ctx);
                 else
-                        r = EVP_DigestFinal_ex(&tmp_ctx,md,&mdlen);
+                        r = EVP_DigestFinal_ex(&tmp_ctx, md, &mdlen);
                 EVP_MD_CTX_cleanup(&tmp_ctx);
                 if (sctx || !r)
                         return r;
                 if (EVP_PKEY_sign(ctx->pctx, sigret, siglen, md, mdlen) <= 0)
                         return 0;
-                }
-        else
-                {
-                if (sctx)
-                        {
-                        if (ctx->pctx->pmeth->signctx(ctx->pctx, sigret, siglen, ctx) <= 0)
+        } else {
+                if (sctx) {
+                        if (ctx->pctx->pmeth->signctx(ctx->pctx, sigret,
+                            siglen, ctx) <= 0)
                                 return 0;
-                        }
-                else
-                        {
+                } else {
                         int s = EVP_MD_size(ctx->digest);
-                        if (s < 0 || EVP_PKEY_sign(ctx->pctx, sigret, siglen, NULL, s) <= 0)
+                        if (s < 0 || EVP_PKEY_sign(ctx->pctx, sigret, siglen,
+                            NULL, s) <= 0)
                                 return 0;
-                        }
                 }
-        return 1;
         }
+        return 1;
+}
 
-int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, unsigned char *sig, size_t siglen)
-        {
+int
+EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, unsigned char *sig, size_t siglen)
+{
         EVP_MD_CTX tmp_ctx;
         unsigned char md[EVP_MAX_MD_SIZE];
         int r;
@@ -184,17 +177,15 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, unsigned char *sig, size_t siglen)
         else
                 vctx = 0;
         EVP_MD_CTX_init(&tmp_ctx);
-        if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
-                return -1;      
-        if (vctx)
-                {
-                r = tmp_ctx.pctx->pmeth->verifyctx(tmp_ctx.pctx,
-                                        sig, siglen, &tmp_ctx);
-                }
-        else
-                r = EVP_DigestFinal_ex(&tmp_ctx,md,&mdlen);
+        if (!EVP_MD_CTX_copy_ex(&tmp_ctx, ctx))
+                return -1;
+        if (vctx) {
+                r = tmp_ctx.pctx->pmeth->verifyctx(tmp_ctx.pctx, sig,
+                    siglen, &tmp_ctx);
+        } else
+                r = EVP_DigestFinal_ex(&tmp_ctx, md, &mdlen);
         EVP_MD_CTX_cleanup(&tmp_ctx);
         if (vctx || !r)
                 return r;
         return EVP_PKEY_verify(ctx->pctx, sig, siglen, md, mdlen);
-        }
+}