KNF

1 files changed, 206 insertions, 186 deletions

diff --git a/lib/libcrypto/dsa/dsa_ossl.c b/lib/libcrypto/dsa/dsa_ossl.c
index 61a20f41a74..17119eb187a 100644
--- a/lib/libcrypto/dsa/dsa_ossl.c
+++ b/lib/libcrypto/dsa/dsa_ossl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_ossl.c,v 1.18 2014/06/27 06:07:35 deraadt Exp $ */
+/* $OpenBSD: dsa_ossl.c,v 1.19 2014/07/09 10:16:24 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,9 +67,10 @@
 #include <openssl/asn1.h>
 
 static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
-static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);
+static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
+	    BIGNUM **rp);
 static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
-			 DSA *dsa);
+	    DSA *dsa);
 static int dsa_init(DSA *dsa);
 static int dsa_finish(DSA *dsa);
 
@@ -82,7 +83,8 @@ static DSA_METHOD openssl_dsa_meth = {
 	.finish = dsa_finish
 };
 
-/* These macro wrappers replace attempts to use the dsa_mod_exp() and
+/*
+ * These macro wrappers replace attempts to use the dsa_mod_exp() and
  * bn_mod_exp() handlers in the DSA_METHOD structure. We avoid the problem of
  * having a the macro work as an expression by bundling an "err_instr". So;
  * 
@@ -96,315 +98,333 @@ 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) \
-			_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; \
-	} while(0)
+do { \
+	int _tmp_res53; \
+	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; \
+} 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) \
-			_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; \
-	} while(0)
-
-const DSA_METHOD *DSA_OpenSSL(void)
+do { \
+	int _tmp_res53; \
+	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; \
+} while(0)
+
+const DSA_METHOD *
+DSA_OpenSSL(void)
 {
 	return &openssl_dsa_meth;
 }
 
-static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
-	{
-	BIGNUM *kinv=NULL,*r=NULL,*s=NULL;
+static DSA_SIG *
+dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
+{
+	BIGNUM *kinv = NULL, *r = NULL, *s = NULL;
 	BIGNUM m;
 	BIGNUM xr;
-	BN_CTX *ctx=NULL;
-	int reason=ERR_R_BN_LIB;
-	DSA_SIG *ret=NULL;
+	BN_CTX *ctx = NULL;
+	int reason = ERR_R_BN_LIB;
+	DSA_SIG *ret = NULL;
 	int noredo = 0;
 
 	BN_init(&m);
 	BN_init(&xr);
 
-	if (!dsa->p || !dsa->q || !dsa->g)
-		{
-		reason=DSA_R_MISSING_PARAMETERS;
+	if (!dsa->p || !dsa->q || !dsa->g) {
+		reason = DSA_R_MISSING_PARAMETERS;
 		goto err;
-		}
+	}
 
-	s=BN_new();
-	if (s == NULL) goto err;
-	ctx=BN_CTX_new();
-	if (ctx == NULL) goto err;
+	s = BN_new();
+	if (s == NULL)
+		goto err;
+	ctx = BN_CTX_new();
+	if (ctx == NULL)
+		goto err;
 redo:
-	if ((dsa->kinv == NULL) || (dsa->r == NULL))
-		{
-		if (!DSA_sign_setup(dsa,ctx,&kinv,&r)) goto err;
-		}
-	else
-		{
-		kinv=dsa->kinv;
-		dsa->kinv=NULL;
-		r=dsa->r;
-		dsa->r=NULL;
+	if (dsa->kinv == NULL || dsa->r == NULL) {
+		if (!DSA_sign_setup(dsa, ctx, &kinv, &r))
+			goto err;
+	} else {
+		kinv = dsa->kinv;
+		dsa->kinv = NULL;
+		r = dsa->r;
+		dsa->r = NULL;
 		noredo = 1;
-		}
+	}
 
 	
+	/*
+	 * If the digest length is greater than the size of q use the
+	 * BN_num_bits(dsa->q) leftmost bits of the digest, see
+	 * fips 186-3, 4.2
+	 */
 	if (dlen > BN_num_bytes(dsa->q))
-		/* if the digest length is greater than the size of q use the
-		 * BN_num_bits(dsa->q) leftmost bits of the digest, see
-		 * fips 186-3, 4.2 */
 		dlen = BN_num_bytes(dsa->q);
 	if (BN_bin2bn(dgst,dlen,&m) == NULL)
 		goto err;
 
 	/* Compute  s = inv(k) (m + xr) mod q */
