From ed3760bf4be4a96a89233fb8f8b84a0d44725862 Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Sun, 2 Aug 2015 21:54:22 +0000 Subject: This commit was manufactured by cvs2git to create tag 'OPENBSD_5_8_BASE'. --- src/lib/libcrypto/asn1/x_attrib.c | 198 -------------------------------------- 1 file changed, 198 deletions(-) delete mode 100644 src/lib/libcrypto/asn1/x_attrib.c (limited to 'src/lib/libcrypto/asn1/x_attrib.c') diff --git a/src/lib/libcrypto/asn1/x_attrib.c b/src/lib/libcrypto/asn1/x_attrib.c deleted file mode 100644 index bb74a1b6c7..0000000000 --- a/src/lib/libcrypto/asn1/x_attrib.c +++ /dev/null @@ -1,198 +0,0 @@ -/* $OpenBSD: x_attrib.c,v 1.13 2015/02/14 14:56:45 jsing Exp $ */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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 acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS 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 AUTHOR OR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include - -#include -#include -#include - -/* X509_ATTRIBUTE: this has the following form: - * - * typedef struct x509_attributes_st - * { - * ASN1_OBJECT *object; - * int single; - * union { - * char *ptr; - * STACK_OF(ASN1_TYPE) *set; - * ASN1_TYPE *single; - * } value; - * } X509_ATTRIBUTE; - * - * this needs some extra thought because the CHOICE type is - * merged with the main structure and because the value can - * be anything at all we *must* try the SET OF first because - * the ASN1_ANY type will swallow anything including the whole - * SET OF structure. - */ - -static const ASN1_TEMPLATE X509_ATTRIBUTE_SET_ch_tt[] = { - { - .flags = ASN1_TFLG_SET_OF, - .tag = 0, - .offset = offsetof(X509_ATTRIBUTE, value.set), - .field_name = "value.set", - .item = &ASN1_ANY_it, - }, - { - .flags = 0, - .tag = 0, - .offset = offsetof(X509_ATTRIBUTE, value.single), - .field_name = "value.single", - .item = &ASN1_ANY_it, - }, -}; - -const ASN1_ITEM X509_ATTRIBUTE_SET_it = { - .itype = ASN1_ITYPE_CHOICE, - .utype = offsetof(X509_ATTRIBUTE, single), - .templates = X509_ATTRIBUTE_SET_ch_tt, - .tcount = sizeof(X509_ATTRIBUTE_SET_ch_tt) / sizeof(ASN1_TEMPLATE), - .funcs = NULL, - .size = sizeof(X509_ATTRIBUTE), - .sname = "X509_ATTRIBUTE", -}; - -static const ASN1_TEMPLATE X509_ATTRIBUTE_seq_tt[] = { - { - .flags = 0, - .tag = 0, - .offset = offsetof(X509_ATTRIBUTE, object), - .field_name = "object", - .item = &ASN1_OBJECT_it, - }, - /* CHOICE type merged with parent */ - { - .flags = 0 | ASN1_TFLG_COMBINE, - .tag = 0, - .offset = 0, - .field_name = NULL, - .item = &X509_ATTRIBUTE_SET_it, - }, -}; - -const ASN1_ITEM X509_ATTRIBUTE_it = { - .itype = ASN1_ITYPE_SEQUENCE, - .utype = V_ASN1_SEQUENCE, - .templates = X509_ATTRIBUTE_seq_tt, - .tcount = sizeof(X509_ATTRIBUTE_seq_tt) / sizeof(ASN1_TEMPLATE), - .funcs = NULL, - .size = sizeof(X509_ATTRIBUTE), - .sname = "X509_ATTRIBUTE", -}; - - -X509_ATTRIBUTE * -d2i_X509_ATTRIBUTE(X509_ATTRIBUTE **a, const unsigned char **in, long len) -{ - return (X509_ATTRIBUTE *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, - &X509_ATTRIBUTE_it); -} - -int -i2d_X509_ATTRIBUTE(X509_ATTRIBUTE *a, unsigned char **out) -{ - return ASN1_item_i2d((ASN1_VALUE *)a, out, &X509_ATTRIBUTE_it); -} - -X509_ATTRIBUTE * -X509_ATTRIBUTE_new(void) -{ - return (X509_ATTRIBUTE *)ASN1_item_new(&X509_ATTRIBUTE_it); -} - -void -X509_ATTRIBUTE_free(X509_ATTRIBUTE *a) -{ - ASN1_item_free((ASN1_VALUE *)a, &X509_ATTRIBUTE_it); -} - -X509_ATTRIBUTE * -X509_ATTRIBUTE_dup(X509_ATTRIBUTE *x) -{ - return ASN1_item_dup(&X509_ATTRIBUTE_it, x); -} - -X509_ATTRIBUTE * -X509_ATTRIBUTE_create(int nid, int atrtype, void *value) -{ - X509_ATTRIBUTE *ret = NULL; - ASN1_TYPE *val = NULL; - - if ((ret = X509_ATTRIBUTE_new()) == NULL) - return (NULL); - ret->object = OBJ_nid2obj(nid); - ret->single = 0; - if ((ret->value.set = sk_ASN1_TYPE_new_null()) == NULL) - goto err; - if ((val = ASN1_TYPE_new()) == NULL) - goto err; - if (!sk_ASN1_TYPE_push(ret->value.set, val)) - goto err; - - ASN1_TYPE_set(val, atrtype, value); - return (ret); - -err: - if (ret != NULL) - X509_ATTRIBUTE_free(ret); - if (val != NULL) - ASN1_TYPE_free(val); - return (NULL); -} -- cgit v1.2.3-55-g6feb