From 4fc1a5885d3a21e4c54c535484c12c48c78b585d Mon Sep 17 00:00:00 2001 From: tb Date: Wed, 26 Apr 2023 14:27:40 +0000 Subject: [PATCH] Remove the now unused bio_pk7.c --- lib/libcrypto/Makefile | 3 +- lib/libcrypto/pkcs7/bio_pk7.c | 63 ----------------------------------- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 lib/libcrypto/pkcs7/bio_pk7.c diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index 551fa4bf3cf..9ebb2e1bdcf 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.119 2023/04/26 08:25:37 tb Exp $ +# $OpenBSD: Makefile,v 1.120 2023/04/26 14:27:40 tb Exp $ LIB= crypto LIBREBUILD=y @@ -561,7 +561,6 @@ SRCS+= p12_utl.c SRCS+= pk12err.c # pkcs7/ -SRCS+= bio_pk7.c SRCS+= pk7_asn1.c SRCS+= pk7_attr.c SRCS+= pk7_doit.c diff --git a/lib/libcrypto/pkcs7/bio_pk7.c b/lib/libcrypto/pkcs7/bio_pk7.c deleted file mode 100644 index c321bdacd9c..00000000000 --- a/lib/libcrypto/pkcs7/bio_pk7.c +++ /dev/null @@ -1,63 +0,0 @@ -/* $OpenBSD: bio_pk7.c,v 1.9 2023/04/26 14:25:58 tb Exp $ */ -/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL - * project. - */ -/* ==================================================================== - * Copyright (c) 2008 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 - -#include -#include -#include - -#include "asn1_local.h" - -/* Streaming encode support for PKCS#7 */ -- 2.20.1