Replace deprecated macros in examples and fuzzers
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
diff --git a/examples/CertificateExample.c b/examples/CertificateExample.c
index a62ea79..1d17d23 100644
--- a/examples/CertificateExample.c
+++ b/examples/CertificateExample.c
@@ -72,12 +72,12 @@
/* "C=US O=gov" */
/******************************************************/
static void
-get_Name_type (ASN1_TYPE cert_def, ASN1_TYPE cert, const char *root,
+get_Name_type (asn1_node cert_def, asn1_node cert, const char *root,
unsigned char *ans)
{
int k, k2, result, len;
char name[128], str[1024], str2[1024], name2[128], counter[5], name3[128];
- ASN1_TYPE value = ASN1_TYPE_EMPTY;
+ asn1_node value = NULL;
char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
char *answer = (char *) ans;
answer[0] = 0;
@@ -207,15 +207,15 @@
/* int *der_len: number of bytes of der string */
/******************************************************/
static void
-create_certificate (ASN1_TYPE cert_def, unsigned char *der, int *der_len)
+create_certificate (asn1_node cert_def, unsigned char *der, int *der_len)
{
int result, k, len;
unsigned char str[1024];
const unsigned char *str2;
- ASN1_TYPE cert1 = ASN1_TYPE_EMPTY;
- ASN1_TYPE value = ASN1_TYPE_EMPTY;
- ASN1_TYPE param = ASN1_TYPE_EMPTY;
- ASN1_TYPE constr = ASN1_TYPE_EMPTY;
+ asn1_node cert1 = NULL;
+ asn1_node value = NULL;
+ asn1_node param = NULL;
+ asn1_node constr = NULL;
char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
int max_len;
@@ -566,11 +566,11 @@
/* int der_len: number of bytes of der string */
/******************************************************/
static void
-get_certificate (ASN1_TYPE cert_def, unsigned char *der, int der_len)
+get_certificate (asn1_node cert_def, unsigned char *der, int der_len)
{
int result, len, start, end;
unsigned char str[1024], str2[1024];
- ASN1_TYPE cert2 = ASN1_TYPE_EMPTY;
+ asn1_node cert2 = NULL;
char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
asn1_create_element (cert_def, "PKIX1Implicit88.Certificate", &cert2);
@@ -624,7 +624,7 @@
asn1_delete_structure (&cert2);
}
-extern const ASN1_ARRAY_TYPE pkix_asn1_tab[];
+extern const asn1_static_node pkix_asn1_tab[];
/********************************************************/
/* Function : main */
@@ -638,7 +638,7 @@
{
int result, der_len;
unsigned char der[1024];
- ASN1_TYPE PKIX1Implicit88 = ASN1_TYPE_EMPTY;
+ asn1_node PKIX1Implicit88 = NULL;
char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
if (1)
diff --git a/examples/CrlExample.c b/examples/CrlExample.c
index 1e59ac7..4513f3d 100644
--- a/examples/CrlExample.c
+++ b/examples/CrlExample.c
@@ -74,12 +74,12 @@
/* "C=US O=gov" */
/******************************************************/
static void
-get_Name_type (ASN1_TYPE cert_def, ASN1_TYPE cert, const char *root,
+get_Name_type (asn1_node cert_def, asn1_node cert, const char *root,
unsigned char *ans)
{
int k, k2, result, len;
char name[128], str[1024], str2[1024], name2[128], counter[5], name3[128];
- ASN1_TYPE value = ASN1_TYPE_EMPTY;
+ asn1_node value = NULL;
char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
char *answer = (char *) ans;
@@ -219,13 +219,13 @@
/* int *der_len: number of bytes of der string */
/******************************************************/
static void
-create_CRL (ASN1_TYPE cert_def, unsigned char *der, int *der_len)
+create_CRL (asn1_node cert_def, unsigned char *der, int *der_len)
{
int result, k, len;
unsigned char str[1024];
const unsigned char *str2;
- ASN1_TYPE crl = ASN1_TYPE_EMPTY;
- ASN1_TYPE value = ASN1_TYPE_EMPTY;
+ asn1_node crl = NULL;
+ asn1_node value = NULL;
char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
int max_len;
@@ -437,11 +437,11 @@
/* int der_len: number of bytes of der string */
/******************************************************/
static void
-get_CRL (ASN1_TYPE cert_def, unsigned char *der, int der_len)
+get_CRL (asn1_node cert_def, unsigned char *der, int der_len)
{
int result, len, start, end;
unsigned char str[1024], str2[1024];
- ASN1_TYPE crl2 = ASN1_TYPE_EMPTY;
+ asn1_node crl2 = NULL;
char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
@@ -491,7 +491,7 @@
asn1_delete_structure (&crl2);
}
-extern const ASN1_ARRAY_TYPE pkix_asn1_tab[];
+extern const asn1_static_node pkix_asn1_tab[];
/********************************************************/
/* Function : main */
@@ -505,7 +505,7 @@
{
int result, der_len;
unsigned char der[1024];
- ASN1_TYPE PKIX1Implicit88 = ASN1_TYPE_EMPTY;
+ asn1_node PKIX1Implicit88 = NULL;
char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
if (1)
diff --git a/fuzz/libtasn1_array2tree_fuzzer.c b/fuzz/libtasn1_array2tree_fuzzer.c
index bb860be..28559da 100644
--- a/fuzz/libtasn1_array2tree_fuzzer.c
+++ b/fuzz/libtasn1_array2tree_fuzzer.c
@@ -77,7 +77,7 @@
tab[nelem].value = NULL;
int result;
- ASN1_TYPE node = ASN1_TYPE_EMPTY;
+ asn1_node node = NULL;
char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
result =
diff --git a/fuzz/libtasn1_gnutls_der_fuzzer.c b/fuzz/libtasn1_gnutls_der_fuzzer.c
index 9816c2d..728f637 100644
--- a/fuzz/libtasn1_gnutls_der_fuzzer.c
+++ b/fuzz/libtasn1_gnutls_der_fuzzer.c
@@ -129,9 +129,9 @@
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
- static ASN1_TYPE _gnutls_gnutls_asn = ASN1_TYPE_EMPTY;
+ static asn1_node _gnutls_gnutls_asn = NULL;
static int first = 1;
- ASN1_TYPE dn;
+ asn1_node dn;
int res;
if (size > 10000) // same as max_len = 10000 in .options file
diff --git a/fuzz/libtasn1_pkix_der_fuzzer.c b/fuzz/libtasn1_pkix_der_fuzzer.c
index 4e15f47..515495c 100644
--- a/fuzz/libtasn1_pkix_der_fuzzer.c
+++ b/fuzz/libtasn1_pkix_der_fuzzer.c
@@ -517,9 +517,9 @@
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
{
- static ASN1_TYPE _gnutls_pkix1_asn = ASN1_TYPE_EMPTY;
+ static asn1_node _gnutls_pkix1_asn = NULL;
static int first = 1;
- ASN1_TYPE dn;
+ asn1_node dn;
int res, start, end;
if (size > 10000) // same as max_len = 10000 in .options file
