Code style: space after 'if'

Reviewed-by: Matt Caswell <gitlab@openssl.org>

diff --git a/apps/apps.c b/apps/apps.c
index 9862afde3a775ff0699a5c1ec0530542ea3f3fd8..5b7aedccde0004e1780f405704f84d4dc2f615f0 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -572,7 +572,7 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp)
         char *prompt = NULL;
 
         prompt = UI_construct_prompt(ui, "pass phrase", prompt_info);
-        if(!prompt) {
+        if (!prompt) {
             BIO_printf(bio_err, "Out of memory\n");
             UI_free(ui);
             return 0;
@@ -586,7 +586,7 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp)
                                      PW_MIN_LENGTH, bufsiz - 1);
         if (ok >= 0 && verify) {
             buff = (char *)OPENSSL_malloc(bufsiz);
-            if(!buff) {
+            if (!buff) {
                 BIO_printf(bio_err, "Out of memory\n");
                 UI_free(ui);
                 OPENSSL_free(prompt);

diff --git a/apps/ca.c b/apps/ca.c
index 5d29a64c57a07a908d5abe8a5773e8b62c24ccd8..97ad0c1ffe96b55386756bbf4677a77bf0e0d73e 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -558,7 +558,7 @@ int MAIN(int argc, char **argv)
 #ifdef OPENSSL_SYS_VMS
         len = strlen(s) + sizeof(CONFIG_FILE);
         tofree = OPENSSL_malloc(len);
-        if(!tofree) {
+        if (!tofree) {
             BIO_printf(bio_err, "Out of memory\n");
             goto err;
         }
@@ -566,7 +566,7 @@ int MAIN(int argc, char **argv)
 #else
         len = strlen(s) + sizeof(CONFIG_FILE) + 1;
         tofree = OPENSSL_malloc(len);
-        if(!tofree) {
+        if (!tofree) {
             BIO_printf(bio_err, "Out of memory\n");
             goto err;
         }
@@ -2803,7 +2803,7 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
     ASN1_GENERALIZEDTIME *comp_time = NULL;
     tmp = BUF_strdup(str);
 
-    if(!tmp) {
+    if (!tmp) {
         BIO_printf(bio_err, "memory allocation failure\n");
         goto err;
     }
@@ -2825,7 +2825,7 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
 
     if (prevtm) {
         *prevtm = ASN1_UTCTIME_new();
-        if(!*prevtm) {
+        if (!*prevtm) {
             BIO_printf(bio_err, "memory allocation failure\n");
             goto err;
         }
@@ -2869,7 +2869,7 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
                 goto err;
             }
             comp_time = ASN1_GENERALIZEDTIME_new();
-            if(!comp_time) {
+            if (!comp_time) {
                 BIO_printf(bio_err, "memory allocation failure\n");
                 goto err;
             }

diff --git a/apps/s_client.c b/apps/s_client.c
index 1f37239e274c925fb3daaede0b20ef68a7aa26c6..b9b79756a3388c122d79f4fd237605c57b656d8a 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -547,7 +547,7 @@ static char *MS_CALLBACK ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
     PW_CB_DATA cb_tmp;
     int l;
 
-    if(!pass) {
+    if (!pass) {
         BIO_printf(bio_err, "Malloc failure\n");
         return NULL;
     }

diff --git a/apps/s_server.c b/apps/s_server.c
index 35b4061e89ce1b3fad0c506aea447333849d792c..648dc6ab0aaa9548c222e1764491d11c97f8537a 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -720,7 +720,7 @@ static int ebcdic_write(BIO *b, const char *in, int inl)
             num = inl;
         wbuf =
             (EBCDIC_OUTBUFF *) OPENSSL_malloc(sizeof(EBCDIC_OUTBUFF) + num);
-        if(!wbuf)
+        if (!wbuf)
             return 0;
         OPENSSL_free(b->ptr);
 
@@ -2916,7 +2916,7 @@ static int generate_session_id(const SSL *ssl, unsigned char *id,
 {
     unsigned int count = 0;
     do {
-        if(RAND_pseudo_bytes(id, *id_len) < 0)
+        if (RAND_pseudo_bytes(id, *id_len) < 0)
             return 0;
         /*
          * Prefix the session_id with the required prefix. NB: If our prefix

diff --git a/apps/s_time.c b/apps/s_time.c
index a40997a22e532dd81ab45eee3fe6a4e08a811455..38788f7130c7ccec1234b03739e1c4bf2c120054 100644 (file)
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -302,7 +302,7 @@ static int parseArgs(int argc, char **argv)
             if (--argc < 1)
                 goto bad;
             maxTime = atoi(*(++argv));
-            if(maxTime <= 0) {
+            if (maxTime <= 0) {
                 BIO_printf(bio_err, "time must be > 0\n");
                 badop = 1;
             }

diff --git a/apps/srp.c b/apps/srp.c
index c679448ee7c55b9451a1037cb027acbfaff0fb50..c0ff4171cabf8e8db3de81ce4bb498e46d652a21 100644 (file)
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -435,7 +435,7 @@ int MAIN(int argc, char **argv)
 # ifdef OPENSSL_SYS_VMS
             len = strlen(s) + sizeof(CONFIG_FILE);
             tofree = OPENSSL_malloc(len);
-            if(!tofree) {
+            if (!tofree) {
                 BIO_printf(bio_err, "Out of memory\n");
                 goto err;
             }
@@ -443,7 +443,7 @@ int MAIN(int argc, char **argv)
 # else
             len = strlen(s) + sizeof(CONFIG_FILE) + 1;
             tofree = OPENSSL_malloc(len);
-            if(!tofree) {
+            if (!tofree) {
                 BIO_printf(bio_err, "Out of memory\n");
                 goto err;
             }

diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index fa4dd820b758db1463f7b772ae0731af7bc9d946..96110c540f3dba9c335953f4128acf829a57a29c 100644 (file)
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -289,7 +289,7 @@ int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
     if ((flags & SMIME_DETACHED) && data) {
         /* We want multipart/signed */
         /* Generate a random boundary */
-        if(RAND_pseudo_bytes((unsigned char *)bound, 32) < 0)
+        if (RAND_pseudo_bytes((unsigned char *)bound, 32) < 0)
             return 0;
         for (i = 0; i < 32; i++) {
             c = bound[i] & 0xf;

diff --git a/crypto/asn1/bio_ndef.c b/crypto/asn1/bio_ndef.c
index 4a73ca9eac514ad2454be3281681f26f46e97a67..31949b87940fa5af84a907ffac1516073645e439 100644 (file)
--- a/crypto/asn1/bio_ndef.c
+++ b/crypto/asn1/bio_ndef.c
@@ -162,7 +162,7 @@ static int ndef_prefix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
 
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, NULL, ndef_aux->it);
     p = OPENSSL_malloc(derlen);
-    if(!p)
+    if (!p)
         return 0;
 
     ndef_aux->derbuf = p;
@@ -232,7 +232,7 @@ static int ndef_suffix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
 
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, NULL, ndef_aux->it);
     p = OPENSSL_malloc(derlen);
-    if(!p)
+    if (!p)
         return 0;
 
     ndef_aux->derbuf = p;

diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 7c54f9d1d4a305057d953654dc7eda16d89a6ae7..5e7d53e9854a6dcc3a741a04c22028269b3cc74e 100644 (file)
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -290,7 +290,7 @@ static int asn1_item_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
         for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
             const ASN1_TEMPLATE *seqtt;
             seqtt = asn1_do_adb(fld, tt, 1);
-            if(!seqtt)
+            if (!seqtt)
                 return 0;
             tmpfld = asn1_get_field_ptr(fld, seqtt);
             if (!asn1_template_print_ctx(out, tmpfld,

diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index d51b76e79e1680c110277fca7c19c4fb82ec8880..f56e837b3a083788749d6ca09658be6c38675191 100644 (file)
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -177,7 +177,7 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
     /* Save start position */
     q = *pp;
 
-    if(!a || *a == NULL) {
+    if (!a || *a == NULL) {
         freeret = 1;
     }
     ret = d2i_X509(a, pp, length);
@@ -192,7 +192,7 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
         goto err;
     return ret;
  err:
-    if(freeret) {
+    if (freeret) {
         X509_free(ret);
         if (a)
             *a = NULL;

diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index c2cf6e619ee4c28e6ac93a221cc7160a3d8b4b4f..452e5cfd95909e931490a108cf50df91df5c5d76 100644 (file)
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -710,7 +710,7 @@ doapr_outch(char **sbuffer,
                 if (*maxlen == 0)
                     *maxlen = 1024;
                 *buffer = OPENSSL_malloc(*maxlen);
-                if(!*buffer) {
+                if (!*buffer) {
                     /* Panic! Can't really do anything sensible. Just return */
                     return;
                 }
@@ -722,7 +722,7 @@ doapr_outch(char **sbuffer,
             } else {
                 *maxlen += 1024;
                 *buffer = OPENSSL_realloc(*buffer, *maxlen);
-                if(!*buffer) {
+                if (!*buffer) {
                     /* Panic! Can't really do anything sensible. Just return */
                     return;
                 }

diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c
index 44d1029f28398ec01d11cc7ee96f9f912f4cfa27..a04f32a008179821ba1b4311332bcebe37f47d2c 100644 (file)
--- a/crypto/bio/bf_nbio.c
+++ b/crypto/bio/bf_nbio.c
@@ -139,7 +139,7 @@ static int nbiof_read(BIO *b, char *out, int outl)
 
     BIO_clear_retry_flags(b);
 #if 1
-    if(RAND_pseudo_bytes(&n, 1) < 0)
+    if (RAND_pseudo_bytes(&n, 1) < 0)
         return -1;
     num = (n & 0x07);
 
@@ -179,7 +179,7 @@ static int nbiof_write(BIO *b, const char *in, int inl)
         num = nt->lwn;
         nt->lwn = 0;
     } else {
-        if(RAND_pseudo_bytes(&n, 1) < 0)
+        if (RAND_pseudo_bytes(&n, 1) < 0)
             return -1;
         num = (n & 7);
     }

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 2e78fd1e960a11b49204cf8dd49a36ce504cd073..8035213616565869ad5c358163b91dc07c20d9da 100644 (file)
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -953,7 +953,7 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
      */
     sockopt_len = (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
     authchunks = OPENSSL_malloc(sockopt_len);
-    if(!authchunks) {
+    if (!authchunks) {
         BIO_vfree(bio);
         return (NULL);
     }
@@ -1364,7 +1364,7 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
     if (data->save_shutdown && !BIO_dgram_sctp_wait_for_dry(b)) {
         char *tmp;
         data->saved_message.bio = b;
-        if(!(tmp = OPENSSL_malloc(inl))) {
+        if (!(tmp = OPENSSL_malloc(inl))) {
             BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE);
             return -1;
         }

diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 48de9cb7cac2b0f06fc60df09a2c4a3ccec91e92..9e78d4d42a14908999dfe5354a71800b7338fdb2 100644 (file)
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -157,7 +157,7 @@ static int bnrand(int pseudorand, BIGNUM *rnd, int bits, int top, int bottom)
         unsigned char c;
 
         for (i = 0; i < bytes; i++) {
-            if(RAND_pseudo_bytes(&c, 1) < 0)
+            if (RAND_pseudo_bytes(&c, 1) < 0)
                 goto err;
             if (c >= 128 && i > 0)
                 buf[i] = buf[i - 1];

diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index b9c560d43819ff43d5e9848147a704f488148dd3..a8322dcdf1a62c3afe3c11d81b115001eda99da7 100644 (file)
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -231,7 +231,7 @@ static int kek_unwrap_key(unsigned char *out, size_t *outlen,
         return 0;
     }
     tmp = OPENSSL_malloc(inlen);
-    if(!tmp)
+    if (!tmp)
         return 0;
     /* setup IV by decrypting last two blocks */
     EVP_DecryptUpdate(ctx, tmp + inlen - 2 * blocklen, &outl,

diff --git a/crypto/des/des.c b/crypto/des/des.c
index dcdb8dd65868d1c8eb98847335d2a7a6f85bde7e..586aed72378cc1ecc8d762b9fbe504c028ae8b97 100644 (file)
--- a/crypto/des/des.c
+++ b/crypto/des/des.c
@@ -456,7 +456,7 @@ void doencryption(void)
             len = l - rem;
             if (feof(DES_IN)) {
                 for (i = 7 - rem; i > 0; i--) {
-                    if(RAND_pseudo_bytes(buf + l++, 1) < 0)
+                    if (RAND_pseudo_bytes(buf + l++, 1) < 0)
                         goto problems;
                 }
                 buf[l++] = rem;

diff --git a/crypto/des/enc_writ.c b/crypto/des/enc_writ.c
index 0777b4f13910ea0b7d3be7f4480c6f2aeaf437fc..25041f2aab5e2465908a9c83c3c5c9118fe58ea5 100644 (file)
--- a/crypto/des/enc_writ.c
+++ b/crypto/des/enc_writ.c
@@ -132,7 +132,7 @@ int DES_enc_write(int fd, const void *_buf, int len,
     if (len < 8) {
         cp = shortbuf;
         memcpy(shortbuf, buf, len);
-        if(RAND_pseudo_bytes(shortbuf + len, 8 - len) < 0) {
+        if (RAND_pseudo_bytes(shortbuf + len, 8 - len) < 0) {
             return -1;
         }
         rnum = 8;

diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 1dec109835817f433ab08242a6fe5c1f777b5a75..873eb2e22de804db1cac3e39c9583343e9532f24 100644 (file)
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -135,7 +135,7 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     dh = pkey->pkey.dh;
 
     str = ASN1_STRING_new();
-    if(!str) {
+    if (!str) {
         DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
         goto err;
     }

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 312335242d1170abe61cb89140caf19b1debf2fc..d686ab0af77058239d00dec8abf9a9200ac1c5db 100644 (file)
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -202,7 +202,7 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
                 goto err;
 
             if (!seed_len) {
-                if(RAND_pseudo_bytes(seed, qsize) < 0)
+                if (RAND_pseudo_bytes(seed, qsize) < 0)
                     goto err;
                 seed_is_random = 1;
             } else {

diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index b30eab0319ffcabb004ddd76a7ffc9473bbd057a..6edb26d97397c1930a42f079f4ea41dceccf438e 100644 (file)
--- a/crypto/dsa/dsa_ossl.c
+++ b/crypto/dsa/dsa_ossl.c
@@ -106,23 +106,23 @@ static DSA_METHOD openssl_dsa_meth = {
 #define DSA_MOD_EXP(err_instr,dsa,rr,a1,p1,a2,p2,m,ctx,in_mont) \
         do { \
         int _tmp_res53; \
-        if((dsa)->meth->dsa_mod_exp) \
+        if ((dsa)->meth->dsa_mod_exp) \
                 _tmp_res53 = (dsa)->meth->dsa_mod_exp((dsa), (rr), (a1), (p1), \
                                 (a2), (p2), (m), (ctx), (in_mont)); \
         else \
                 _tmp_res53 = BN_mod_exp2_mont((rr), (a1), (p1), (a2), (p2), \
                                 (m), (ctx), (in_mont)); \
-        if(!_tmp_res53) err_instr; \
+        if (!_tmp_res53) err_instr; \
         } while(0)
 #define DSA_BN_MOD_EXP(err_instr,dsa,r,a,p,m,ctx,m_ctx) \
         do { \
         int _tmp_res53; \
-        if((dsa)->meth->bn_mod_exp) \
+        if ((dsa)->meth->bn_mod_exp) \
                 _tmp_res53 = (dsa)->meth->bn_mod_exp((dsa), (r), (a), (p), \
                                 (m), (ctx), (m_ctx)); \
         else \
                 _tmp_res53 = BN_mod_exp_mont((r), (a), (p), (m), (ctx), (m_ctx)); \
-        if(!_tmp_res53) err_instr; \
+        if (!_tmp_res53) err_instr; \
         } while(0)
 
 const DSA_METHOD *DSA_OpenSSL(void)

diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index d2a48bb6640c4a270aec66a8187c812583a4a3ae..09b8eafccacc3d5ee07ac17994b17d356434df9c 100644 (file)
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -285,7 +285,7 @@ DSO_FUNC_TYPE DSO_bind_func(DSO *dso, const char *symname)
  * honest. For one thing, I think I have to return a negative value for any
  * error because possible DSO_ctrl() commands may return values such as
  * "size"s that can legitimately be zero (making the standard
- * "if(DSO_cmd(...))" form that works almost everywhere else fail at odd
+ * "if (DSO_cmd(...))" form that works almost everywhere else fail at odd
  * times. I'd prefer "output" values to be passed by reference and the return
  * value as success/failure like usual ... but we conform when we must... :-)
  */

diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index 0eff96ec22f9925ba183fbabc1e97a9dc54c2826..d0794b8fb044b8f9e9b108cfc3e624791ea1dff0 100644 (file)
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c
@@ -539,7 +539,7 @@ static char *vms_name_converter(DSO *dso, const char *filename)
 {
     int len = strlen(filename);
     char *not_translated = OPENSSL_malloc(len + 1);
-    if(not_translated)
+    if (not_translated)
         strcpy(not_translated, filename);
     return (not_translated);
 }

diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index 859712fb74e8a65a4c14030e02f2fa5011b2ee70..5c32e35e17b9cf0bf133b42b86fe4ac3bb306f22 100644 (file)
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -491,7 +491,7 @@ static int sig_out(BIO *b)
      * FIXME: there's absolutely no guarantee this makes any sense at all,
      * particularly now EVP_MD_CTX has been restructured.
      */
-    if(RAND_pseudo_bytes(md->md_data, md->digest->md_size) < 0)
+    if (RAND_pseudo_bytes(md->md_data, md->digest->md_size) < 0)
         goto berr;
     memcpy(&(ctx->buf[ctx->buf_len]), md->md_data, md->digest->md_size);
     longswap(&(ctx->buf[ctx->buf_len]), md->digest->md_size);

diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 2daacf6e704fe311ce4687c15396e0131b9663b0..b1f7317d7b354ee776eda3472d643791a975fe58 100644 (file)
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -91,13 +91,13 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
     if (md != NULL) {
         reset = 1;
         ctx->md = md;
-    } else if(ctx->md) {
+    } else if (ctx->md) {
         md = ctx->md;
     } else {
         return 0;
     }
 
-    if(!ctx->key_init && key == NULL)
+    if (!ctx->key_init && key == NULL)
         return 0;
 
     if (key != NULL) {
@@ -113,7 +113,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
                                     &ctx->key_length))
                 goto err;
         } else {
-            if(len < 0 || len > (int)sizeof(ctx->key))
+            if (len < 0 || len > (int)sizeof(ctx->key))
                 return 0;
             memcpy(ctx->key, key, len);
             ctx->key_length = len;
@@ -159,7 +159,7 @@ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
     if (FIPS_mode() && !ctx->i_ctx.engine)
         return FIPS_hmac_update(ctx, data, len);
 #endif
-    if(!ctx->key_init)
+    if (!ctx->key_init)
         return 0;
 
     return EVP_DigestUpdate(&ctx->md_ctx, data, len);
@@ -174,7 +174,7 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
         return FIPS_hmac_final(ctx, md, len);
 #endif
 
-    if(!ctx->key_init)
+    if (!ctx->key_init)
         goto err;
 
     if (!EVP_DigestFinal_ex(&ctx->md_ctx, buf, &i))
@@ -208,7 +208,7 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
     if (!EVP_MD_CTX_copy(&dctx->md_ctx, &sctx->md_ctx))
         goto err;
     dctx->key_init = sctx->key_init;
-    if(sctx->key_init) {
+    if (sctx->key_init) {
         memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
         dctx->key_length = sctx->key_length;
     }

diff --git a/crypto/hmac/hmactest.c b/crypto/hmac/hmactest.c
index 5c8ec4c6152ec1a1d284ddbfff5eed82c39b0700..86b6c2529fe29c557ceaa7297eb284afa042fd96 100644 (file)
--- a/crypto/hmac/hmactest.c
+++ b/crypto/hmac/hmactest.c
@@ -173,22 +173,22 @@ int main(int argc, char *argv[])
 
 /* test4 */
     HMAC_CTX_init(&ctx);
-    if(HMAC_Init_ex(&ctx, NULL, 0, NULL, NULL)) {
+    if (HMAC_Init_ex(&ctx, NULL, 0, NULL, NULL)) {
         printf("Should fail to initialise HMAC with empty MD and key (test 4)\n");
         err++;
         goto test5;
     }
-    if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+    if (HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
         printf("Should fail HMAC_Update with ctx not set up (test 4)\n");
         err++;
         goto test5;
     }
-    if(HMAC_Init_ex(&ctx, NULL, 0, EVP_sha1(), NULL)) {
+    if (HMAC_Init_ex(&ctx, NULL, 0, EVP_sha1(), NULL)) {
         printf("Should fail to initialise HMAC with empty key (test 4)\n");
         err++;
         goto test5;
     }
-    if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+    if (HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
         printf("Should fail HMAC_Update with ctx not set up (test 4)\n");
         err++;
         goto test5;
@@ -196,32 +196,32 @@ int main(int argc, char *argv[])
     printf("test 4 ok\n");
 test5:
     HMAC_CTX_init(&ctx);
-    if(HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, NULL, NULL)) {
+    if (HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, NULL, NULL)) {
         printf("Should fail to initialise HMAC with empty MD (test 5)\n");
         err++;
         goto test6;
     }
-    if(HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+    if (HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
         printf("Should fail HMAC_Update with ctx not set up (test 5)\n");
         err++;
         goto test6;
     }
-    if(HMAC_Init_ex(&ctx, test[4].key, -1, EVP_sha1(), NULL)) {
+    if (HMAC_Init_ex(&ctx, test[4].key, -1, EVP_sha1(), NULL)) {
         printf("Should fail to initialise HMAC with invalid key len(test 5)\n");
         err++;
         goto test6;
     }
-    if(!HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, EVP_sha1(), NULL)) {
+    if (!HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, EVP_sha1(), NULL)) {
         printf("Failed to initialise HMAC (test 5)\n");
         err++;
         goto test6;
     }
-    if(!HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
+    if (!HMAC_Update(&ctx, test[4].data, test[4].data_len)) {
         printf("Error updating HMAC with data (test 5)\n");
         err++;
         goto test6;
     }
-    if(!HMAC_Final(&ctx, buf, &len)) {
+    if (!HMAC_Final(&ctx, buf, &len)) {
         printf("Error finalising data (test 5)\n");
         err++;
         goto test6;
@@ -233,17 +233,17 @@ test5:
         err++;
         goto test6;
     }
-    if(!HMAC_Init_ex(&ctx, NULL, 0, EVP_sha256(), NULL)) {
+    if (!HMAC_Init_ex(&ctx, NULL, 0, EVP_sha256(), NULL)) {
         printf("Failed to reinitialise HMAC (test 5)\n");
         err++;
         goto test6;
     }
-    if(!HMAC_Update(&ctx, test[5].data, test[5].data_len)) {
+    if (!HMAC_Update(&ctx, test[5].data, test[5].data_len)) {
         printf("Error updating HMAC with data (sha256) (test 5)\n");
         err++;
         goto test6;
     }
-    if(!HMAC_Final(&ctx, buf, &len)) {
+    if (!HMAC_Final(&ctx, buf, &len)) {
         printf("Error finalising data (sha256) (test 5)\n");
         err++;
         goto test6;
@@ -255,17 +255,17 @@ test5:
         err++;
         goto test6;
     }
-    if(!HMAC_Init_ex(&ctx, test[6].key, test[6].key_len, NULL, NULL)) {
+    if (!HMAC_Init_ex(&ctx, test[6].key, test[6].key_len, NULL, NULL)) {
         printf("Failed to reinitialise HMAC with key (test 5)\n");
         err++;
         goto test6;
     }
-    if(!HMAC_Update(&ctx, test[6].data, test[6].data_len)) {
+    if (!HMAC_Update(&ctx, test[6].data, test[6].data_len)) {
         printf("Error updating HMAC with data (new key) (test 5)\n");
         err++;
         goto test6;
     }
-    if(!HMAC_Final(&ctx, buf, &len)) {
+    if (!HMAC_Final(&ctx, buf, &len)) {
         printf("Error finalising data (new key) (test 5)\n");
         err++;
         goto test6;
@@ -280,22 +280,22 @@ test5:
     }
 test6:
     HMAC_CTX_init(&ctx);
-    if(!HMAC_Init_ex(&ctx, test[7].key, test[7].key_len, EVP_sha1(), NULL)) {
+    if (!HMAC_Init_ex(&ctx, test[7].key, test[7].key_len, EVP_sha1(), NULL)) {
         printf("Failed to initialise HMAC (test 6)\n");
         err++;
         goto end;
     }
-    if(!HMAC_Update(&ctx, test[7].data, test[7].data_len)) {
+    if (!HMAC_Update(&ctx, test[7].data, test[7].data_len)) {
         printf("Error updating HMAC with data (test 6)\n");
         err++;
         goto end;
     }
-    if(!HMAC_CTX_copy(&ctx2, &ctx)) {
+    if (!HMAC_CTX_copy(&ctx2, &ctx)) {
         printf("Failed to copy HMAC_CTX (test 6)\n");
         err++;
         goto end;
     }
-    if(!HMAC_Final(&ctx2, buf, &len)) {
+    if (!HMAC_Final(&ctx2, buf, &len)) {
         printf("Error finalising data (test 6)\n");
         err++;
         goto end;

diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index c6774f4578db41555c9b6b182e4f3c4bf3fe19ea..24859926ace6d9b79f8bf198c18610215e561812 100644 (file)
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -313,7 +313,7 @@ void OBJ_NAME_do_all_sorted(int type,
     d.names =
         OPENSSL_malloc(lh_OBJ_NAME_num_items(names_lh) * sizeof *d.names);
     /* Really should return an error if !d.names...but its a void function! */
-    if(d.names) {
+    if (d.names) {
         d.n = 0;
         OBJ_NAME_do_all(type, do_all_sorted_fn, &d);
 

diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
index fdfddf9fc135f7473e239c5836cce4767bd8f679..c19648c7329b3bc45246146d83f2462b6a288914 100644 (file)
--- a/crypto/ocsp/ocsp_ext.c
+++ b/crypto/ocsp/ocsp_ext.c
@@ -361,7 +361,7 @@ static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts,
     ASN1_put_object(&tmpval, 0, len, V_ASN1_OCTET_STRING, V_ASN1_UNIVERSAL);
     if (val)
         memcpy(tmpval, val, len);
-    else if(RAND_pseudo_bytes(tmpval, len) < 0)
+    else if (RAND_pseudo_bytes(tmpval, len) < 0)
         goto err;
     if (!X509V3_add1_i2d(exts, NID_id_pkix_OCSP_Nonce,
                          &os, 0, X509V3_ADD_REPLACE))

diff --git a/crypto/rand/rand_os2.c b/crypto/rand/rand_os2.c
index 02148d5bf9412c20534d6d9caff52049086d9eae..706ab1e8172b16b827f839a91781e8b9ac3d8702 100644 (file)
--- a/crypto/rand/rand_os2.c
+++ b/crypto/rand/rand_os2.c
@@ -149,7 +149,7 @@ int RAND_poll(void)
     if (DosQuerySysState) {
         char *buffer = OPENSSL_malloc(256 * 1024);
 
-        if(!buffer)
+        if (!buffer)
             return 0;
 
         if (DosQuerySysState(0x1F, 0, 0, 0, buffer, 256 * 1024) == 0) {

diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 902df1013bf3caeeba141a1e5704f6e742a51bd3..50f75d7e4c9f16ba30385684114dc04859ebb867 100644 (file)
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -497,7 +497,7 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username)
     if (!SRP_user_pwd_set_ids(user, username, NULL))
         goto err;
 
-    if(RAND_pseudo_bytes(digv, SHA_DIGEST_LENGTH) < 0)
+    if (RAND_pseudo_bytes(digv, SHA_DIGEST_LENGTH) < 0)
         goto err;
     EVP_MD_CTX_init(&ctxt);
     EVP_DigestInit_ex(&ctxt, EVP_sha1(), NULL);
@@ -550,7 +550,7 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
     }
 
     if (*salt == NULL) {
-        if(RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN) < 0)
+        if (RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN) < 0)
             goto err;
 
         s = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);
@@ -611,7 +611,7 @@ int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
     srp_bn_print(g);
 
     if (*salt == NULL) {
-        if(RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN) < 0)
+        if (RAND_pseudo_bytes(tmp2, SRP_RANDOM_SALT_LEN) < 0)
             goto err;
 
         *salt = BN_bin2bn(tmp2, SRP_RANDOM_SALT_LEN, NULL);

diff --git a/crypto/threads/th-lock.c b/crypto/threads/th-lock.c
index 28884c2d44fa92ae7868364c7c570e69d512b5c7..cc8cf2581d6440afe6f58d504780b8103c8fccd4 100644 (file)
--- a/crypto/threads/th-lock.c
+++ b/crypto/threads/th-lock.c
@@ -117,7 +117,7 @@ void CRYPTO_thread_setup(void)
     int i;
 
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(HANDLE));
-    if(!lock_cs) {
+    if (!lock_cs) {
         /* Nothing we can do about this...void function! */
         return;
     }
@@ -172,7 +172,7 @@ void CRYPTO_thread_setup(void)
 # else
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(rwlock_t));
 # endif
-    if(!lock_cs) {
+    if (!lock_cs) {
         /* Nothing we can do about this...void function! */
         return;
     }
@@ -260,7 +260,7 @@ void CRYPTO_thread_setup(void)
     char filename[20];
 
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(usema_t *));
-    if(!lock_cs) {
+    if (!lock_cs) {
         /* Nothing we can do about this...void function! */
         return;
     }
@@ -328,11 +328,11 @@ void CRYPTO_thread_setup(void)
 
     lock_cs = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t));
     lock_count = OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long));
-    if(!lock_cs || !lock_count) {
+    if (!lock_cs || !lock_count) {
         /* Nothing we can do about this...void function! */
-        if(lock_cs)
+        if (lock_cs)
             OPENSSL_free(lock_cs);
-        if(lock_count)
+        if (lock_count)
             OPENSSL_free(lock_count);
         return;
     }

diff --git a/crypto/x509v3/v3_cpols.c b/crypto/x509v3/v3_cpols.c
index dca6ab2ec934f6e1f27b9483bf0760c4cb8dfe53..0febc1b3edc1cfec97677f8f1910c287510be322 100644 (file)
--- a/crypto/x509v3/v3_cpols.c
+++ b/crypto/x509v3/v3_cpols.c
@@ -230,11 +230,11 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx,
                 goto merr;
             if (!sk_POLICYQUALINFO_push(pol->qualifiers, qual))
                 goto merr;
-            if(!(qual->pqualid = OBJ_nid2obj(NID_id_qt_cps))) {
+            if (!(qual->pqualid = OBJ_nid2obj(NID_id_qt_cps))) {
                 X509V3err(X509V3_F_POLICY_SECTION, ERR_R_INTERNAL_ERROR);
                 goto err;
             }
-            if(!(qual->d.cpsuri = M_ASN1_IA5STRING_new()))
+            if (!(qual->d.cpsuri = M_ASN1_IA5STRING_new()))
                 goto merr;
             if (!ASN1_STRING_set(qual->d.cpsuri, cnf->value,
                                  strlen(cnf->value)))
@@ -294,7 +294,7 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
     POLICYQUALINFO *qual;
     if (!(qual = POLICYQUALINFO_new()))
         goto merr;
-    if(!(qual->pqualid = OBJ_nid2obj(NID_id_qt_unotice))) {
+    if (!(qual->pqualid = OBJ_nid2obj(NID_id_qt_unotice))) {
         X509V3err(X509V3_F_NOTICE_SECTION, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -304,7 +304,7 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
     for (i = 0; i < sk_CONF_VALUE_num(unot); i++) {
         cnf = sk_CONF_VALUE_value(unot, i);
         if (!strcmp(cnf->name, "explicitText")) {
-            if(!(not->exptext = M_ASN1_VISIBLESTRING_new()))
+            if (!(not->exptext = M_ASN1_VISIBLESTRING_new()))
                 goto merr;
             if (!ASN1_STRING_set(not->exptext, cnf->value,
                                  strlen(cnf->value)))

diff --git a/demos/easy_tls/easy-tls.c b/demos/easy_tls/easy-tls.c
index df6ae6cf3764b9885b5ec1af5cf090d056c19cec..5682e91a4793022d9b9e77f24890b4479656e312 100644 (file)
--- a/demos/easy_tls/easy-tls.c
+++ b/demos/easy_tls/easy-tls.c
@@ -761,7 +761,7 @@ SSL_CTX *tls_create_ctx(struct tls_create_ctx_args a, void *apparg)
         if (tls_dhe1024 == NULL) {
             int i;
 
-            if(RAND_bytes((unsigned char *)&i, sizeof i) <= 0)
+            if (RAND_bytes((unsigned char *)&i, sizeof i) <= 0)
                 goto err_return;
             /*
              * make sure that i is non-negative -- pick one of the provided

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 5cb30a52ee3d01d63d5ad025ffa339fa8bad7e20..68218e718c3839cefa5a755c82586ef958641e3b 100644 (file)
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1540,7 +1540,7 @@ int dtls1_process_heartbeat(SSL *s)
         memcpy(bp, pl, payload);
         bp += payload;
         /* Random padding */
-        if(RAND_pseudo_bytes(bp, padding) < 0) {
+        if (RAND_pseudo_bytes(bp, padding) < 0) {
             OPENSSL_free(buffer);
             return -1;
         }
@@ -1625,11 +1625,11 @@ int dtls1_heartbeat(SSL *s)
     /* Sequence number */
     s2n(s->tlsext_hb_seq, p);
     /* 16 random bytes */
-    if(RAND_pseudo_bytes(p, 16) < 0)
+    if (RAND_pseudo_bytes(p, 16) < 0)
         goto err;
     p += 16;
     /* Random padding */
-    if(RAND_pseudo_bytes(p, padding) < 0)
+    if (RAND_pseudo_bytes(p, padding) < 0)
         goto err;
 
     ret = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buf, 3 + payload + padding);

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 30ca11afb322b26b5fedaf803b2770ef1042b4a7..3d6b491efed5bacd8e37232bff20872af69f2ba0 100644 (file)
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2729,7 +2729,7 @@ int ssl3_send_client_key_exchange(SSL *s)
 
             EVP_PKEY_encrypt_init(pkey_ctx);
             /* Generate session key */
-            if(RAND_bytes(premaster_secret, 32) <= 0) {
+            if (RAND_bytes(premaster_secret, 32) <= 0) {
                 EVP_PKEY_CTX_free(pkey_ctx);
                 goto err;
             }

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 4e2845fa6ec9085b55e5821c8f1d76e96ebd75cd..2736238f8ea42bb604ec1c9eae2be522b91253c7 100644 (file)
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -261,7 +261,7 @@ static int tls1_PRF(long digest_mask,
         if ((m << TLS1_PRF_DGST_SHIFT) & digest_mask)
             count++;
     }
-    if(!count) {
+    if (!count) {
         /* Should never happen */
         SSLerr(SSL_F_TLS1_PRF, ERR_R_INTERNAL_ERROR);
         goto err;

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index f0112486cba508a1f45b0ba3008567fb2176f8ab..1ad25078c1730712d4c45eae582d66a05c5515b0 100644 (file)
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2612,7 +2612,7 @@ int tls1_process_heartbeat(SSL *s)
         memcpy(bp, pl, payload);
         bp += payload;
         /* Random padding */
-        if(RAND_pseudo_bytes(bp, padding) < 0) {
+        if (RAND_pseudo_bytes(bp, padding) < 0) {
             OPENSSL_free(buffer);
             return -1;
         }
@@ -2698,13 +2698,13 @@ int tls1_heartbeat(SSL *s)
     /* Sequence number */
     s2n(s->tlsext_hb_seq, p);
     /* 16 random bytes */
-    if(RAND_pseudo_bytes(p, 16) < 0) {
+    if (RAND_pseudo_bytes(p, 16) < 0) {
         SSLerr(SSL_F_TLS1_HEARTBEAT, ERR_R_INTERNAL_ERROR);
         goto err;
     }
     p += 16;
     /* Random padding */
-    if(RAND_pseudo_bytes(p, padding) < 0) {
+    if (RAND_pseudo_bytes(p, padding) < 0) {
         SSLerr(SSL_F_TLS1_HEARTBEAT, ERR_R_INTERNAL_ERROR);
         goto err;
     }

diff --git a/ssl/tls_srp.c b/ssl/tls_srp.c
index 6bdf7f32f86fd4d26dc0bcc388013fdaf2ab0dd0..bb719ba4cf9fd25422b5b293c4bb6c1a12ad17f4 100644 (file)
--- a/ssl/tls_srp.c
+++ b/ssl/tls_srp.c
@@ -454,7 +454,7 @@ int SRP_Calc_A_param(SSL *s)
 {
     unsigned char rnd[SSL_MAX_MASTER_KEY_LENGTH];
 
-    if(RAND_bytes(rnd, sizeof(rnd)) <= 0)
+    if (RAND_bytes(rnd, sizeof(rnd)) <= 0)
         return -1;
     s->srp_ctx.a = BN_bin2bn(rnd, sizeof(rnd), s->srp_ctx.a);
     OPENSSL_cleanse(rnd, sizeof(rnd));