fix function codes for error

[openssl.git] / crypto / ts / ts_asn1.c

diff --git a/crypto/ts/ts_asn1.c b/crypto/ts/ts_asn1.c
index 9ac347ff8139a6bc83b7189c44fe34eb7af62d0d..40b730c5e2ea6580e70cd744703a1445ded438f1 100644 (file)
--- a/crypto/ts/ts_asn1.c
+++ b/crypto/ts/ts_asn1.c
@@ -67,6 +67,11 @@ ASN1_SEQUENCE(TS_MSG_IMPRINT) = {
 IMPLEMENT_ASN1_FUNCTIONS_const(TS_MSG_IMPRINT)
 IMPLEMENT_ASN1_DUP_FUNCTION(TS_MSG_IMPRINT)
 #ifndef OPENSSL_NO_BIO
+TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT **a)
+       {
+       return ASN1_d2i_bio_of(TS_MSG_IMPRINT, TS_MSG_IMPRINT_new, d2i_TS_MSG_IMPRINT, bp, a);
+       }
+
 int i2d_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT *a)
 {
        return ASN1_i2d_bio_of_const(TS_MSG_IMPRINT, i2d_TS_MSG_IMPRINT, bp, a);
@@ -89,7 +94,7 @@ ASN1_SEQUENCE(TS_REQ) = {
        ASN1_SIMPLE(TS_REQ, msg_imprint, TS_MSG_IMPRINT),
        ASN1_OPT(TS_REQ, policy_id, ASN1_OBJECT),
        ASN1_OPT(TS_REQ, nonce, ASN1_INTEGER),
-       ASN1_OPT(TS_REQ, cert_req, ASN1_BOOLEAN),
+       ASN1_OPT(TS_REQ, cert_req, ASN1_FBOOLEAN),
        ASN1_IMP_SEQUENCE_OF_OPT(TS_REQ, extensions, X509_EXTENSION, 0)
 } ASN1_SEQUENCE_END(TS_REQ)
 
@@ -134,7 +139,7 @@ ASN1_SEQUENCE(TS_TST_INFO) = {
        ASN1_SIMPLE(TS_TST_INFO, serial, ASN1_INTEGER),
        ASN1_SIMPLE(TS_TST_INFO, time, ASN1_GENERALIZEDTIME),
        ASN1_OPT(TS_TST_INFO, accuracy, TS_ACCURACY),
-       ASN1_OPT(TS_TST_INFO, ordering, ASN1_BOOLEAN),
+       ASN1_OPT(TS_TST_INFO, ordering, ASN1_FBOOLEAN),
        ASN1_OPT(TS_TST_INFO, nonce, ASN1_INTEGER),
        ASN1_EXP_OPT(TS_TST_INFO, tsa, GENERAL_NAME, 0),
        ASN1_IMP_SEQUENCE_OF_OPT(TS_TST_INFO, extensions, X509_EXTENSION, 1)
@@ -174,75 +179,54 @@ ASN1_SEQUENCE(TS_STATUS_INFO) = {
 IMPLEMENT_ASN1_FUNCTIONS_const(TS_STATUS_INFO)
 IMPLEMENT_ASN1_DUP_FUNCTION(TS_STATUS_INFO)
 
-ASN1_SEQUENCE(TS_RESP) = {
-       ASN1_SIMPLE(TS_RESP, status_info, TS_STATUS_INFO),
-       ASN1_OPT(TS_RESP, token, PKCS7),
-} ASN1_SEQUENCE_END(TS_RESP)
-
-DECLARE_ASN1_ALLOC_FUNCTIONS_name(TS_RESP, TS_RESP_int)
-IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(TS_RESP, TS_RESP, TS_RESP_int)
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(TS_RESP, TS_RESP_int)
-IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(TS_RESP, TS_RESP, TS_RESP_int)
-
-TS_RESP *TS_RESP_new(void)
-{
-       TS_RESP *ret = TS_RESP_int_new();
-       if (!ret)
-               return NULL;
-       ret->tst_info = NULL;
-       return ret;
-}
-
-void TS_RESP_free(TS_RESP *a)
-{
-       if (!a)
-               return;
-       if (a->tst_info)
-               TS_TST_INFO_free(a->tst_info);
-       TS_RESP_int_free(a);
-}
-
-int i2d_TS_RESP(const TS_RESP *a, unsigned char **pp)
-{
-       return i2d_TS_RESP_int(a, pp);
-}
-
-TS_RESP *d2i_TS_RESP(TS_RESP **a, const unsigned char **pp, long len)
+static int ts_resp_set_tst_info(TS_RESP *a)
 {
        long    status;
-       TS_RESP *ret;
 
-       ret = d2i_TS_RESP_int(a, pp, len);
-       if (!ret) {
-               TSerr(TS_F_D2I_TS_RESP, TS_R_D2I_TS_RESP_INT_FAILED);
-               return NULL;
-       }
-       status = ASN1_INTEGER_get(ret->status_info->status);
+       status = ASN1_INTEGER_get(a->status_info->status);
 
-       if (ret->token) {
+       if (a->token) {
                if (status != 0 && status != 1) {
-                       TSerr(TS_F_D2I_TS_RESP, TS_R_TOKEN_PRESENT);
-                       if (!*a)
-                               TS_RESP_free(ret);
-                       return NULL;
+                       TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_TOKEN_PRESENT);
+                       return 0;
                }
-               ret->tst_info = PKCS7_to_TS_TST_INFO(ret->token);
-               if (!ret->tst_info) {
-                       TSerr(TS_F_D2I_TS_RESP, TS_R_PKCS7_TO_TS_TST_INFO_FAILED);
-                       if (!*a)
-                               TS_RESP_free(ret);
-                       return NULL;
+               if (a->tst_info != NULL)
+                       TS_TST_INFO_free(a->tst_info);
+               a->tst_info = PKCS7_to_TS_TST_INFO(a->token);
+               if (!a->tst_info) {
+                       TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_PKCS7_TO_TS_TST_INFO_FAILED);
+                       return 0;
                }
        } else if (status == 0 || status == 1) {
-               TSerr(TS_F_D2I_TS_RESP, TS_R_TOKEN_NOT_PRESENT);
-               if (!*a)
-                       TS_RESP_free(ret);
-               return NULL;
+               TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_TOKEN_NOT_PRESENT);
+               return 0;
        }
 
-       return ret;
+       return 1;
 }
 
+static int ts_resp_cb(int op, ASN1_VALUE **pval, const ASN1_ITEM *it,
+       void *exarg)
+{
+       TS_RESP *ts_resp = (TS_RESP *)*pval;
+       if (op == ASN1_OP_NEW_POST) {
+               ts_resp->tst_info = NULL;
+       } else if (op == ASN1_OP_FREE_POST) {
+               if (ts_resp->tst_info != NULL)
+                       TS_TST_INFO_free(ts_resp->tst_info);
+       } else if (op == ASN1_OP_D2I_POST) {
+               if (ts_resp_set_tst_info(ts_resp) == 0)
+                       return 0;
+       }
+       return 1;
+}
+
+ASN1_SEQUENCE_cb(TS_RESP, ts_resp_cb) = {
+       ASN1_SIMPLE(TS_RESP, status_info, TS_STATUS_INFO),
+       ASN1_OPT(TS_RESP, token, PKCS7),
+} ASN1_SEQUENCE_END_cb(TS_RESP, TS_RESP)
+
+IMPLEMENT_ASN1_FUNCTIONS_const(TS_RESP)
 IMPLEMENT_ASN1_DUP_FUNCTION(TS_RESP)
 #ifndef OPENSSL_NO_BIO
 TS_RESP *d2i_TS_RESP_bio(BIO *bp, TS_RESP **a)