diff options
| author |   tb <tb@openbsd.org> | 2019-01-20 01:59:06 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2019-01-20 01:59:06 +0000 |
| commit | d1ddd1698e323b829cf392e0fb64c34bf2ca97c0 (patch) | |
| tree | 65e89c606ef74c6843ef45511ac96cef33fcb071 | |
| parent | Fix BN_is_prime_* calls in libcrypto, the API returns -1 on error. (diff) | |
| download | wireguard-openbsd-d1ddd1698e323b829cf392e0fb64c34bf2ca97c0.tar.xz wireguard-openbsd-d1ddd1698e323b829cf392e0fb64c34bf2ca97c0.zip | |
Fix BN_is_prime_* calls in openssl(1), the API returns -1 on error.
Found thanks to BoringSSL's commit 53409ee3d7595ed37da472bc73b010cd2c8a5ffd
by David Benjamin.
ok djm, jsing
| -rw-r--r-- | usr.bin/openssl/prime.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr.bin/openssl/prime.c b/usr.bin/openssl/prime.c index 280ccef5fc4..5e1ad70ca09 100644 --- a/usr.bin/openssl/prime.c +++ b/usr.bin/openssl/prime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prime.c,v 1.11 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: prime.c,v 1.12 2019/01/20 01:59:06 tb Exp $ */ /* ==================================================================== * Copyright (c) 2004 The OpenSSL Project. All rights reserved. * @@ -116,7 +116,7 @@ prime_main(int argc, char **argv) char *prime = NULL; BIO *bio_out; char *s; - int ret = 1; + int is_prime, ret = 1; if (single_execution) { if (pledge("stdio rpath", NULL) == -1) { @@ -184,9 +184,13 @@ prime_main(int argc, char **argv) } } + is_prime = BN_is_prime_ex(bn, prime_config.checks, NULL, NULL); + if (is_prime < 0) { + BIO_printf(bio_err, "BN_is_prime_ex failed.\n"); + goto end; + } BIO_printf(bio_out, "%s is %sprime\n", prime, - BN_is_prime_ex(bn, prime_config.checks, - NULL, NULL) ? "" : "not "); + is_prime == 1 ? "" : "not "); } ret = 0; |