Unifdef ZLIB

This has long been unused code and compilation with -DZLIB was broken
for a long time after BIO was made opaque.

ok jsing

3 files changed, 2 insertions, 186 deletions

diff --git a/src/lib/libcrypto/cms/cms_cd.c b/src/lib/libcrypto/cms/cms_cd.c
deleted file mode 100644
index 3ecf801bc8..0000000000
--- a/src/lib/libcrypto/cms/cms_cd.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* $OpenBSD: cms_cd.c,v 1.16 2022/11/26 16:08:51 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 "cryptlib.h"
-#include <openssl/asn1t.h>
-#include <openssl/pem.h>
-#include <openssl/x509v3.h>
-#include <openssl/err.h>
-#include <openssl/cms.h>
-#include <openssl/bio.h>
-#include <openssl/comp.h>
-#include "cms_local.h"
-
-#ifdef ZLIB
-
-/* CMS CompressedData Utilities */
-
-CMS_ContentInfo *
-cms_CompressedData_create(int comp_nid)
-{
-        CMS_ContentInfo *cms;
-        CMS_CompressedData *cd;
-
-        /*
-         * Will need something cleverer if there is ever more than one
-         * compression algorithm or parameters have some meaning...
-         */
-        if (comp_nid != NID_zlib_compression) {
-                CMSerror(CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
-                return NULL;
-        }
-        cms = CMS_ContentInfo_new();
-        if (cms == NULL)
-                return NULL;
-
-        cd = (CMS_CompressedData *)ASN1_item_new(&CMS_CompressedData_it);
-
-        if (cd == NULL)
-                goto err;
-
-        cms->contentType = OBJ_nid2obj(NID_id_smime_ct_compressedData);
-        cms->d.compressedData = cd;
-
-        cd->version = 0;
-
-        X509_ALGOR_set0(cd->compressionAlgorithm,
-                                OBJ_nid2obj(NID_zlib_compression), V_ASN1_UNDEF, NULL);
-
-        cd->encapContentInfo->eContentType = OBJ_nid2obj(NID_pkcs7_data);
-
-        return cms;
-
- err:
-        CMS_ContentInfo_free(cms);
-        return NULL;
-}
-
-BIO *
-cms_CompressedData_init_bio(CMS_ContentInfo *cms)
-{
-        CMS_CompressedData *cd;
-        const ASN1_OBJECT *compoid;
-
-        if (OBJ_obj2nid(cms->contentType) != NID_id_smime_ct_compressedData) {
-                CMSerror(CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA);
-                return NULL;
-        }
-        cd = cms->d.compressedData;
-        X509_ALGOR_get0(&compoid, NULL, NULL, cd->compressionAlgorithm);
-        if (OBJ_obj2nid(compoid) != NID_zlib_compression) {
-                CMSerror(CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
-                return NULL;
-        }
-        return BIO_new(BIO_f_zlib());
-}
-
-#endif
diff --git a/src/lib/libcrypto/cms/cms_lib.c b/src/lib/libcrypto/cms/cms_lib.c
index ee9385910f..f8d950de03 100644
--- a/src/lib/libcrypto/cms/cms_lib.c
+++ b/src/lib/libcrypto/cms/cms_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_lib.c,v 1.16 2022/11/26 16:08:51 tb Exp $ */
+/* $OpenBSD: cms_lib.c,v 1.17 2023/06/11 05:35:43 tb Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -160,11 +160,6 @@ CMS_dataInit(CMS_ContentInfo *cms, BIO *icont)
         case NID_pkcs7_digest:
                 cmsbio = cms_DigestedData_init_bio(cms);
                 break;
-#ifdef ZLIB
-        case NID_id_smime_ct_compressedData:
-                cmsbio = cms_CompressedData_init_bio(cms);
-                break;
-#endif
 
         case NID_pkcs7_encrypted:
                 cmsbio = cms_EncryptedData_init_bio(cms);
diff --git a/src/lib/libcrypto/cms/cms_smime.c b/src/lib/libcrypto/cms/cms_smime.c
index d21ff124d7..e9001d0f01 100644
--- a/src/lib/libcrypto/cms/cms_smime.c
+++ b/src/lib/libcrypto/cms/cms_smime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_smime.c,v 1.25 2022/11/26 16:08:51 tb Exp $ */
+/* $OpenBSD: cms_smime.c,v 1.26 2023/06/11 05:35:43 tb Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -868,55 +868,6 @@ CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags)
         return ret;
 }
 
-#ifdef ZLIB
-
-int
-CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out, unsigned int flags)
-{
-        BIO *cont;
-        int r;
-
-        if (OBJ_obj2nid(CMS_get0_type(cms)) != NID_id_smime_ct_compressedData) {
-                CMSerror(CMS_R_TYPE_NOT_COMPRESSED_DATA);
-                return 0;
-        }
-
-        if (!dcont && !check_content(cms))
-                return 0;
-
-        cont = CMS_dataInit(cms, dcont);
-        if (!cont)
-                return 0;
-        r = cms_copy_content(out, cont, flags);
-        do_free_upto(cont, dcont);
-
-        return r;
-}
-
-CMS_ContentInfo *
-CMS_compress(BIO *in, int comp_nid, unsigned int flags)
-{
-        CMS_ContentInfo *cms;
-
-        if (comp_nid <= 0)
-                comp_nid = NID_zlib_compression;
-        cms = cms_CompressedData_create(comp_nid);
-        if (!cms)
-                return NULL;
-
-        if (!(flags & CMS_DETACHED))
-                CMS_set_detached(cms, 0);
-
-        if ((flags & CMS_STREAM) || CMS_final(cms, in, NULL, flags))
-                return cms;
-
-        CMS_ContentInfo_free(cms);
-
-        return NULL;
-}
-
-#else
-
 int
 CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out, unsigned int flags)
 {
@@ -930,5 +881,3 @@ CMS_compress(BIO *in, int comp_nid, unsigned int flags)
         CMSerror(CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
         return NULL;
 }
-
-#endif