提交 231f1337 编写于 作者: K Kurt Roeckx

Make asn1 fuzzer more reproducible

Reviewed-by: NRich Salz <rsalz@openssl.org>
GH: #2041
上级 7d152a3c
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <openssl/ts.h> #include <openssl/ts.h>
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
#include <openssl/cms.h> #include <openssl/cms.h>
#include <openssl/err.h>
#include "fuzzer.h" #include "fuzzer.h"
static ASN1_ITEM_EXP *item_type[] = { static ASN1_ITEM_EXP *item_type[] = {
...@@ -183,8 +184,21 @@ static ASN1_ITEM_EXP *item_type[] = { ...@@ -183,8 +184,21 @@ static ASN1_ITEM_EXP *item_type[] = {
NULL NULL
}; };
static ASN1_PCTX *pctx;
int FuzzerInitialize(int *argc, char ***argv) int FuzzerInitialize(int *argc, char ***argv)
{ {
pctx = ASN1_PCTX_new();
ASN1_PCTX_set_flags(pctx, ASN1_PCTX_FLAGS_SHOW_ABSENT |
ASN1_PCTX_FLAGS_SHOW_SEQUENCE | ASN1_PCTX_FLAGS_SHOW_SSOF |
ASN1_PCTX_FLAGS_SHOW_TYPE | ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME);
ASN1_PCTX_set_str_flags(pctx, ASN1_STRFLGS_UTF8_CONVERT |
ASN1_STRFLGS_SHOW_TYPE | ASN1_STRFLGS_DUMP_ALL);
OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
ERR_get_state();
CRYPTO_free_ex_index(0, -1);
return 1; return 1;
} }
...@@ -192,13 +206,6 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len) ...@@ -192,13 +206,6 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
{ {
int n; int n;
ASN1_PCTX *pctx = ASN1_PCTX_new();
ASN1_PCTX_set_flags(pctx, ASN1_PCTX_FLAGS_SHOW_ABSENT |
ASN1_PCTX_FLAGS_SHOW_SEQUENCE | ASN1_PCTX_FLAGS_SHOW_SSOF |
ASN1_PCTX_FLAGS_SHOW_TYPE | ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME);
ASN1_PCTX_set_str_flags(pctx, ASN1_STRFLGS_UTF8_CONVERT |
ASN1_STRFLGS_SHOW_TYPE | ASN1_STRFLGS_DUMP_ALL);
for (n = 0; item_type[n] != NULL; ++n) { for (n = 0; item_type[n] != NULL; ++n) {
const uint8_t *b = buf; const uint8_t *b = buf;
...@@ -218,11 +225,12 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len) ...@@ -218,11 +225,12 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
} }
} }
ASN1_PCTX_free(pctx); ERR_clear_error();
return 0; return 0;
} }
void FuzzerCleanup(void) void FuzzerCleanup(void)
{ {
ASN1_PCTX_free(pctx);
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册