mime_hdr_new: free mhdr, tmpname, tmpval on error path

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

diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index 213756fe162dd5f067e6c9531091c489deb88b9e..7036868fcc110a1cda653bcb2f699541911f0f65 100644 (file)
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -64,7 +64,6 @@
 #include <stdio.h>
 #include <time.h>
 #include "cryptlib.h"
-#include "o_time.h"
 #include <openssl/asn1t.h>
 #include "asn1_locl.h"
 
@@ -217,7 +216,7 @@ static int asn1_time_to_tm(struct tm *tm, const ASN1_TIME *t)
        return 0;
        }
 
-int ASN1_TIME_diff(int *pyear, int *psec,
+int ASN1_TIME_diff(int *pday, int *psec,
                        const ASN1_TIME *from, const ASN1_TIME *to)
        {
        struct tm tm_from, tm_to;
@@ -225,5 +224,5 @@ int ASN1_TIME_diff(int *pyear, int *psec,
                return 0;
        if (!asn1_time_to_tm(&tm_to, to))
                return 0;
-       return OPENSSL_gmtime_diff(&tm_from, &tm_to, pyear, psec);
+       return OPENSSL_gmtime_diff(pday, psec, &tm_from, &tm_to);
        }