Code style: space after 'if'

Reviewed-by: Matt Caswell <gitlab@openssl.org>
This commit is contained in:
Viktor Dukhovni 2015-04-16 02:55:35 -04:00
parent 5d28381ae4
commit 1a38987de0
4 changed files with 8 additions and 8 deletions

View File

@ -184,7 +184,7 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
/* Save start position */ /* Save start position */
q = *pp; q = *pp;
if(!a || *a == NULL) { if (!a || *a == NULL) {
freeret = 1; freeret = 1;
} }
ret = d2i_X509(a, pp, length); ret = d2i_X509(a, pp, length);
@ -199,7 +199,7 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
goto err; goto err;
return ret; return ret;
err: err:
if(freeret) { if (freeret) {
X509_free(ret); X509_free(ret);
if (a) if (a)
*a = NULL; *a = NULL;

View File

@ -107,23 +107,23 @@ static DSA_METHOD openssl_dsa_meth = {
# define DSA_MOD_EXP(err_instr,dsa,rr,a1,p1,a2,p2,m,ctx,in_mont) \ # define DSA_MOD_EXP(err_instr,dsa,rr,a1,p1,a2,p2,m,ctx,in_mont) \
do { \ do { \
int _tmp_res53; \ 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), \ _tmp_res53 = (dsa)->meth->dsa_mod_exp((dsa), (rr), (a1), (p1), \
(a2), (p2), (m), (ctx), (in_mont)); \ (a2), (p2), (m), (ctx), (in_mont)); \
else \ else \
_tmp_res53 = BN_mod_exp2_mont((rr), (a1), (p1), (a2), (p2), \ _tmp_res53 = BN_mod_exp2_mont((rr), (a1), (p1), (a2), (p2), \
(m), (ctx), (in_mont)); \ (m), (ctx), (in_mont)); \
if(!_tmp_res53) err_instr; \ if (!_tmp_res53) err_instr; \
} while(0) } while(0)
# define DSA_BN_MOD_EXP(err_instr,dsa,r,a,p,m,ctx,m_ctx) \ # define DSA_BN_MOD_EXP(err_instr,dsa,r,a,p,m,ctx,m_ctx) \
do { \ do { \
int _tmp_res53; \ 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), \ _tmp_res53 = (dsa)->meth->bn_mod_exp((dsa), (r), (a), (p), \
(m), (ctx), (m_ctx)); \ (m), (ctx), (m_ctx)); \
else \ else \
_tmp_res53 = BN_mod_exp_mont((r), (a), (p), (m), (ctx), (m_ctx)); \ _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) } while(0)
const DSA_METHOD *DSA_OpenSSL(void) const DSA_METHOD *DSA_OpenSSL(void)

View File

@ -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 * 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 * error because possible DSO_ctrl() commands may return values such as
* "size"s that can legitimately be zero (making the standard * "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 * 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... :-) * value as success/failure like usual ... but we conform when we must... :-)
*/ */

View File

@ -158,7 +158,7 @@ const RSA_METHOD *RSA_PKCS1_SSLeay(void)
* RSA_FLAG_CACHE_PRIVATE, goto err); * RSA_FLAG_CACHE_PRIVATE, goto err);
*/ */
# define MONT_HELPER(rsa, ctx, m, pre_cond, err_instr) \ # define MONT_HELPER(rsa, ctx, m, pre_cond, err_instr) \
if((pre_cond) && ((rsa)->_method_mod_##m == NULL) && \ if ((pre_cond) && ((rsa)->_method_mod_##m == NULL) && \
!BN_MONT_CTX_set_locked(&((rsa)->_method_mod_##m), \ !BN_MONT_CTX_set_locked(&((rsa)->_method_mod_##m), \
CRYPTO_LOCK_RSA, \ CRYPTO_LOCK_RSA, \
(rsa)->m, (ctx))) \ (rsa)->m, (ctx))) \