As ftruncate is not availabe on all platforms, switch back to

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

diff --git a/crypto/asn1/x_val.c b/crypto/asn1/x_val.c
index 9ffa8671d5ead592c0b95a9736acabd5ee065ed5..d0a7ea1cf1a50c3b4c3e9b290efba4662eb2e959 100644 (file)
--- a/crypto/asn1/x_val.c
+++ b/crypto/asn1/x_val.c
@@ -58,12 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
-
-/* ASN1err(ASN1_F_X509_VAL_NEW,ERR_R_MALLOC_FAILURE);
- * ASN1err(ASN1_F_X509_VAL_FREE,ERR_R_MALLOC_FAILURE);
- * ASN1err(ASN1_F_D2I_X509_VAL,ERR_R_MALLOC_FAILURE);
- */
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 int i2d_X509_VAL(X509_VAL *a, unsigned char **pp)
        {
@@ -97,8 +93,8 @@ X509_VAL *X509_VAL_new(void)
        ASN1_CTX c;
 
        M_ASN1_New_Malloc(ret,X509_VAL);
-       M_ASN1_New(ret->notBefore,ASN1_TIME_new);
-       M_ASN1_New(ret->notAfter,ASN1_TIME_new);
+       M_ASN1_New(ret->notBefore,M_ASN1_TIME_new);
+       M_ASN1_New(ret->notAfter,M_ASN1_TIME_new);
        return(ret);
        M_ASN1_New_Error(ASN1_F_X509_VAL_NEW);
        }
@@ -106,8 +102,8 @@ X509_VAL *X509_VAL_new(void)
 void X509_VAL_free(X509_VAL *a)
        {
        if (a == NULL) return;
-       ASN1_TIME_free(a->notBefore);
-       ASN1_TIME_free(a->notAfter);
+       M_ASN1_TIME_free(a->notBefore);
+       M_ASN1_TIME_free(a->notAfter);
        Free((char *)a);
        }