Publish our INT32, UINT32, INT64, UINT64 ASN.1 types and Z variants

[openssl.git] / fuzz / asn1.c

diff --git a/fuzz/asn1.c b/fuzz/asn1.c
index b4c20b51ab17893c8c73290dbbc0f3f4207937af..63d26f98042dc40b2c0ece0fe27a1e8b82e33c2b 100644 (file)
--- a/fuzz/asn1.c
+++ b/fuzz/asn1.c
@@ -19,19 +19,24 @@
 #include <string.h>
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
+#include <openssl/dh.h>
 #include <openssl/ec.h>
 #include <openssl/ocsp.h>
 #include <openssl/pkcs12.h>
+#include <openssl/rsa.h>
 #include <openssl/ts.h>
 #include <openssl/x509v3.h>
 #include <openssl/cms.h>
+#include <openssl/err.h>
 #include "fuzzer.h"
 
 static ASN1_ITEM_EXP *item_type[] = {
     ASN1_ITEM_ref(ACCESS_DESCRIPTION),
+#ifndef OPENSSL_NO_RFC3779
     ASN1_ITEM_ref(ASIdentifierChoice),
     ASN1_ITEM_ref(ASIdentifiers),
     ASN1_ITEM_ref(ASIdOrRange),
+#endif
     ASN1_ITEM_ref(ASN1_ANY),
     ASN1_ITEM_ref(ASN1_BIT_STRING),
     ASN1_ITEM_ref(ASN1_BMPSTRING),
@@ -58,17 +63,23 @@ static ASN1_ITEM_EXP *item_type[] = {
     ASN1_ITEM_ref(ASN1_UTCTIME),
     ASN1_ITEM_ref(ASN1_UTF8STRING),
     ASN1_ITEM_ref(ASN1_VISIBLESTRING),
+#ifndef OPENSSL_NO_RFC3779
     ASN1_ITEM_ref(ASRange),
+#endif
     ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
     ASN1_ITEM_ref(AUTHORITY_KEYID),
     ASN1_ITEM_ref(BASIC_CONSTRAINTS),
     ASN1_ITEM_ref(BIGNUM),
     ASN1_ITEM_ref(CBIGNUM),
     ASN1_ITEM_ref(CERTIFICATEPOLICIES),
+#ifndef OPENSSL_NO_CMS
     ASN1_ITEM_ref(CMS_ContentInfo),
     ASN1_ITEM_ref(CMS_ReceiptRequest),
     ASN1_ITEM_ref(CRL_DIST_POINTS),
+#endif
+#ifndef OPENSSL_NO_DH
     ASN1_ITEM_ref(DHparams),
+#endif
     ASN1_ITEM_ref(DIRECTORYSTRING),
     ASN1_ITEM_ref(DISPLAYTEXT),
     ASN1_ITEM_ref(DIST_POINT),
@@ -82,10 +93,12 @@ static ASN1_ITEM_EXP *item_type[] = {
     ASN1_ITEM_ref(GENERAL_NAME),
     ASN1_ITEM_ref(GENERAL_NAMES),
     ASN1_ITEM_ref(GENERAL_SUBTREE),
+#ifndef OPENSSL_NO_RFC3779
     ASN1_ITEM_ref(IPAddressChoice),
     ASN1_ITEM_ref(IPAddressFamily),
     ASN1_ITEM_ref(IPAddressOrRange),
     ASN1_ITEM_ref(IPAddressRange),
+#endif
     ASN1_ITEM_ref(ISSUING_DIST_POINT),
     ASN1_ITEM_ref(LONG),
     ASN1_ITEM_ref(NAME_CONSTRAINTS),
@@ -93,6 +106,7 @@ static ASN1_ITEM_EXP *item_type[] = {
     ASN1_ITEM_ref(NETSCAPE_SPKAC),
     ASN1_ITEM_ref(NETSCAPE_SPKI),
     ASN1_ITEM_ref(NOTICEREF),
+#ifndef OPENSSL_NO_OCSP
     ASN1_ITEM_ref(OCSP_BASICRESP),
     ASN1_ITEM_ref(OCSP_CERTID),
     ASN1_ITEM_ref(OCSP_CERTSTATUS),
@@ -108,6 +122,7 @@ static ASN1_ITEM_EXP *item_type[] = {
     ASN1_ITEM_ref(OCSP_SERVICELOC),
     ASN1_ITEM_ref(OCSP_SIGNATURE),
     ASN1_ITEM_ref(OCSP_SINGLERESP),
+#endif
     ASN1_ITEM_ref(OTHERNAME),
     ASN1_ITEM_ref(PBE2PARAM),
     ASN1_ITEM_ref(PBEPARAM),
@@ -166,24 +181,40 @@ static ASN1_ITEM_EXP *item_type[] = {
     ASN1_ITEM_ref(X509_SIG),
     ASN1_ITEM_ref(X509_VAL),
     ASN1_ITEM_ref(ZLONG),
+    ASN1_ITEM_ref(INT32),
+    ASN1_ITEM_ref(ZINT32),
+    ASN1_ITEM_ref(UINT32),
+    ASN1_ITEM_ref(ZUINT32),
+    ASN1_ITEM_ref(INT64),
+    ASN1_ITEM_ref(ZINT64),
+    ASN1_ITEM_ref(UINT64),
+    ASN1_ITEM_ref(ZUINT64),
     NULL
 };
 
-int FuzzerInitialize(int *argc, char ***argv) {
-    return 1;
-}
-
-int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
-    int n;
-
-    ASN1_PCTX *pctx = ASN1_PCTX_new();
+static ASN1_PCTX *pctx;
 
+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;
+}
+
+int FuzzerTestOneInput(const uint8_t *buf, size_t len)
+{
+    int n;
+
+
     for (n = 0; item_type[n] != NULL; ++n) {
         const uint8_t *b = buf;
         unsigned char *der = NULL;
@@ -202,7 +233,12 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len) {
         }
     }
 
-    ASN1_PCTX_free(pctx);
+    ERR_clear_error();
 
     return 0;
 }
+
+void FuzzerCleanup(void)
+{
+    ASN1_PCTX_free(pctx);
+}