mirror of
https://github.com/opnsense/src.git
synced 2026-06-07 15:52:40 -04:00
e4520c8bd1
Summary: Release notes can be found at https://www.openssl.org/news/openssl-3.0-notes.html . Obtained from: https://www.openssl.org/source/openssl-3.0.8.tar.gz Differential Revision: https://reviews.freebsd.org/D38835 Test Plan: ``` $ git status On branch vendor/openssl-3.0 nothing to commit, working tree clean $ (cd ..; fetch http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz.asc) openssl-3.0.8.tar.gz 14 MB 4507 kBps 04s openssl-3.0.8.tar.gz.asc 833 B 10 MBps 00s $ set | egrep '(XLIST|OSSLVER)=' OSSLVER=3.0.8 XLIST=FREEBSD-Xlist $ gpg --list-keys /home/ngie/.gnupg/pubring.kbx ----------------------------- pub rsa4096 2014-10-04 [SC] 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C uid [ unknown] Richard Levitte <richard@levitte.org> uid [ unknown] Richard Levitte <levitte@lp.se> uid [ unknown] Richard Levitte <levitte@openssl.org> sub rsa4096 2014-10-04 [E] $ gpg --verify openssl-${OSSLVER}.tar.gz.asc openssl-${OSSLVER}.tar.gz gpg: Signature made Tue Feb 7 05:43:55 2023 PST gpg: using RSA key 7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C gpg: Good signature from "Richard Levitte <richard@levitte.org>" [unknown] gpg: aka "Richard Levitte <levitte@lp.se>" [unknown] gpg: aka "Richard Levitte <levitte@openssl.org>" [unknown] gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Primary key fingerprint: 7953 AC1F BC3D C8B3 B292 393E D5E9 E43F 7DF9 EE8C $ (cd vendor.checkout/; git status; find . -type f -or -type l | cut -c 3- | sort > ../old) On branch vendor/openssl-3.0 nothing to commit, working tree clean $ tar -x -X $XLIST -f ../openssl-${OSSLVER}.tar.gz -C .. $ rsync --exclude FREEBSD.* --delete -avzz ../openssl-${OSSLVER}/* . $ cat .git gitdir: /home/ngie/git/freebsd-src/.git/worktrees/vendor.checkout $ diff -arq ../openssl-3.0.8 . Only in .: .git Only in .: FREEBSD-Xlist Only in .: FREEBSD-upgrade $ git status FREEBSD* On branch vendor/openssl-3.0 nothing to commit, working tree clean $ ``` Reviewers: emaste, jkim Subscribers: imp, andrew, dab Differential Revision: https://reviews.freebsd.org/D38835
83 lines
2.3 KiB
C
83 lines
2.3 KiB
C
/*
|
|
* Copyright 2008-2021 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include "internal/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 *ossl_cms_CompressedData_create(int comp_nid,
|
|
OSSL_LIB_CTX *libctx,
|
|
const char *propq)
|
|
{
|
|
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) {
|
|
ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
|
|
return NULL;
|
|
}
|
|
cms = CMS_ContentInfo_new_ex(libctx, propq);
|
|
if (cms == NULL)
|
|
return NULL;
|
|
|
|
cd = M_ASN1_new_of(CMS_CompressedData);
|
|
|
|
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 *ossl_cms_CompressedData_init_bio(const CMS_ContentInfo *cms)
|
|
{
|
|
CMS_CompressedData *cd;
|
|
const ASN1_OBJECT *compoid;
|
|
|
|
if (OBJ_obj2nid(cms->contentType) != NID_id_smime_ct_compressedData) {
|
|
ERR_raise(ERR_LIB_CMS, 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) {
|
|
ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
|
|
return NULL;
|
|
}
|
|
return BIO_new(BIO_f_zlib());
|
|
}
|
|
|
|
#endif
|