diff options
| author | schwarze <> | 2019-08-20 10:59:09 +0000 |
|---|---|---|
| committer | schwarze <> | 2019-08-20 10:59:09 +0000 |
| commit | ac910fc8efbc518a705326409d1b3ab0036d46af (patch) | |
| tree | fed7433b1d8a85759b55f69550b7b7588fadd6e4 /src/lib/libcrypto | |
| parent | e4a3f1d7dd18a8a8e8975951aa9bcff4f9c51a92 (diff) | |
| download | openbsd-ac910fc8efbc518a705326409d1b3ab0036d46af.tar.gz openbsd-ac910fc8efbc518a705326409d1b3ab0036d46af.tar.bz2 openbsd-ac910fc8efbc518a705326409d1b3ab0036d46af.zip | |
make BN_CTX_end(NULL) a NOOP for compatibility with documented behaviour
in OpenSSL 1.1.1 even though in general, letting random functions
accept NULL is not advisable because it can hide programming errors;
"yes please" tb@
"unfortunately I suspect you're right" jsing@
"oh well" deraadt@
Diffstat (limited to 'src/lib/libcrypto')
| -rw-r--r-- | src/lib/libcrypto/bn/bn_ctx.c | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/man/BN_CTX_start.3 | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/lib/libcrypto/bn/bn_ctx.c b/src/lib/libcrypto/bn/bn_ctx.c index 1237ac1365..0d64ccab93 100644 --- a/src/lib/libcrypto/bn/bn_ctx.c +++ b/src/lib/libcrypto/bn/bn_ctx.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bn_ctx.c,v 1.15 2017/01/29 17:49:22 beck Exp $ */ | 1 | /* $OpenBSD: bn_ctx.c,v 1.16 2019/08/20 10:59:09 schwarze Exp $ */ |
| 2 | /* Written by Ulf Moeller for the OpenSSL project. */ | 2 | /* Written by Ulf Moeller for the OpenSSL project. */ |
| 3 | /* ==================================================================== | 3 | /* ==================================================================== |
| 4 | * Copyright (c) 1998-2004 The OpenSSL Project. All rights reserved. | 4 | * Copyright (c) 1998-2004 The OpenSSL Project. All rights reserved. |
| @@ -283,6 +283,9 @@ BN_CTX_start(BN_CTX *ctx) | |||
| 283 | void | 283 | void |
| 284 | BN_CTX_end(BN_CTX *ctx) | 284 | BN_CTX_end(BN_CTX *ctx) |
| 285 | { | 285 | { |
| 286 | if (ctx == NULL) | ||
| 287 | return; | ||
| 288 | |||
| 286 | CTXDBG_ENTRY("BN_CTX_end", ctx); | 289 | CTXDBG_ENTRY("BN_CTX_end", ctx); |
| 287 | 290 | ||
| 288 | if (ctx->err_stack) | 291 | if (ctx->err_stack) |
diff --git a/src/lib/libcrypto/man/BN_CTX_start.3 b/src/lib/libcrypto/man/BN_CTX_start.3 index f4f10b8b0c..a2b62eff5c 100644 --- a/src/lib/libcrypto/man/BN_CTX_start.3 +++ b/src/lib/libcrypto/man/BN_CTX_start.3 | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | .\" $OpenBSD: BN_CTX_start.3,v 1.7 2018/03/22 16:06:33 schwarze Exp $ | 1 | .\" $OpenBSD: BN_CTX_start.3,v 1.8 2019/08/20 10:59:09 schwarze Exp $ |
| 2 | .\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 | 2 | .\" full merge up to: OpenSSL 35fd9953 May 28 14:49:38 2019 +0200 |
| 3 | .\" | 3 | .\" |
| 4 | .\" This file was written by Ulf Moeller <ulf@openssl.org>. | 4 | .\" This file was written by Ulf Moeller <ulf@openssl.org>. |
| 5 | .\" Copyright (c) 2000 The OpenSSL Project. All rights reserved. | 5 | .\" Copyright (c) 2000 The OpenSSL Project. All rights reserved. |
| @@ -48,7 +48,7 @@ | |||
| 48 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 48 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
| 49 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 49 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
| 50 | .\" | 50 | .\" |
| 51 | .Dd $Mdocdate: March 22 2018 $ | 51 | .Dd $Mdocdate: August 20 2019 $ |
| 52 | .Dt BN_CTX_START 3 | 52 | .Dt BN_CTX_START 3 |
| 53 | .Os | 53 | .Os |
| 54 | .Sh NAME | 54 | .Sh NAME |
| @@ -104,6 +104,11 @@ is called, the | |||
| 104 | pointers obtained from | 104 | pointers obtained from |
| 105 | .Fn BN_CTX_get | 105 | .Fn BN_CTX_get |
| 106 | become invalid. | 106 | become invalid. |
| 107 | If | ||
| 108 | .Fa ctx | ||
| 109 | is | ||
| 110 | .Dv NULL , | ||
| 111 | no action occurs. | ||
| 107 | .Sh RETURN VALUES | 112 | .Sh RETURN VALUES |
| 108 | .Fn BN_CTX_get | 113 | .Fn BN_CTX_get |
| 109 | returns a pointer to the | 114 | returns a pointer to the |