SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-01-15 03:18:19 +00:00
parent 60ea4113ce
commit 25aa71bc5f
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
6 changed files with 56 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/libcrypto/cms/cms_enc.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: cms_enc.c,v 1.23 2023/07/08 08:26:26 beck Exp $ */
/* $OpenBSD: cms_enc.c,v 1.24 2024/01/14 18:40:24 tb Exp $ */
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
@ -61,7 +61,10 @@
#include <openssl/err.h>
#include <openssl/cms.h>
#include <openssl/rand.h>
#include "cms_local.h"
#include "evp_local.h"
#include "x509_local.h"
/* CMS EncryptedData Utilities */

7
lib/libcrypto/cms/cms_env.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: cms_env.c,v 1.26 2023/07/08 08:26:26 beck Exp $ */
/* $OpenBSD: cms_env.c,v 1.27 2024/01/14 18:40:24 tb Exp $ */
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
@ -54,16 +54,17 @@
#include <string.h>
#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/aes.h>
#include "cms_local.h"
#include "asn1/asn1_local.h"
#include "cms_local.h"
#include "evp/evp_local.h"
#include "x509_local.h"
/* CMS EnvelopedData Utilities */

6
lib/libcrypto/cms/cms_ess.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: cms_ess.c,v 1.23 2023/07/08 08:26:26 beck Exp $ */
/* $OpenBSD: cms_ess.c,v 1.24 2024/01/14 18:40:24 tb Exp $ */
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
@ -54,15 +54,15 @@
#include <string.h>
#include "cryptlib.h"
#include <openssl/asn1t.h>
#include <openssl/pem.h>
#include <openssl/rand.h>
#include <openssl/x509v3.h>
#include <openssl/err.h>
#include <openssl/cms.h>
#include "cms_local.h"
#include "cms_local.h"
#include "x509_local.h"
CMS_ReceiptRequest *
d2i_CMS_ReceiptRequest(CMS_ReceiptRequest **a, const unsigned char **in, long len)

3
lib/libcrypto/cms/cms_pwri.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: cms_pwri.c,v 1.30 2023/12/20 18:38:19 tb Exp $ */
/* $OpenBSD: cms_pwri.c,v 1.31 2024/01/14 18:40:24 tb Exp $ */
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
@ -66,6 +66,7 @@
#include "cms_local.h"
#include "evp_local.h"
#include "x509_local.h"
int
CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, unsigned char *pass,