Remove fipscanister build functionality from makefiles.

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

diff --git a/crypto/ts/ts_asn1.c b/crypto/ts/ts_asn1.c
index 808d419c4b8f16a77e1169e692ef6441ce233524..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
 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);
 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_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)
 
        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_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)
        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)


@@ -182,18 +187,18 @@ static int ts_resp_set_tst_info(TS_RESP *a)
 
        if (a->token) {
                if (status != 0 && status != 1) {
 
        if (a->token) {
                if (status != 0 && status != 1) {

-                       TSerr(TS_F_D2I_TS_RESP, TS_R_TOKEN_PRESENT);
+                       TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_TOKEN_PRESENT);

                        return 0;
                }
                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) {
                        return 0;
                }
                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_D2I_TS_RESP, TS_R_PKCS7_TO_TS_TST_INFO_FAILED);
+                       TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_PKCS7_TO_TS_TST_INFO_FAILED);

                        return 0;
                }
        } else if (status == 0 || status == 1) {
                        return 0;
                }
        } else if (status == 0 || status == 1) {

-               TSerr(TS_F_D2I_TS_RESP, TS_R_TOKEN_NOT_PRESENT);
+               TSerr(TS_F_TS_RESP_SET_TST_INFO, TS_R_TOKEN_NOT_PRESENT);

                return 0;
        }
 
                return 0;
        }