summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/dh/dh_key.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/dh/dh_key.c')
-rw-r--r--src/lib/libcrypto/dh/dh_key.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c
index 5b365cdd06..63d38771c3 100644
--- a/src/lib/libcrypto/dh/dh_key.c
+++ b/src/lib/libcrypto/dh/dh_key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dh_key.c,v 1.26 2017/01/21 09:38:58 beck Exp $ */ 1/* $OpenBSD: dh_key.c,v 1.27 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 *
@@ -165,7 +165,7 @@ generate_key(DH *dh)
165 ok = 1; 165 ok = 1;
166err: 166err:
167 if (ok != 1) 167 if (ok != 1)
168 DHerr(DH_F_GENERATE_KEY, ERR_R_BN_LIB); 168 DHerror(ERR_R_BN_LIB);
169 169
170 if (pub_key != NULL && dh->pub_key == NULL) 170 if (pub_key != NULL && dh->pub_key == NULL)
171 BN_free(pub_key); 171 BN_free(pub_key);
@@ -185,7 +185,7 @@ compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
185 int check_result; 185 int check_result;
186 186
187 if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) { 187 if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) {
188 DHerr(DH_F_COMPUTE_KEY, DH_R_MODULUS_TOO_LARGE); 188 DHerror(DH_R_MODULUS_TOO_LARGE);
189 goto err; 189 goto err;
190 } 190 }
191 191
@@ -197,7 +197,7 @@ compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
197 goto err; 197 goto err;
198 198
199 if (dh->priv_key == NULL) { 199 if (dh->priv_key == NULL) {
200 DHerr(DH_F_COMPUTE_KEY, DH_R_NO_PRIVATE_VALUE); 200 DHerror(DH_R_NO_PRIVATE_VALUE);
201 goto err; 201 goto err;
202 } 202 }
203 203
@@ -212,13 +212,13 @@ compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
212 } 212 }
213 213
214 if (!DH_check_pub_key(dh, pub_key, &check_result) || check_result) { 214 if (!DH_check_pub_key(dh, pub_key, &check_result) || check_result) {
215 DHerr(DH_F_COMPUTE_KEY, DH_R_INVALID_PUBKEY); 215 DHerror(DH_R_INVALID_PUBKEY);
216 goto err; 216 goto err;
217 } 217 }
218 218
219 if (!dh->meth->bn_mod_exp(dh, tmp, pub_key, dh->priv_key, dh->p, ctx, 219 if (!dh->meth->bn_mod_exp(dh, tmp, pub_key, dh->priv_key, dh->p, ctx,
220 mont)) { 220 mont)) {
221 DHerr(DH_F_COMPUTE_KEY, ERR_R_BN_LIB); 221 DHerror(ERR_R_BN_LIB);
222 goto err; 222 goto err;
223 } 223 }
224 224