shorter filenames
authorUlf Möller <ulf@openssl.org>
Wed, 15 Feb 2006 00:35:46 +0000 (00:35 +0000)
committerUlf Möller <ulf@openssl.org>
Wed, 15 Feb 2006 00:35:46 +0000 (00:35 +0000)
crypto/ts/Makefile
crypto/ts/ts_resp_print.c [deleted file]
crypto/ts/ts_resp_sign.c [deleted file]
crypto/ts/ts_resp_utils.c [deleted file]
crypto/ts/ts_resp_verify.c [deleted file]
crypto/ts/ts_rsp_print.c [new file with mode: 0644]
crypto/ts/ts_rsp_sign.c [new file with mode: 0644]
crypto/ts/ts_rsp_utils.c [new file with mode: 0644]
crypto/ts/ts_rsp_verify.c [new file with mode: 0644]

index 0ba67ffeeec34169db04645c15e1862389a5619c..ad1d43c318fe119d98204128b68aa9cfe6b59d35 100644 (file)
@@ -25,11 +25,11 @@ TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC=        ts_err.c ts_req_utils.c ts_req_print.c ts_resp_utils.c ts_resp_print.c \
-       ts_resp_sign.c ts_resp_verify.c ts_verify_ctx.c ts_lib.c ts_conf.c \
+LIBSRC=        ts_err.c ts_req_utils.c ts_req_print.c ts_rsp_utils.c ts_rsp_print.c \
+       ts_rsp_sign.c ts_rsp_verify.c ts_verify_ctx.c ts_lib.c ts_conf.c \
        ts_asn1.c
-LIBOBJ= ts_err.o ts_req_utils.o ts_req_print.o ts_resp_utils.o ts_resp_print.o \
-       ts_resp_sign.o ts_resp_verify.o ts_verify_ctx.o ts_lib.o ts_conf.o \
+LIBOBJ= ts_err.o ts_req_utils.o ts_req_print.o ts_rsp_utils.o ts_rsp_print.o \
+       ts_rsp_sign.o ts_rsp_verify.o ts_verify_ctx.o ts_lib.o ts_conf.o \
        ts_asn1.o
 
 SRC= $(LIBSRC)
@@ -180,77 +180,74 @@ ts_req_utils.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 ts_req_utils.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
 ts_req_utils.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 ts_req_utils.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_req_utils.c
-ts_resp_print.o: ../../e_os.h ../../include/openssl/asn1.h
-ts_resp_print.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-ts_resp_print.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
-ts_resp_print.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-ts_resp_print.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-ts_resp_print.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-ts_resp_print.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
-ts_resp_print.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-ts_resp_print.o: ../../include/openssl/obj_mac.h
-ts_resp_print.o: ../../include/openssl/objects.h
-ts_resp_print.o: ../../include/openssl/opensslconf.h
-ts_resp_print.o: ../../include/openssl/opensslv.h
-ts_resp_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-ts_resp_print.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ts_resp_print.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ts_resp_print.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-ts_resp_print.o: ../../include/openssl/x509_vfy.h
-ts_resp_print.o: ../../include/openssl/x509v3.h ../cryptlib.h ts.h
-ts_resp_print.o: ts_resp_print.c
-ts_resp_sign.o: ../../e_os.h ../../include/openssl/asn1.h
-ts_resp_sign.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
-ts_resp_sign.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
-ts_resp_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-ts_resp_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-ts_resp_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
-ts_resp_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-ts_resp_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-ts_resp_sign.o: ../../include/openssl/objects.h
-ts_resp_sign.o: ../../include/openssl/opensslconf.h
-ts_resp_sign.o: ../../include/openssl/opensslv.h
-ts_resp_sign.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-ts_resp_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ts_resp_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ts_resp_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
-ts_resp_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-ts_resp_sign.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_resp_sign.c
-ts_resp_utils.o: ../../e_os.h ../../include/openssl/asn1.h
-ts_resp_utils.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
-ts_resp_utils.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
-ts_resp_utils.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-ts_resp_utils.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-ts_resp_utils.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
-ts_resp_utils.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-ts_resp_utils.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-ts_resp_utils.o: ../../include/openssl/objects.h
-ts_resp_utils.o: ../../include/openssl/opensslconf.h
-ts_resp_utils.o: ../../include/openssl/opensslv.h
-ts_resp_utils.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-ts_resp_utils.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-ts_resp_utils.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-ts_resp_utils.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
-ts_resp_utils.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-ts_resp_utils.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_resp_utils.c
-ts_resp_verify.o: ../../e_os.h ../../include/openssl/asn1.h
-ts_resp_verify.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
-ts_resp_verify.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
-ts_resp_verify.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-ts_resp_verify.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-ts_resp_verify.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
-ts_resp_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-ts_resp_verify.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-ts_resp_verify.o: ../../include/openssl/objects.h
-ts_resp_verify.o: ../../include/openssl/opensslconf.h
-ts_resp_verify.o: ../../include/openssl/opensslv.h
-ts_resp_verify.o: ../../include/openssl/ossl_typ.h
-ts_resp_verify.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
-ts_resp_verify.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-ts_resp_verify.o: ../../include/openssl/stack.h
-ts_resp_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
-ts_resp_verify.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-ts_resp_verify.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_resp_verify.c
+ts_rsp_print.o: ../../e_os.h ../../include/openssl/asn1.h
+ts_rsp_print.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+ts_rsp_print.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
+ts_rsp_print.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+ts_rsp_print.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+ts_rsp_print.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+ts_rsp_print.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+ts_rsp_print.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+ts_rsp_print.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+ts_rsp_print.o: ../../include/openssl/opensslconf.h
+ts_rsp_print.o: ../../include/openssl/opensslv.h
+ts_rsp_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ts_rsp_print.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_rsp_print.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_rsp_print.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+ts_rsp_print.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+ts_rsp_print.o: ../cryptlib.h ts.h ts_rsp_print.c
+ts_rsp_sign.o: ../../e_os.h ../../include/openssl/asn1.h
+ts_rsp_sign.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ts_rsp_sign.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ts_rsp_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ts_rsp_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ts_rsp_sign.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ts_rsp_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ts_rsp_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ts_rsp_sign.o: ../../include/openssl/objects.h
+ts_rsp_sign.o: ../../include/openssl/opensslconf.h
+ts_rsp_sign.o: ../../include/openssl/opensslv.h
+ts_rsp_sign.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ts_rsp_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_rsp_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_rsp_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
+ts_rsp_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ts_rsp_sign.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_sign.c
+ts_rsp_utils.o: ../../e_os.h ../../include/openssl/asn1.h
+ts_rsp_utils.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ts_rsp_utils.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ts_rsp_utils.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ts_rsp_utils.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ts_rsp_utils.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ts_rsp_utils.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ts_rsp_utils.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ts_rsp_utils.o: ../../include/openssl/objects.h
+ts_rsp_utils.o: ../../include/openssl/opensslconf.h
+ts_rsp_utils.o: ../../include/openssl/opensslv.h
+ts_rsp_utils.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ts_rsp_utils.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_rsp_utils.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_rsp_utils.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
+ts_rsp_utils.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ts_rsp_utils.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_utils.c
+ts_rsp_verify.o: ../../e_os.h ../../include/openssl/asn1.h
+ts_rsp_verify.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ts_rsp_verify.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+ts_rsp_verify.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+ts_rsp_verify.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ts_rsp_verify.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+ts_rsp_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+ts_rsp_verify.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ts_rsp_verify.o: ../../include/openssl/objects.h
+ts_rsp_verify.o: ../../include/openssl/opensslconf.h
+ts_rsp_verify.o: ../../include/openssl/opensslv.h
+ts_rsp_verify.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+ts_rsp_verify.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+ts_rsp_verify.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+ts_rsp_verify.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h
+ts_rsp_verify.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+ts_rsp_verify.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_verify.c
 ts_verify_ctx.o: ../../e_os.h ../../include/openssl/asn1.h
 ts_verify_ctx.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 ts_verify_ctx.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
