nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-04-05 01:00:11 -05:00
Code Issues Projects Releases Wiki Activity

Simplify base64 decoding in script.c

Browse Source
This commit is contained in:
Michał Trojnara 2024-03-11 12:10:20 +01:00
parent 0a0761746f
commit e8ef027776
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
script.c
View File

@ -316,12 +316,10 @@ static PKCS7 *script_pkcs7_extract(FILE_FORMAT_CTX *ctx)
{ {
const char *signature_data = ctx->options->indata + ctx->script_ctx->sigpos; const char *signature_data = ctx->options->indata + ctx->script_ctx->sigpos;
size_t signature_len = ctx->script_ctx->fileend - ctx->script_ctx->sigpos; size_t signature_len = ctx->script_ctx->fileend - ctx->script_ctx->sigpos;
size_t base64_len, der_max_length, der_length; size_t base64_len;
char *ptr; char *ptr;
BIO *bio_mem, *bio_b64 = NULL; BIO *bio_mem, *bio_b64 = NULL;
char *base64_data = NULL; char *base64_data = NULL;
char *der_data = NULL;
const char *der_tmp;
char *clean_base64 = NULL; char *clean_base64 = NULL;
int clean_base64_len = 0; int clean_base64_len = 0;
const char *open_tag = ctx->script_ctx->comment_text->open; const char *open_tag = ctx->script_ctx->comment_text->open;
@ -403,26 +401,12 @@ static PKCS7 *script_pkcs7_extract(FILE_FORMAT_CTX *ctx)
BIO_push(bio_b64, bio_mem); BIO_push(bio_b64, bio_mem);
BIO_set_flags(bio_b64, BIO_FLAGS_BASE64_NO_NL); BIO_set_flags(bio_b64, BIO_FLAGS_BASE64_NO_NL);
/* allocate memory for DER output */
der_max_length = BIO_ctrl_pending(bio_b64);
der_data = OPENSSL_malloc(der_max_length);
if (!der_data)
goto cleanup;
/* decode Base64 to DER */
if (!BIO_read_ex(bio_b64, der_data, der_max_length, &der_length))
goto cleanup;
if (der_length <= 0)
goto cleanup;
/* decode DER */ /* decode DER */
der_tmp = der_data; retval = d2i_PKCS7_bio(bio_b64, NULL);
retval = d2i_PKCS7(NULL, (const unsigned char **)&der_tmp, (int)der_length);
cleanup: cleanup:
OPENSSL_free(base64_data); OPENSSL_free(base64_data);
OPENSSL_free(clean_base64); OPENSSL_free(clean_base64);
OPENSSL_free(der_data);
BIO_free_all(bio_b64); BIO_free_all(bio_b64);
return retval; return retval;
} }