| Index: openssl/crypto/asn1/x_algor.c
|
| diff --git a/openssl/crypto/asn1/x_algor.c b/openssl/crypto/asn1/x_algor.c
|
| deleted file mode 100644
|
| index 274e456c738296480a58b4f46288001add228234..0000000000000000000000000000000000000000
|
| --- a/openssl/crypto/asn1/x_algor.c
|
| +++ /dev/null
|
| @@ -1,144 +0,0 @@
|
| -/* x_algor.c */
|
| -/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
| - * project 2000.
|
| - */
|
| -/* ====================================================================
|
| - * Copyright (c) 2000 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 <stddef.h>
|
| -#include <openssl/x509.h>
|
| -#include <openssl/asn1.h>
|
| -#include <openssl/asn1t.h>
|
| -
|
| -ASN1_SEQUENCE(X509_ALGOR) = {
|
| - ASN1_SIMPLE(X509_ALGOR, algorithm, ASN1_OBJECT),
|
| - ASN1_OPT(X509_ALGOR, parameter, ASN1_ANY)
|
| -} ASN1_SEQUENCE_END(X509_ALGOR)
|
| -
|
| -ASN1_ITEM_TEMPLATE(X509_ALGORS) =
|
| - ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, algorithms, X509_ALGOR)
|
| -ASN1_ITEM_TEMPLATE_END(X509_ALGORS)
|
| -
|
| -IMPLEMENT_ASN1_FUNCTIONS(X509_ALGOR)
|
| -IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_ALGORS, X509_ALGORS, X509_ALGORS)
|
| -IMPLEMENT_ASN1_DUP_FUNCTION(X509_ALGOR)
|
| -
|
| -IMPLEMENT_STACK_OF(X509_ALGOR)
|
| -IMPLEMENT_ASN1_SET_OF(X509_ALGOR)
|
| -
|
| -int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval)
|
| - {
|
| - if (!alg)
|
| - return 0;
|
| - if (ptype != V_ASN1_UNDEF)
|
| - {
|
| - if (alg->parameter == NULL)
|
| - alg->parameter = ASN1_TYPE_new();
|
| - if (alg->parameter == NULL)
|
| - return 0;
|
| - }
|
| - if (alg)
|
| - {
|
| - if (alg->algorithm)
|
| - ASN1_OBJECT_free(alg->algorithm);
|
| - alg->algorithm = aobj;
|
| - }
|
| - if (ptype == 0)
|
| - return 1;
|
| - if (ptype == V_ASN1_UNDEF)
|
| - {
|
| - if (alg->parameter)
|
| - {
|
| - ASN1_TYPE_free(alg->parameter);
|
| - alg->parameter = NULL;
|
| - }
|
| - }
|
| - else
|
| - ASN1_TYPE_set(alg->parameter, ptype, pval);
|
| - return 1;
|
| - }
|
| -
|
| -void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval,
|
| - X509_ALGOR *algor)
|
| - {
|
| - if (paobj)
|
| - *paobj = algor->algorithm;
|
| - if (pptype)
|
| - {
|
| - if (algor->parameter == NULL)
|
| - {
|
| - *pptype = V_ASN1_UNDEF;
|
| - return;
|
| - }
|
| - else
|
| - *pptype = algor->parameter->type;
|
| - if (ppval)
|
| - *ppval = algor->parameter->value.ptr;
|
| - }
|
| - }
|
| -
|
| -/* Set up an X509_ALGOR DigestAlgorithmIdentifier from an EVP_MD */
|
| -
|
| -void X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md)
|
| - {
|
| - int param_type;
|
| -
|
| - if (md->flags & EVP_MD_FLAG_DIGALGID_ABSENT)
|
| - param_type = V_ASN1_UNDEF;
|
| - else
|
| - param_type = V_ASN1_NULL;
|
| -
|
| - X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_type(md)), param_type, NULL);
|
| -
|
| - }
|
|
|