diff --git a/crypto/ts/ts_resp_print.c b/crypto/ts/ts_resp_print.c
deleted file mode 100644 (file)
index 6421315..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-/* crypto/ts/ts_resp_print.c */
-/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
- * project 2002.
- */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/objects.h>
-#include <openssl/bn.h>
-#include <openssl/x509v3.h>
-#include "ts.h"
-
-struct status_map_st
-       {
-       int bit;
-       const char *text;
-       };
-
-/* Local function declarations. */
-
-static int TS_status_map_print(BIO *bio, struct status_map_st *a,
-                              ASN1_BIT_STRING *v);
-static int TS_ACCURACY_print_bio(BIO *bio, TS_ACCURACY *accuracy);
-
-/* Function definitions. */
-
-int TS_RESP_print_bio(BIO *bio, TS_RESP *a)
-       {
-       TS_TST_INFO *tst_info;
-
-       BIO_printf(bio, "Status info:\n");
-       TS_STATUS_INFO_print_bio(bio, TS_RESP_get_status_info(a));
-
-       BIO_printf(bio, "\nTST info:\n");
-       tst_info = TS_RESP_get_tst_info(a);
-       if (tst_info != NULL)
-               TS_TST_INFO_print_bio(bio, TS_RESP_get_tst_info(a));
-       else
-               BIO_printf(bio, "Not included.\n");
-               
-       return 1;
-       }
-
-int TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a)
-       {
-       static const char *status_map[] =
-               {
-               "Granted.",
-               "Granted with modifications.",
-               "Rejected.",
-               "Waiting.",
-               "Revocation warning.",
-               "Revoked."
-               };
-       static struct status_map_st failure_map[] =
-               {
-               { TS_INFO_BAD_ALG,
-               "unrecognized or unsupported algorithm identifier" },
-               { TS_INFO_BAD_REQUEST,
-               "transaction not permitted or supported" },
-               { TS_INFO_BAD_DATA_FORMAT,
-               "the data submitted has the wrong format" },
-               { TS_INFO_TIME_NOT_AVAILABLE,
-               "the TSA's time source is not available" },
-               { TS_INFO_UNACCEPTED_POLICY,
-               "the requested TSA policy is not supported by the TSA" },
-               { TS_INFO_UNACCEPTED_EXTENSION,
-               "the requested extension is not supported by the TSA" },
-               { TS_INFO_ADD_INFO_NOT_AVAILABLE,
-               "the additional information requested could not be understood "
-               "or is not available" },
-               { TS_INFO_SYSTEM_FAILURE,
-               "the request cannot be handled due to system failure" },
-               { -1, NULL }
-               };
-       long status;
-       int i, lines = 0;
-
-       /* Printing status code. */
-       BIO_printf(bio, "Status: ");
-       status = ASN1_INTEGER_get(a->status);
-       if (0 <= status && status < (long)(sizeof(status_map)/sizeof(status_map[0])))
-               BIO_printf(bio, "%s\n", status_map[status]);
-       else
-               BIO_printf(bio, "out of bounds\n");
-       
-       /* Printing status description. */
-       BIO_printf(bio, "Status description: ");
-       for (i = 0; i < sk_ASN1_UTF8STRING_num(a->text); ++i)
-               {
-               if (i > 0)
-                       BIO_puts(bio, "\t");
-               ASN1_STRING_print_ex(bio, sk_ASN1_UTF8STRING_value(a->text, i),
-                                    0);
-               BIO_puts(bio, "\n");
-               }
-       if (i == 0)
-               BIO_printf(bio, "unspecified\n");
-
-       /* Printing failure information. */
-       BIO_printf(bio, "Failure info: ");
-       if (a->failure_info != NULL)
-               lines = TS_status_map_print(bio, failure_map,
-                                           a->failure_info);
-       if (lines == 0)
-               BIO_printf(bio, "unspecified");
-       BIO_printf(bio, "\n");
-
-       return 1;
-       }
-
-static int TS_status_map_print(BIO *bio, struct status_map_st *a,
-                              ASN1_BIT_STRING *v)
-       {
-       int lines = 0;
-
-       for (; a->bit >= 0; ++a)
-               {
-               if (ASN1_BIT_STRING_get_bit(v, a->bit))
-                       {
-                       if (++lines > 1)
-                               BIO_printf(bio, ", ");
-                       BIO_printf(bio, "%s", a->text);
-                       }
-               }
-
-       return lines;
-       }
-
-int TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a)
-       {
-       int v;
-       ASN1_OBJECT *policy_id;
-       ASN1_INTEGER *serial;
-       ASN1_GENERALIZEDTIME *gtime;
-       TS_ACCURACY *accuracy;
-       ASN1_INTEGER *nonce;
-       GENERAL_NAME *tsa_name;
-
-       if (a == NULL) return 0;
-
-       /* Print version. */
-       v = TS_TST_INFO_get_version(a);
-       BIO_printf(bio, "Version: %d\n", v);
-
-       /* Print policy id. */
-       BIO_printf(bio, "Policy OID: ");
-       policy_id = TS_TST_INFO_get_policy_id(a);
-       TS_OBJ_print_bio(bio, policy_id);
-
-       /* Print message imprint. */
-       TS_MSG_IMPRINT_print_bio(bio, TS_TST_INFO_get_msg_imprint(a));
-
-       /* Print serial number. */
-       BIO_printf(bio, "Serial number: ");
-       serial = TS_TST_INFO_get_serial(a);
-       if (serial == NULL)
-               BIO_printf(bio, "unspecified");
-       else
-               TS_ASN1_INTEGER_print_bio(bio, serial);
-       BIO_write(bio, "\n", 1);
-
-       /* Print time stamp. */
-       BIO_printf(bio, "Time stamp: ");
-       gtime = TS_TST_INFO_get_time(a);
-       ASN1_GENERALIZEDTIME_print(bio, gtime);
-       BIO_write(bio, "\n", 1);
-
-       /* Print accuracy. */
-       BIO_printf(bio, "Accuracy: ");
-       accuracy = TS_TST_INFO_get_accuracy(a);
-       if (accuracy == NULL)
-               BIO_printf(bio, "unspecified");
-       else
-               TS_ACCURACY_print_bio(bio, accuracy);
-       BIO_write(bio, "\n", 1);
-
-       /* Print ordering. */
-       BIO_printf(bio, "Ordering: %s\n", 
-                  TS_TST_INFO_get_ordering(a) ? "yes" : "no");
-
-       /* Print nonce. */
-       BIO_printf(bio, "Nonce: ");
-       nonce = TS_TST_INFO_get_nonce(a);
-       if (nonce == NULL)
-               BIO_printf(bio, "unspecified");
-       else
-               TS_ASN1_INTEGER_print_bio(bio, nonce);
-       BIO_write(bio, "\n", 1);
-
-       /* Print TSA name. */
-       BIO_printf(bio, "TSA: ");
-       tsa_name = TS_TST_INFO_get_tsa(a);
-       if (tsa_name == NULL)
-               BIO_printf(bio, "unspecified");
-       else
-               {
-               STACK_OF(CONF_VALUE) *nval;
-               if ((nval = i2v_GENERAL_NAME(NULL, tsa_name, NULL)))
-                       X509V3_EXT_val_prn(bio, nval, 0, 0);
-               sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
-               }
-       BIO_write(bio, "\n", 1);
-
-       /* Print extensions. */
-       TS_ext_print_bio(bio, TS_TST_INFO_get_exts(a));
-
-       return 1;
-       }
-
-static int TS_ACCURACY_print_bio(BIO *bio, TS_ACCURACY *accuracy)
-       {
-       ASN1_INTEGER *seconds = TS_ACCURACY_get_seconds(accuracy);
-       ASN1_INTEGER *millis = TS_ACCURACY_get_millis(accuracy);
-       ASN1_INTEGER *micros = TS_ACCURACY_get_micros(accuracy);
-
-       if (seconds != NULL)
-               TS_ASN1_INTEGER_print_bio(bio, seconds);
-       else
-               BIO_printf(bio, "unspecified");
-       BIO_printf(bio, " seconds, ");
-       if (millis != NULL)
-               TS_ASN1_INTEGER_print_bio(bio, millis);
-       else
-               BIO_printf(bio, "unspecified");
-       BIO_printf(bio, " millis, ");
-       if (micros != NULL)
-               TS_ASN1_INTEGER_print_bio(bio, micros);
-       else
-               BIO_printf(bio, "unspecified");
-       BIO_printf(bio, " micros");
-
-       return 1;
-       }
diff --git a/crypto/ts/ts_resp_sign.c b/crypto/ts/ts_resp_sign.c
deleted file mode 100644 (file)
index aa81f74..0000000
+++ /dev/null
@@ -1,1011 +0,0 @@
-/* crypto/ts/ts_resp_sign.c */
-/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
- * project 2002.
- */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include "cryptlib.h"
-
-#if defined(OPENSSL_SYS_UNIX)
-#include <sys/time.h>
-#endif
-
-#include <openssl/objects.h>
-#include <openssl/ts.h>
-#include <openssl/pkcs7.h>
-
-/* Private function declarations. */
-
-static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *);
-static int def_time_cb(struct TS_resp_ctx *, void *, long *sec, long *usec);
-static int def_extension_cb(struct TS_resp_ctx *, X509_EXTENSION *, void *);
-
-static void TS_RESP_CTX_init(TS_RESP_CTX *ctx);
-static void TS_RESP_CTX_cleanup(TS_RESP_CTX *ctx);
-static int TS_RESP_check_request(TS_RESP_CTX *ctx);
-static ASN1_OBJECT *TS_RESP_get_policy(TS_RESP_CTX *ctx);
-static TS_TST_INFO *TS_RESP_create_tst_info(TS_RESP_CTX *ctx, 
-                                           ASN1_OBJECT *policy);
-static int TS_RESP_process_extensions(TS_RESP_CTX *ctx);
-static int TS_RESP_sign(TS_RESP_CTX *ctx);
-
-static ESS_SIGNING_CERT *ESS_SIGNING_CERT_new_init(X509 *signcert, 
-                                                  STACK_OF(X509) *certs);
-static ESS_CERT_ID *ESS_CERT_ID_new_init(X509 *cert, int issuer_needed);
-static int TS_TST_INFO_content_new(PKCS7 *p7);
-static int ESS_add_signing_cert(PKCS7_SIGNER_INFO *si, ESS_SIGNING_CERT *sc);
-
-static ASN1_GENERALIZEDTIME *TS_RESP_set_genTime_with_precision(
-       ASN1_GENERALIZEDTIME *, long, long, unsigned);
-
-/* Default callbacks for response generation. */
-
-static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *ctx, void *data)
-       {
-       ASN1_INTEGER *serial = ASN1_INTEGER_new();
-       if (!serial) goto err;
-       if (!ASN1_INTEGER_set(serial, 1)) goto err;
-       return serial;
- err:
-       TSerr(TS_F_DEF_SERIAL_CB, ERR_R_MALLOC_FAILURE);
-       TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                   "Error during serial number generation.");
-       return NULL;
-       }
-
-#if defined(OPENSSL_SYS_UNIX)
-
-/* Use the gettimeofday function call. */
-static int def_time_cb(struct TS_resp_ctx *ctx, void *data, 
-                      long *sec, long *usec)
-       {
-       struct timeval tv;
-       if (gettimeofday(&tv, NULL) != 0) 
-               {
-               TSerr(TS_F_DEF_TIME_CB, TS_R_TIME_SYSCALL_ERROR);
-               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                           "Time is not available.");
-               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_TIME_NOT_AVAILABLE);
-               return 0;
-               }
-       /* Return time to caller. */
-       *sec = tv.tv_sec;
-       *usec = tv.tv_usec;
-
-       return 1;
-       }
-
-#else
-
-/* Use the time function call that provides only seconds precision. */
-static int def_time_cb(struct TS_resp_ctx *ctx, void *data, 
-                      long *sec, long *usec)
-       {
-       time_t t;
-       if (time(&t) == (time_t) -1)
-               {
-               TSerr(TS_F_DEF_TIME_CB, TS_R_TIME_SYSCALL_ERROR);
-               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                           "Time is not available.");
-               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_TIME_NOT_AVAILABLE);
-               return 0;
-               }
-       /* Return time to caller, only second precision. */
-       *sec = (long) t;
-       *usec = 0;
-
-       return 1;
-       }
-
-#endif
-
-static int def_extension_cb(struct TS_resp_ctx *ctx, X509_EXTENSION *ext,
-                           void *data)
-       {
-       /* No extensions are processed here. */
-       TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                   "Unsupported extension.");
-       TS_RESP_CTX_add_failure_info(ctx, TS_INFO_UNACCEPTED_EXTENSION);
-       return 0;
-       }
-
-/* TS_RESP_CTX management functions. */
-
-TS_RESP_CTX *TS_RESP_CTX_new()
-       {
-       TS_RESP_CTX *ctx;
-
-       if (!(ctx = (TS_RESP_CTX *) OPENSSL_malloc(sizeof(TS_RESP_CTX))))
-               {
-               TSerr(TS_F_TS_RESP_CTX_NEW, ERR_R_MALLOC_FAILURE);
-               return NULL;
-               }
-       memset(ctx, 0, sizeof(TS_RESP_CTX));
-
-       /* Setting default callbacks. */
-       ctx->serial_cb = def_serial_cb;
-       ctx->time_cb = def_time_cb;
-       ctx->extension_cb = def_extension_cb;
-
-       return ctx;
-       }
-
-void TS_RESP_CTX_free(TS_RESP_CTX *ctx)
-       {
-       if (!ctx) return;
-
-       X509_free(ctx->signer_cert);
-       EVP_PKEY_free(ctx->signer_key);
-       sk_X509_pop_free(ctx->certs, X509_free);
-       sk_ASN1_OBJECT_pop_free(ctx->policies, ASN1_OBJECT_free);
-       ASN1_OBJECT_free(ctx->default_policy);
-       sk_EVP_MD_free(ctx->mds);       /* No EVP_MD_free method exists. */
-       ASN1_INTEGER_free(ctx->seconds);
-       ASN1_INTEGER_free(ctx->millis);
-       ASN1_INTEGER_free(ctx->micros);
-       OPENSSL_free(ctx);
-       }
-
-int TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer)
-       {
-       if (X509_check_purpose(signer, X509_PURPOSE_TIMESTAMP_SIGN, 0) != 1)
-               {
-               TSerr(TS_F_TS_RESP_CTX_SET_SIGNER_CERT, 
-                     TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE);
-               return 0;
-               }
-       if (ctx->signer_cert) X509_free(ctx->signer_cert);
-       ctx->signer_cert = signer;
-       CRYPTO_add(&ctx->signer_cert->references, +1, CRYPTO_LOCK_X509);
-       return 1;
-       }
-
-int TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key)
-       {
-       if (ctx->signer_key) EVP_PKEY_free(ctx->signer_key);
-       ctx->signer_key = key;
-       CRYPTO_add(&ctx->signer_key->references, +1, CRYPTO_LOCK_EVP_PKEY);
-
-       return 1;
-       }
-
-int TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *def_policy)
-       {
-       if (ctx->default_policy) ASN1_OBJECT_free(ctx->default_policy);
-       if (!(ctx->default_policy = OBJ_dup(def_policy))) goto err;
-       return 1;
- err:
-       TSerr(TS_F_TS_RESP_CTX_SET_DEF_POLICY, ERR_R_MALLOC_FAILURE);
-       return 0;
-       }
-
-int TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs)
-       {
-       int i;
-
-       if (ctx->certs)
-               {
-               sk_X509_pop_free(ctx->certs, X509_free);
-               ctx->certs = NULL;
-               }
-       if (!certs) return 1;
-       if (!(ctx->certs = sk_X509_dup(certs))) 
-               {
-               TSerr(TS_F_TS_RESP_CTX_SET_CERTS, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       for (i = 0; i < sk_X509_num(ctx->certs); ++i)
-               {
-               X509 *cert = sk_X509_value(ctx->certs, i);
-               CRYPTO_add(&cert->references, +1, CRYPTO_LOCK_X509);
-               }
-
-       return 1;
-       }
-
-int TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *policy)
-       {
-       ASN1_OBJECT *copy = NULL;
-
-       /* Create new policy stack if necessary. */
-       if (!ctx->policies && !(ctx->policies = sk_ASN1_OBJECT_new_null())) 
-               goto err;
-       if (!(copy = OBJ_dup(policy))) goto err;
-       if (!sk_ASN1_OBJECT_push(ctx->policies, copy)) goto err;
-
-       return 1;
- err:
-       TSerr(TS_F_TS_RESP_CTX_ADD_POLICY, ERR_R_MALLOC_FAILURE);
-       ASN1_OBJECT_free(copy);
-       return 0;
-       }
-
-int TS_RESP_CTX_add_md(TS_RESP_CTX *ctx, const EVP_MD *md)
-       {
-       /* Create new md stack if necessary. */
-       if (!ctx->mds && !(ctx->mds = sk_EVP_MD_new_null())) 
-               goto err;
-       /* Add the shared md, no copy needed. */
-       if (!sk_EVP_MD_push(ctx->mds, md)) goto err;
-
-       return 1;
- err:
-       TSerr(TS_F_TS_RESP_CTX_ADD_MD, ERR_R_MALLOC_FAILURE);
-       return 0;
-       }
-
-#define TS_RESP_CTX_accuracy_free(ctx)         \
-       ASN1_INTEGER_free(ctx->seconds);        \
-       ctx->seconds = NULL;                    \
-       ASN1_INTEGER_free(ctx->millis);         \
-       ctx->millis = NULL;                     \
-       ASN1_INTEGER_free(ctx->micros);         \
-       ctx->micros = NULL;
-
-int TS_RESP_CTX_set_accuracy(TS_RESP_CTX *ctx, 
-                            int secs, int millis, int micros)
-       {
-
-       TS_RESP_CTX_accuracy_free(ctx);
-       if (secs && (!(ctx->seconds = ASN1_INTEGER_new())
-                    || !ASN1_INTEGER_set(ctx->seconds, secs)))
-               goto err;
-       if (millis && (!(ctx->millis = ASN1_INTEGER_new())
-                      || !ASN1_INTEGER_set(ctx->millis, millis)))
-               goto err;
-       if (micros && (!(ctx->micros = ASN1_INTEGER_new())
-                      || !ASN1_INTEGER_set(ctx->micros, micros)))
-               goto err;
-
-       return 1;
- err:
-       TS_RESP_CTX_accuracy_free(ctx);
-       TSerr(TS_F_TS_RESP_CTX_SET_ACCURACY, ERR_R_MALLOC_FAILURE);
-       return 0;
-       }
-
-void TS_RESP_CTX_add_flags(TS_RESP_CTX *ctx, int flags)
-       {
-       ctx->flags |= flags;
-       }
-
-void TS_RESP_CTX_set_serial_cb(TS_RESP_CTX *ctx, TS_serial_cb cb, void *data)
-       {
-       ctx->serial_cb = cb;
-       ctx->serial_cb_data = data;
-       }
-
-void TS_RESP_CTX_set_time_cb(TS_RESP_CTX *ctx, TS_time_cb cb, void *data)
-       {
-       ctx->time_cb = cb;
-       ctx->time_cb_data = data;
-       }
-
-void TS_RESP_CTX_set_extension_cb(TS_RESP_CTX *ctx, 
-                                 TS_extension_cb cb, void *data)
-       {
-       ctx->extension_cb = cb;
-       ctx->extension_cb_data = data;
-       }
-
-int TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx, 
-                               int status, const char *text)
-       {
-       TS_STATUS_INFO *si = NULL;
-       ASN1_UTF8STRING *utf8_text = NULL;
-       int ret = 0;
-
-       if (!(si = TS_STATUS_INFO_new())) goto err;
-       if (!ASN1_INTEGER_set(si->status, status)) goto err;
-       if (text)
-               {
-               if (!(utf8_text = ASN1_UTF8STRING_new())
-                   || !ASN1_STRING_set(utf8_text, text, strlen(text)))
-                       goto err;
-               if (!si->text && !(si->text = sk_ASN1_UTF8STRING_new_null()))
-                       goto err;
-               if (!sk_ASN1_UTF8STRING_push(si->text, utf8_text)) goto err;
-               utf8_text = NULL;       /* Ownership is lost. */
-               }
-       if (!TS_RESP_set_status_info(ctx->response, si)) goto err;
-       ret = 1;
- err:
-       if (!ret)
-               TSerr(TS_F_TS_RESP_CTX_SET_STATUS_INFO, ERR_R_MALLOC_FAILURE);
-       TS_STATUS_INFO_free(si);
-       ASN1_UTF8STRING_free(utf8_text);
-       return ret;
-       }
-
-int TS_RESP_CTX_set_status_info_cond(TS_RESP_CTX *ctx, 
-                                    int status, const char *text)
-       {
-       int ret = 1;
-       TS_STATUS_INFO *si = TS_RESP_get_status_info(ctx->response);
-
-       if (ASN1_INTEGER_get(si->status) == TS_STATUS_GRANTED)
-               {
-               /* Status has not been set, set it now. */
-               ret = TS_RESP_CTX_set_status_info(ctx, status, text);
-               }
-       return ret;
-       }
-
-int TS_RESP_CTX_add_failure_info(TS_RESP_CTX *ctx, int failure)
-       {
-       TS_STATUS_INFO *si = TS_RESP_get_status_info(ctx->response);
-       if (!si->failure_info && !(si->failure_info = ASN1_BIT_STRING_new()))
-               goto err;
-       if (!ASN1_BIT_STRING_set_bit(si->failure_info, failure, 1))
-               goto err;
-       return 1;
- err:
-       TSerr(TS_F_TS_RESP_CTX_ADD_FAILURE_INFO, ERR_R_MALLOC_FAILURE);
-       return 0;
-       }
-
-TS_REQ *TS_RESP_CTX_get_request(TS_RESP_CTX *ctx)
-       {
-       return ctx->request;
-       }
-
-TS_TST_INFO *TS_RESP_CTX_get_tst_info(TS_RESP_CTX *ctx)
-       {
-       return ctx->tst_info;
-       }
-
-int TS_RESP_CTX_set_clock_precision_digits(TS_RESP_CTX *ctx, unsigned precision)
-       {
-       if (precision > TS_MAX_CLOCK_PRECISION_DIGITS)
-              return 0;
-       ctx->clock_precision_digits = precision;
-       return 1;
-       }
-
-/* Main entry method of the response generation. */
-TS_RESP *TS_RESP_create_response(TS_RESP_CTX *ctx, BIO *req_bio)
-       {
-       ASN1_OBJECT *policy;
-       TS_RESP *response;
-       int result = 0;
-
-       TS_RESP_CTX_init(ctx);
-
-       /* Creating the response object. */
-       if (!(ctx->response = TS_RESP_new())) 
-               {
-               TSerr(TS_F_TS_RESP_CREATE_RESPONSE, ERR_R_MALLOC_FAILURE);
-               goto end;
-               }
-
-       /* Parsing DER request. */
-       if (!(ctx->request = d2i_TS_REQ_bio(req_bio, NULL)))
-               {
-               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                           "Bad request format or "
-                                           "system error.");
-               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_DATA_FORMAT);
-               goto end;
-               }
-
-       /* Setting default status info. */
-       if (!TS_RESP_CTX_set_status_info(ctx, TS_STATUS_GRANTED, NULL))
-               goto end;
-
-       /* Checking the request format. */
-       if (!TS_RESP_check_request(ctx)) goto end;
-
-       /* Checking acceptable policies. */
-       if (!(policy = TS_RESP_get_policy(ctx))) goto end;
-
-       /* Creating the TS_TST_INFO object. */
-       if (!(ctx->tst_info = TS_RESP_create_tst_info(ctx, policy)))
-               goto end;
-
-       /* Processing extensions. */
-       if (!TS_RESP_process_extensions(ctx)) goto end;
-
-       /* Generating the signature. */
-       if (!TS_RESP_sign(ctx)) goto end;
-
-       /* Everything was successful. */
-       result = 1;
- end:
-       if (!result)
-               {
-               TSerr(TS_F_TS_RESP_CREATE_RESPONSE, TS_R_RESPONSE_SETUP_ERROR);
-               TS_RESP_CTX_set_status_info_cond(ctx, TS_STATUS_REJECTION,
-                                                "Error during response "
-                                                "generation.");
-               /* Check if the status info was set. */
-               if (ctx->response
-                   && ASN1_INTEGER_get(
-                           TS_RESP_get_status_info(ctx->response)->status)
-                   == TS_STATUS_GRANTED)
-                       {
-                       /* Status info wasn't set, don't return a response. */
-                       TS_RESP_free(ctx->response);
-                       ctx->response = NULL;
-                       }
-               }
-       response = ctx->response;
-       ctx->response = NULL;   /* Ownership will be returned to caller. */
-       TS_RESP_CTX_cleanup(ctx);
-       return response;
-       }
-
-/* Initializes the variable part of the context. */
-static void TS_RESP_CTX_init(TS_RESP_CTX *ctx)
-       {
-       ctx->request = NULL;
-       ctx->response = NULL;
-       ctx->tst_info = NULL;
-       }
-
-/* Cleans up the variable part of the context. */
-static void TS_RESP_CTX_cleanup(TS_RESP_CTX *ctx)
-       {
-       TS_REQ_free(ctx->request);
-       ctx->request = NULL;
-       TS_RESP_free(ctx->response);
-       ctx->response = NULL;
-       TS_TST_INFO_free(ctx->tst_info);
-       ctx->tst_info = NULL;
-       }
-
-/* Checks the format and content of the request. */
-static int TS_RESP_check_request(TS_RESP_CTX *ctx)
-       {
-       TS_REQ *request = ctx->request;
-       TS_MSG_IMPRINT *msg_imprint;
-       X509_ALGOR *md_alg;
-       int md_alg_id;
-       ASN1_OCTET_STRING *digest;
-       EVP_MD *md = NULL;
-       int i;
-
-       /* Checking request version. */
-       if (TS_REQ_get_version(request) != 1)
-               {
-               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                           "Bad request version.");
-               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_REQUEST);
-               return 0;
-               }
-
-       /* Checking message digest algorithm. */
-       msg_imprint = TS_REQ_get_msg_imprint(request);
-       md_alg = TS_MSG_IMPRINT_get_algo(msg_imprint);
-       md_alg_id = OBJ_obj2nid(md_alg->algorithm);
-       for (i = 0; !md && i < sk_EVP_MD_num(ctx->mds); ++i)
-               {
-               EVP_MD *current_md = sk_EVP_MD_value(ctx->mds, i);
-               if (md_alg_id == EVP_MD_type(current_md))
-                       md = current_md;
-               }
-       if (!md)
-               {
-               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                           "Message digest algorithm is "
-                                           "not supported.");
-               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_ALG);
-               return 0;
-               }
-
-       /* No message digest takes parameter. */
-       if (md_alg->parameter 
-           && ASN1_TYPE_get(md_alg->parameter) != V_ASN1_NULL)
-               {
-               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                           "Superfluous message digest "
-                                           "parameter.");
-               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_ALG);
-               return 0;
-               }
-       /* Checking message digest size. */
-       digest = TS_MSG_IMPRINT_get_msg(msg_imprint);
-       if (digest->length != EVP_MD_size(md))
-               {
-               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                           "Bad message digest.");
-               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_DATA_FORMAT);
-               return 0;
-               }
-
-       return 1;
-       }
-
-/* Returns the TSA policy based on the rqeuested and acceptable policies. */
-static ASN1_OBJECT *TS_RESP_get_policy(TS_RESP_CTX *ctx)
-       {
-       ASN1_OBJECT *requested = TS_REQ_get_policy_id(ctx->request);
-       ASN1_OBJECT *policy = NULL;
-       int i;
-
-       /* Return the default policy if none is requested or the default is
-          requested. */
-       if (!requested || !OBJ_cmp(requested, ctx->default_policy))
-               policy = ctx->default_policy;
-
-       /* Check if the policy is acceptable. */
-       for (i = 0; !policy && i < sk_ASN1_OBJECT_num(ctx->policies); ++i)
-               {
-               ASN1_OBJECT *current = sk_ASN1_OBJECT_value(ctx->policies, i);
-               if (!OBJ_cmp(requested, current))
-                       policy = current;
-               }
-       if (!policy)
-               {
-               TSerr(TS_F_TS_RESP_GET_POLICY, TS_R_UNACCEPTABLE_POLICY);
-               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                           "Requested policy is not "
-                                           "supported.");
-               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_UNACCEPTED_POLICY);
-               }
-       return policy;
-       }
-
-/* Creates the TS_TST_INFO object based on the settings of the context. */
-static TS_TST_INFO *TS_RESP_create_tst_info(TS_RESP_CTX *ctx,
-                                           ASN1_OBJECT *policy)
-       {
-       int result = 0;
-       TS_TST_INFO *tst_info = NULL;
-       ASN1_INTEGER *serial = NULL;
-       ASN1_GENERALIZEDTIME *asn1_time = NULL;
-       long sec, usec;
-       TS_ACCURACY *accuracy = NULL;
-       ASN1_INTEGER *nonce;
-       GENERAL_NAME *tsa_name = NULL;
-
-       if (!(tst_info = TS_TST_INFO_new())) goto end;
-       if (!TS_TST_INFO_set_version(tst_info, 1)) goto end;
-       if (!TS_TST_INFO_set_policy_id(tst_info, policy)) goto end;
-       if (!TS_TST_INFO_set_msg_imprint(tst_info, ctx->request->msg_imprint))
-               goto end;
-       if (!(serial = (*ctx->serial_cb)(ctx, ctx->serial_cb_data))
-           || !TS_TST_INFO_set_serial(tst_info, serial))
-               goto end;
-       if (!(*ctx->time_cb)(ctx, ctx->time_cb_data, &sec, &usec)
-            || !(asn1_time = TS_RESP_set_genTime_with_precision(NULL, 
-                                       sec, usec, 
-                                       ctx->clock_precision_digits))
-           || !TS_TST_INFO_set_time(tst_info, asn1_time))
-               goto end;
-
-       /* Setting accuracy if needed. */
-       if ((ctx->seconds || ctx->millis || ctx->micros) 
-           && !(accuracy = TS_ACCURACY_new()))
-               goto end;
-
-       if (ctx->seconds && !TS_ACCURACY_set_seconds(accuracy, ctx->seconds))
-               goto end;
-       if (ctx->millis && !TS_ACCURACY_set_millis(accuracy, ctx->millis))
-               goto end;
-       if (ctx->micros && !TS_ACCURACY_set_micros(accuracy, ctx->micros))
-               goto end;
-       if (accuracy && !TS_TST_INFO_set_accuracy(tst_info, accuracy)) 
-               goto end;
-
-       /* Setting ordering. */
-       if ((ctx->flags & TS_ORDERING) 
-           && !TS_TST_INFO_set_ordering(tst_info, 1))
-               goto end;
-       
-       /* Setting nonce if needed. */
-       if ((nonce = TS_REQ_get_nonce(ctx->request)) != NULL
-           && !TS_TST_INFO_set_nonce(tst_info, nonce))
-               goto end;
-
-       /* Setting TSA name to subject of signer certificate. */
-       if (ctx->flags & TS_TSA_NAME)
-               {
-               if (!(tsa_name = GENERAL_NAME_new())) goto end;
-               tsa_name->type = GEN_DIRNAME;
-               tsa_name->d.dirn = 
-                       X509_NAME_dup(ctx->signer_cert->cert_info->subject);
-               if (!tsa_name->d.dirn) goto end;
-               if (!TS_TST_INFO_set_tsa(tst_info, tsa_name)) goto end;
-               }
-
-       result = 1;
- end:
-       if (!result)
-               {
-               TS_TST_INFO_free(tst_info);
-               tst_info = NULL;
-               TSerr(TS_F_TS_RESP_CREATE_TST_INFO, TS_R_TST_INFO_SETUP_ERROR);
-               TS_RESP_CTX_set_status_info_cond(ctx, TS_STATUS_REJECTION,
-                                                "Error during TSTInfo "
-                                                "generation.");
-               }
-       GENERAL_NAME_free(tsa_name);
-       TS_ACCURACY_free(accuracy);
-       ASN1_GENERALIZEDTIME_free(asn1_time);
-       ASN1_INTEGER_free(serial);
-       
-       return tst_info;
-       }
-
-/* Processing the extensions of the request. */
-static int TS_RESP_process_extensions(TS_RESP_CTX *ctx)
-       {
-       STACK_OF(X509_EXTENSION) *exts = TS_REQ_get_exts(ctx->request);
-       int i;
-       int ok = 1;
-
-       for (i = 0; ok && i < sk_X509_EXTENSION_num(exts); ++i)
-               {
-               X509_EXTENSION *ext = sk_X509_EXTENSION_value(exts, i);
-               ok = (*ctx->extension_cb)(ctx, ext, (void *)ctx->extension_cb);
-               }
-
-       return ok;
-       }
-
-/* Functions for signing the TS_TST_INFO structure of the context. */
-static int TS_RESP_sign(TS_RESP_CTX *ctx)
-       {
-       int ret = 0;
-       PKCS7 *p7 = NULL;
-       PKCS7_SIGNER_INFO *si;
-       STACK_OF(X509) *certs;  /* Certificates to include in sc. */
-       ESS_SIGNING_CERT *sc = NULL;
-       ASN1_OBJECT *oid;
-       BIO *p7bio = NULL;
-       int i;
-
-       /* Check if signcert and pkey match. */
-       if (!X509_check_private_key(ctx->signer_cert, ctx->signer_key)) {
-               TSerr(TS_F_TS_RESP_SIGN, 
-                     TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
-                goto err;
-       }
-
-       /* Create a new PKCS7 signed object. */
-       if (!(p7 = PKCS7_new())) {
-               TSerr(TS_F_TS_RESP_SIGN, ERR_R_MALLOC_FAILURE);
-               goto err;
-       }
-       if (!PKCS7_set_type(p7, NID_pkcs7_signed)) goto err;
-
-       /* Force SignedData version to be 3 instead of the default 1. */
-       if (!ASN1_INTEGER_set(p7->d.sign->version, 3)) goto err;
-
-       /* Add signer certificate and optional certificate chain. */
-       if (TS_REQ_get_cert_req(ctx->request))
-               {
-               PKCS7_add_certificate(p7, ctx->signer_cert);
-               if (ctx->certs)
-                       {
-                       for(i = 0; i < sk_X509_num(ctx->certs); ++i) 
-                               {
-                               X509 *cert = sk_X509_value(ctx->certs, i);
-                               PKCS7_add_certificate(p7, cert);
-                               }
-                       }
-               }
-
-       /* Add a new signer info. */
-       if (!(si = PKCS7_add_signature(p7, ctx->signer_cert, 
-                                      ctx->signer_key, EVP_sha1())))
-               {
-               TSerr(TS_F_TS_RESP_SIGN, TS_R_PKCS7_ADD_SIGNATURE_ERROR);
-               goto err;
-               }
-
-       /* Add content type signed attribute to the signer info. */
-       oid = OBJ_nid2obj(NID_id_smime_ct_TSTInfo);
-       if (!PKCS7_add_signed_attribute(si, NID_pkcs9_contentType,
-                                       V_ASN1_OBJECT, oid))
-               {
-               TSerr(TS_F_TS_RESP_SIGN, TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR);
-               goto err;
-               }
-
-       /* Create the ESS SigningCertificate attribute which contains 
-          the signer certificate id and optionally the certificate chain. */
-       certs = ctx->flags & TS_ESS_CERT_ID_CHAIN ? ctx->certs : NULL;
-       if (!(sc = ESS_SIGNING_CERT_new_init(ctx->signer_cert, certs)))
-               goto err;
-
-       /* Add SigningCertificate signed attribute to the signer info. */
-       if (!ESS_add_signing_cert(si, sc))
-               {
-               TSerr(TS_F_TS_RESP_SIGN, TS_R_ESS_ADD_SIGNING_CERT_ERROR);
-               goto err;
-               }       
-
-       /* Add a new empty NID_id_smime_ct_TSTInfo encapsulated content. */
-       if (!TS_TST_INFO_content_new(p7)) goto err;
-
-       /* Add the DER encoded tst_info to the PKCS7 structure. */
-       if (!(p7bio = PKCS7_dataInit(p7, NULL))) {
-               TSerr(TS_F_TS_RESP_SIGN, ERR_R_MALLOC_FAILURE);
-               goto err;
-       }
-
-       /* Convert tst_info to DER. */
-       if (!i2d_TS_TST_INFO_bio(p7bio, ctx->tst_info))
-               {
-               TSerr(TS_F_TS_RESP_SIGN, TS_R_TS_DATASIGN);
-               goto err;
-               }
-
-       /* Create the signature and add it to the signer info. */
-        if (!PKCS7_dataFinal(p7, p7bio))
-               {
-               TSerr(TS_F_TS_RESP_SIGN, TS_R_TS_DATASIGN);
-               goto err;
-               }
-
-       /* Set new PKCS7 and TST_INFO objects. */
-       TS_RESP_set_tst_info(ctx->response, p7, ctx->tst_info);
-       p7 = NULL;              /* Ownership is lost. */
-       ctx->tst_info = NULL;   /* Ownership is lost. */
-
-       ret = 1;
- err:
-       if (!ret)
-               TS_RESP_CTX_set_status_info_cond(ctx, TS_STATUS_REJECTION,
-                                                "Error during signature "
-                                                "generation.");
-       BIO_free_all(p7bio);
-       ESS_SIGNING_CERT_free(sc);
-       PKCS7_free(p7);
-       return ret;
-       }
-
-static ESS_SIGNING_CERT *ESS_SIGNING_CERT_new_init(X509 *signcert, 
-                                                  STACK_OF(X509) *certs)
-       {
-       ESS_CERT_ID *cid;
-       ESS_SIGNING_CERT *sc = NULL;
-       int i;
-
-       /* Creating the ESS_CERT_ID stack. */
-       if (!(sc = ESS_SIGNING_CERT_new())) goto err;
-       if (!sc->cert_ids && !(sc->cert_ids = sk_ESS_CERT_ID_new_null()))
-               goto err;
-
-       /* Adding the signing certificate id. */
-       if (!(cid = ESS_CERT_ID_new_init(signcert, 0))
-           || !sk_ESS_CERT_ID_push(sc->cert_ids, cid))
-               goto err;
-       /* Adding the certificate chain ids. */
-       for (i = 0; i < sk_X509_num(certs); ++i)
-               {
-               X509 *cert = sk_X509_value(certs, i);
-               if (!(cid = ESS_CERT_ID_new_init(cert, 1))
-                   || !sk_ESS_CERT_ID_push(sc->cert_ids, cid))
-                       goto err;
-               }
-
-       return sc;
-err:
-       ESS_SIGNING_CERT_free(sc);
-       TSerr(TS_F_ESS_SIGNING_CERT_NEW_INIT, ERR_R_MALLOC_FAILURE);
-       return NULL;
-       }
-
-static ESS_CERT_ID *ESS_CERT_ID_new_init(X509 *cert, int issuer_needed)
-       {
-       ESS_CERT_ID *cid = NULL;
-       GENERAL_NAME *name = NULL;
-       
-       /* Recompute SHA1 hash of certificate if necessary (side effect). */
-       X509_check_purpose(cert, -1, 0);
-
-       if (!(cid = ESS_CERT_ID_new())) goto err;
-       if (!ASN1_OCTET_STRING_set(cid->hash, cert->sha1_hash,
-                                  sizeof(cert->sha1_hash)))
-               goto err;
-
-       /* Setting the issuer/serial if requested. */
-       if (issuer_needed)
-               {
-               /* Creating issuer/serial structure. */
-               if (!cid->issuer_serial
-                   && !(cid->issuer_serial = ESS_ISSUER_SERIAL_new()))
-                       goto err;
-               /* Creating general name from the certificate issuer. */
-               if (!(name = GENERAL_NAME_new())) goto err;
-               name->type = GEN_DIRNAME;
-               if (!(name->d.dirn = X509_NAME_dup(cert->cert_info->issuer))) 
-                       goto err;
-               if (!sk_GENERAL_NAME_push(cid->issuer_serial->issuer, name)) 
-                       goto err;
-               name = NULL;    /* Ownership is lost. */
-               /* Setting the serial number. */
-               ASN1_INTEGER_free(cid->issuer_serial->serial);
-               if (!(cid->issuer_serial->serial = 
-                     ASN1_INTEGER_dup(cert->cert_info->serialNumber)))
-                       goto err;
-               }
-
-       return cid;
-err:
-       GENERAL_NAME_free(name);
-       ESS_CERT_ID_free(cid);
-       TSerr(TS_F_ESS_CERT_ID_NEW_INIT, ERR_R_MALLOC_FAILURE);
-       return NULL;
-       }
-
-static int TS_TST_INFO_content_new(PKCS7 *p7)
-       {
-       PKCS7 *ret = NULL;
-       ASN1_OCTET_STRING *octet_string = NULL;
-
-       /* Create new encapsulated NID_id_smime_ct_TSTInfo content. */
-       if (!(ret = PKCS7_new())) goto err;
-       if (!(ret->d.other = ASN1_TYPE_new())) goto err;
-       ret->type = OBJ_nid2obj(NID_id_smime_ct_TSTInfo);
-       if (!(octet_string = ASN1_OCTET_STRING_new())) goto err;
-       ASN1_TYPE_set(ret->d.other, V_ASN1_OCTET_STRING, octet_string);
-       octet_string = NULL;
-
-       /* Add encapsulated content to signed PKCS7 structure. */
-       if (!PKCS7_set_content(p7, ret)) goto err;
-
-       return 1;
- err:
-       ASN1_OCTET_STRING_free(octet_string);
-       PKCS7_free(ret);
-       return 0;
-       }
-
-static int ESS_add_signing_cert(PKCS7_SIGNER_INFO *si, ESS_SIGNING_CERT *sc)
-       {
-       ASN1_STRING *seq = NULL;
-       unsigned char *p, *pp = NULL;
-       int len;
-
-       len = i2d_ESS_SIGNING_CERT(sc, NULL);
-       if (!(pp = (unsigned char *) OPENSSL_malloc(len)))
-               {
-               TSerr(TS_F_ESS_ADD_SIGNING_CERT, ERR_R_MALLOC_FAILURE);
-               goto err;
-               }
-       p = pp;
-       i2d_ESS_SIGNING_CERT(sc, &p);
-       if (!(seq = ASN1_STRING_new()) || !ASN1_STRING_set(seq, pp, len))
-               {
-               TSerr(TS_F_ESS_ADD_SIGNING_CERT, ERR_R_MALLOC_FAILURE);
-               goto err;
-               }
-       OPENSSL_free(pp); pp = NULL;
-       return PKCS7_add_signed_attribute(si, 
-                                         NID_id_smime_aa_signingCertificate,
-                                         V_ASN1_SEQUENCE, seq);
- err:
-       ASN1_STRING_free(seq);
-       OPENSSL_free(pp);
-
-       return 0;
-       }
-
-
-static ASN1_GENERALIZEDTIME *
-TS_RESP_set_genTime_with_precision(ASN1_GENERALIZEDTIME *asn1_time, 
-                                  long sec, long usec, unsigned precision)
-       {
-       time_t time_sec = (time_t) sec;
-       struct tm *tm = NULL;   
-       char genTime_str[17 + TS_MAX_CLOCK_PRECISION_DIGITS];
-       char *p = genTime_str;
-       char *p_end = genTime_str + sizeof(genTime_str);
-
-       if (precision > TS_MAX_CLOCK_PRECISION_DIGITS)
-               goto err;
-
-       
-       if (!(tm = gmtime(&time_sec)))
-               goto err;
-
-       /* 
-        * Put "genTime_str" in GeneralizedTime format.  We work around the 
-        * restrictions imposed by rfc3280 (i.e. "GeneralizedTime values MUST 
-        * NOT include fractional seconds") and OpenSSL related functions to 
-        * meet the rfc3161 requirement: "GeneralizedTime syntax can include 
-        * fraction-of-second details". 
-        */                   
-       p += BIO_snprintf(p, p_end - p,
-                         "%04d%02d%02d%02d%02d%02d",
-                         tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, 
-                         tm->tm_hour, tm->tm_min, tm->tm_sec);
-       if (precision > 0)
-       {
-               /* Add fraction of seconds (leave space for dot and null). */
-               BIO_snprintf(p, 2 + precision, ".%ld", usec);
-               /* We cannot use the snprintf return value, 
-                  because it might have been truncated. */
-               p += strlen(p);
-
-               /* To make things a bit harder, X.690 | ISO/IEC 8825-1 provides
-                  the following restrictions for a DER-encoding, which OpenSSL
-                  (specifically ASN1_GENERALIZEDTIME_check() function) doesn't 
-                  support:
-                  "The encoding MUST terminate with a "Z" (which means "Zulu" 
-                  time). The decimal point element, if present, MUST be the 
-                  point option ".". The fractional-seconds elements, 
-                  if present, MUST omit all trailing 0's; 
-                  if the elements correspond to 0, they MUST be wholly
-                  omitted, and the decimal point element also MUST be
-                  omitted." */
-               /* Remove trailing zeros. The dot guarantees the exit
-                  condition of this loop even if all the digits are zero. */
-               while (*--p == '0')
-                       /* empty */;
-               /* p points to either the dot or the last non-zero digit. */
-               if (*p != '.') ++p;
-               }
-       /* Add the trailing Z and the terminating null. */
-       *p++ = 'Z';
-       *p++ = '\0';
-
-       /* Now call OpenSSL to check and set our genTime value */
-       if (!asn1_time && !(asn1_time = M_ASN1_GENERALIZEDTIME_new()))
-               goto err;
-       if (!ASN1_GENERALIZEDTIME_set_string(asn1_time, genTime_str))
-               {
-               ASN1_GENERALIZEDTIME_free(asn1_time);
-               goto err;
-               }
-
-       return asn1_time;
- err:
-       TSerr(TS_F_TS_RESP_SET_GENTIME_WITH_PRECISION, TS_R_COULD_NOT_SET_TIME);
-       return NULL;
-       }
diff --git a/crypto/ts/ts_resp_utils.c b/crypto/ts/ts_resp_utils.c
deleted file mode 100644 (file)
index 0c6c504..0000000
+++ /dev/null
@@ -1,409 +0,0 @@
-/* crypto/ts/ts_resp_utils.c */
-/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
- * project 2002.
- */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/objects.h>
-#include <openssl/ts.h>
-#include <openssl/pkcs7.h>
-
-/* Function definitions. */
-
-int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *status_info)
-       {
-       TS_STATUS_INFO *new_status_info;
-
-       if (a->status_info == status_info)
-               return 1;
-       new_status_info = TS_STATUS_INFO_dup(status_info);
-       if (new_status_info == NULL)
-               {
-               TSerr(TS_F_TS_RESP_SET_STATUS_INFO, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       TS_STATUS_INFO_free(a->status_info);
-       a->status_info = new_status_info;
-
-       return 1;
-       }
-
-TS_STATUS_INFO *TS_RESP_get_status_info(TS_RESP *a)
-       {
-       return a->status_info;
-       }
-
-/* Caller loses ownership of PKCS7 and TS_TST_INFO objects. */
-void TS_RESP_set_tst_info(TS_RESP *a, PKCS7 *p7, TS_TST_INFO *tst_info)
-       {
-       /* Set new PKCS7 and TST_INFO objects. */
-       PKCS7_free(a->token);
-       a->token = p7;
-       TS_TST_INFO_free(a->tst_info);
-       a->tst_info = tst_info;
-       }
-
-PKCS7 *TS_RESP_get_token(TS_RESP *a)
-       {
-       return a->token;
-       }
-
-TS_TST_INFO *TS_RESP_get_tst_info(TS_RESP *a)
-       {
-       return a->tst_info;
-       }
-
-int TS_TST_INFO_set_version(TS_TST_INFO *a, long version)
-       {
-       return ASN1_INTEGER_set(a->version, version);
-       }
-
-long TS_TST_INFO_get_version(TS_TST_INFO *a)
-       {
-       return ASN1_INTEGER_get(a->version);
-       }
-
-int TS_TST_INFO_set_policy_id(TS_TST_INFO *a, ASN1_OBJECT *policy)
-       {
-       ASN1_OBJECT *new_policy;
-
-       if (a->policy_id == policy)
-               return 1;
-       new_policy = OBJ_dup(policy);
-       if (new_policy == NULL)
-               {
-               TSerr(TS_F_TS_TST_INFO_SET_POLICY_ID, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       ASN1_OBJECT_free(a->policy_id);
-       a->policy_id = new_policy;
-       return 1;
-       }
-
-ASN1_OBJECT *TS_TST_INFO_get_policy_id(TS_TST_INFO *a)
-       {
-       return a->policy_id;
-       }
-
-int TS_TST_INFO_set_msg_imprint(TS_TST_INFO *a, TS_MSG_IMPRINT *msg_imprint)
-       {
-       TS_MSG_IMPRINT *new_msg_imprint;
-
-       if (a->msg_imprint == msg_imprint)
-               return 1;
-       new_msg_imprint = TS_MSG_IMPRINT_dup(msg_imprint);
-       if (new_msg_imprint == NULL)
-               {
-               TSerr(TS_F_TS_TST_INFO_SET_MSG_IMPRINT, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       TS_MSG_IMPRINT_free(a->msg_imprint);
-       a->msg_imprint = new_msg_imprint;
-       return 1;
-       }
-
-TS_MSG_IMPRINT *TS_TST_INFO_get_msg_imprint(TS_TST_INFO *a)
-       {
-       return a->msg_imprint;
-       }
-
-int TS_TST_INFO_set_serial(TS_TST_INFO *a, ASN1_INTEGER *serial)
-       {
-       ASN1_INTEGER *new_serial;
-
-       if (a->serial == serial)
-               return 1;
-       new_serial = ASN1_INTEGER_dup(serial);
-       if (new_serial == NULL)
-               {
-               TSerr(TS_F_TS_TST_INFO_SET_SERIAL, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       ASN1_INTEGER_free(a->serial);
-       a->serial = new_serial;
-       return 1;
-       }
-
-ASN1_INTEGER *TS_TST_INFO_get_serial(TS_TST_INFO *a)
-       {
-       return a->serial;
-       }
-
-int TS_TST_INFO_set_time(TS_TST_INFO *a, ASN1_GENERALIZEDTIME *gtime)
-       {
-       ASN1_GENERALIZEDTIME *new_time;
-
-       if (a->time == gtime)
-               return 1;
-       new_time = M_ASN1_GENERALIZEDTIME_dup(gtime);
-       if (new_time == NULL)
-               {
-               TSerr(TS_F_TS_TST_INFO_SET_TIME, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       ASN1_GENERALIZEDTIME_free(a->time);
-       a->time = new_time;
-       return 1;
-       }
-
-ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(TS_TST_INFO *a)
-       {
-       return a->time;
-       }
-
-int TS_TST_INFO_set_accuracy(TS_TST_INFO *a, TS_ACCURACY *accuracy)
-       {
-       TS_ACCURACY *new_accuracy;
-
-       if (a->accuracy == accuracy)
-               return 1;
-       new_accuracy = TS_ACCURACY_dup(accuracy);
-       if (new_accuracy == NULL)
-               {
-               TSerr(TS_F_TS_TST_INFO_SET_ACCURACY, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       TS_ACCURACY_free(a->accuracy);
-       a->accuracy = new_accuracy;
-       return 1;
-       }
-
-TS_ACCURACY *TS_TST_INFO_get_accuracy(TS_TST_INFO *a)
-       {
-       return a->accuracy;
-       }
-
-int TS_ACCURACY_set_seconds(TS_ACCURACY *a, ASN1_INTEGER *seconds)
-       {
-       ASN1_INTEGER *new_seconds;
-
-       if (a->seconds == seconds)
-               return 1;
-       new_seconds = ASN1_INTEGER_dup(seconds);
-       if (new_seconds == NULL)
-               {
-               TSerr(TS_F_TS_ACCURACY_SET_SECONDS, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       ASN1_INTEGER_free(a->seconds);
-       a->seconds = new_seconds;
-       return 1;
-       }
-
-ASN1_INTEGER *TS_ACCURACY_get_seconds(TS_ACCURACY *a)
-       {
-       return a->seconds;
-       }
-
-int TS_ACCURACY_set_millis(TS_ACCURACY *a, ASN1_INTEGER *millis)
-       {
-       ASN1_INTEGER *new_millis = NULL;
-
-       if (a->millis == millis)
-               return 1;
-       if (millis != NULL)
-               {
-               new_millis = ASN1_INTEGER_dup(millis);
-               if (new_millis == NULL)
-                       {
-                       TSerr(TS_F_TS_ACCURACY_SET_MILLIS, 
-                             ERR_R_MALLOC_FAILURE);
-                       return 0;
-                       }
-               }
-       ASN1_INTEGER_free(a->millis);
-       a->millis = new_millis;
-       return 1;
-       }
-
-ASN1_INTEGER *TS_ACCURACY_get_millis(TS_ACCURACY *a)
-       {
-       return a->millis;
-       }
-
-int TS_ACCURACY_set_micros(TS_ACCURACY *a, ASN1_INTEGER *micros)
-       {
-       ASN1_INTEGER *new_micros = NULL;
-
-       if (a->micros == micros)
-               return 1;
-       if (micros != NULL)
-               {
-               new_micros = ASN1_INTEGER_dup(micros);
-               if (new_micros == NULL)
-                       {
-                       TSerr(TS_F_TS_ACCURACY_SET_MICROS, 
-                             ERR_R_MALLOC_FAILURE);
-                       return 0;
-                       }
-               }
-       ASN1_INTEGER_free(a->micros);
-       a->micros = new_micros;
-       return 1;
-       }
-
-ASN1_INTEGER *TS_ACCURACY_get_micros(TS_ACCURACY *a)
-       {
-       return a->micros;
-       }
-
-int TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering)
-       {
-       a->ordering = ordering ? 0xFF : 0x00;
-       return 1;
-       }
-
-int TS_TST_INFO_get_ordering(TS_TST_INFO *a)
-       {
-       return a->ordering ? 1 : 0;
-       }
-
-int TS_TST_INFO_set_nonce(TS_TST_INFO *a, ASN1_INTEGER *nonce)
-       {
-       ASN1_INTEGER *new_nonce;
-
-       if (a->nonce == nonce)
-               return 1;
-       new_nonce = ASN1_INTEGER_dup(nonce);
-       if (new_nonce == NULL)
-               {
-               TSerr(TS_F_TS_TST_INFO_SET_NONCE, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       ASN1_INTEGER_free(a->nonce);
-       a->nonce = new_nonce;
-       return 1;
-       }
-
-ASN1_INTEGER *TS_TST_INFO_get_nonce(TS_TST_INFO *a)
-       {
-       return a->nonce;
-       }
-
-int TS_TST_INFO_set_tsa(TS_TST_INFO *a, GENERAL_NAME *tsa)
-       {
-       GENERAL_NAME *new_tsa;
-
-       if (a->tsa == tsa)
-               return 1;
-       new_tsa = GENERAL_NAME_dup(tsa);
-       if (new_tsa == NULL)
-               {
-               TSerr(TS_F_TS_TST_INFO_SET_TSA, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       GENERAL_NAME_free(a->tsa);
-       a->tsa = new_tsa;
-       return 1;
-       }
-
-GENERAL_NAME *TS_TST_INFO_get_tsa(TS_TST_INFO *a)
-       {
-       return a->tsa;
-       }
-
-STACK_OF(X509_EXTENSION) *TS_TST_INFO_get_exts(TS_TST_INFO *a)
-       {
-       return a->extensions;
-       }
-
-void TS_TST_INFO_ext_free(TS_TST_INFO *a)
-       {
-       if (!a) return;
-       sk_X509_EXTENSION_pop_free(a->extensions, X509_EXTENSION_free);
-       a->extensions = NULL;
-       }
-
-int TS_TST_INFO_get_ext_count(TS_TST_INFO *a)
-       {
-       return X509v3_get_ext_count(a->extensions);
-       }
-
-int TS_TST_INFO_get_ext_by_NID(TS_TST_INFO *a, int nid, int lastpos)
-       {
-       return X509v3_get_ext_by_NID(a->extensions, nid, lastpos);
-       }
-
-int TS_TST_INFO_get_ext_by_OBJ(TS_TST_INFO *a, ASN1_OBJECT *obj, int lastpos)
-       {
-       return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos);
-       }
-
-int TS_TST_INFO_get_ext_by_critical(TS_TST_INFO *a, int crit, int lastpos)
-       {
-       return X509v3_get_ext_by_critical(a->extensions, crit, lastpos);
-       }
-
-X509_EXTENSION *TS_TST_INFO_get_ext(TS_TST_INFO *a, int loc)
-       {
-       return X509v3_get_ext(a->extensions,loc);
-       }
-
-X509_EXTENSION *TS_TST_INFO_delete_ext(TS_TST_INFO *a, int loc)
-       {
-       return X509v3_delete_ext(a->extensions,loc);
-       }
-
-int TS_TST_INFO_add_ext(TS_TST_INFO *a, X509_EXTENSION *ex, int loc)
-       {
-       return X509v3_add_ext(&a->extensions,ex,loc) != NULL;
-       }
-
-void *TS_TST_INFO_get_ext_d2i(TS_TST_INFO *a, int nid, int *crit, int *idx)
-       {
-       return X509V3_get_d2i(a->extensions, nid, crit, idx);
-       }
diff --git a/crypto/ts/ts_resp_verify.c b/crypto/ts/ts_resp_verify.c
deleted file mode 100644 (file)
index 8b57513..0000000
+++ /dev/null
@@ -1,722 +0,0 @@
-/* crypto/ts/ts_resp_verify.c */
-/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
- * project 2002.
- */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/objects.h>
-#include <openssl/ts.h>
-#include <openssl/pkcs7.h>
-
-/* Private function declarations. */
-
-static int TS_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,
-                         X509 *signer, STACK_OF(X509) **chain);
-static int TS_check_signing_certs(PKCS7_SIGNER_INFO *si, STACK_OF(X509) *chain);
-static ESS_SIGNING_CERT *ESS_get_signing_cert(PKCS7_SIGNER_INFO *si);
-static int TS_find_cert(STACK_OF(ESS_CERT_ID) *cert_ids, X509 *cert);
-static int TS_issuer_serial_cmp(ESS_ISSUER_SERIAL *is, X509_CINF *cinfo);
-static int _TS_RESP_verify_token(TS_VERIFY_CTX *ctx, 
-                                PKCS7 *token, TS_TST_INFO *tst_info);
-static int TS_check_status_info(TS_RESP *response);
-static char *TS_get_status_text(STACK_OF(ASN1_UTF8STRING) *text);
-static int TS_check_policy(ASN1_OBJECT *req_oid, TS_TST_INFO *tst_info);
-static int TS_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
-                             X509_ALGOR **md_alg, 
-                             unsigned char **imprint, unsigned *imprint_len);
-static int TS_check_imprints(X509_ALGOR *algor_a, 
-                            unsigned char *imprint_a, unsigned len_a,
-                            TS_TST_INFO *tst_info);
-static int TS_check_nonces(ASN1_INTEGER *a, TS_TST_INFO *tst_info);
-static int TS_check_signer_name(GENERAL_NAME *tsa_name, X509 *signer);
-static int TS_find_name(STACK_OF(GENERAL_NAME) *gen_names, GENERAL_NAME *name);
-
-/*
- * Local mapping between response codes and descriptions.
- * Don't forget to change TS_STATUS_BUF_SIZE when modifying 
- * the elements of this array.
- */
-static const char *TS_status_text[] =
-       { "granted",
-         "grantedWithMods",
-         "rejection",
-         "waiting",
-         "revocationWarning",
-         "revocationNotification" };
-
-#define TS_STATUS_TEXT_SIZE    (sizeof(TS_status_text)/sizeof(*TS_status_text))
-
-/*
- * This must be greater or equal to the sum of the strings in TS_status_text
- * plus the number of its elements.
- */
-#define TS_STATUS_BUF_SIZE     256
-
-static struct
-       {
-       int code;
-       const char *text;
-       } TS_failure_info[] =
-               { { TS_INFO_BAD_ALG, "badAlg" },
-                 { TS_INFO_BAD_REQUEST, "badRequest" },
-                 { TS_INFO_BAD_DATA_FORMAT, "badDataFormat" },
-                 { TS_INFO_TIME_NOT_AVAILABLE, "timeNotAvailable" },
-                 { TS_INFO_UNACCEPTED_POLICY, "unacceptedPolicy" },
-                 { TS_INFO_UNACCEPTED_EXTENSION, "unacceptedExtension" },
-                 { TS_INFO_ADD_INFO_NOT_AVAILABLE, "addInfoNotAvailable" },
-                 { TS_INFO_SYSTEM_FAILURE, "systemFailure" } };
-
-#define TS_FAILURE_INFO_SIZE   (sizeof(TS_failure_info) / \
-                               sizeof(*TS_failure_info))
-
-/* Functions for verifying a signed TS_TST_INFO structure. */
-
-/*
- * This function carries out the following tasks:
- *     - Checks if there is one and only one signer.
- *     - Search for the signing certificate in 'certs' and in the response.
- *     - Check the extended key usage and key usage fields of the signer
- *     certificate (done by the path validation).
- *     - Build and validate the certificate path.
- *     - Check if the certificate path meets the requirements of the
- *     SigningCertificate ESS signed attribute.
- *     - Verify the signature value.
- *     - Returns the signer certificate in 'signer', if 'signer' is not NULL.
- */
-int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
-                            X509_STORE *store, X509 **signer_out)
-       {
-       STACK_OF(PKCS7_SIGNER_INFO) *sinfos = NULL;
-       PKCS7_SIGNER_INFO *si;
-       STACK_OF(X509) *signers = NULL;
-       X509    *signer;
-       STACK_OF(X509) *chain = NULL;
-       char    buf[4096];
-       int     i, j = 0, ret = 0;
-       BIO     *p7bio = NULL;
-
-       /* Some sanity checks first. */
-       if (!token)
-               {
-               TSerr(TS_F_TS_RESP_VERIFY_SIGNATURE, TS_R_INVALID_NULL_POINTER);
-               goto err;
-               }
-
-       /* Check for the correct content type */
-       if(!PKCS7_type_is_signed(token))
-               {
-               TSerr(TS_F_TS_RESP_VERIFY_SIGNATURE, TS_R_WRONG_CONTENT_TYPE);
-               goto err;
-               }
-
-       /* Check if there is one and only one signer. */
-       sinfos = PKCS7_get_signer_info(token);
-       if (!sinfos || sk_PKCS7_SIGNER_INFO_num(sinfos) != 1)
-               {
-               TSerr(TS_F_TS_RESP_VERIFY_SIGNATURE,
-                     TS_R_THERE_MUST_BE_ONE_SIGNER);
-               goto err;
-               }
-       si = sk_PKCS7_SIGNER_INFO_value(sinfos, 0);
-
-       /* Check for no content: no data to verify signature. */
-       if (PKCS7_get_detached(token))
-               {
-               TSerr(TS_F_TS_RESP_VERIFY_SIGNATURE, TS_R_NO_CONTENT);
-               goto err;
-               }
-       
-       /* Get hold of the signer certificate, search only internal
-          certificates if it was requested. */
-       signers = PKCS7_get0_signers(token, certs, 0);
-       if (!signers || sk_X509_num(signers) != 1) goto err;
-       signer = sk_X509_value(signers, 0);
-
-       /* Now verify the certificate. */
-       if (!TS_verify_cert(store, certs, signer, &chain)) goto err;
-
-       /* Check if the signer certificate is consistent with the
-          ESS extension. */
-       if (!TS_check_signing_certs(si, chain)) goto err;
-
-       /* Creating the message digest. */
-       p7bio = PKCS7_dataInit(token, NULL);
-
-       /* We now have to 'read' from p7bio to calculate digests etc. */
-       while ((i = BIO_read(p7bio,buf,sizeof(buf))) > 0);
-
-       /* Verifying the signature. */
-       j = PKCS7_signatureVerify(p7bio, token, si, signer);
-       if (j <= 0)
-               {
-               TSerr(TS_F_TS_RESP_VERIFY_SIGNATURE, TS_R_SIGNATURE_FAILURE);
-               goto err;
-               }
-
-       /* Return the signer certificate if needed. */
-       if (signer_out)
-               {
-               *signer_out = signer;
-               CRYPTO_add(&signer->references, 1, CRYPTO_LOCK_X509);
-               }
-
-       ret = 1;
-
- err:
-       BIO_free_all(p7bio);
-       sk_X509_pop_free(chain, X509_free);
-       sk_X509_free(signers);
-
-       return ret;
-       }
-
-/*
- * The certificate chain is returned in chain. Caller is responsible for
- * freeing the vector.
- */
-static int TS_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,
-                         X509 *signer, STACK_OF(X509) **chain)
-       {
-       X509_STORE_CTX  cert_ctx;
-       int i;
-       int ret = 1;
-
-       /* chain is an out argument. */
-       *chain = NULL;
-       X509_STORE_CTX_init(&cert_ctx, store, signer, untrusted);
-       X509_STORE_CTX_set_purpose(&cert_ctx, X509_PURPOSE_TIMESTAMP_SIGN);
-       i = X509_verify_cert(&cert_ctx);
-       if (i <= 0)
-               {
-               int j = X509_STORE_CTX_get_error(&cert_ctx);
-               TSerr(TS_F_TS_VERIFY_CERT, TS_R_CERTIFICATE_VERIFY_ERROR);
-               ERR_add_error_data(2, "Verify error:",
-                                  X509_verify_cert_error_string(j));
-               ret = 0;
-               }
-       else
-               {
-               /* Get a copy of the certificate chain. */
-               *chain = X509_STORE_CTX_get1_chain(&cert_ctx);
-               }
-
-       X509_STORE_CTX_cleanup(&cert_ctx);
-
-       return ret;
-       }
-
-static int TS_check_signing_certs(PKCS7_SIGNER_INFO *si, STACK_OF(X509) *chain)
-       {
-       ESS_SIGNING_CERT *ss = ESS_get_signing_cert(si);
-       STACK_OF(ESS_CERT_ID) *cert_ids = NULL;
-       X509 *cert;
-       int i = 0;
-       int ret = 0;
-
-       if (!ss) goto err;
-       cert_ids = ss->cert_ids;
-       /* The signer certificate must be the first in cert_ids. */
-       cert = sk_X509_value(chain, 0);
-       if (TS_find_cert(cert_ids, cert) != 0) goto err;
-       
-       /* Check the other certificates of the chain if there are more
-          than one certificate ids in cert_ids. */
-       if (sk_ESS_CERT_ID_num(cert_ids) > 1)
-               {
-               /* All the certificates of the chain must be in cert_ids. */
-               for (i = 1; i < sk_X509_num(chain); ++i)
-                       {
-                       cert = sk_X509_value(chain, i);
-                       if (TS_find_cert(cert_ids, cert) < 0) goto err;
-                       }
-               }
-       ret = 1;
- err:
-       if (!ret)
-               TSerr(TS_F_TS_CHECK_SIGNING_CERTS, 
-                     TS_R_ESS_SIGNING_CERTIFICATE_ERROR);
-       ESS_SIGNING_CERT_free(ss);
-       return ret;
-       }
-
-static ESS_SIGNING_CERT *ESS_get_signing_cert(PKCS7_SIGNER_INFO *si)
-       {
-       ASN1_TYPE *attr;
-       const unsigned char *p;
-       attr = PKCS7_get_signed_attribute(si, 
-                                         NID_id_smime_aa_signingCertificate);
-       if (!attr) return NULL;
-       p = attr->value.sequence->data;
-       return d2i_ESS_SIGNING_CERT(NULL, &p, attr->value.sequence->length);
-       }
-
-/* Returns < 0 if certificate is not found, certificate index otherwise. */
-static int TS_find_cert(STACK_OF(ESS_CERT_ID) *cert_ids, X509 *cert)
-       {
-       int i;
-
-       if (!cert_ids || !cert) return -1;
-
-       /* Recompute SHA1 hash of certificate if necessary (side effect). */
-       X509_check_purpose(cert, -1, 0);
-
-       /* Look for cert in the cert_ids vector. */
-       for (i = 0; i < sk_ESS_CERT_ID_num(cert_ids); ++i)
-               {
-               ESS_CERT_ID *cid = sk_ESS_CERT_ID_value(cert_ids, i);
-
-               /* Check the SHA-1 hash first. */
-               if (cid->hash->length == sizeof(cert->sha1_hash)
-                   && !memcmp(cid->hash->data, cert->sha1_hash,
-                              sizeof(cert->sha1_hash)))
-                       {
-                       /* Check the issuer/serial as well if specified. */
-                       ESS_ISSUER_SERIAL *is = cid->issuer_serial;
-                       if (!is || !TS_issuer_serial_cmp(is, cert->cert_info))
-                               return i;
-                       }
-               }
-       
-       return -1;
-       }
-
-static int TS_issuer_serial_cmp(ESS_ISSUER_SERIAL *is, X509_CINF *cinfo)
-       {
-       GENERAL_NAME *issuer;
-
-       if (!is || !cinfo || sk_GENERAL_NAME_num(is->issuer) != 1) return -1;
-
-       /* Check the issuer first. It must be a directory name. */
-       issuer = sk_GENERAL_NAME_value(is->issuer, 0);
-       if (issuer->type != GEN_DIRNAME 
-           || X509_NAME_cmp(issuer->d.dirn, cinfo->issuer))
-               return -1;
-
-       /* Check the serial number, too. */
-       if (ASN1_INTEGER_cmp(is->serial, cinfo->serialNumber))
-               return -1;
-
-       return 0;
-       }
-
-/*
- * Verifies whether 'response' contains a valid response with regards 
- * to the settings of the context:
- *     - Gives an error message if the TS_TST_INFO is not present.
- *     - Calls _TS_RESP_verify_token to verify the token content.
- */
-int TS_RESP_verify_response(TS_VERIFY_CTX *ctx, TS_RESP *response)
-       {
-       PKCS7 *token = TS_RESP_get_token(response);
-       TS_TST_INFO *tst_info = TS_RESP_get_tst_info(response);
-       int ret = 0;
-
-       /* Check if we have a successful TS_TST_INFO object in place. */
-       if (!TS_check_status_info(response)) goto err;
-
-       /* Check the contents of the time stamp token. */
-       if (!_TS_RESP_verify_token(ctx, token, tst_info))
-               goto err;
-
-       ret = 1;
- err:
-       return ret;
-       }
-
-/*
- * Tries to extract a TS_TST_INFO structure from the PKCS7 token and
- * calls the internal _TS_RESP_verify_token function for verifying it.
- */
-int TS_RESP_verify_token(TS_VERIFY_CTX *ctx, PKCS7 *token)
-       {
-       TS_TST_INFO *tst_info = PKCS7_to_TS_TST_INFO(token);
-       int ret = 0;
-       if (tst_info)
-               {
-               ret = _TS_RESP_verify_token(ctx, token, tst_info);
-               TS_TST_INFO_free(tst_info);
-               }
-       return ret;
-       }
-
-/*
- * Verifies whether the 'token' contains a valid time stamp token 
- * with regards to the settings of the context. Only those checks are
- * carried out that are specified in the context:
- *     - Verifies the signature of the TS_TST_INFO.
- *     - Checks the version number of the response.
- *     - Check if the requested and returned policies math.
- *     - Check if the message imprints are the same.
- *     - Check if the nonces are the same.
- *     - Check if the TSA name matches the signer.
- *     - Check if the TSA name is the expected TSA.
- */
-static int _TS_RESP_verify_token(TS_VERIFY_CTX *ctx, 
-                                PKCS7 *token, TS_TST_INFO *tst_info)
-       {
-       X509 *signer = NULL;
-       GENERAL_NAME *tsa_name = TS_TST_INFO_get_tsa(tst_info);
-       X509_ALGOR *md_alg = NULL;
-       unsigned char *imprint = NULL;
-       unsigned imprint_len = 0;
-       int ret = 0;
-
-       /* Verify the signature. */
-       if ((ctx->flags & TS_VFY_SIGNATURE)
-           && !TS_RESP_verify_signature(token, ctx->certs, ctx->store,
-                                        &signer))
-               goto err;
-       
-       /* Check version number of response. */
-       if ((ctx->flags & TS_VFY_VERSION)
-           && TS_TST_INFO_get_version(tst_info) != 1)
-               {
-               TSerr(TS_F_TS_VERIFY, TS_R_UNSUPPORTED_VERSION);
-               goto err;
-               }
-
-       /* Check policies. */
-       if ((ctx->flags & TS_VFY_POLICY)
-           && !TS_check_policy(ctx->policy, tst_info))
-               goto err;
-       
-       /* Check message imprints. */
-       if ((ctx->flags & TS_VFY_IMPRINT)
-           && !TS_check_imprints(ctx->md_alg, ctx->imprint, ctx->imprint_len,
-                                 tst_info)) 
-               goto err;
-
-       /* Compute and check message imprints. */
-       if ((ctx->flags & TS_VFY_DATA)
-           && (!TS_compute_imprint(ctx->data, tst_info,
-                                   &md_alg, &imprint, &imprint_len)
-           || !TS_check_imprints(md_alg, imprint, imprint_len, tst_info)))
-               goto err;
-
-       /* Check nonces. */
-       if ((ctx->flags & TS_VFY_NONCE)
-           && !TS_check_nonces(ctx->nonce, tst_info))
-               goto err;
-
-       /* Check whether TSA name and signer certificate match. */
-       if ((ctx->flags & TS_VFY_SIGNER)
-           && tsa_name && !TS_check_signer_name(tsa_name, signer))
-               {
-               TSerr(TS_F_TS_RESP_VERIFY_TOKEN, TS_R_TSA_NAME_MISMATCH);
-               goto err;
-               }
-
-       /* Check whether the TSA is the expected one. */
-       if ((ctx->flags & TS_VFY_TSA_NAME)
-           && !TS_check_signer_name(ctx->tsa_name, signer))
-               {
-               TSerr(TS_F_TS_RESP_VERIFY_TOKEN, TS_R_TSA_UNTRUSTED);
-               goto err;
-               }
-
-       ret = 1;
- err:
-       X509_free(signer);
-       X509_ALGOR_free(md_alg);
-       OPENSSL_free(imprint);
-       return ret;
-       }
-
-static int TS_check_status_info(TS_RESP *response)
-       {
-       TS_STATUS_INFO *info = TS_RESP_get_status_info(response);
-       long status = ASN1_INTEGER_get(info->status);
-       const char *status_text = NULL;
-       char *embedded_status_text = NULL;
-       char failure_text[TS_STATUS_BUF_SIZE] = "";
-
-       /* Check if everything went fine. */
-       if (status == 0 || status == 1) return 1;
-
-       /* There was an error, get the description in status_text. */
-       if (0 <= status && status < (long)TS_STATUS_TEXT_SIZE)
-               status_text = TS_status_text[status];
-       else
-               status_text = "unknown code";
-
-       /* Set the embedded_status_text to the returned description. */
-       if (sk_ASN1_UTF8STRING_num(info->text) > 0
-           && !(embedded_status_text = TS_get_status_text(info->text)))
-               return 0;
-       
-       /* Filling in failure_text with the failure information. */
-       if (info->failure_info)
-               {
-               int i;
-               int first = 1;
-               for (i = 0; i < (int)TS_FAILURE_INFO_SIZE; ++i)
-                       {
-                       if (ASN1_BIT_STRING_get_bit(info->failure_info,
-                                                   TS_failure_info[i].code))
-                               {
-                               if (!first)
-                                       strcpy(failure_text, ",");
-                               else
-                                       first = 0;
-                               strcat(failure_text, TS_failure_info[i].text);
-                               }
-                       }
-               }
-       if (failure_text[0] == '\0')
-               strcpy(failure_text, "unspecified");
-
-       /* Making up the error string. */
-       TSerr(TS_F_TS_CHECK_STATUS_INFO, TS_R_NO_TIME_STAMP_TOKEN);
-       ERR_add_error_data(6,
-                          "status code: ", status_text,
-                          ", status text: ", embedded_status_text ? 
-                          embedded_status_text : "unspecified",
-                          ", failure codes: ", failure_text);
-       OPENSSL_free(embedded_status_text);
-
-       return 0;
-       }
-
-static char *TS_get_status_text(STACK_OF(ASN1_UTF8STRING) *text)
-       {
-       int i;
-       unsigned int length = 0;
-       char *result = NULL;
-       char *p;
-
-       /* Determine length first. */
-       for (i = 0; i < sk_ASN1_UTF8STRING_num(text); ++i)
-               {
-               ASN1_UTF8STRING *current = sk_ASN1_UTF8STRING_value(text, i);
-               length += ASN1_STRING_length(current);
-               length += 1;    /* separator character */
-               }
-       /* Allocate memory (closing '\0' included). */
-       if (!(result = OPENSSL_malloc(length)))
-               {
-               TSerr(TS_F_TS_GET_STATUS_TEXT, ERR_R_MALLOC_FAILURE);
-               return NULL;
-               }
-       /* Concatenate the descriptions. */
-       for (i = 0, p = result; i < sk_ASN1_UTF8STRING_num(text); ++i)
-               {
-               ASN1_UTF8STRING *current = sk_ASN1_UTF8STRING_value(text, i);
-               length = ASN1_STRING_length(current);
-               if (i > 0) *p++ = '/';
-               strncpy(p, (const char *)ASN1_STRING_data(current), length);
-               p += length;
-               }
-       /* We do have space for this, too. */
-       *p = '\0';
-       
-       return result;
-       }
-
-static int TS_check_policy(ASN1_OBJECT *req_oid, TS_TST_INFO *tst_info)
-       {
-       ASN1_OBJECT *resp_oid = TS_TST_INFO_get_policy_id(tst_info);
-
-       if (OBJ_cmp(req_oid, resp_oid) != 0)
-               {
-               TSerr(TS_F_TS_CHECK_POLICY, TS_R_POLICY_MISMATCH);
-               return 0;
-               }
-
-       return 1;
-       }
-
-static int TS_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
-                             X509_ALGOR **md_alg, 
-                             unsigned char **imprint, unsigned *imprint_len)
-       {
-       TS_MSG_IMPRINT *msg_imprint = TS_TST_INFO_get_msg_imprint(tst_info);
-       X509_ALGOR *md_alg_resp = TS_MSG_IMPRINT_get_algo(msg_imprint);
-       const EVP_MD *md;
-       EVP_MD_CTX md_ctx;
-       unsigned char buffer[4096];
-       int length;
-
-       *md_alg = NULL;
-       *imprint = NULL;
-
-       /* Return the MD algorithm of the response. */
-       if (!(*md_alg = X509_ALGOR_dup(md_alg_resp))) goto err;
-
-       /* Getting the MD object. */
-       if (!(md = EVP_get_digestbyobj((*md_alg)->algorithm)))
-               {
-               TSerr(TS_F_TS_COMPUTE_IMPRINT, TS_R_UNSUPPORTED_MD_ALGORITHM);
-               goto err;
-               }
-
-       /* Compute message digest. */
-       *imprint_len = EVP_MD_size(md);
-       if (!(*imprint = OPENSSL_malloc(*imprint_len))) 
-               {
-               TSerr(TS_F_TS_COMPUTE_IMPRINT, ERR_R_MALLOC_FAILURE);
-               goto err;
-               }
-
-       EVP_DigestInit(&md_ctx, md);
-       while ((length = BIO_read(data, buffer, sizeof(buffer))) > 0)
-               {
-               EVP_DigestUpdate(&md_ctx, buffer, length);
-               }
-       EVP_DigestFinal(&md_ctx, *imprint, NULL);
-
-       return 1;
- err:
-       X509_ALGOR_free(*md_alg);
-       OPENSSL_free(*imprint);
-       *imprint_len = 0;
-       return 0;
-       }
-
-static int TS_check_imprints(X509_ALGOR *algor_a, 
-                            unsigned char *imprint_a, unsigned len_a,
-                            TS_TST_INFO *tst_info)
-       {
-       TS_MSG_IMPRINT *b = TS_TST_INFO_get_msg_imprint(tst_info);
-       X509_ALGOR *algor_b = TS_MSG_IMPRINT_get_algo(b);
-       int ret = 0;
-
-       /* algor_a is optional. */
-       if (algor_a)
-               {
-               /* Compare algorithm OIDs. */
-               if (OBJ_cmp(algor_a->algorithm, algor_b->algorithm)) goto err;
-
-               /* The parameter must be NULL in both. */
-               if ((algor_a->parameter 
-                    && ASN1_TYPE_get(algor_a->parameter) != V_ASN1_NULL)
-                   || (algor_b->parameter
-                       && ASN1_TYPE_get(algor_b->parameter) != V_ASN1_NULL))
-                       goto err;
-               }
-
-       /* Compare octet strings. */
-       ret = len_a == (unsigned) ASN1_STRING_length(b->hashed_msg) &&
-               memcmp(imprint_a, ASN1_STRING_data(b->hashed_msg), len_a) == 0;
- err:
-       if (!ret)
-               TSerr(TS_F_TS_CHECK_IMPRINTS, TS_R_MESSAGE_IMPRINT_MISMATCH);
-       return ret;
-       }
-
-static int TS_check_nonces(ASN1_INTEGER *a, TS_TST_INFO *tst_info)
-       {
-       ASN1_INTEGER *b = TS_TST_INFO_get_nonce(tst_info);
-
-       /* Error if nonce is missing. */
-       if (!b)
-               {
-               TSerr(TS_F_TS_CHECK_NONCES, TS_R_NONCE_NOT_RETURNED);
-               return 0;
-               }
-
-       /* No error if a nonce is returned without being requested. */
-       if (ASN1_INTEGER_cmp(a, b) != 0)
-               {
-               TSerr(TS_F_TS_CHECK_NONCES, TS_R_NONCE_MISMATCH);
-               return 0;
-               }
-
-       return 1;
-       }
-
-/* Check if the specified TSA name matches either the subject
-   or one of the subject alternative names of the TSA certificate. */
-static int TS_check_signer_name(GENERAL_NAME *tsa_name, X509 *signer)
-       {
-       STACK_OF(GENERAL_NAME) *gen_names = NULL;
-       int idx = -1;
-       int found = 0;
-
-       /* Check the subject name first. */
-       if (tsa_name->type == GEN_DIRNAME 
-           && X509_name_cmp(tsa_name->d.dirn, signer->cert_info->subject) == 0)
-               return 1;
-
-       /* Check all the alternative names. */
-       gen_names = X509_get_ext_d2i(signer, NID_subject_alt_name,
-                                    NULL, &idx);
-       while (gen_names != NULL
-              && !(found = TS_find_name(gen_names, tsa_name) >= 0))
-               {
-               /* Get the next subject alternative name,
-                  although there should be no more than one. */
-               GENERAL_NAMES_free(gen_names);
-               gen_names = X509_get_ext_d2i(signer, NID_subject_alt_name,
-                                            NULL, &idx);
-               }
-       if (gen_names) GENERAL_NAMES_free(gen_names);
-       
-       return found;
-       }
-
-/* Returns 1 if name is in gen_names, 0 otherwise. */
-static int TS_find_name(STACK_OF(GENERAL_NAME) *gen_names, GENERAL_NAME *name)
-       {
-       int i, found;
-       for (i = 0, found = 0; !found && i < sk_GENERAL_NAME_num(gen_names);
-            ++i)
-               {
-               GENERAL_NAME *current = sk_GENERAL_NAME_value(gen_names, i);
-               found = GENERAL_NAME_cmp(current, name) == 0;
-               }
-       return found ? i - 1 : -1;
-       }
diff --git a/crypto/ts/ts_rsp_print.c b/crypto/ts/ts_rsp_print.c
new file mode 100644 (file)
index 0000000..6421315
--- /dev/null
@@ -0,0 +1,287 @@
+/* crypto/ts/ts_resp_print.c */
+/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
+ * project 2002.
+ */
+/* ====================================================================
+ * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/objects.h>
+#include <openssl/bn.h>
+#include <openssl/x509v3.h>
+#include "ts.h"
+
+struct status_map_st
+       {
+       int bit;
+       const char *text;
+       };
+
+/* Local function declarations. */
+
+static int TS_status_map_print(BIO *bio, struct status_map_st *a,
+                              ASN1_BIT_STRING *v);
+static int TS_ACCURACY_print_bio(BIO *bio, TS_ACCURACY *accuracy);
+
+/* Function definitions. */
+
+int TS_RESP_print_bio(BIO *bio, TS_RESP *a)
+       {
+       TS_TST_INFO *tst_info;
+
+       BIO_printf(bio, "Status info:\n");
+       TS_STATUS_INFO_print_bio(bio, TS_RESP_get_status_info(a));
+
+       BIO_printf(bio, "\nTST info:\n");
+       tst_info = TS_RESP_get_tst_info(a);
+       if (tst_info != NULL)
+               TS_TST_INFO_print_bio(bio, TS_RESP_get_tst_info(a));
+       else
+               BIO_printf(bio, "Not included.\n");
+               
+       return 1;
+       }
+
+int TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a)
+       {
+       static const char *status_map[] =
+               {
+               "Granted.",
+               "Granted with modifications.",
+               "Rejected.",
+               "Waiting.",
+               "Revocation warning.",
+               "Revoked."
+               };
+       static struct status_map_st failure_map[] =
+               {
+               { TS_INFO_BAD_ALG,
+               "unrecognized or unsupported algorithm identifier" },
+               { TS_INFO_BAD_REQUEST,
+               "transaction not permitted or supported" },
+               { TS_INFO_BAD_DATA_FORMAT,
+               "the data submitted has the wrong format" },
+               { TS_INFO_TIME_NOT_AVAILABLE,
+               "the TSA's time source is not available" },
+               { TS_INFO_UNACCEPTED_POLICY,
+               "the requested TSA policy is not supported by the TSA" },
+               { TS_INFO_UNACCEPTED_EXTENSION,
+               "the requested extension is not supported by the TSA" },
+               { TS_INFO_ADD_INFO_NOT_AVAILABLE,
+               "the additional information requested could not be understood "
+               "or is not available" },
+               { TS_INFO_SYSTEM_FAILURE,
+               "the request cannot be handled due to system failure" },
+               { -1, NULL }
+               };
+       long status;
+       int i, lines = 0;
+
+       /* Printing status code. */
+       BIO_printf(bio, "Status: ");
+       status = ASN1_INTEGER_get(a->status);
+       if (0 <= status && status < (long)(sizeof(status_map)/sizeof(status_map[0])))
+               BIO_printf(bio, "%s\n", status_map[status]);
+       else
+               BIO_printf(bio, "out of bounds\n");
+       
+       /* Printing status description. */
+       BIO_printf(bio, "Status description: ");
+       for (i = 0; i < sk_ASN1_UTF8STRING_num(a->text); ++i)
+               {
+               if (i > 0)
+                       BIO_puts(bio, "\t");
+               ASN1_STRING_print_ex(bio, sk_ASN1_UTF8STRING_value(a->text, i),
+                                    0);
+               BIO_puts(bio, "\n");
+               }
+       if (i == 0)
+               BIO_printf(bio, "unspecified\n");
+
+       /* Printing failure information. */
+       BIO_printf(bio, "Failure info: ");
+       if (a->failure_info != NULL)
+               lines = TS_status_map_print(bio, failure_map,
+                                           a->failure_info);
+       if (lines == 0)
+               BIO_printf(bio, "unspecified");
+       BIO_printf(bio, "\n");
+
+       return 1;
+       }
+
+static int TS_status_map_print(BIO *bio, struct status_map_st *a,
+                              ASN1_BIT_STRING *v)
+       {
+       int lines = 0;
+
+       for (; a->bit >= 0; ++a)
+               {
+               if (ASN1_BIT_STRING_get_bit(v, a->bit))
+                       {
+                       if (++lines > 1)
+                               BIO_printf(bio, ", ");
+                       BIO_printf(bio, "%s", a->text);
+                       }
+               }
+
+       return lines;
+       }
+
+int TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a)
+       {
+       int v;
+       ASN1_OBJECT *policy_id;
+       ASN1_INTEGER *serial;
+       ASN1_GENERALIZEDTIME *gtime;
+       TS_ACCURACY *accuracy;
+       ASN1_INTEGER *nonce;
+       GENERAL_NAME *tsa_name;
+
+       if (a == NULL) return 0;
+
+       /* Print version. */
+       v = TS_TST_INFO_get_version(a);
+       BIO_printf(bio, "Version: %d\n", v);
+
+       /* Print policy id. */
+       BIO_printf(bio, "Policy OID: ");
+       policy_id = TS_TST_INFO_get_policy_id(a);
+       TS_OBJ_print_bio(bio, policy_id);
+
+       /* Print message imprint. */
+       TS_MSG_IMPRINT_print_bio(bio, TS_TST_INFO_get_msg_imprint(a));
+
+       /* Print serial number. */
+       BIO_printf(bio, "Serial number: ");
+       serial = TS_TST_INFO_get_serial(a);
+       if (serial == NULL)
+               BIO_printf(bio, "unspecified");
+       else
+               TS_ASN1_INTEGER_print_bio(bio, serial);
+       BIO_write(bio, "\n", 1);
+
+       /* Print time stamp. */
+       BIO_printf(bio, "Time stamp: ");
+       gtime = TS_TST_INFO_get_time(a);
+       ASN1_GENERALIZEDTIME_print(bio, gtime);
+       BIO_write(bio, "\n", 1);
+
+       /* Print accuracy. */
+       BIO_printf(bio, "Accuracy: ");
+       accuracy = TS_TST_INFO_get_accuracy(a);
+       if (accuracy == NULL)
+               BIO_printf(bio, "unspecified");
+       else
+               TS_ACCURACY_print_bio(bio, accuracy);
+       BIO_write(bio, "\n", 1);
+
+       /* Print ordering. */
+       BIO_printf(bio, "Ordering: %s\n", 
+                  TS_TST_INFO_get_ordering(a) ? "yes" : "no");
+
+       /* Print nonce. */
+       BIO_printf(bio, "Nonce: ");
+       nonce = TS_TST_INFO_get_nonce(a);
+       if (nonce == NULL)
+               BIO_printf(bio, "unspecified");
+       else
+               TS_ASN1_INTEGER_print_bio(bio, nonce);
+       BIO_write(bio, "\n", 1);
+
+       /* Print TSA name. */
+       BIO_printf(bio, "TSA: ");
+       tsa_name = TS_TST_INFO_get_tsa(a);
+       if (tsa_name == NULL)
+               BIO_printf(bio, "unspecified");
+       else
+               {
+               STACK_OF(CONF_VALUE) *nval;
+               if ((nval = i2v_GENERAL_NAME(NULL, tsa_name, NULL)))
+                       X509V3_EXT_val_prn(bio, nval, 0, 0);
+               sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
+               }
+       BIO_write(bio, "\n", 1);
+
+       /* Print extensions. */
+       TS_ext_print_bio(bio, TS_TST_INFO_get_exts(a));
+
+       return 1;
+       }
+
+static int TS_ACCURACY_print_bio(BIO *bio, TS_ACCURACY *accuracy)
+       {
+       ASN1_INTEGER *seconds = TS_ACCURACY_get_seconds(accuracy);
+       ASN1_INTEGER *millis = TS_ACCURACY_get_millis(accuracy);
+       ASN1_INTEGER *micros = TS_ACCURACY_get_micros(accuracy);
+
+       if (seconds != NULL)
+               TS_ASN1_INTEGER_print_bio(bio, seconds);
+       else
+               BIO_printf(bio, "unspecified");
+       BIO_printf(bio, " seconds, ");
+       if (millis != NULL)
+               TS_ASN1_INTEGER_print_bio(bio, millis);
+       else
+               BIO_printf(bio, "unspecified");
+       BIO_printf(bio, " millis, ");
+       if (micros != NULL)
+               TS_ASN1_INTEGER_print_bio(bio, micros);
+       else
+               BIO_printf(bio, "unspecified");
+       BIO_printf(bio, " micros");
+
+       return 1;
+       }
diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c
new file mode 100644 (file)
index 0000000..aa81f74
--- /dev/null
@@ -0,0 +1,1011 @@
+/* crypto/ts/ts_resp_sign.c */
+/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
+ * project 2002.
+ */
+/* ====================================================================
+ * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "cryptlib.h"
+
+#if defined(OPENSSL_SYS_UNIX)
+#include <sys/time.h>
+#endif
+
+#include <openssl/objects.h>
+#include <openssl/ts.h>
+#include <openssl/pkcs7.h>
+
+/* Private function declarations. */
+
+static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *);
+static int def_time_cb(struct TS_resp_ctx *, void *, long *sec, long *usec);
+static int def_extension_cb(struct TS_resp_ctx *, X509_EXTENSION *, void *);
+
+static void TS_RESP_CTX_init(TS_RESP_CTX *ctx);
+static void TS_RESP_CTX_cleanup(TS_RESP_CTX *ctx);
+static int TS_RESP_check_request(TS_RESP_CTX *ctx);
+static ASN1_OBJECT *TS_RESP_get_policy(TS_RESP_CTX *ctx);
+static TS_TST_INFO *TS_RESP_create_tst_info(TS_RESP_CTX *ctx, 
+                                           ASN1_OBJECT *policy);
+static int TS_RESP_process_extensions(TS_RESP_CTX *ctx);
+static int TS_RESP_sign(TS_RESP_CTX *ctx);
+
+static ESS_SIGNING_CERT *ESS_SIGNING_CERT_new_init(X509 *signcert, 
+                                                  STACK_OF(X509) *certs);
+static ESS_CERT_ID *ESS_CERT_ID_new_init(X509 *cert, int issuer_needed);
+static int TS_TST_INFO_content_new(PKCS7 *p7);
+static int ESS_add_signing_cert(PKCS7_SIGNER_INFO *si, ESS_SIGNING_CERT *sc);
+
+static ASN1_GENERALIZEDTIME *TS_RESP_set_genTime_with_precision(
+       ASN1_GENERALIZEDTIME *, long, long, unsigned);
+
+/* Default callbacks for response generation. */
+
+static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *ctx, void *data)
+       {
+       ASN1_INTEGER *serial = ASN1_INTEGER_new();
+       if (!serial) goto err;
+       if (!ASN1_INTEGER_set(serial, 1)) goto err;
+       return serial;
+ err:
+       TSerr(TS_F_DEF_SERIAL_CB, ERR_R_MALLOC_FAILURE);
+       TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
+                                   "Error during serial number generation.");
+       return NULL;
+       }
+
+#if defined(OPENSSL_SYS_UNIX)
+
+/* Use the gettimeofday function call. */
+static int def_time_cb(struct TS_resp_ctx *ctx, void *data, 
+                      long *sec, long *usec)
+       {
+       struct timeval tv;
+       if (gettimeofday(&tv, NULL) != 0) 
+               {
+               TSerr(TS_F_DEF_TIME_CB, TS_R_TIME_SYSCALL_ERROR);
+               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
+                                           "Time is not available.");
+               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_TIME_NOT_AVAILABLE);
+               return 0;
+               }
+       /* Return time to caller. */
+       *sec = tv.tv_sec;
+       *usec = tv.tv_usec;
+
+       return 1;
+       }
+
+#else
+
+/* Use the time function call that provides only seconds precision. */
+static int def_time_cb(struct TS_resp_ctx *ctx, void *data, 
+                      long *sec, long *usec)
+       {
+       time_t t;
+       if (time(&t) == (time_t) -1)
+               {
+               TSerr(TS_F_DEF_TIME_CB, TS_R_TIME_SYSCALL_ERROR);
+               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
+                                           "Time is not available.");
+               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_TIME_NOT_AVAILABLE);
+               return 0;
+               }
+       /* Return time to caller, only second precision. */
+       *sec = (long) t;
+       *usec = 0;
+
+       return 1;
+       }
+
+#endif
+
+static int def_extension_cb(struct TS_resp_ctx *ctx, X509_EXTENSION *ext,
+                           void *data)
+       {
+       /* No extensions are processed here. */
+       TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
+                                   "Unsupported extension.");
+       TS_RESP_CTX_add_failure_info(ctx, TS_INFO_UNACCEPTED_EXTENSION);
+       return 0;
+       }
+
+/* TS_RESP_CTX management functions. */
+
+TS_RESP_CTX *TS_RESP_CTX_new()
+       {
+       TS_RESP_CTX *ctx;
+
+       if (!(ctx = (TS_RESP_CTX *) OPENSSL_malloc(sizeof(TS_RESP_CTX))))
+               {
+               TSerr(TS_F_TS_RESP_CTX_NEW, ERR_R_MALLOC_FAILURE);
+               return NULL;
+               }
+       memset(ctx, 0, sizeof(TS_RESP_CTX));
+
+       /* Setting default callbacks. */
+       ctx->serial_cb = def_serial_cb;
+       ctx->time_cb = def_time_cb;
+       ctx->extension_cb = def_extension_cb;
+
+       return ctx;
+       }
+
+void TS_RESP_CTX_free(TS_RESP_CTX *ctx)
+       {
+       if (!ctx) return;
+
+       X509_free(ctx->signer_cert);
+       EVP_PKEY_free(ctx->signer_key);
+       sk_X509_pop_free(ctx->certs, X509_free);
+       sk_ASN1_OBJECT_pop_free(ctx->policies, ASN1_OBJECT_free);
+       ASN1_OBJECT_free(ctx->default_policy);
+       sk_EVP_MD_free(ctx->mds);       /* No EVP_MD_free method exists. */
+       ASN1_INTEGER_free(ctx->seconds);
+       ASN1_INTEGER_free(ctx->millis);
+       ASN1_INTEGER_free(ctx->micros);
+       OPENSSL_free(ctx);
+       }
+
+int TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer)
+       {
+       if (X509_check_purpose(signer, X509_PURPOSE_TIMESTAMP_SIGN, 0) != 1)
+               {
+               TSerr(TS_F_TS_RESP_CTX_SET_SIGNER_CERT, 
+                     TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE);
+               return 0;
+               }
+       if (ctx->signer_cert) X509_free(ctx->signer_cert);
+       ctx->signer_cert = signer;
+       CRYPTO_add(&ctx->signer_cert->references, +1, CRYPTO_LOCK_X509);
+       return 1;
+       }
+
+int TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key)
+       {
+       if (ctx->signer_key) EVP_PKEY_free(ctx->signer_key);
+       ctx->signer_key = key;
+       CRYPTO_add(&ctx->signer_key->references, +1, CRYPTO_LOCK_EVP_PKEY);
+
+       return 1;
+       }
+
+int TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *def_policy)
+       {
+       if (ctx->default_policy) ASN1_OBJECT_free(ctx->default_policy);
+       if (!(ctx->default_policy = OBJ_dup(def_policy))) goto err;
+       return 1;
+ err:
+       TSerr(TS_F_TS_RESP_CTX_SET_DEF_POLICY, ERR_R_MALLOC_FAILURE);
+       return 0;
+       }
+
+int TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs)
+       {
+       int i;
+
+       if (ctx->certs)
+               {
+               sk_X509_pop_free(ctx->certs, X509_free);
+               ctx->certs = NULL;
+               }
+       if (!certs) return 1;
+       if (!(ctx->certs = sk_X509_dup(certs))) 
+               {
+               TSerr(TS_F_TS_RESP_CTX_SET_CERTS, ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       for (i = 0; i < sk_X509_num(ctx->certs); ++i)
+               {
+               X509 *cert = sk_X509_value(ctx->certs, i);
+               CRYPTO_add(&cert->references, +1, CRYPTO_LOCK_X509);
+               }
+
+       return 1;
+       }
+
+int TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *policy)
+       {
+       ASN1_OBJECT *copy = NULL;
+
+       /* Create new policy stack if necessary. */
+       if (!ctx->policies && !(ctx->policies = sk_ASN1_OBJECT_new_null())) 
+               goto err;
+       if (!(copy = OBJ_dup(policy))) goto err;
+       if (!sk_ASN1_OBJECT_push(ctx->policies, copy)) goto err;
+
+       return 1;
+ err:
+       TSerr(TS_F_TS_RESP_CTX_ADD_POLICY, ERR_R_MALLOC_FAILURE);
+       ASN1_OBJECT_free(copy);
+       return 0;
+       }
+
+int TS_RESP_CTX_add_md(TS_RESP_CTX *ctx, const EVP_MD *md)
+       {
+       /* Create new md stack if necessary. */
+       if (!ctx->mds && !(ctx->mds = sk_EVP_MD_new_null())) 
+               goto err;
+       /* Add the shared md, no copy needed. */
+       if (!sk_EVP_MD_push(ctx->mds, md)) goto err;
+
+       return 1;
+ err:
+       TSerr(TS_F_TS_RESP_CTX_ADD_MD, ERR_R_MALLOC_FAILURE);
+       return 0;
+       }
+
+#define TS_RESP_CTX_accuracy_free(ctx)         \
+       ASN1_INTEGER_free(ctx->seconds);        \
+       ctx->seconds = NULL;                    \
+       ASN1_INTEGER_free(ctx->millis);         \
+       ctx->millis = NULL;                     \
+       ASN1_INTEGER_free(ctx->micros);         \
+       ctx->micros = NULL;
+
+int TS_RESP_CTX_set_accuracy(TS_RESP_CTX *ctx, 
+                            int secs, int millis, int micros)
+       {
+
+       TS_RESP_CTX_accuracy_free(ctx);
+       if (secs && (!(ctx->seconds = ASN1_INTEGER_new())
+                    || !ASN1_INTEGER_set(ctx->seconds, secs)))
+               goto err;
+       if (millis && (!(ctx->millis = ASN1_INTEGER_new())
+                      || !ASN1_INTEGER_set(ctx->millis, millis)))
+               goto err;
+       if (micros && (!(ctx->micros = ASN1_INTEGER_new())
+                      || !ASN1_INTEGER_set(ctx->micros, micros)))
+               goto err;
+
+       return 1;
+ err:
+       TS_RESP_CTX_accuracy_free(ctx);
+       TSerr(TS_F_TS_RESP_CTX_SET_ACCURACY, ERR_R_MALLOC_FAILURE);
+       return 0;
+       }
+
+void TS_RESP_CTX_add_flags(TS_RESP_CTX *ctx, int flags)
+       {
+       ctx->flags |= flags;
+       }
+
+void TS_RESP_CTX_set_serial_cb(TS_RESP_CTX *ctx, TS_serial_cb cb, void *data)
+       {
+       ctx->serial_cb = cb;
+       ctx->serial_cb_data = data;
+       }
+
+void TS_RESP_CTX_set_time_cb(TS_RESP_CTX *ctx, TS_time_cb cb, void *data)
+       {
+       ctx->time_cb = cb;
+       ctx->time_cb_data = data;
+       }
+
+void TS_RESP_CTX_set_extension_cb(TS_RESP_CTX *ctx, 
+                                 TS_extension_cb cb, void *data)
+       {
+       ctx->extension_cb = cb;
+       ctx->extension_cb_data = data;
+       }
+
+int TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx, 
+                               int status, const char *text)
+       {
+       TS_STATUS_INFO *si = NULL;
+       ASN1_UTF8STRING *utf8_text = NULL;
+       int ret = 0;
+
+       if (!(si = TS_STATUS_INFO_new())) goto err;
+       if (!ASN1_INTEGER_set(si->status, status)) goto err;
+       if (text)
+               {
+               if (!(utf8_text = ASN1_UTF8STRING_new())
+                   || !ASN1_STRING_set(utf8_text, text, strlen(text)))
+                       goto err;
+               if (!si->text && !(si->text = sk_ASN1_UTF8STRING_new_null()))
+                       goto err;
+               if (!sk_ASN1_UTF8STRING_push(si->text, utf8_text)) goto err;
+               utf8_text = NULL;       /* Ownership is lost. */
+               }
+       if (!TS_RESP_set_status_info(ctx->response, si)) goto err;
+       ret = 1;
+ err:
+       if (!ret)
+               TSerr(TS_F_TS_RESP_CTX_SET_STATUS_INFO, ERR_R_MALLOC_FAILURE);
+       TS_STATUS_INFO_free(si);
+       ASN1_UTF8STRING_free(utf8_text);
+       return ret;
+       }
+
+int TS_RESP_CTX_set_status_info_cond(TS_RESP_CTX *ctx, 
+                                    int status, const char *text)
+       {
+       int ret = 1;
+       TS_STATUS_INFO *si = TS_RESP_get_status_info(ctx->response);
+
+       if (ASN1_INTEGER_get(si->status) == TS_STATUS_GRANTED)
+               {
+               /* Status has not been set, set it now. */
+               ret = TS_RESP_CTX_set_status_info(ctx, status, text);
+               }
+       return ret;
+       }
+
+int TS_RESP_CTX_add_failure_info(TS_RESP_CTX *ctx, int failure)
+       {
+       TS_STATUS_INFO *si = TS_RESP_get_status_info(ctx->response);
+       if (!si->failure_info && !(si->failure_info = ASN1_BIT_STRING_new()))
+               goto err;
+       if (!ASN1_BIT_STRING_set_bit(si->failure_info, failure, 1))
+               goto err;
+       return 1;
+ err:
+       TSerr(TS_F_TS_RESP_CTX_ADD_FAILURE_INFO, ERR_R_MALLOC_FAILURE);
+       return 0;
+       }
+
+TS_REQ *TS_RESP_CTX_get_request(TS_RESP_CTX *ctx)
+       {
+       return ctx->request;
+       }
+
+TS_TST_INFO *TS_RESP_CTX_get_tst_info(TS_RESP_CTX *ctx)
+       {
+       return ctx->tst_info;
+       }
+
+int TS_RESP_CTX_set_clock_precision_digits(TS_RESP_CTX *ctx, unsigned precision)
+       {
+       if (precision > TS_MAX_CLOCK_PRECISION_DIGITS)
+              return 0;
+       ctx->clock_precision_digits = precision;
+       return 1;
+       }
+
+/* Main entry method of the response generation. */
+TS_RESP *TS_RESP_create_response(TS_RESP_CTX *ctx, BIO *req_bio)
+       {
+       ASN1_OBJECT *policy;
+       TS_RESP *response;
+       int result = 0;
+
+       TS_RESP_CTX_init(ctx);
+
+       /* Creating the response object. */
+       if (!(ctx->response = TS_RESP_new())) 
+               {
+               TSerr(TS_F_TS_RESP_CREATE_RESPONSE, ERR_R_MALLOC_FAILURE);
+               goto end;
+               }
+
+       /* Parsing DER request. */
+       if (!(ctx->request = d2i_TS_REQ_bio(req_bio, NULL)))
+               {
+               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
+                                           "Bad request format or "
+                                           "system error.");
+               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_DATA_FORMAT);
+               goto end;
+               }
+
+       /* Setting default status info. */
+       if (!TS_RESP_CTX_set_status_info(ctx, TS_STATUS_GRANTED, NULL))
+               goto end;
+
+       /* Checking the request format. */
+       if (!TS_RESP_check_request(ctx)) goto end;
+
+       /* Checking acceptable policies. */
+       if (!(policy = TS_RESP_get_policy(ctx))) goto end;
+
+       /* Creating the TS_TST_INFO object. */
+       if (!(ctx->tst_info = TS_RESP_create_tst_info(ctx, policy)))
+               goto end;
+
+       /* Processing extensions. */
+       if (!TS_RESP_process_extensions(ctx)) goto end;
+
+       /* Generating the signature. */
+       if (!TS_RESP_sign(ctx)) goto end;
+
+       /* Everything was successful. */
+       result = 1;
+ end:
+       if (!result)
+               {
+               TSerr(TS_F_TS_RESP_CREATE_RESPONSE, TS_R_RESPONSE_SETUP_ERROR);
+               TS_RESP_CTX_set_status_info_cond(ctx, TS_STATUS_REJECTION,
+                                                "Error during response "
+                                                "generation.");
+               /* Check if the status info was set. */
+               if (ctx->response
+                   && ASN1_INTEGER_get(
+                           TS_RESP_get_status_info(ctx->response)->status)
+                   == TS_STATUS_GRANTED)
+                       {
+                       /* Status info wasn't set, don't return a response. */
+                       TS_RESP_free(ctx->response);
+                       ctx->response = NULL;
+                       }
+               }
+       response = ctx->response;
+       ctx->response = NULL;   /* Ownership will be returned to caller. */
+       TS_RESP_CTX_cleanup(ctx);
+       return response;
+       }
+
+/* Initializes the variable part of the context. */
+static void TS_RESP_CTX_init(TS_RESP_CTX *ctx)
+       {
+       ctx->request = NULL;
+       ctx->response = NULL;
+       ctx->tst_info = NULL;
+       }
+
+/* Cleans up the variable part of the context. */
+static void TS_RESP_CTX_cleanup(TS_RESP_CTX *ctx)
+       {
+       TS_REQ_free(ctx->request);
+       ctx->request = NULL;
+       TS_RESP_free(ctx->response);
+       ctx->response = NULL;
+       TS_TST_INFO_free(ctx->tst_info);
+       ctx->tst_info = NULL;
+       }
+
+/* Checks the format and content of the request. */
+static int TS_RESP_check_request(TS_RESP_CTX *ctx)
+       {
+       TS_REQ *request = ctx->request;
+       TS_MSG_IMPRINT *msg_imprint;
+       X509_ALGOR *md_alg;
+       int md_alg_id;
+       ASN1_OCTET_STRING *digest;
+       EVP_MD *md = NULL;
+       int i;
+
+       /* Checking request version. */
+       if (TS_REQ_get_version(request) != 1)
+               {
+               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
+                                           "Bad request version.");
+               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_REQUEST);
+               return 0;
+               }
+
+       /* Checking message digest algorithm. */
+       msg_imprint = TS_REQ_get_msg_imprint(request);
+       md_alg = TS_MSG_IMPRINT_get_algo(msg_imprint);
+       md_alg_id = OBJ_obj2nid(md_alg->algorithm);
+       for (i = 0; !md && i < sk_EVP_MD_num(ctx->mds); ++i)
+               {
+               EVP_MD *current_md = sk_EVP_MD_value(ctx->mds, i);
+               if (md_alg_id == EVP_MD_type(current_md))
+                       md = current_md;
+               }
+       if (!md)
+               {
+               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
+                                           "Message digest algorithm is "
+                                           "not supported.");
+               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_ALG);
+               return 0;
+               }
+
+       /* No message digest takes parameter. */
+       if (md_alg->parameter 
+           && ASN1_TYPE_get(md_alg->parameter) != V_ASN1_NULL)
+               {
+               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
+                                           "Superfluous message digest "
+                                           "parameter.");
+               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_ALG);
+               return 0;
+               }
+       /* Checking message digest size. */
+       digest = TS_MSG_IMPRINT_get_msg(msg_imprint);
+       if (digest->length != EVP_MD_size(md))
+               {
+               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
+                                           "Bad message digest.");
+               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_DATA_FORMAT);
+               return 0;
+               }
+
+       return 1;
+       }
+
+/* Returns the TSA policy based on the rqeuested and acceptable policies. */
+static ASN1_OBJECT *TS_RESP_get_policy(TS_RESP_CTX *ctx)
+       {
+       ASN1_OBJECT *requested = TS_REQ_get_policy_id(ctx->request);
+       ASN1_OBJECT *policy = NULL;
+       int i;
+
+       /* Return the default policy if none is requested or the default is
+          requested. */
+       if (!requested || !OBJ_cmp(requested, ctx->default_policy))
+               policy = ctx->default_policy;
+
+       /* Check if the policy is acceptable. */
+       for (i = 0; !policy && i < sk_ASN1_OBJECT_num(ctx->policies); ++i)
+               {
+               ASN1_OBJECT *current = sk_ASN1_OBJECT_value(ctx->policies, i);
+               if (!OBJ_cmp(requested, current))
+                       policy = current;
+               }
+       if (!policy)
+               {
+               TSerr(TS_F_TS_RESP_GET_POLICY, TS_R_UNACCEPTABLE_POLICY);
+               TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
+                                           "Requested policy is not "
+                                           "supported.");
+               TS_RESP_CTX_add_failure_info(ctx, TS_INFO_UNACCEPTED_POLICY);
+               }
+       return policy;
+       }
+
+/* Creates the TS_TST_INFO object based on the settings of the context. */
+static TS_TST_INFO *TS_RESP_create_tst_info(TS_RESP_CTX *ctx,
+                                           ASN1_OBJECT *policy)
+       {
+       int result = 0;
+       TS_TST_INFO *tst_info = NULL;
+       ASN1_INTEGER *serial = NULL;
+       ASN1_GENERALIZEDTIME *asn1_time = NULL;
+       long sec, usec;
+       TS_ACCURACY *accuracy = NULL;
+       ASN1_INTEGER *nonce;
+       GENERAL_NAME *tsa_name = NULL;
+
+       if (!(tst_info = TS_TST_INFO_new())) goto end;
+       if (!TS_TST_INFO_set_version(tst_info, 1)) goto end;
+       if (!TS_TST_INFO_set_policy_id(tst_info, policy)) goto end;
+       if (!TS_TST_INFO_set_msg_imprint(tst_info, ctx->request->msg_imprint))
+               goto end;
+       if (!(serial = (*ctx->serial_cb)(ctx, ctx->serial_cb_data))
+           || !TS_TST_INFO_set_serial(tst_info, serial))
+               goto end;
+       if (!(*ctx->time_cb)(ctx, ctx->time_cb_data, &sec, &usec)
+            || !(asn1_time = TS_RESP_set_genTime_with_precision(NULL, 
+                                       sec, usec, 
+                                       ctx->clock_precision_digits))
+           || !TS_TST_INFO_set_time(tst_info, asn1_time))
+               goto end;
+
+       /* Setting accuracy if needed. */
+       if ((ctx->seconds || ctx->millis || ctx->micros) 
+           && !(accuracy = TS_ACCURACY_new()))
+               goto end;
+
+       if (ctx->seconds && !TS_ACCURACY_set_seconds(accuracy, ctx->seconds))
+               goto end;
+       if (ctx->millis && !TS_ACCURACY_set_millis(accuracy, ctx->millis))
+               goto end;
+       if (ctx->micros && !TS_ACCURACY_set_micros(accuracy, ctx->micros))
+               goto end;
+       if (accuracy && !TS_TST_INFO_set_accuracy(tst_info, accuracy)) 
+               goto end;
+
+       /* Setting ordering. */
+       if ((ctx->flags & TS_ORDERING) 
+           && !TS_TST_INFO_set_ordering(tst_info, 1))
+               goto end;
+       
+       /* Setting nonce if needed. */
+       if ((nonce = TS_REQ_get_nonce(ctx->request)) != NULL
+           && !TS_TST_INFO_set_nonce(tst_info, nonce))
+               goto end;
+
+       /* Setting TSA name to subject of signer certificate. */
+       if (ctx->flags & TS_TSA_NAME)
+               {
+               if (!(tsa_name = GENERAL_NAME_new())) goto end;
+               tsa_name->type = GEN_DIRNAME;
+               tsa_name->d.dirn = 
+                       X509_NAME_dup(ctx->signer_cert->cert_info->subject);
+               if (!tsa_name->d.dirn) goto end;
+               if (!TS_TST_INFO_set_tsa(tst_info, tsa_name)) goto end;
+               }
+
+       result = 1;
+ end:
+       if (!result)
+               {
+               TS_TST_INFO_free(tst_info);
+               tst_info = NULL;
+               TSerr(TS_F_TS_RESP_CREATE_TST_INFO, TS_R_TST_INFO_SETUP_ERROR);
+               TS_RESP_CTX_set_status_info_cond(ctx, TS_STATUS_REJECTION,
+                                                "Error during TSTInfo "
+                                                "generation.");
+               }
+       GENERAL_NAME_free(tsa_name);
+       TS_ACCURACY_free(accuracy);
+       ASN1_GENERALIZEDTIME_free(asn1_time);
+       ASN1_INTEGER_free(serial);
+       
+       return tst_info;
+       }
+
+/* Processing the extensions of the request. */
+static int TS_RESP_process_extensions(TS_RESP_CTX *ctx)
+       {
+       STACK_OF(X509_EXTENSION) *exts = TS_REQ_get_exts(ctx->request);
+       int i;
+       int ok = 1;
+
+       for (i = 0; ok && i < sk_X509_EXTENSION_num(exts); ++i)
+               {
+               X509_EXTENSION *ext = sk_X509_EXTENSION_value(exts, i);
+               ok = (*ctx->extension_cb)(ctx, ext, (void *)ctx->extension_cb);
+               }
+
+       return ok;
+       }
+
+/* Functions for signing the TS_TST_INFO structure of the context. */
+static int TS_RESP_sign(TS_RESP_CTX *ctx)
+       {
+       int ret = 0;
+       PKCS7 *p7 = NULL;
+       PKCS7_SIGNER_INFO *si;
+       STACK_OF(X509) *certs;  /* Certificates to include in sc. */
+       ESS_SIGNING_CERT *sc = NULL;
+       ASN1_OBJECT *oid;
+       BIO *p7bio = NULL;
+       int i;
+
+       /* Check if signcert and pkey match. */
+       if (!X509_check_private_key(ctx->signer_cert, ctx->signer_key)) {
+               TSerr(TS_F_TS_RESP_SIGN, 
+                     TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
+                goto err;
+       }
+
+       /* Create a new PKCS7 signed object. */
+       if (!(p7 = PKCS7_new())) {
+               TSerr(TS_F_TS_RESP_SIGN, ERR_R_MALLOC_FAILURE);
+               goto err;
+       }
+       if (!PKCS7_set_type(p7, NID_pkcs7_signed)) goto err;
+
+       /* Force SignedData version to be 3 instead of the default 1. */
+       if (!ASN1_INTEGER_set(p7->d.sign->version, 3)) goto err;
+
+       /* Add signer certificate and optional certificate chain. */
+       if (TS_REQ_get_cert_req(ctx->request))
+               {
+               PKCS7_add_certificate(p7, ctx->signer_cert);
+               if (ctx->certs)
+                       {
+                       for(i = 0; i < sk_X509_num(ctx->certs); ++i) 
+                               {
+                               X509 *cert = sk_X509_value(ctx->certs, i);
+                               PKCS7_add_certificate(p7, cert);
+                               }
+                       }
+               }
+
+       /* Add a new signer info. */
+       if (!(si = PKCS7_add_signature(p7, ctx->signer_cert, 
+                                      ctx->signer_key, EVP_sha1())))
+               {
+               TSerr(TS_F_TS_RESP_SIGN, TS_R_PKCS7_ADD_SIGNATURE_ERROR);
+               goto err;
+               }
+
+       /* Add content type signed attribute to the signer info. */
+       oid = OBJ_nid2obj(NID_id_smime_ct_TSTInfo);
+       if (!PKCS7_add_signed_attribute(si, NID_pkcs9_contentType,
+                                       V_ASN1_OBJECT, oid))
+               {
+               TSerr(TS_F_TS_RESP_SIGN, TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR);
+               goto err;
+               }
+
+       /* Create the ESS SigningCertificate attribute which contains 
+          the signer certificate id and optionally the certificate chain. */
+       certs = ctx->flags & TS_ESS_CERT_ID_CHAIN ? ctx->certs : NULL;
+       if (!(sc = ESS_SIGNING_CERT_new_init(ctx->signer_cert, certs)))
+               goto err;
+
+       /* Add SigningCertificate signed attribute to the signer info. */
+       if (!ESS_add_signing_cert(si, sc))
+               {
+               TSerr(TS_F_TS_RESP_SIGN, TS_R_ESS_ADD_SIGNING_CERT_ERROR);
+               goto err;
+               }       
+
+       /* Add a new empty NID_id_smime_ct_TSTInfo encapsulated content. */
+       if (!TS_TST_INFO_content_new(p7)) goto err;
+
+       /* Add the DER encoded tst_info to the PKCS7 structure. */
+       if (!(p7bio = PKCS7_dataInit(p7, NULL))) {
+               TSerr(TS_F_TS_RESP_SIGN, ERR_R_MALLOC_FAILURE);
+               goto err;
+       }
+
+       /* Convert tst_info to DER. */
+       if (!i2d_TS_TST_INFO_bio(p7bio, ctx->tst_info))
+               {
+               TSerr(TS_F_TS_RESP_SIGN, TS_R_TS_DATASIGN);
+               goto err;
+               }
+
+       /* Create the signature and add it to the signer info. */
+        if (!PKCS7_dataFinal(p7, p7bio))
+               {
+               TSerr(TS_F_TS_RESP_SIGN, TS_R_TS_DATASIGN);
+               goto err;
+               }
+
+       /* Set new PKCS7 and TST_INFO objects. */
+       TS_RESP_set_tst_info(ctx->response, p7, ctx->tst_info);
+       p7 = NULL;              /* Ownership is lost. */
+       ctx->tst_info = NULL;   /* Ownership is lost. */
+
+       ret = 1;
+ err:
+       if (!ret)
+               TS_RESP_CTX_set_status_info_cond(ctx, TS_STATUS_REJECTION,
+                                                "Error during signature "
+                                                "generation.");
+       BIO_free_all(p7bio);
+       ESS_SIGNING_CERT_free(sc);
+       PKCS7_free(p7);
+       return ret;
+       }
+
+static ESS_SIGNING_CERT *ESS_SIGNING_CERT_new_init(X509 *signcert, 
+                                                  STACK_OF(X509) *certs)
+       {
+       ESS_CERT_ID *cid;
+       ESS_SIGNING_CERT *sc = NULL;
+       int i;
+
+       /* Creating the ESS_CERT_ID stack. */
+       if (!(sc = ESS_SIGNING_CERT_new())) goto err;
+       if (!sc->cert_ids && !(sc->cert_ids = sk_ESS_CERT_ID_new_null()))
+               goto err;
+
+       /* Adding the signing certificate id. */
+       if (!(cid = ESS_CERT_ID_new_init(signcert, 0))
+           || !sk_ESS_CERT_ID_push(sc->cert_ids, cid))
+               goto err;
+       /* Adding the certificate chain ids. */
+       for (i = 0; i < sk_X509_num(certs); ++i)
+               {
+               X509 *cert = sk_X509_value(certs, i);
+               if (!(cid = ESS_CERT_ID_new_init(cert, 1))
+                   || !sk_ESS_CERT_ID_push(sc->cert_ids, cid))
+                       goto err;
+               }
+
+       return sc;
+err:
+       ESS_SIGNING_CERT_free(sc);
+       TSerr(TS_F_ESS_SIGNING_CERT_NEW_INIT, ERR_R_MALLOC_FAILURE);
+       return NULL;
+       }
+
+static ESS_CERT_ID *ESS_CERT_ID_new_init(X509 *cert, int issuer_needed)
+       {
+       ESS_CERT_ID *cid = NULL;
+       GENERAL_NAME *name = NULL;
+       
+       /* Recompute SHA1 hash of certificate if necessary (side effect). */
+       X509_check_purpose(cert, -1, 0);
+
+       if (!(cid = ESS_CERT_ID_new())) goto err;
+       if (!ASN1_OCTET_STRING_set(cid->hash, cert->sha1_hash,
+                                  sizeof(cert->sha1_hash)))
+               goto err;
+
+       /* Setting the issuer/serial if requested. */
+       if (issuer_needed)
+               {
+               /* Creating issuer/serial structure. */
+               if (!cid->issuer_serial
+                   && !(cid->issuer_serial = ESS_ISSUER_SERIAL_new()))
+                       goto err;
+               /* Creating general name from the certificate issuer. */
+               if (!(name = GENERAL_NAME_new())) goto err;
+               name->type = GEN_DIRNAME;
+               if (!(name->d.dirn = X509_NAME_dup(cert->cert_info->issuer))) 
+                       goto err;
+               if (!sk_GENERAL_NAME_push(cid->issuer_serial->issuer, name)) 
+                       goto err;
+               name = NULL;    /* Ownership is lost. */
+               /* Setting the serial number. */
+               ASN1_INTEGER_free(cid->issuer_serial->serial);
+               if (!(cid->issuer_serial->serial = 
+                     ASN1_INTEGER_dup(cert->cert_info->serialNumber)))
+                       goto err;
+               }
+
+       return cid;
+err:
+       GENERAL_NAME_free(name);
+       ESS_CERT_ID_free(cid);
+       TSerr(TS_F_ESS_CERT_ID_NEW_INIT, ERR_R_MALLOC_FAILURE);
+       return NULL;
+       }
+
+static int TS_TST_INFO_content_new(PKCS7 *p7)
+       {
+       PKCS7 *ret = NULL;
+       ASN1_OCTET_STRING *octet_string = NULL;
+
+       /* Create new encapsulated NID_id_smime_ct_TSTInfo content. */
+       if (!(ret = PKCS7_new())) goto err;
+       if (!(ret->d.other = ASN1_TYPE_new())) goto err;
+       ret->type = OBJ_nid2obj(NID_id_smime_ct_TSTInfo);
+       if (!(octet_string = ASN1_OCTET_STRING_new())) goto err;
+       ASN1_TYPE_set(ret->d.other, V_ASN1_OCTET_STRING, octet_string);
+       octet_string = NULL;
+
+       /* Add encapsulated content to signed PKCS7 structure. */
+       if (!PKCS7_set_content(p7, ret)) goto err;
+
+       return 1;
+ err:
+       ASN1_OCTET_STRING_free(octet_string);
+       PKCS7_free(ret);
+       return 0;
+       }
+
+static int ESS_add_signing_cert(PKCS7_SIGNER_INFO *si, ESS_SIGNING_CERT *sc)
+       {
+       ASN1_STRING *seq = NULL;
+       unsigned char *p, *pp = NULL;
+       int len;
+
+       len = i2d_ESS_SIGNING_CERT(sc, NULL);
+       if (!(pp = (unsigned char *) OPENSSL_malloc(len)))
+               {
+               TSerr(TS_F_ESS_ADD_SIGNING_CERT, ERR_R_MALLOC_FAILURE);
+               goto err;
+               }
+       p = pp;
+       i2d_ESS_SIGNING_CERT(sc, &p);
+       if (!(seq = ASN1_STRING_new()) || !ASN1_STRING_set(seq, pp, len))
+               {
+               TSerr(TS_F_ESS_ADD_SIGNING_CERT, ERR_R_MALLOC_FAILURE);
+               goto err;
+               }
+       OPENSSL_free(pp); pp = NULL;
+       return PKCS7_add_signed_attribute(si, 
+                                         NID_id_smime_aa_signingCertificate,
+                                         V_ASN1_SEQUENCE, seq);
+ err:
+       ASN1_STRING_free(seq);
+       OPENSSL_free(pp);
+
+       return 0;
+       }
+
+
+static ASN1_GENERALIZEDTIME *
+TS_RESP_set_genTime_with_precision(ASN1_GENERALIZEDTIME *asn1_time, 
+                                  long sec, long usec, unsigned precision)
+       {
+       time_t time_sec = (time_t) sec;
+       struct tm *tm = NULL;   
+       char genTime_str[17 + TS_MAX_CLOCK_PRECISION_DIGITS];
+       char *p = genTime_str;
+       char *p_end = genTime_str + sizeof(genTime_str);
+
+       if (precision > TS_MAX_CLOCK_PRECISION_DIGITS)
+               goto err;
+
+       
+       if (!(tm = gmtime(&time_sec)))
+               goto err;
+
+       /* 
+        * Put "genTime_str" in GeneralizedTime format.  We work around the 
+        * restrictions imposed by rfc3280 (i.e. "GeneralizedTime values MUST 
+        * NOT include fractional seconds") and OpenSSL related functions to 
+        * meet the rfc3161 requirement: "GeneralizedTime syntax can include 
+        * fraction-of-second details". 
+        */                   
+       p += BIO_snprintf(p, p_end - p,
+                         "%04d%02d%02d%02d%02d%02d",
+                         tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, 
+                         tm->tm_hour, tm->tm_min, tm->tm_sec);
+       if (precision > 0)
+       {
+               /* Add fraction of seconds (leave space for dot and null). */
+               BIO_snprintf(p, 2 + precision, ".%ld", usec);
+               /* We cannot use the snprintf return value, 
+                  because it might have been truncated. */
+               p += strlen(p);
+
+               /* To make things a bit harder, X.690 | ISO/IEC 8825-1 provides
+                  the following restrictions for a DER-encoding, which OpenSSL
+                  (specifically ASN1_GENERALIZEDTIME_check() function) doesn't 
+                  support:
+                  "The encoding MUST terminate with a "Z" (which means "Zulu" 
+                  time). The decimal point element, if present, MUST be the 
+                  point option ".". The fractional-seconds elements, 
+                  if present, MUST omit all trailing 0's; 
+                  if the elements correspond to 0, they MUST be wholly
+                  omitted, and the decimal point element also MUST be
+                  omitted." */
+               /* Remove trailing zeros. The dot guarantees the exit
+                  condition of this loop even if all the digits are zero. */
+               while (*--p == '0')
+                       /* empty */;
+               /* p points to either the dot or the last non-zero digit. */
+               if (*p != '.') ++p;
+               }
+       /* Add the trailing Z and the terminating null. */
+       *p++ = 'Z';
+       *p++ = '\0';
+
+       /* Now call OpenSSL to check and set our genTime value */
+       if (!asn1_time && !(asn1_time = M_ASN1_GENERALIZEDTIME_new()))
+               goto err;
+       if (!ASN1_GENERALIZEDTIME_set_string(asn1_time, genTime_str))
+               {
+               ASN1_GENERALIZEDTIME_free(asn1_time);
+               goto err;
+               }
+
+       return asn1_time;
+ err:
+       TSerr(TS_F_TS_RESP_SET_GENTIME_WITH_PRECISION, TS_R_COULD_NOT_SET_TIME);
+       return NULL;
+       }
diff --git a/crypto/ts/ts_rsp_utils.c b/crypto/ts/ts_rsp_utils.c
new file mode 100644 (file)
index 0000000..0c6c504
--- /dev/null
@@ -0,0 +1,409 @@
+/* crypto/ts/ts_resp_utils.c */
+/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
+ * project 2002.
+ */
+/* ====================================================================
+ * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/objects.h>
+#include <openssl/ts.h>
+#include <openssl/pkcs7.h>
+
+/* Function definitions. */
+
+int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *status_info)
+       {
+       TS_STATUS_INFO *new_status_info;
+
+       if (a->status_info == status_info)
+               return 1;
+       new_status_info = TS_STATUS_INFO_dup(status_info);
+       if (new_status_info == NULL)
+               {
+               TSerr(TS_F_TS_RESP_SET_STATUS_INFO, ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       TS_STATUS_INFO_free(a->status_info);
+       a->status_info = new_status_info;
+
+       return 1;
+       }
+
+TS_STATUS_INFO *TS_RESP_get_status_info(TS_RESP *a)
+       {
+       return a->status_info;
+       }
+
+/* Caller loses ownership of PKCS7 and TS_TST_INFO objects. */
+void TS_RESP_set_tst_info(TS_RESP *a, PKCS7 *p7, TS_TST_INFO *tst_info)
+       {
+       /* Set new PKCS7 and TST_INFO objects. */
+       PKCS7_free(a->token);
+       a->token = p7;
+       TS_TST_INFO_free(a->tst_info);
+       a->tst_info = tst_info;
+       }
+
+PKCS7 *TS_RESP_get_token(TS_RESP *a)
+       {
+       return a->token;
+       }
+
+TS_TST_INFO *TS_RESP_get_tst_info(TS_RESP *a)
+       {
+       return a->tst_info;
+       }
+
+int TS_TST_INFO_set_version(TS_TST_INFO *a, long version)
+       {
+       return ASN1_INTEGER_set(a->version, version);
+       }
+
+long TS_TST_INFO_get_version(TS_TST_INFO *a)
+       {
+       return ASN1_INTEGER_get(a->version);
+       }
+
+int TS_TST_INFO_set_policy_id(TS_TST_INFO *a, ASN1_OBJECT *policy)
+       {
+       ASN1_OBJECT *new_policy;
+
+       if (a->policy_id == policy)
+               return 1;
+       new_policy = OBJ_dup(policy);
+       if (new_policy == NULL)
+               {
+               TSerr(TS_F_TS_TST_INFO_SET_POLICY_ID, ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       ASN1_OBJECT_free(a->policy_id);
+       a->policy_id = new_policy;
+       return 1;
+       }
+
+ASN1_OBJECT *TS_TST_INFO_get_policy_id(TS_TST_INFO *a)
+       {
+       return a->policy_id;
+       }
+
+int TS_TST_INFO_set_msg_imprint(TS_TST_INFO *a, TS_MSG_IMPRINT *msg_imprint)
+       {
+       TS_MSG_IMPRINT *new_msg_imprint;
+
+       if (a->msg_imprint == msg_imprint)
+               return 1;
+       new_msg_imprint = TS_MSG_IMPRINT_dup(msg_imprint);
+       if (new_msg_imprint == NULL)
+               {
+               TSerr(TS_F_TS_TST_INFO_SET_MSG_IMPRINT, ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       TS_MSG_IMPRINT_free(a->msg_imprint);
+       a->msg_imprint = new_msg_imprint;
+       return 1;
+       }
+
+TS_MSG_IMPRINT *TS_TST_INFO_get_msg_imprint(TS_TST_INFO *a)
+       {
+       return a->msg_imprint;
+       }
+
+int TS_TST_INFO_set_serial(TS_TST_INFO *a, ASN1_INTEGER *serial)
+       {
+       ASN1_INTEGER *new_serial;
+
+       if (a->serial == serial)
+               return 1;
+       new_serial = ASN1_INTEGER_dup(serial);
+       if (new_serial == NULL)
+               {
+               TSerr(TS_F_TS_TST_INFO_SET_SERIAL, ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       ASN1_INTEGER_free(a->serial);
+       a->serial = new_serial;
+       return 1;
+       }
+
+ASN1_INTEGER *TS_TST_INFO_get_serial(TS_TST_INFO *a)
+       {
+       return a->serial;
+       }
+
+int TS_TST_INFO_set_time(TS_TST_INFO *a, ASN1_GENERALIZEDTIME *gtime)
+       {
+       ASN1_GENERALIZEDTIME *new_time;
+
+       if (a->time == gtime)
+               return 1;
+       new_time = M_ASN1_GENERALIZEDTIME_dup(gtime);
+       if (new_time == NULL)
+               {
+               TSerr(TS_F_TS_TST_INFO_SET_TIME, ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       ASN1_GENERALIZEDTIME_free(a->time);
+       a->time = new_time;
+       return 1;
+       }
+
+ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(TS_TST_INFO *a)
+       {
+       return a->time;
+       }
+
+int TS_TST_INFO_set_accuracy(TS_TST_INFO *a, TS_ACCURACY *accuracy)
+       {
+       TS_ACCURACY *new_accuracy;
+
+       if (a->accuracy == accuracy)
+               return 1;
+       new_accuracy = TS_ACCURACY_dup(accuracy);
+       if (new_accuracy == NULL)
+               {
+               TSerr(TS_F_TS_TST_INFO_SET_ACCURACY, ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       TS_ACCURACY_free(a->accuracy);
+       a->accuracy = new_accuracy;
+       return 1;
+       }
+
+TS_ACCURACY *TS_TST_INFO_get_accuracy(TS_TST_INFO *a)
+       {
+       return a->accuracy;
+       }
+
+int TS_ACCURACY_set_seconds(TS_ACCURACY *a, ASN1_INTEGER *seconds)
+       {
+       ASN1_INTEGER *new_seconds;
+
+       if (a->seconds == seconds)
+               return 1;
+       new_seconds = ASN1_INTEGER_dup(seconds);
+       if (new_seconds == NULL)
+               {
+               TSerr(TS_F_TS_ACCURACY_SET_SECONDS, ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       ASN1_INTEGER_free(a->seconds);
+       a->seconds = new_seconds;
+       return 1;
+       }
+
+ASN1_INTEGER *TS_ACCURACY_get_seconds(TS_ACCURACY *a)
+       {
+       return a->seconds;
+       }
+
+int TS_ACCURACY_set_millis(TS_ACCURACY *a, ASN1_INTEGER *millis)
+       {
+       ASN1_INTEGER *new_millis = NULL;
+
+       if (a->millis == millis)
+               return 1;
+       if (millis != NULL)
+               {
+               new_millis = ASN1_INTEGER_dup(millis);
+               if (new_millis == NULL)
+                       {
+                       TSerr(TS_F_TS_ACCURACY_SET_MILLIS, 
+                             ERR_R_MALLOC_FAILURE);
+                       return 0;
+                       }
+               }
+       ASN1_INTEGER_free(a->millis);
+       a->millis = new_millis;
+       return 1;
+       }
+
+ASN1_INTEGER *TS_ACCURACY_get_millis(TS_ACCURACY *a)
+       {
+       return a->millis;
+       }
+
+int TS_ACCURACY_set_micros(TS_ACCURACY *a, ASN1_INTEGER *micros)
+       {
+       ASN1_INTEGER *new_micros = NULL;
+
+       if (a->micros == micros)
+               return 1;
+       if (micros != NULL)
+               {
+               new_micros = ASN1_INTEGER_dup(micros);
+               if (new_micros == NULL)
+                       {
+                       TSerr(TS_F_TS_ACCURACY_SET_MICROS, 
+                             ERR_R_MALLOC_FAILURE);
+                       return 0;
+                       }
+               }
+       ASN1_INTEGER_free(a->micros);
+       a->micros = new_micros;
+       return 1;
+       }
+
+ASN1_INTEGER *TS_ACCURACY_get_micros(TS_ACCURACY *a)
+       {
+       return a->micros;
+       }
+
+int TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering)
+       {
+       a->ordering = ordering ? 0xFF : 0x00;
+       return 1;
+       }
+
+int TS_TST_INFO_get_ordering(TS_TST_INFO *a)
+       {
+       return a->ordering ? 1 : 0;
+       }
+
+int TS_TST_INFO_set_nonce(TS_TST_INFO *a, ASN1_INTEGER *nonce)
+       {
+       ASN1_INTEGER *new_nonce;
+
+       if (a->nonce == nonce)
+               return 1;
+       new_nonce = ASN1_INTEGER_dup(nonce);
+       if (new_nonce == NULL)
+               {
+               TSerr(TS_F_TS_TST_INFO_SET_NONCE, ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       ASN1_INTEGER_free(a->nonce);
+       a->nonce = new_nonce;
+       return 1;
+       }
+
+ASN1_INTEGER *TS_TST_INFO_get_nonce(TS_TST_INFO *a)
+       {
+       return a->nonce;
+       }
+
+int TS_TST_INFO_set_tsa(TS_TST_INFO *a, GENERAL_NAME *tsa)
+       {
+       GENERAL_NAME *new_tsa;
+
+       if (a->tsa == tsa)
+               return 1;
+       new_tsa = GENERAL_NAME_dup(tsa);
+       if (new_tsa == NULL)
+               {
+               TSerr(TS_F_TS_TST_INFO_SET_TSA, ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       GENERAL_NAME_free(a->tsa);
+       a->tsa = new_tsa;
+       return 1;
+       }
+
+GENERAL_NAME *TS_TST_INFO_get_tsa(TS_TST_INFO *a)
+       {
+       return a->tsa;
+       }
+
+STACK_OF(X509_EXTENSION) *TS_TST_INFO_get_exts(TS_TST_INFO *a)
+       {
+       return a->extensions;
+       }
+
+void TS_TST_INFO_ext_free(TS_TST_INFO *a)
+       {
+       if (!a) return;
+       sk_X509_EXTENSION_pop_free(a->extensions, X509_EXTENSION_free);
+       a->extensions = NULL;
+       }
+
+int TS_TST_INFO_get_ext_count(TS_TST_INFO *a)
+       {
+       return X509v3_get_ext_count(a->extensions);
+       }
+
+int TS_TST_INFO_get_ext_by_NID(TS_TST_INFO *a, int nid, int lastpos)
+       {
+       return X509v3_get_ext_by_NID(a->extensions, nid, lastpos);
+       }
+
+int TS_TST_INFO_get_ext_by_OBJ(TS_TST_INFO *a, ASN1_OBJECT *obj, int lastpos)
+       {
+       return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos);
+       }
+
+int TS_TST_INFO_get_ext_by_critical(TS_TST_INFO *a, int crit, int lastpos)
+       {
+       return X509v3_get_ext_by_critical(a->extensions, crit, lastpos);
+       }
+
+X509_EXTENSION *TS_TST_INFO_get_ext(TS_TST_INFO *a, int loc)
+       {
+       return X509v3_get_ext(a->extensions,loc);
+       }
+
+X509_EXTENSION *TS_TST_INFO_delete_ext(TS_TST_INFO *a, int loc)
+       {
+       return X509v3_delete_ext(a->extensions,loc);
+       }
+
+int TS_TST_INFO_add_ext(TS_TST_INFO *a, X509_EXTENSION *ex, int loc)
+       {
+       return X509v3_add_ext(&a->extensions,ex,loc) != NULL;
+       }
+
+void *TS_TST_INFO_get_ext_d2i(TS_TST_INFO *a, int nid, int *crit, int *idx)
+       {
+       return X509V3_get_d2i(a->extensions, nid, crit, idx);
+       }
diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c
new file mode 100644 (file)
index 0000000..8b57513
--- /dev/null
@@ -0,0 +1,722 @@
+/* crypto/ts/ts_resp_verify.c */
+/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
+ * project 2002.
+ */
+/* ====================================================================
+ * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/objects.h>
+#include <openssl/ts.h>
+#include <openssl/pkcs7.h>
+
+/* Private function declarations. */
+
+static int TS_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,
+                         X509 *signer, STACK_OF(X509) **chain);
+static int TS_check_signing_certs(PKCS7_SIGNER_INFO *si, STACK_OF(X509) *chain);
+static ESS_SIGNING_CERT *ESS_get_signing_cert(PKCS7_SIGNER_INFO *si);
+static int TS_find_cert(STACK_OF(ESS_CERT_ID) *cert_ids, X509 *cert);
+static int TS_issuer_serial_cmp(ESS_ISSUER_SERIAL *is, X509_CINF *cinfo);
+static int _TS_RESP_verify_token(TS_VERIFY_CTX *ctx, 
+                                PKCS7 *token, TS_TST_INFO *tst_info);
+static int TS_check_status_info(TS_RESP *response);
+static char *TS_get_status_text(STACK_OF(ASN1_UTF8STRING) *text);
+static int TS_check_policy(ASN1_OBJECT *req_oid, TS_TST_INFO *tst_info);
+static int TS_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
+                             X509_ALGOR **md_alg, 
+                             unsigned char **imprint, unsigned *imprint_len);
+static int TS_check_imprints(X509_ALGOR *algor_a, 
+                            unsigned char *imprint_a, unsigned len_a,
+                            TS_TST_INFO *tst_info);
+static int TS_check_nonces(ASN1_INTEGER *a, TS_TST_INFO *tst_info);
+static int TS_check_signer_name(GENERAL_NAME *tsa_name, X509 *signer);
+static int TS_find_name(STACK_OF(GENERAL_NAME) *gen_names, GENERAL_NAME *name);
+
+/*
+ * Local mapping between response codes and descriptions.
+ * Don't forget to change TS_STATUS_BUF_SIZE when modifying 
+ * the elements of this array.
+ */
+static const char *TS_status_text[] =
+       { "granted",
+         "grantedWithMods",
+         "rejection",
+         "waiting",
+         "revocationWarning",
+         "revocationNotification" };
+
+#define TS_STATUS_TEXT_SIZE    (sizeof(TS_status_text)/sizeof(*TS_status_text))
+
+/*
+ * This must be greater or equal to the sum of the strings in TS_status_text
+ * plus the number of its elements.
+ */
+#define TS_STATUS_BUF_SIZE     256
+
+static struct
+       {
+       int code;
+       const char *text;
+       } TS_failure_info[] =
+               { { TS_INFO_BAD_ALG, "badAlg" },
+                 { TS_INFO_BAD_REQUEST, "badRequest" },
+                 { TS_INFO_BAD_DATA_FORMAT, "badDataFormat" },
+                 { TS_INFO_TIME_NOT_AVAILABLE, "timeNotAvailable" },
+                 { TS_INFO_UNACCEPTED_POLICY, "unacceptedPolicy" },
+                 { TS_INFO_UNACCEPTED_EXTENSION, "unacceptedExtension" },
+                 { TS_INFO_ADD_INFO_NOT_AVAILABLE, "addInfoNotAvailable" },
+                 { TS_INFO_SYSTEM_FAILURE, "systemFailure" } };
+
+#define TS_FAILURE_INFO_SIZE   (sizeof(TS_failure_info) / \
+                               sizeof(*TS_failure_info))
+
+/* Functions for verifying a signed TS_TST_INFO structure. */
+
+/*
+ * This function carries out the following tasks:
+ *     - Checks if there is one and only one signer.
+ *     - Search for the signing certificate in 'certs' and in the response.
+ *     - Check the extended key usage and key usage fields of the signer
+ *     certificate (done by the path validation).
+ *     - Build and validate the certificate path.
+ *     - Check if the certificate path meets the requirements of the
+ *     SigningCertificate ESS signed attribute.
+ *     - Verify the signature value.
+ *     - Returns the signer certificate in 'signer', if 'signer' is not NULL.
+ */
+int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
+                            X509_STORE *store, X509 **signer_out)
+       {
+       STACK_OF(PKCS7_SIGNER_INFO) *sinfos = NULL;
+       PKCS7_SIGNER_INFO *si;
+       STACK_OF(X509) *signers = NULL;
+       X509    *signer;
+       STACK_OF(X509) *chain = NULL;
+       char    buf[4096];
+       int     i, j = 0, ret = 0;
+       BIO     *p7bio = NULL;
+
+       /* Some sanity checks first. */
+       if (!token)
+               {
+               TSerr(TS_F_TS_RESP_VERIFY_SIGNATURE, TS_R_INVALID_NULL_POINTER);
+               goto err;
+               }
+
+       /* Check for the correct content type */
+       if(!PKCS7_type_is_signed(token))
+               {
+               TSerr(TS_F_TS_RESP_VERIFY_SIGNATURE, TS_R_WRONG_CONTENT_TYPE);
+               goto err;
+               }
+
+       /* Check if there is one and only one signer. */
+       sinfos = PKCS7_get_signer_info(token);
+       if (!sinfos || sk_PKCS7_SIGNER_INFO_num(sinfos) != 1)
+               {
+               TSerr(TS_F_TS_RESP_VERIFY_SIGNATURE,
+                     TS_R_THERE_MUST_BE_ONE_SIGNER);
+               goto err;
+               }
+       si = sk_PKCS7_SIGNER_INFO_value(sinfos, 0);
+
+       /* Check for no content: no data to verify signature. */
+       if (PKCS7_get_detached(token))
+               {
+               TSerr(TS_F_TS_RESP_VERIFY_SIGNATURE, TS_R_NO_CONTENT);
+               goto err;
+               }
+       
+       /* Get hold of the signer certificate, search only internal
+          certificates if it was requested. */
+       signers = PKCS7_get0_signers(token, certs, 0);
+       if (!signers || sk_X509_num(signers) != 1) goto err;
+       signer = sk_X509_value(signers, 0);
+
+       /* Now verify the certificate. */
+       if (!TS_verify_cert(store, certs, signer, &chain)) goto err;
+
+       /* Check if the signer certificate is consistent with the
+          ESS extension. */
+       if (!TS_check_signing_certs(si, chain)) goto err;
+
+       /* Creating the message digest. */
+       p7bio = PKCS7_dataInit(token, NULL);
+
+       /* We now have to 'read' from p7bio to calculate digests etc. */
+       while ((i = BIO_read(p7bio,buf,sizeof(buf))) > 0);
+
+       /* Verifying the signature. */
+       j = PKCS7_signatureVerify(p7bio, token, si, signer);
+       if (j <= 0)
+               {
+               TSerr(TS_F_TS_RESP_VERIFY_SIGNATURE, TS_R_SIGNATURE_FAILURE);
+               goto err;
+               }
+
+       /* Return the signer certificate if needed. */
+       if (signer_out)
+               {
+               *signer_out = signer;
+               CRYPTO_add(&signer->references, 1, CRYPTO_LOCK_X509);
+               }
+
+       ret = 1;
+
+ err:
+       BIO_free_all(p7bio);
+       sk_X509_pop_free(chain, X509_free);
+       sk_X509_free(signers);
+
+       return ret;
+       }
+
+/*
+ * The certificate chain is returned in chain. Caller is responsible for
+ * freeing the vector.
+ */
+static int TS_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,
+                         X509 *signer, STACK_OF(X509) **chain)
+       {
+       X509_STORE_CTX  cert_ctx;
+       int i;
+       int ret = 1;
+
+       /* chain is an out argument. */
+       *chain = NULL;
+       X509_STORE_CTX_init(&cert_ctx, store, signer, untrusted);
+       X509_STORE_CTX_set_purpose(&cert_ctx, X509_PURPOSE_TIMESTAMP_SIGN);
+       i = X509_verify_cert(&cert_ctx);
+       if (i <= 0)
+               {
+               int j = X509_STORE_CTX_get_error(&cert_ctx);
+               TSerr(TS_F_TS_VERIFY_CERT, TS_R_CERTIFICATE_VERIFY_ERROR);
+               ERR_add_error_data(2, "Verify error:",
+                                  X509_verify_cert_error_string(j));
+               ret = 0;
+               }
+       else
+               {
+               /* Get a copy of the certificate chain. */
+               *chain = X509_STORE_CTX_get1_chain(&cert_ctx);
+               }
+
+       X509_STORE_CTX_cleanup(&cert_ctx);
+
+       return ret;
+       }
+
+static int TS_check_signing_certs(PKCS7_SIGNER_INFO *si, STACK_OF(X509) *chain)
+       {
+       ESS_SIGNING_CERT *ss = ESS_get_signing_cert(si);
+       STACK_OF(ESS_CERT_ID) *cert_ids = NULL;
+       X509 *cert;
+       int i = 0;
+       int ret = 0;
+
+       if (!ss) goto err;
+       cert_ids = ss->cert_ids;
+       /* The signer certificate must be the first in cert_ids. */
+       cert = sk_X509_value(chain, 0);
+       if (TS_find_cert(cert_ids, cert) != 0) goto err;
+       
+       /* Check the other certificates of the chain if there are more
+          than one certificate ids in cert_ids. */
+       if (sk_ESS_CERT_ID_num(cert_ids) > 1)
+               {
+               /* All the certificates of the chain must be in cert_ids. */
+               for (i = 1; i < sk_X509_num(chain); ++i)
+                       {
+                       cert = sk_X509_value(chain, i);
+                       if (TS_find_cert(cert_ids, cert) < 0) goto err;
+                       }
+               }
+       ret = 1;
+ err:
+       if (!ret)
+               TSerr(TS_F_TS_CHECK_SIGNING_CERTS, 
+                     TS_R_ESS_SIGNING_CERTIFICATE_ERROR);
+       ESS_SIGNING_CERT_free(ss);
+       return ret;
+       }
+
+static ESS_SIGNING_CERT *ESS_get_signing_cert(PKCS7_SIGNER_INFO *si)
+       {
+       ASN1_TYPE *attr;
+       const unsigned char *p;
+       attr = PKCS7_get_signed_attribute(si, 
+                                         NID_id_smime_aa_signingCertificate);
+       if (!attr) return NULL;
+       p = attr->value.sequence->data;
+       return d2i_ESS_SIGNING_CERT(NULL, &p, attr->value.sequence->length);
+       }
+
+/* Returns < 0 if certificate is not found, certificate index otherwise. */
+static int TS_find_cert(STACK_OF(ESS_CERT_ID) *cert_ids, X509 *cert)
+       {
+       int i;
+
+       if (!cert_ids || !cert) return -1;
+
+       /* Recompute SHA1 hash of certificate if necessary (side effect). */
+       X509_check_purpose(cert, -1, 0);
+
+       /* Look for cert in the cert_ids vector. */
+       for (i = 0; i < sk_ESS_CERT_ID_num(cert_ids); ++i)
+               {
+               ESS_CERT_ID *cid = sk_ESS_CERT_ID_value(cert_ids, i);
+
+               /* Check the SHA-1 hash first. */
+               if (cid->hash->length == sizeof(cert->sha1_hash)
+                   && !memcmp(cid->hash->data, cert->sha1_hash,
+                              sizeof(cert->sha1_hash)))
+                       {
+                       /* Check the issuer/serial as well if specified. */
+                       ESS_ISSUER_SERIAL *is = cid->issuer_serial;
+                       if (!is || !TS_issuer_serial_cmp(is, cert->cert_info))
+                               return i;
+                       }
+               }
+       
+       return -1;
+       }
+
+static int TS_issuer_serial_cmp(ESS_ISSUER_SERIAL *is, X509_CINF *cinfo)
+       {
+       GENERAL_NAME *issuer;
+
+       if (!is || !cinfo || sk_GENERAL_NAME_num(is->issuer) != 1) return -1;
+
+       /* Check the issuer first. It must be a directory name. */
+       issuer = sk_GENERAL_NAME_value(is->issuer, 0);
+       if (issuer->type != GEN_DIRNAME 
+           || X509_NAME_cmp(issuer->d.dirn, cinfo->issuer))
+               return -1;
+
+       /* Check the serial number, too. */
+       if (ASN1_INTEGER_cmp(is->serial, cinfo->serialNumber))
+               return -1;
+
+       return 0;
+       }
+
+/*
+ * Verifies whether 'response' contains a valid response with regards 
+ * to the settings of the context:
+ *     - Gives an error message if the TS_TST_INFO is not present.
+ *     - Calls _TS_RESP_verify_token to verify the token content.
+ */
+int TS_RESP_verify_response(TS_VERIFY_CTX *ctx, TS_RESP *response)
+       {
+       PKCS7 *token = TS_RESP_get_token(response);
+       TS_TST_INFO *tst_info = TS_RESP_get_tst_info(response);
+       int ret = 0;
+
+       /* Check if we have a successful TS_TST_INFO object in place. */
+       if (!TS_check_status_info(response)) goto err;
+
+       /* Check the contents of the time stamp token. */
+       if (!_TS_RESP_verify_token(ctx, token, tst_info))
+               goto err;
+
+       ret = 1;
+ err:
+       return ret;
+       }
+
+/*
+ * Tries to extract a TS_TST_INFO structure from the PKCS7 token and
+ * calls the internal _TS_RESP_verify_token function for verifying it.
+ */
+int TS_RESP_verify_token(TS_VERIFY_CTX *ctx, PKCS7 *token)
+       {
+       TS_TST_INFO *tst_info = PKCS7_to_TS_TST_INFO(token);
+       int ret = 0;
+       if (tst_info)
+               {
+               ret = _TS_RESP_verify_token(ctx, token, tst_info);
+               TS_TST_INFO_free(tst_info);
+               }
+       return ret;
+       }
+
+/*
+ * Verifies whether the 'token' contains a valid time stamp token 
+ * with regards to the settings of the context. Only those checks are
+ * carried out that are specified in the context:
+ *     - Verifies the signature of the TS_TST_INFO.
+ *     - Checks the version number of the response.
+ *     - Check if the requested and returned policies math.
+ *     - Check if the message imprints are the same.
+ *     - Check if the nonces are the same.
+ *     - Check if the TSA name matches the signer.
+ *     - Check if the TSA name is the expected TSA.
+ */
+static int _TS_RESP_verify_token(TS_VERIFY_CTX *ctx, 
+                                PKCS7 *token, TS_TST_INFO *tst_info)
+       {
+       X509 *signer = NULL;
+       GENERAL_NAME *tsa_name = TS_TST_INFO_get_tsa(tst_info);
+       X509_ALGOR *md_alg = NULL;
+       unsigned char *imprint = NULL;
+       unsigned imprint_len = 0;
+       int ret = 0;
+
+       /* Verify the signature. */
+       if ((ctx->flags & TS_VFY_SIGNATURE)
+           && !TS_RESP_verify_signature(token, ctx->certs, ctx->store,
+                                        &signer))
+               goto err;
+       
+       /* Check version number of response. */
+       if ((ctx->flags & TS_VFY_VERSION)
+           && TS_TST_INFO_get_version(tst_info) != 1)
+               {
+               TSerr(TS_F_TS_VERIFY, TS_R_UNSUPPORTED_VERSION);
+               goto err;
+               }
+
+       /* Check policies. */
+       if ((ctx->flags & TS_VFY_POLICY)
+           && !TS_check_policy(ctx->policy, tst_info))
+               goto err;
+       
+       /* Check message imprints. */
+       if ((ctx->flags & TS_VFY_IMPRINT)
+           && !TS_check_imprints(ctx->md_alg, ctx->imprint, ctx->imprint_len,
+                                 tst_info)) 
+               goto err;
+
+       /* Compute and check message imprints. */
+       if ((ctx->flags & TS_VFY_DATA)
+           && (!TS_compute_imprint(ctx->data, tst_info,
+                                   &md_alg, &imprint, &imprint_len)
+           || !TS_check_imprints(md_alg, imprint, imprint_len, tst_info)))
+               goto err;
+
+       /* Check nonces. */
+       if ((ctx->flags & TS_VFY_NONCE)
+           && !TS_check_nonces(ctx->nonce, tst_info))
+               goto err;
+
+       /* Check whether TSA name and signer certificate match. */
+       if ((ctx->flags & TS_VFY_SIGNER)
+           && tsa_name && !TS_check_signer_name(tsa_name, signer))
+               {
+               TSerr(TS_F_TS_RESP_VERIFY_TOKEN, TS_R_TSA_NAME_MISMATCH);
+               goto err;
+               }
+
+       /* Check whether the TSA is the expected one. */
+       if ((ctx->flags & TS_VFY_TSA_NAME)
+           && !TS_check_signer_name(ctx->tsa_name, signer))
+               {
+               TSerr(TS_F_TS_RESP_VERIFY_TOKEN, TS_R_TSA_UNTRUSTED);
+               goto err;
+               }
+
+       ret = 1;
+ err:
+       X509_free(signer);
+       X509_ALGOR_free(md_alg);
+       OPENSSL_free(imprint);
+       return ret;
+       }
+
+static int TS_check_status_info(TS_RESP *response)
+       {
+       TS_STATUS_INFO *info = TS_RESP_get_status_info(response);
+       long status = ASN1_INTEGER_get(info->status);
+       const char *status_text = NULL;
+       char *embedded_status_text = NULL;
+       char failure_text[TS_STATUS_BUF_SIZE] = "";
+
+       /* Check if everything went fine. */
+       if (status == 0 || status == 1) return 1;
+
+       /* There was an error, get the description in status_text. */
+       if (0 <= status && status < (long)TS_STATUS_TEXT_SIZE)
+               status_text = TS_status_text[status];
+       else
+               status_text = "unknown code";
+
+       /* Set the embedded_status_text to the returned description. */
+       if (sk_ASN1_UTF8STRING_num(info->text) > 0
+           && !(embedded_status_text = TS_get_status_text(info->text)))
+               return 0;
+       
+       /* Filling in failure_text with the failure information. */
+       if (info->failure_info)
+               {
+               int i;
+               int first = 1;
+               for (i = 0; i < (int)TS_FAILURE_INFO_SIZE; ++i)
+                       {
+                       if (ASN1_BIT_STRING_get_bit(info->failure_info,
+                                                   TS_failure_info[i].code))
+                               {
+                               if (!first)
+                                       strcpy(failure_text, ",");
+                               else
+                                       first = 0;
+                               strcat(failure_text, TS_failure_info[i].text);
+                               }
+                       }
+               }
+       if (failure_text[0] == '\0')
+               strcpy(failure_text, "unspecified");
+
+       /* Making up the error string. */
+       TSerr(TS_F_TS_CHECK_STATUS_INFO, TS_R_NO_TIME_STAMP_TOKEN);
+       ERR_add_error_data(6,
+                          "status code: ", status_text,
+                          ", status text: ", embedded_status_text ? 
+                          embedded_status_text : "unspecified",
+                          ", failure codes: ", failure_text);
+       OPENSSL_free(embedded_status_text);
+
+       return 0;
+       }
+
+static char *TS_get_status_text(STACK_OF(ASN1_UTF8STRING) *text)
+       {
+       int i;
+       unsigned int length = 0;
+       char *result = NULL;
+       char *p;
+
+       /* Determine length first. */
+       for (i = 0; i < sk_ASN1_UTF8STRING_num(text); ++i)
+               {
+               ASN1_UTF8STRING *current = sk_ASN1_UTF8STRING_value(text, i);
+               length += ASN1_STRING_length(current);
+               length += 1;    /* separator character */
+               }
+       /* Allocate memory (closing '\0' included). */
+       if (!(result = OPENSSL_malloc(length)))
+               {
+               TSerr(TS_F_TS_GET_STATUS_TEXT, ERR_R_MALLOC_FAILURE);
+               return NULL;
+               }
+       /* Concatenate the descriptions. */
+       for (i = 0, p = result; i < sk_ASN1_UTF8STRING_num(text); ++i)
+               {
+               ASN1_UTF8STRING *current = sk_ASN1_UTF8STRING_value(text, i);
+               length = ASN1_STRING_length(current);
+               if (i > 0) *p++ = '/';
+               strncpy(p, (const char *)ASN1_STRING_data(current), length);
+               p += length;
+               }
+       /* We do have space for this, too. */
+       *p = '\0';
+       
+       return result;
+       }
+
+static int TS_check_policy(ASN1_OBJECT *req_oid, TS_TST_INFO *tst_info)
+       {
+       ASN1_OBJECT *resp_oid = TS_TST_INFO_get_policy_id(tst_info);
+
+       if (OBJ_cmp(req_oid, resp_oid) != 0)
+               {
+               TSerr(TS_F_TS_CHECK_POLICY, TS_R_POLICY_MISMATCH);
+               return 0;
+               }
+
+       return 1;
+       }
+
+static int TS_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
+                             X509_ALGOR **md_alg, 
+                             unsigned char **imprint, unsigned *imprint_len)
+       {
+       TS_MSG_IMPRINT *msg_imprint = TS_TST_INFO_get_msg_imprint(tst_info);
+       X509_ALGOR *md_alg_resp = TS_MSG_IMPRINT_get_algo(msg_imprint);
+       const EVP_MD *md;
+       EVP_MD_CTX md_ctx;
+       unsigned char buffer[4096];
+       int length;
+
+       *md_alg = NULL;
+       *imprint = NULL;
+
+       /* Return the MD algorithm of the response. */
+       if (!(*md_alg = X509_ALGOR_dup(md_alg_resp))) goto err;
+
+       /* Getting the MD object. */
+       if (!(md = EVP_get_digestbyobj((*md_alg)->algorithm)))
+               {
+               TSerr(TS_F_TS_COMPUTE_IMPRINT, TS_R_UNSUPPORTED_MD_ALGORITHM);
+               goto err;
+               }
+
+       /* Compute message digest. */
+       *imprint_len = EVP_MD_size(md);
+       if (!(*imprint = OPENSSL_malloc(*imprint_len))) 
+               {
+               TSerr(TS_F_TS_COMPUTE_IMPRINT, ERR_R_MALLOC_FAILURE);
+               goto err;
+               }
+
+       EVP_DigestInit(&md_ctx, md);
+       while ((length = BIO_read(data, buffer, sizeof(buffer))) > 0)
+               {
+               EVP_DigestUpdate(&md_ctx, buffer, length);
+               }
+       EVP_DigestFinal(&md_ctx, *imprint, NULL);
+
+       return 1;
+ err:
+       X509_ALGOR_free(*md_alg);
+       OPENSSL_free(*imprint);
+       *imprint_len = 0;
+       return 0;
+       }
+
+static int TS_check_imprints(X509_ALGOR *algor_a, 
+                            unsigned char *imprint_a, unsigned len_a,
+                            TS_TST_INFO *tst_info)
+       {
+       TS_MSG_IMPRINT *b = TS_TST_INFO_get_msg_imprint(tst_info);
+       X509_ALGOR *algor_b = TS_MSG_IMPRINT_get_algo(b);
+       int ret = 0;
+
+       /* algor_a is optional. */
+       if (algor_a)
+               {
+               /* Compare algorithm OIDs. */
+               if (OBJ_cmp(algor_a->algorithm, algor_b->algorithm)) goto err;
+
+               /* The parameter must be NULL in both. */
+               if ((algor_a->parameter 
+                    && ASN1_TYPE_get(algor_a->parameter) != V_ASN1_NULL)
+                   || (algor_b->parameter
+                       && ASN1_TYPE_get(algor_b->parameter) != V_ASN1_NULL))
+                       goto err;
+               }
+
+       /* Compare octet strings. */
+       ret = len_a == (unsigned) ASN1_STRING_length(b->hashed_msg) &&
+               memcmp(imprint_a, ASN1_STRING_data(b->hashed_msg), len_a) == 0;
+ err:
+       if (!ret)
+               TSerr(TS_F_TS_CHECK_IMPRINTS, TS_R_MESSAGE_IMPRINT_MISMATCH);
+       return ret;
+       }
+
+static int TS_check_nonces(ASN1_INTEGER *a, TS_TST_INFO *tst_info)
+       {
+       ASN1_INTEGER *b = TS_TST_INFO_get_nonce(tst_info);
+
+       /* Error if nonce is missing. */
+       if (!b)
+               {
+               TSerr(TS_F_TS_CHECK_NONCES, TS_R_NONCE_NOT_RETURNED);
+               return 0;
+               }
+
+       /* No error if a nonce is returned without being requested. */
+       if (ASN1_INTEGER_cmp(a, b) != 0)
+               {
+               TSerr(TS_F_TS_CHECK_NONCES, TS_R_NONCE_MISMATCH);
+               return 0;
+               }
+
+       return 1;
+       }
+
+/* Check if the specified TSA name matches either the subject
+   or one of the subject alternative names of the TSA certificate. */
+static int TS_check_signer_name(GENERAL_NAME *tsa_name, X509 *signer)
+       {
+       STACK_OF(GENERAL_NAME) *gen_names = NULL;
+       int idx = -1;
+       int found = 0;
+
+       /* Check the subject name first. */
+       if (tsa_name->type == GEN_DIRNAME 
+           && X509_name_cmp(tsa_name->d.dirn, signer->cert_info->subject) == 0)
+               return 1;
+
+       /* Check all the alternative names. */
+       gen_names = X509_get_ext_d2i(signer, NID_subject_alt_name,
+                                    NULL, &idx);
+       while (gen_names != NULL
+              && !(found = TS_find_name(gen_names, tsa_name) >= 0))
+               {
+               /* Get the next subject alternative name,
+                  although there should be no more than one. */
+               GENERAL_NAMES_free(gen_names);
+               gen_names = X509_get_ext_d2i(signer, NID_subject_alt_name,
+                                            NULL, &idx);
+               }
+       if (gen_names) GENERAL_NAMES_free(gen_names);
+       
+       return found;
+       }
+
+/* Returns 1 if name is in gen_names, 0 otherwise. */
+static int TS_find_name(STACK_OF(GENERAL_NAME) *gen_names, GENERAL_NAME *name)
+       {
+       int i, found;
+       for (i = 0, found = 0; !found && i < sk_GENERAL_NAME_num(gen_names);
+            ++i)
+               {
+               GENERAL_NAME *current = sk_GENERAL_NAME_value(gen_names, i);
+               found = GENERAL_NAME_cmp(current, name) == 0;
+               }
+       return found ? i - 1 : -1;
+       }