summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/dsa/dsa_ossl.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/dsa/dsa_ossl.c')
-rw-r--r--src/lib/libcrypto/dsa/dsa_ossl.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/dsa/dsa_ossl.c b/src/lib/libcrypto/dsa/dsa_ossl.c
index f806cd645a..f1013fe547 100644
--- a/src/lib/libcrypto/dsa/dsa_ossl.c
+++ b/src/lib/libcrypto/dsa/dsa_ossl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsa_ossl.c,v 1.29 2017/01/21 11:00:46 beck Exp $ */ 1/* $OpenBSD: dsa_ossl.c,v 1.30 2017/01/29 17:49:22 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -169,7 +169,7 @@ redo:
169 169
170err: 170err:
171 if (!ret) { 171 if (!ret) {
172 DSAerr(DSA_F_DSA_DO_SIGN, reason); 172 DSAerror(reason);
173 BN_free(r); 173 BN_free(r);
174 BN_free(s); 174 BN_free(s);
175 } 175 }
@@ -188,7 +188,7 @@ dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
188 int ret = 0; 188 int ret = 0;
189 189
190 if (!dsa->p || !dsa->q || !dsa->g) { 190 if (!dsa->p || !dsa->q || !dsa->g) {
191 DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS); 191 DSAerror(DSA_R_MISSING_PARAMETERS);
192 return 0; 192 return 0;
193 } 193 }
194 194
@@ -259,7 +259,7 @@ dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
259 ret = 1; 259 ret = 1;
260err: 260err:
261 if (!ret) { 261 if (!ret) {
262 DSAerr(DSA_F_DSA_SIGN_SETUP, ERR_R_BN_LIB); 262 DSAerror(ERR_R_BN_LIB);
263 BN_clear_free(r); 263 BN_clear_free(r);
264 } 264 }
265 if (ctx_in == NULL) 265 if (ctx_in == NULL)
@@ -277,19 +277,19 @@ dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, DSA *dsa)
277 int ret = -1, i; 277 int ret = -1, i;
278 278
279 if (!dsa->p || !dsa->q || !dsa->g) { 279 if (!dsa->p || !dsa->q || !dsa->g) {
280 DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_MISSING_PARAMETERS); 280 DSAerror(DSA_R_MISSING_PARAMETERS);
281 return -1; 281 return -1;
282 } 282 }
283 283
284 i = BN_num_bits(dsa->q); 284 i = BN_num_bits(dsa->q);
285 /* fips 186-3 allows only different sizes for q */ 285 /* fips 186-3 allows only different sizes for q */
286 if (i != 160 && i != 224 && i != 256) { 286 if (i != 160 && i != 224 && i != 256) {
287 DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_BAD_Q_VALUE); 287 DSAerror(DSA_R_BAD_Q_VALUE);
288 return -1; 288 return -1;
289 } 289 }
290 290
291 if (BN_num_bits(dsa->p) > OPENSSL_DSA_MAX_MODULUS_BITS) { 291 if (BN_num_bits(dsa->p) > OPENSSL_DSA_MAX_MODULUS_BITS) {
292 DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_MODULUS_TOO_LARGE); 292 DSAerror(DSA_R_MODULUS_TOO_LARGE);
293 return -1; 293 return -1;
294 } 294 }
295 BN_init(&u1); 295 BN_init(&u1);
@@ -363,7 +363,7 @@ dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, DSA *dsa)
363 363
364err: 364err:
365 if (ret < 0) 365 if (ret < 0)
366 DSAerr(DSA_F_DSA_DO_VERIFY, ERR_R_BN_LIB); 366 DSAerror(ERR_R_BN_LIB);
367 BN_CTX_free(ctx); 367 BN_CTX_free(ctx);
368 BN_free(&u1); 368 BN_free(&u1);
369 BN_free(&u2); 369 BN_free(&u2);