| Index: openssl/crypto/pkcs7/pk7_mime.c
 | 
| diff --git a/openssl/crypto/pkcs7/pk7_mime.c b/openssl/crypto/pkcs7/pk7_mime.c
 | 
| deleted file mode 100644
 | 
| index 938f79a646cb256f3df10ac45189f7f7e407144c..0000000000000000000000000000000000000000
 | 
| --- a/openssl/crypto/pkcs7/pk7_mime.c
 | 
| +++ /dev/null
 | 
| @@ -1,97 +0,0 @@
 | 
| -/* pk7_mime.c */
 | 
| -/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
 | 
| - * project.
 | 
| - */
 | 
| -/* ====================================================================
 | 
| - * Copyright (c) 1999-2005 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.
 | 
| - * ====================================================================
 | 
| - *
 | 
| - */
 | 
| -
 | 
| -#include <stdio.h>
 | 
| -#include <ctype.h>
 | 
| -#include "cryptlib.h"
 | 
| -#include <openssl/rand.h>
 | 
| -#include <openssl/x509.h>
 | 
| -#include <openssl/asn1.h>
 | 
| -
 | 
| -/* PKCS#7 wrappers round generalised stream and MIME routines */
 | 
| -
 | 
| -int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
 | 
| -	{
 | 
| -	return i2d_ASN1_bio_stream(out, (ASN1_VALUE *)p7, in, flags,
 | 
| -					ASN1_ITEM_rptr(PKCS7));
 | 
| -	}
 | 
| -
 | 
| -int PEM_write_bio_PKCS7_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
 | 
| -	{
 | 
| -	return PEM_write_bio_ASN1_stream(out, (ASN1_VALUE *) p7, in, flags,
 | 
| -						"PKCS7",
 | 
| -						ASN1_ITEM_rptr(PKCS7));
 | 
| -	}
 | 
| -
 | 
| -int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
 | 
| -	{
 | 
| -	STACK_OF(X509_ALGOR) *mdalgs;
 | 
| -	int ctype_nid = OBJ_obj2nid(p7->type);
 | 
| -	if (ctype_nid == NID_pkcs7_signed)
 | 
| -		mdalgs = p7->d.sign->md_algs;
 | 
| -	else
 | 
| -		mdalgs = NULL;
 | 
| -
 | 
| -	flags ^= SMIME_OLDMIME;
 | 
| -
 | 
| -
 | 
| -	return SMIME_write_ASN1(bio, (ASN1_VALUE *)p7, data, flags,
 | 
| -					ctype_nid, NID_undef, mdalgs,
 | 
| -					ASN1_ITEM_rptr(PKCS7));	
 | 
| -	}
 | 
| -
 | 
| -PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont)
 | 
| -	{
 | 
| -	return (PKCS7 *)SMIME_read_ASN1(bio, bcont, ASN1_ITEM_rptr(PKCS7));
 | 
| -	}
 | 
| 
 |