/* 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
#include <stdio.h>
#include "cryptlib.h"
-#include "asn1_mac.h"
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.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);
- */
-
-int i2d_X509_VAL(a,pp)
-X509_VAL *a;
-unsigned char **pp;
+int i2d_X509_VAL(X509_VAL *a, 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();
}
-X509_VAL *d2i_X509_VAL(a,pp,length)
-X509_VAL **a;
-unsigned char **pp;
-long length;
+X509_VAL *d2i_X509_VAL(X509_VAL **a, unsigned char **pp, long length)
{
M_ASN1_D2I_vars(a,X509_VAL *,X509_VAL_new);
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 *X509_VAL_new(void)
{
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,M_ASN1_TIME_new);
+ M_ASN1_New(ret->notAfter,M_ASN1_TIME_new);
return(ret);
M_ASN1_New_Error(ASN1_F_X509_VAL_NEW);
}
-void X509_VAL_free(a)
-X509_VAL *a;
+void X509_VAL_free(X509_VAL *a)
{
if (a == NULL) return;
- ASN1_UTCTIME_free(a->notBefore);
- ASN1_UTCTIME_free(a->notAfter);
+ M_ASN1_TIME_free(a->notBefore);
+ M_ASN1_TIME_free(a->notAfter);
Free((char *)a);
}