diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2020-10-01 19:57:01 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2020-10-01 19:57:01 +0000 |
| commit | 195640a220ff57752bc16eeb5e76bd42903172e8 (patch) | |
| tree | 6aaeeae8c80bfcc29dd14c029856a91c3327f14c | |
| parent | 0a4779e71bf8de4e65ca234044de3547ebc51a9d (diff) | |
In OpenSSL 1.1.x EVP_ENCODE_CTX is an opaque struct and has to be
allocated with EVP_ENCODE_CTX_new(). Do this once on the first call
and keep the context around for all subsequent calls.
OK tb@ and benno@
| -rw-r--r-- | usr.sbin/rpki-client/tal.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr.sbin/rpki-client/tal.c b/usr.sbin/rpki-client/tal.c index 05a7b6aed81..518dcd5d7b6 100644 --- a/usr.sbin/rpki-client/tal.c +++ b/usr.sbin/rpki-client/tal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tal.c,v 1.20 2020/09/30 14:42:14 claudio Exp $ */ +/* $OpenBSD: tal.c,v 1.21 2020/10/01 19:57:00 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -31,10 +31,13 @@ static int base64_decode(const unsigned char *in, size_t inlen, unsigned char **out, size_t *outlen) { - EVP_ENCODE_CTX ctx; + static EVP_ENCODE_CTX *ctx; unsigned char *to; int tolen; + if (ctx == NULL && (ctx = EVP_ENCODE_CTX_new()) == NULL) + err(1, "EVP_ENCODE_CTX_new"); + *out = NULL; *outlen = 0; @@ -44,11 +47,11 @@ base64_decode(const unsigned char *in, size_t inlen, unsigned char **out, if ((to = malloc(tolen)) == NULL) return -1; - EVP_DecodeInit(&ctx); - if (EVP_DecodeUpdate(&ctx, to, &tolen, in, inlen) == -1) + EVP_DecodeInit(ctx); + if (EVP_DecodeUpdate(ctx, to, &tolen, in, inlen) == -1) goto fail; *outlen = tolen; - if (EVP_DecodeFinal(&ctx, to + tolen, &tolen) == -1) + if (EVP_DecodeFinal(ctx, to + tolen, &tolen) == -1) goto fail; *outlen += tolen; *out = to; |