Add an evil cast, because POSIX/SUSv2 define connect(2) require

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

diff --git a/crypto/asn1/p7_i_s.c b/crypto/asn1/p7_i_s.c
index 11ebfcadc97e049fe632210c2e3b28b1efb0b394..d21f7ddb846a40ae62ef1943845d42eefcc8db96 100644 (file)
--- a/crypto/asn1/p7_i_s.c
+++ b/crypto/asn1/p7_i_s.c
@@ -58,13 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
-#include "x509.h"
-
-/*
- * ASN1err(ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_D2I_PKCS7_ISSUER_AND_SERIAL,ERR_R_ASN1_LENGTH_MISMATCH);
- */
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 int i2d_PKCS7_ISSUER_AND_SERIAL(PKCS7_ISSUER_AND_SERIAL *a,
             unsigned char **pp)
@@ -101,7 +96,7 @@ PKCS7_ISSUER_AND_SERIAL *PKCS7_ISSUER_AND_SERIAL_new(void)
 
        M_ASN1_New_Malloc(ret,PKCS7_ISSUER_AND_SERIAL);
        M_ASN1_New(ret->issuer,X509_NAME_new);
-       M_ASN1_New(ret->serial,ASN1_INTEGER_new);
+       M_ASN1_New(ret->serial,M_ASN1_INTEGER_new);
        return(ret);
        M_ASN1_New_Error(ASN1_F_PKCS7_ISSUER_AND_SERIAL_NEW);
        }
@@ -110,7 +105,7 @@ void PKCS7_ISSUER_AND_SERIAL_free(PKCS7_ISSUER_AND_SERIAL *a)
        {
        if (a == NULL) return;
        X509_NAME_free(a->issuer);
-       ASN1_INTEGER_free(a->serial);
-       Free((char *)a);
+       M_ASN1_INTEGER_free(a->serial);
+       Free(a);
        }