Continued patches so certificates and CRLs now can support and use

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

diff --git a/crypto/asn1/x_val.c b/crypto/asn1/x_val.c
index e2e4d004362b8f518eb6f6e80d16f39f7052aea0..f6534a6a5cc51d6ef8577bf17afbb47b60a629fd 100644 (file)
--- a/crypto/asn1/x_val.c
+++ b/crypto/asn1/x_val.c
@@ -1,5 +1,5 @@
 /* crypto/asn1/x_val.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -71,13 +71,13 @@ unsigned char **pp;
        {
        M_ASN1_I2D_vars(a);
 
-       M_ASN1_I2D_len(a->notBefore,i2d_ASN1_UTCTIME);
-       M_ASN1_I2D_len(a->notAfter,i2d_ASN1_UTCTIME);
+       M_ASN1_I2D_len(a->notBefore,i2d_ASN1_TIME);
+       M_ASN1_I2D_len(a->notAfter,i2d_ASN1_TIME);
 
        M_ASN1_I2D_seq_total();
 
-       M_ASN1_I2D_put(a->notBefore,i2d_ASN1_UTCTIME);
-       M_ASN1_I2D_put(a->notAfter,i2d_ASN1_UTCTIME);
+       M_ASN1_I2D_put(a->notBefore,i2d_ASN1_TIME);
+       M_ASN1_I2D_put(a->notAfter,i2d_ASN1_TIME);
 
        M_ASN1_I2D_finish();
        }
@@ -91,18 +91,19 @@ long length;
 
        M_ASN1_D2I_Init();
        M_ASN1_D2I_start_sequence();
-       M_ASN1_D2I_get(ret->notBefore,d2i_ASN1_UTCTIME);
-       M_ASN1_D2I_get(ret->notAfter,d2i_ASN1_UTCTIME);
+       M_ASN1_D2I_get(ret->notBefore,d2i_ASN1_TIME);
+       M_ASN1_D2I_get(ret->notAfter,d2i_ASN1_TIME);
        M_ASN1_D2I_Finish(a,X509_VAL_free,ASN1_F_D2I_X509_VAL);
        }
 
 X509_VAL *X509_VAL_new()
        {
        X509_VAL *ret=NULL;
+       ASN1_CTX c;
 
        M_ASN1_New_Malloc(ret,X509_VAL);
-       M_ASN1_New(ret->notBefore,ASN1_UTCTIME_new);
-       M_ASN1_New(ret->notAfter,ASN1_UTCTIME_new);
+       M_ASN1_New(ret->notBefore,ASN1_TIME_new);
+       M_ASN1_New(ret->notAfter,ASN1_TIME_new);
        return(ret);
        M_ASN1_New_Error(ASN1_F_X509_VAL_NEW);
        }
@@ -111,8 +112,8 @@ void X509_VAL_free(a)
 X509_VAL *a;
        {
        if (a == NULL) return;
-       ASN1_UTCTIME_free(a->notBefore);
-       ASN1_UTCTIME_free(a->notAfter);
+       ASN1_TIME_free(a->notBefore);
+       ASN1_TIME_free(a->notAfter);
        Free((char *)a);
        }