early-access version 2698
This commit is contained in:
3
externals/libressl/crypto/cms/cms_asn1.c
vendored
3
externals/libressl/crypto/cms/cms_asn1.c
vendored
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: cms_asn1.c,v 1.18 2019/08/11 10:43:57 jsing Exp $ */
|
||||
/* $OpenBSD: cms_asn1.c,v 1.19 2022/01/14 08:16:13 tb Exp $ */
|
||||
/*
|
||||
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
@@ -1323,7 +1323,6 @@ static const ASN1_ADB_TABLE CMS_ContentInfo_adbtbl[] = {
|
||||
static const ASN1_ADB CMS_ContentInfo_adb = {
|
||||
.flags = 0,
|
||||
.offset = offsetof(CMS_ContentInfo, contentType),
|
||||
.app_items = 0,
|
||||
.tbl = CMS_ContentInfo_adbtbl,
|
||||
.tblcount = sizeof(CMS_ContentInfo_adbtbl) / sizeof(ASN1_ADB_TABLE),
|
||||
.default_tt = &cms_default_tt,
|
||||
|
4
externals/libressl/crypto/cms/cms_enc.c
vendored
4
externals/libressl/crypto/cms/cms_enc.c
vendored
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: cms_enc.c,v 1.20 2019/08/11 11:04:18 jsing Exp $ */
|
||||
/* $OpenBSD: cms_enc.c,v 1.21 2022/01/20 10:58:35 inoguchi Exp $ */
|
||||
/*
|
||||
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
@@ -151,7 +151,7 @@ cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
|
||||
|
||||
if (ec->keylen != tkeylen) {
|
||||
/* If necessary set key length */
|
||||
if (EVP_CIPHER_CTX_set_key_length(ctx, ec->keylen) <= 0) {
|
||||
if (!EVP_CIPHER_CTX_set_key_length(ctx, ec->keylen)) {
|
||||
/*
|
||||
* Only reveal failure if debugging so we don't leak information
|
||||
* which may be useful in MMA.
|
||||
|
3
externals/libressl/crypto/cms/cms_env.c
vendored
3
externals/libressl/crypto/cms/cms_env.c
vendored
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: cms_env.c,v 1.23 2019/10/04 18:03:56 tb Exp $ */
|
||||
/* $OpenBSD: cms_env.c,v 1.24 2021/09/08 14:33:02 tb Exp $ */
|
||||
/*
|
||||
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
@@ -792,6 +792,7 @@ cms_RecipientInfo_kekri_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri)
|
||||
goto err;
|
||||
}
|
||||
|
||||
freezero(ec->key, ec->keylen);
|
||||
ec->key = ukey;
|
||||
ec->keylen = ukeylen;
|
||||
|
||||
|
5
externals/libressl/crypto/cms/cms_lib.c
vendored
5
externals/libressl/crypto/cms/cms_lib.c
vendored
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: cms_lib.c,v 1.14 2019/08/12 18:13:13 jsing Exp $ */
|
||||
/* $OpenBSD: cms_lib.c,v 1.15 2021/11/01 20:53:08 tb Exp $ */
|
||||
/*
|
||||
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
@@ -59,8 +59,9 @@
|
||||
#include <openssl/bio.h>
|
||||
#include <openssl/asn1.h>
|
||||
#include <openssl/cms.h>
|
||||
#include "cms_lcl.h"
|
||||
|
||||
#include "cms_lcl.h"
|
||||
#include "x509_lcl.h"
|
||||
|
||||
CMS_ContentInfo *
|
||||
d2i_CMS_ContentInfo(CMS_ContentInfo **a, const unsigned char **in, long len)
|
||||
|
6
externals/libressl/crypto/cms/cms_pwri.c
vendored
6
externals/libressl/crypto/cms/cms_pwri.c
vendored
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: cms_pwri.c,v 1.26 2019/08/12 18:04:57 jsing Exp $ */
|
||||
/* $OpenBSD: cms_pwri.c,v 1.27 2022/01/19 13:47:44 inoguchi Exp $ */
|
||||
/*
|
||||
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
@@ -126,7 +126,9 @@ CMS_add0_recipient_password(CMS_ContentInfo *cms, int iter, int wrap_nid,
|
||||
if (encalg == NULL) {
|
||||
goto merr;
|
||||
}
|
||||
ctx = EVP_CIPHER_CTX_new();
|
||||
|
||||
if ((ctx = EVP_CIPHER_CTX_new()) == NULL)
|
||||
goto merr;
|
||||
|
||||
if (EVP_EncryptInit_ex(ctx, kekciph, NULL, NULL, NULL) <= 0) {
|
||||
CMSerror(ERR_R_EVP_LIB);
|
||||
|
Reference in New Issue
Block a user