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

1 files changed, 0 insertions, 174 deletions

diff --git a/src/lib/libcrypto/asn1/x_spki.c b/src/lib/libcrypto/asn1/x_spki.c
deleted file mode 100644
index 2aa860feb9..0000000000
--- a/src/lib/libcrypto/asn1/x_spki.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* $OpenBSD: x_spki.c,v 1.11 2015/02/11 04:00:39 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.]
- */
-
- /* This module was send to me my Pat Richards <patr@x509.com> who
-  * wrote it.  It is under my Copyright with his permission
-  */
-
-#include <stdio.h>
-
-#include <openssl/x509.h>
-#include <openssl/asn1t.h>
-
-static const ASN1_TEMPLATE NETSCAPE_SPKAC_seq_tt[] = {
-        {
-                .offset = offsetof(NETSCAPE_SPKAC, pubkey),
-                .field_name = "pubkey",
-                .item = &X509_PUBKEY_it,
-        },
-        {
-                .offset = offsetof(NETSCAPE_SPKAC, challenge),
-                .field_name = "challenge",
-                .item = &ASN1_IA5STRING_it,
-        },
-};
-
-const ASN1_ITEM NETSCAPE_SPKAC_it = {
-        .itype = ASN1_ITYPE_SEQUENCE,
-        .utype = V_ASN1_SEQUENCE,
-        .templates = NETSCAPE_SPKAC_seq_tt,
-        .tcount = sizeof(NETSCAPE_SPKAC_seq_tt) / sizeof(ASN1_TEMPLATE),
-        .size = sizeof(NETSCAPE_SPKAC),
-        .sname = "NETSCAPE_SPKAC",
-};
-
-
-NETSCAPE_SPKAC *
-d2i_NETSCAPE_SPKAC(NETSCAPE_SPKAC **a, const unsigned char **in, long len)
-{
-        return (NETSCAPE_SPKAC *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
-            &NETSCAPE_SPKAC_it);
-}
-
-int
-i2d_NETSCAPE_SPKAC(NETSCAPE_SPKAC *a, unsigned char **out)
-{
-        return ASN1_item_i2d((ASN1_VALUE *)a, out, &NETSCAPE_SPKAC_it);
-}
-
-NETSCAPE_SPKAC *
-NETSCAPE_SPKAC_new(void)
-{
-        return (NETSCAPE_SPKAC *)ASN1_item_new(&NETSCAPE_SPKAC_it);
-}
-
-void
-NETSCAPE_SPKAC_free(NETSCAPE_SPKAC *a)
-{
-        ASN1_item_free((ASN1_VALUE *)a, &NETSCAPE_SPKAC_it);
-}
-
-static const ASN1_TEMPLATE NETSCAPE_SPKI_seq_tt[] = {
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(NETSCAPE_SPKI, spkac),
-                .field_name = "spkac",
-                .item = &NETSCAPE_SPKAC_it,
-        },
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(NETSCAPE_SPKI, sig_algor),
-                .field_name = "sig_algor",
-                .item = &X509_ALGOR_it,
-        },
-        {
-                .flags = 0,
-                .tag = 0,
-                .offset = offsetof(NETSCAPE_SPKI, signature),
-                .field_name = "signature",
-                .item = &ASN1_BIT_STRING_it,
-        },
-};
-
-const ASN1_ITEM NETSCAPE_SPKI_it = {
-        .itype = ASN1_ITYPE_SEQUENCE,
-        .utype = V_ASN1_SEQUENCE,
-        .templates = NETSCAPE_SPKI_seq_tt,
-        .tcount = sizeof(NETSCAPE_SPKI_seq_tt) / sizeof(ASN1_TEMPLATE),
-        .funcs = NULL,
-        .size = sizeof(NETSCAPE_SPKI),
-        .sname = "NETSCAPE_SPKI",
-};
-
-
-NETSCAPE_SPKI *
-d2i_NETSCAPE_SPKI(NETSCAPE_SPKI **a, const unsigned char **in, long len)
-{
-        return (NETSCAPE_SPKI *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
-            &NETSCAPE_SPKI_it);
-}
-
-int
-i2d_NETSCAPE_SPKI(NETSCAPE_SPKI *a, unsigned char **out)
-{
-        return ASN1_item_i2d((ASN1_VALUE *)a, out, &NETSCAPE_SPKI_it);
-}
-
-NETSCAPE_SPKI *
-NETSCAPE_SPKI_new(void)
-{
-        return (NETSCAPE_SPKI *)ASN1_item_new(&NETSCAPE_SPKI_it);
-}
-
-void
-NETSCAPE_SPKI_free(NETSCAPE_SPKI *a)
-{
-        ASN1_item_free((ASN1_VALUE *)a, &NETSCAPE_SPKI_it);
-}