-	if (!BN_mod_mul(&xr,dsa->priv_key,r,dsa->q,ctx)) goto err;/* s = xr */
-	if (!BN_add(s, &xr, &m)) goto err;		/* s = m + xr */
-	if (BN_cmp(s,dsa->q) > 0)
-		if (!BN_sub(s,s,dsa->q)) goto err;
-	if (!BN_mod_mul(s,s,kinv,dsa->q,ctx)) goto err;
-
-	ret=DSA_SIG_new();
-	if (ret == NULL) goto err;
-	/* Redo if r or s is zero as required by FIPS 186-3: this is
+	if (!BN_mod_mul(&xr, dsa->priv_key, r, dsa->q, ctx))	/* s = xr */
+		goto err;
+	if (!BN_add(s, &xr, &m))				/* s = m + xr */
+		goto err;
+	if (BN_cmp(s, dsa->q) > 0)
+		if (!BN_sub(s, s, dsa->q))
+			goto err;
+	if (!BN_mod_mul(s, s, kinv, dsa->q, ctx))
+		goto err;
+
+	ret = DSA_SIG_new();
+	if (ret == NULL)
+		goto err;
+	/*
+	 * Redo if r or s is zero as required by FIPS 186-3: this is
 	 * very unlikely.
 	 */
-	if (BN_is_zero(r) || BN_is_zero(s))
-		{
-		if (noredo)
-			{
+	if (BN_is_zero(r) || BN_is_zero(s)) {
+		if (noredo) {
 			reason = DSA_R_NEED_NEW_SETUP_VALUES;
 			goto err;
-			}
-		goto redo;
 		}
+		goto redo;
+	}
 	ret->r = r;
 	ret->s = s;
 	
 err:
-	if (!ret)
-		{
-		DSAerr(DSA_F_DSA_DO_SIGN,reason);
+	if (!ret) {
+		DSAerr(DSA_F_DSA_DO_SIGN, reason);
 		BN_free(r);
 		BN_free(s);
-		}
-	if (ctx != NULL) BN_CTX_free(ctx);
+	}
+	if (ctx != NULL)
+		BN_CTX_free(ctx);
 	BN_clear_free(&m);
 	BN_clear_free(&xr);
 	if (kinv != NULL) /* dsa->kinv is NULL now if we used it */
 	    BN_clear_free(kinv);
-	return(ret);
-	}
+	return ret;
+}
 
-static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
-	{
+static int
+dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
+{
 	BN_CTX *ctx;
-	BIGNUM k,kq,*K,*kinv=NULL,*r=NULL;
-	int ret=0;
+	BIGNUM k, kq, *K, *kinv = NULL, *r = NULL;
+	int ret = 0;
 
-	if (!dsa->p || !dsa->q || !dsa->g)
-		{
-		DSAerr(DSA_F_DSA_SIGN_SETUP,DSA_R_MISSING_PARAMETERS);
+	if (!dsa->p || !dsa->q || !dsa->g) {
+		DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS);
 		return 0;
-		}
+	}
 
 	BN_init(&k);
 	BN_init(&kq);
 
-	if (ctx_in == NULL)
-		{
-		if ((ctx=BN_CTX_new()) == NULL) goto err;
-		}
-	else
-		ctx=ctx_in;
+	if (ctx_in == NULL) {
+		if ((ctx = BN_CTX_new()) == NULL)
+			goto err;
+	} else
+		ctx = ctx_in;
 
-	if ((r=BN_new()) == NULL) goto err;
+	if ((r = BN_new()) == NULL)
+		goto err;
 
 	/* Get random k */
-	do
-		if (!BN_rand_range(&k, dsa->q)) goto err;
-	while (BN_is_zero(&k));
-	if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0)
-		{
+	do {
+		if (!BN_rand_range(&k, dsa->q))
+			goto err;
+	} while (BN_is_zero(&k));
+	if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0) {
 		BN_set_flags(&k, BN_FLG_CONSTTIME);
-		}
+	}
 
-	if (dsa->flags & DSA_FLAG_CACHE_MONT_P)
-		{
+	if (dsa->flags & DSA_FLAG_CACHE_MONT_P) {
 		if (!BN_MONT_CTX_set_locked(&dsa->method_mont_p,
-						CRYPTO_LOCK_DSA,
-						dsa->p, ctx))
+		    CRYPTO_LOCK_DSA, dsa->p, ctx))
 			goto err;
-		}
+	}
 
 	/* Compute r = (g^k mod p) mod q */
 
