Introduce limits to prevent malicious keys being able to

[oweals/openssl.git] / crypto / asn1 / a_meth.c

diff --git a/crypto/asn1/a_meth.c b/crypto/asn1/a_meth.c
index 513625c3054cc39db3eb88b81bfc09ba2250355f..50bea917e38be7f89c0a647336ace6ff3d4c6a29 100644 (file)
--- a/crypto/asn1/a_meth.c
+++ b/crypto/asn1/a_meth.c
@@ -58,27 +58,27 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "x509.h"
+#include <openssl/buffer.h>
+#include <openssl/asn1.h>
 
 static  ASN1_METHOD ia5string_meth={
-       (int (*)())     i2d_ASN1_IA5STRING,
-       (char *(*)())   d2i_ASN1_IA5STRING,
-       (char *(*)())   ASN1_STRING_new,
-       (void (*)())    ASN1_STRING_free};
+       (I2D_OF(void))  i2d_ASN1_IA5STRING,
+       (D2I_OF(void))  d2i_ASN1_IA5STRING,
+       (void *(*)(void))ASN1_STRING_new,
+       (void (*)(void *))ASN1_STRING_free};
 
 static  ASN1_METHOD bit_string_meth={
-       (int (*)())     i2d_ASN1_BIT_STRING,
-       (char *(*)())   d2i_ASN1_BIT_STRING,
-       (char *(*)())   ASN1_STRING_new,
-       (void (*)())    ASN1_STRING_free};
+       (I2D_OF(void))  i2d_ASN1_BIT_STRING,
+       (D2I_OF(void))  d2i_ASN1_BIT_STRING,
+       (void *(*)(void))ASN1_STRING_new,
+       (void (*)(void *))ASN1_STRING_free};
 
-ASN1_METHOD *ASN1_IA5STRING_asn1_meth()
+ASN1_METHOD *ASN1_IA5STRING_asn1_meth(void)
        {
        return(&ia5string_meth);
        }
 
-ASN1_METHOD *ASN1_BIT_STRING_asn1_meth()
+ASN1_METHOD *ASN1_BIT_STRING_asn1_meth(void)
        {
        return(&bit_string_meth);
        }