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

1 files changed, 0 insertions, 168 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_utl.c b/src/lib/libcrypto/pkcs12/p12_utl.c
deleted file mode 100644
index b60d4d020c..0000000000
--- a/src/lib/libcrypto/pkcs12/p12_utl.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* $OpenBSD: p12_utl.c,v 1.12 2014/07/11 08:44:49 jsing Exp $ */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 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 <string.h>
-
-#include <openssl/pkcs12.h>
-
-/* Cheap and nasty Unicode stuff */
-
-unsigned char *
-OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen)
-{
-        int ulen, i;
-        unsigned char *unitmp;
-
-        if (asclen == -1)
-                asclen = strlen(asc);
-        ulen = asclen * 2 + 2;
-        if (!(unitmp = malloc(ulen)))
-                return NULL;
-        for (i = 0; i < ulen - 2; i += 2) {
-                unitmp[i] = 0;
-                unitmp[i + 1] = asc[i >> 1];
-        }
-        /* Make result double null terminated */
-        unitmp[ulen - 2] = 0;
-        unitmp[ulen - 1] = 0;
-        if (unilen)
-                *unilen = ulen;
-        if (uni)
-                *uni = unitmp;
-        return unitmp;
-}
-
-char *
-OPENSSL_uni2asc(unsigned char *uni, int unilen)
-{
-        int asclen, i;
-        char *asctmp;
-
-        asclen = unilen / 2;
-        /* If no terminating zero allow for one */
-        if (!unilen || uni[unilen - 1])
-                asclen++;
-        uni++;
-        if (!(asctmp = malloc(asclen)))
-                return NULL;
-        for (i = 0; i < unilen; i += 2)
-                asctmp[i >> 1] = uni[i];
-        asctmp[asclen - 1] = 0;
-        return asctmp;
-}
-
-int
-i2d_PKCS12_bio(BIO *bp, PKCS12 *p12)
-{
-        return ASN1_item_i2d_bio(ASN1_ITEM_rptr(PKCS12), bp, p12);
-}
-
-int
-i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
-{
-        return ASN1_item_i2d_fp(ASN1_ITEM_rptr(PKCS12), fp, p12);
-}
-
-PKCS12 *
-d2i_PKCS12_bio(BIO *bp, PKCS12 **p12)
-{
-        return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS12), bp, p12);
-}
-
-PKCS12 *
-d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
-{
-            return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS12), fp, p12);
-}
-
-PKCS12_SAFEBAG *
-PKCS12_x5092certbag(X509 *x509)
-{
-        return PKCS12_item_pack_safebag(x509, ASN1_ITEM_rptr(X509),
-            NID_x509Certificate, NID_certBag);
-}
-
-PKCS12_SAFEBAG *
-PKCS12_x509crl2certbag(X509_CRL *crl)
-{
-        return PKCS12_item_pack_safebag(crl, ASN1_ITEM_rptr(X509_CRL),
-            NID_x509Crl, NID_crlBag);
-}
-
-X509 *
-PKCS12_certbag2x509(PKCS12_SAFEBAG *bag)
-{
-        if (M_PKCS12_bag_type(bag) != NID_certBag)
-                return NULL;
-        if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate)
-                return NULL;
-        return ASN1_item_unpack(bag->value.bag->value.octet,
-            ASN1_ITEM_rptr(X509));
-}
-
-X509_CRL *
-PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag)
-{
-        if (M_PKCS12_bag_type(bag) != NID_crlBag)
-                return NULL;
-        if (M_PKCS12_cert_bag_type(bag) != NID_x509Crl)
-                return NULL;
-        return ASN1_item_unpack(bag->value.bag->value.octet,
-            ASN1_ITEM_rptr(X509_CRL));
-}