-	if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0)
-		{
-		if (!BN_copy(&kq, &k)) goto err;
+	if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0) {
+		if (!BN_copy(&kq, &k))
+			goto err;
 
-		/* We do not want timing information to leak the length of k,
-		 * so we compute g^k using an equivalent exponent of fixed length.
+		/*
+		 * We do not want timing information to leak the length of k,
+		 * so we compute g^k using an equivalent exponent of fixed
+		 * length.
 		 *
 		 * (This is a kludge that we need because the BN_mod_exp_mont()
-		 * does not let us specify the desired timing behaviour.) */
+		 * does not let us specify the desired timing behaviour.)
+		 */
 
-		if (!BN_add(&kq, &kq, dsa->q)) goto err;
-		if (BN_num_bits(&kq) <= BN_num_bits(dsa->q))
-			{
-			if (!BN_add(&kq, &kq, dsa->q)) goto err;
-			}
+		if (!BN_add(&kq, &kq, dsa->q))
+			goto err;
+		if (BN_num_bits(&kq) <= BN_num_bits(dsa->q)) {
+			if (!BN_add(&kq, &kq, dsa->q))
+				goto err;
+		}
 
 		K = &kq;
-		}
-	else
-		{
+	} else {
 		K = &k;
-		}
+	}
 	DSA_BN_MOD_EXP(goto err, dsa, r, dsa->g, K, dsa->p, ctx,
-			dsa->method_mont_p);
-	if (!BN_mod(r,r,dsa->q,ctx)) goto err;
+	    dsa->method_mont_p);
+	if (!BN_mod(r,r,dsa->q,ctx))
+		goto err;
 
 	/* Compute  part of 's = inv(k) (m + xr) mod q' */
-	if ((kinv=BN_mod_inverse(NULL,&k,dsa->q,ctx)) == NULL) goto err;
-
-	if (*kinvp != NULL) BN_clear_free(*kinvp);
-	*kinvp=kinv;
-	kinv=NULL;
-	if (*rp != NULL) BN_clear_free(*rp);
-	*rp=r;
-	ret=1;
+	if ((kinv = BN_mod_inverse(NULL, &k, dsa->q, ctx)) == NULL)
+		goto err;
+
+	if (*kinvp != NULL)
+		BN_clear_free(*kinvp);
+	*kinvp = kinv;
+	kinv = NULL;
+	if (*rp != NULL)
+		BN_clear_free(*rp);
+	*rp = r;
+	ret = 1;
 err:
-	if (!ret)
-		{
-		DSAerr(DSA_F_DSA_SIGN_SETUP,ERR_R_BN_LIB);
+	if (!ret) {
+		DSAerr(DSA_F_DSA_SIGN_SETUP, ERR_R_BN_LIB);
 		if (r != NULL)
 			BN_clear_free(r);
-		}
-	if (ctx_in == NULL) BN_CTX_free(ctx);
+	}
+	if (ctx_in == NULL)
+		BN_CTX_free(ctx);
 	BN_clear_free(&k);
 	BN_clear_free(&kq);
-	return(ret);
-	}
+	return ret;
+}
 
-static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
-			 DSA *dsa)
-	{
+static int
+dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, DSA *dsa)
+{
 	BN_CTX *ctx;
-	BIGNUM u1,u2,t1;
-	BN_MONT_CTX *mont=NULL;
+	BIGNUM u1, u2, t1;
+	BN_MONT_CTX *mont = NULL;
 	int ret = -1, i;
-	if (!dsa->p || !dsa->q || !dsa->g)
-		{
-		DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MISSING_PARAMETERS);
+
+	if (!dsa->p || !dsa->q || !dsa->g) {
+		DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_MISSING_PARAMETERS);
 		return -1;
-		}
+	}
 
 	i = BN_num_bits(dsa->q);
 	/* fips 186-3 allows only different sizes for q */
-	if (i != 160 && i != 224 && i != 256)
-		{
-		DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_BAD_Q_VALUE);
+	if (i != 160 && i != 224 && i != 256) {
+		DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_BAD_Q_VALUE);
 		return -1;
-		}
+	}
 
-	if (BN_num_bits(dsa->p) > OPENSSL_DSA_MAX_MODULUS_BITS)
-		{
-		DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MODULUS_TOO_LARGE);
+	if (BN_num_bits(dsa->p) > OPENSSL_DSA_MAX_MODULUS_BITS) {
+		DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_MODULUS_TOO_LARGE);
 		return -1;
-		}
+	}
 	BN_init(&u1);
 	BN_init(&u2);
 	BN_init(&t1);
 
