diff options
| author | beck <> | 2017-01-29 17:49:23 +0000 | 
|---|---|---|
| committer | beck <> | 2017-01-29 17:49:23 +0000 | 
| commit | d1f47bd292f36094480caa49ada36b99a69c59b0 (patch) | |
| tree | 1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/rsa/rsa_gen.c | |
| parent | f8c627888330b75c2eea8a3c27d0efe947a4f9da (diff) | |
| download | openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.tar.gz openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.tar.bz2 openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.zip  | |
Send the function codes from the error functions to the bit bucket,
as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@
Diffstat (limited to 'src/lib/libcrypto/rsa/rsa_gen.c')
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_gen.c | 7 | 
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_gen.c b/src/lib/libcrypto/rsa/rsa_gen.c index e09dccb4a8..596eb8eb78 100644 --- a/src/lib/libcrypto/rsa/rsa_gen.c +++ b/src/lib/libcrypto/rsa/rsa_gen.c  | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_gen.c,v 1.21 2017/01/25 06:15:44 beck Exp $ */ | 1 | /* $OpenBSD: rsa_gen.c,v 1.22 2017/01/29 17:49:23 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 | * | 
| @@ -162,8 +162,7 @@ rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb) | |||
| 162 | ++degenerate < 3); | 162 | ++degenerate < 3); | 
| 163 | if (degenerate == 3) { | 163 | if (degenerate == 3) { | 
| 164 | ok = 0; /* we set our own err */ | 164 | ok = 0; /* we set our own err */ | 
| 165 | RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, | 165 | RSAerror(RSA_R_KEY_SIZE_TOO_SMALL); | 
| 166 | RSA_R_KEY_SIZE_TOO_SMALL); | ||
| 167 | goto err; | 166 | goto err; | 
| 168 | } | 167 | } | 
| 169 | if (!BN_sub(r2, rsa->q, BN_value_one())) | 168 | if (!BN_sub(r2, rsa->q, BN_value_one())) | 
| @@ -219,7 +218,7 @@ rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb) | |||
| 219 | ok = 1; | 218 | ok = 1; | 
| 220 | err: | 219 | err: | 
| 221 | if (ok == -1) { | 220 | if (ok == -1) { | 
| 222 | RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, ERR_LIB_BN); | 221 | RSAerror(ERR_LIB_BN); | 
| 223 | ok = 0; | 222 | ok = 0; | 
| 224 | } | 223 | } | 
| 225 | if (ctx != NULL) { | 224 | if (ctx != NULL) { | 
