Merge from the ASN1 branch of new ASN1 code

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

diff --git a/crypto/asn1/x_val.c b/crypto/asn1/x_val.c
index a9c390f88ce889eae8d449035ad7114a4930c83a..48edf88e81f4da6c6be765e58242af484ea6f83a 100644 (file)
--- a/crypto/asn1/x_val.c
+++ b/crypto/asn1/x_val.c
@@ -58,61 +58,10 @@
 
 #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);
- */
-
-int i2d_X509_VAL(a,pp)
-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_seq_total();
-
-       M_ASN1_I2D_put(a->notBefore,i2d_ASN1_UTCTIME);
-       M_ASN1_I2D_put(a->notAfter,i2d_ASN1_UTCTIME);
-
-       M_ASN1_I2D_finish();
-       }
-
-X509_VAL *d2i_X509_VAL(a,pp,length)
-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_Finish(a,X509_VAL_free,ASN1_F_D2I_X509_VAL);
-       }
-
-X509_VAL *X509_VAL_new()
-       {
-       X509_VAL *ret=NULL;
-
-       M_ASN1_New_Malloc(ret,X509_VAL);
-       M_ASN1_New(ret->notBefore,ASN1_UTCTIME_new);
-       M_ASN1_New(ret->notAfter,ASN1_UTCTIME_new);
-       return(ret);
-       M_ASN1_New_Error(ASN1_F_X509_VAL_NEW);
-       }
-
-void X509_VAL_free(a)
-X509_VAL *a;
-       {
-       if (a == NULL) return;
-       ASN1_UTCTIME_free(a->notBefore);
-       ASN1_UTCTIME_free(a->notAfter);
-       Free((char *)a);
-       }
+#include <openssl/asn1t.h>
+#include <openssl/x509.h>
 
+ASN1_SEQUENCE(X509_VAL) = {
+       ASN1_SIMPLE(X509_VAL, notBefore, ASN1_TIME),
+       ASN1_SIMPLE(X509_VAL, notAfter, ASN1_TIME)
+} ASN1_SEQUENCE_END(X509_VAL);