-	if ((ctx=BN_CTX_new()) == NULL) goto err;
+	if ((ctx = BN_CTX_new()) == NULL)
+		goto err;
 
 	if (BN_is_zero(sig->r) || BN_is_negative(sig->r) ||
-	    BN_ucmp(sig->r, dsa->q) >= 0)
-		{
+	    BN_ucmp(sig->r, dsa->q) >= 0) {
 		ret = 0;
 		goto err;
-		}
+	}
 	if (BN_is_zero(sig->s) || BN_is_negative(sig->s) ||
-	    BN_ucmp(sig->s, dsa->q) >= 0)
-		{
+	    BN_ucmp(sig->s, dsa->q) >= 0) {
 		ret = 0;
 		goto err;
-		}
+	}
 
 	/* Calculate W = inv(S) mod Q
 	 * save W in u2 */
-	if ((BN_mod_inverse(&u2,sig->s,dsa->q,ctx)) == NULL) goto err;
+	if ((BN_mod_inverse(&u2, sig->s, dsa->q, ctx)) == NULL)
+		goto err;
 
 	/* save M in u1 */
+	/*
+	 * If the digest length is greater than the size of q use the
+	 * BN_num_bits(dsa->q) leftmost bits of the digest, see
+	 * fips 186-3, 4.2
+	 */
 	if (dgst_len > (i >> 3))
-		/* if the digest length is greater than the size of q use the
-		 * BN_num_bits(dsa->q) leftmost bits of the digest, see
-		 * fips 186-3, 4.2 */
 		dgst_len = (i >> 3);
-	if (BN_bin2bn(dgst,dgst_len,&u1) == NULL) goto err;
+	if (BN_bin2bn(dgst, dgst_len, &u1) == NULL)
+		goto err;
 
 	/* u1 = M * w mod q */
-	if (!BN_mod_mul(&u1,&u1,&u2,dsa->q,ctx)) goto err;
+	if (!BN_mod_mul(&u1, &u1, &u2, dsa->q, ctx))
+		goto err;
 
 	/* u2 = r * w mod q */
-	if (!BN_mod_mul(&u2,sig->r,&u2,dsa->q,ctx)) goto err;
+	if (!BN_mod_mul(&u2, sig->r, &u2, dsa->q, ctx))
+		goto err;
 
 
-	if (dsa->flags & DSA_FLAG_CACHE_MONT_P)
-		{
+	if (dsa->flags & DSA_FLAG_CACHE_MONT_P) {
 		mont = BN_MONT_CTX_set_locked(&dsa->method_mont_p,
-					CRYPTO_LOCK_DSA, dsa->p, ctx);
+		    CRYPTO_LOCK_DSA, dsa->p, ctx);
 		if (!mont)
 			goto err;
-		}
-
+	}
 
-	DSA_MOD_EXP(goto err, dsa, &t1, dsa->g, &u1, dsa->pub_key, &u2, dsa->p, ctx, mont);
+	DSA_MOD_EXP(goto err, dsa, &t1, dsa->g, &u1, dsa->pub_key, &u2, dsa->p,
+	    ctx, mont);
 	/* BN_copy(&u1,&t1); */
 	/* let u1 = u1 mod q */
-	if (!BN_mod(&u1,&t1,dsa->q,ctx)) goto err;
+	if (!BN_mod(&u1, &t1, dsa->q, ctx))
+		goto err;
 
 	/* V is now in u1.  If the signature is correct, it will be
 	 * equal to R. */
-	ret=(BN_ucmp(&u1, sig->r) == 0);
+	ret = BN_ucmp(&u1, sig->r) == 0;
 
-	err:
+err:
 	/* XXX: surely this is wrong - if ret is 0, it just didn't verify;
 	   there is no error in BN. Test should be ret == -1 (Ben) */
-	if (ret != 1) DSAerr(DSA_F_DSA_DO_VERIFY,ERR_R_BN_LIB);
-	if (ctx != NULL) BN_CTX_free(ctx);
+	if (ret != 1)
+		DSAerr(DSA_F_DSA_DO_VERIFY, ERR_R_BN_LIB);
+	if (ctx != NULL)
+		BN_CTX_free(ctx);
 	BN_free(&u1);
 	BN_free(&u2);
 	BN_free(&t1);
-	return(ret);
-	}
+	return ret;
+}
 
-static int dsa_init(DSA *dsa)
+static int
+dsa_init(DSA *dsa)
 {
-	dsa->flags|=DSA_FLAG_CACHE_MONT_P;
-	return(1);
+	dsa->flags |= DSA_FLAG_CACHE_MONT_P;
+	return 1;
 }
 
-static int dsa_finish(DSA *dsa)
+static int
+dsa_finish(DSA *dsa)
 {
-	if(dsa->method_mont_p)
+	if (dsa->method_mont_p)
 		BN_MONT_CTX_free(dsa->method_mont_p);
-	return(1);
+	return 1;
 }