diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2022-04-19 19:01:20 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2022-04-19 19:01:20 +0000 |
| commit | 47c957f1b5a62817644661c271a54f963917fb48 (patch) | |
| tree | c9e2bddf970400a5145be5f9fe85f94ed6b1af95 | |
| parent | 9db68d411cafcfdcc80af1410a240d7736149bbb (diff) | |
Do not use a hidden global for the EVP_ENCODE_CTX to save a calloc() call.
Make this work concurrently by allocating and freeing the EVP_ENCODE_CTX
for every call to base64_decode(). This is not a hot path so the impact
is negligible.
OK tb@
| -rw-r--r-- | usr.sbin/rpki-client/encoding.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/usr.sbin/rpki-client/encoding.c b/usr.sbin/rpki-client/encoding.c index 372489a81fd..1fed80d0d92 100644 --- a/usr.sbin/rpki-client/encoding.c +++ b/usr.sbin/rpki-client/encoding.c @@ -1,4 +1,4 @@ -/* $OpenBSD: encoding.c,v 1.10 2021/11/24 15:24:16 claudio Exp $ */ +/* $OpenBSD: encoding.c,v 1.11 2022/04/19 19:01:19 claudio Exp $ */ /* * Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org> * @@ -96,21 +96,21 @@ int base64_decode(const unsigned char *in, size_t inlen, unsigned char **out, size_t *outlen) { - static EVP_ENCODE_CTX *ctx; - unsigned char *to; + EVP_ENCODE_CTX *ctx; + unsigned char *to = NULL; size_t tolen; int evplen; - if (ctx == NULL && (ctx = EVP_ENCODE_CTX_new()) == NULL) + if ((ctx = EVP_ENCODE_CTX_new()) == NULL) err(1, "EVP_ENCODE_CTX_new"); *out = NULL; *outlen = 0; if (base64_decode_len(inlen, &tolen) == -1) - return -1; + goto fail; if ((to = malloc(tolen)) == NULL) - return -1; + err(1, NULL); evplen = tolen; EVP_DecodeInit(ctx); @@ -121,10 +121,13 @@ base64_decode(const unsigned char *in, size_t inlen, goto fail; *outlen += evplen; *out = to; + + EVP_ENCODE_CTX_free(ctx); return 0; fail: free(to); + EVP_ENCODE_CTX_free(ctx); return -1; } |