mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

base64_encode() should not add any newlines into the output. Because

Browse Source 
of this switch from EVP_EncodeUpdate() plus complexity to the much
simpler use of calling EVP_EncodeBlock() directly.
OK job@
This commit is contained in:
claudio 2021-10-11 16:06:36 +00:00
parent 23e8a0c040
commit 577ce9cf68
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.sbin/rpki-client/encoding.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: encoding.c,v 1.3 2021/09/01 08:09:41 claudio Exp $ */
/* $OpenBSD: encoding.c,v 1.4 2021/10/11 16:06:36 claudio Exp $ */
/*
* Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org>
*
@ -67,12 +67,8 @@ fail:
int
base64_encode(const unsigned char *in, size_t inlen, char **out)
{
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");
size_t tolen;
*out = NULL;
@ -82,16 +78,9 @@ base64_encode(const unsigned char *in, size_t inlen, char **out)
if ((to = malloc(tolen)) == NULL)
return -1;
EVP_EncodeInit(ctx);
if (EVP_EncodeUpdate(ctx, to, &tolen, in, inlen) != 1)
goto fail;
EVP_EncodeFinal(ctx, to + tolen, &tolen);
EVP_EncodeBlock(to, in, inlen);
*out = to;
return 0;
fail:
free(to);
return -1;
}
/*