This commit was manufactured by cvs2git to create tag 'OPENBSD_5_7_BASE'.OPENBSD_5_7_BASE

1 files changed, 0 insertions, 436 deletions

diff --git a/src/lib/libcrypto/ts/ts_rsp_utils.c b/src/lib/libcrypto/ts/ts_rsp_utils.c
deleted file mode 100644
index 0d05814297..0000000000
--- a/src/lib/libcrypto/ts/ts_rsp_utils.c
+++ /dev/null
@@ -1,436 +0,0 @@
-/* $OpenBSD: ts_rsp_utils.c,v 1.4 2014/07/11 08:44:49 jsing Exp $ */
-/* 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 <openssl/err.h>
-#include <openssl/objects.h>
-#include <openssl/pkcs7.h>
-#include <openssl/ts.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(const 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, const 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;
-}
-
-const ASN1_INTEGER *
-TS_TST_INFO_get_serial(const TS_TST_INFO *a)
-{
-        return a->serial;
-}
-
-int
-TS_TST_INFO_set_time(TS_TST_INFO *a, const 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;
-}
-
-const ASN1_GENERALIZEDTIME *
-TS_TST_INFO_get_time(const 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, const 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;
-}
-
-const ASN1_INTEGER *
-TS_ACCURACY_get_seconds(const TS_ACCURACY *a)
-{
-        return a->seconds;
-}
-
-int
-TS_ACCURACY_set_millis(TS_ACCURACY *a, const 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;
-}
-
-const ASN1_INTEGER *
-TS_ACCURACY_get_millis(const TS_ACCURACY *a)
-{
-        return a->millis;
-}
-
-int
-TS_ACCURACY_set_micros(TS_ACCURACY *a, const 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;
-}
-
-const ASN1_INTEGER *
-TS_ACCURACY_get_micros(const 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(const TS_TST_INFO *a)
-{
-        return a->ordering ? 1 : 0;
-}
-
-int
-TS_TST_INFO_set_nonce(TS_TST_INFO *a, const 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;
-}
-
-const ASN1_INTEGER *
-TS_TST_INFO_get_nonce(const 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);
-}