Tolerate a SEQUENCE in DN components.

[openssl.git] / crypto / asn1 / f_enum.c

diff --git a/crypto/asn1/f_enum.c b/crypto/asn1/f_enum.c
index ea460eb1df755a4df0ecc60ede9a3a9528489843..56e3cc8df2b79b6bd0aff3a24383c8e48b0547eb 100644 (file)
--- a/crypto/asn1/f_enum.c
+++ b/crypto/asn1/f_enum.c
@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/buffer.h>
-#include <openssl/x509.h>
+#include <openssl/asn1.h>
 
 /* Based on a_int.c: equivalent ENUMERATED functions */
 
@@ -153,15 +153,15 @@ int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size)
                if (num+i > slen)
                        {
                        if (s == NULL)
-                               sp=(unsigned char *)Malloc(
+                               sp=(unsigned char *)OPENSSL_malloc(
                                        (unsigned int)num+i*2);
                        else
-                               sp=(unsigned char *)Realloc(s,
+                               sp=(unsigned char *)OPENSSL_realloc(s,
                                        (unsigned int)num+i*2);
                        if (sp == NULL)
                                {
                                ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE);
-                               if (s != NULL) Free((char *)s);
+                               if (s != NULL) OPENSSL_free(s);
                                goto err;
                                }
                        s=sp;