early-access version 2698
This commit is contained in:
3
externals/libressl/crypto/pkcs7/pk7_asn1.c
vendored
3
externals/libressl/crypto/pkcs7/pk7_asn1.c
vendored
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: pk7_asn1.c,v 1.12 2015/07/25 15:33:06 jsing Exp $ */
|
||||
/* $OpenBSD: pk7_asn1.c,v 1.13 2022/01/14 08:16:13 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project 2000.
|
||||
*/
|
||||
@@ -146,7 +146,6 @@ static const ASN1_ADB_TABLE PKCS7_adbtbl[] = {
|
||||
static const ASN1_ADB PKCS7_adb = {
|
||||
.flags = 0,
|
||||
.offset = offsetof(PKCS7, type),
|
||||
.app_items = 0,
|
||||
.tbl = PKCS7_adbtbl,
|
||||
.tblcount = sizeof(PKCS7_adbtbl) / sizeof(ASN1_ADB_TABLE),
|
||||
.default_tt = &p7default_tt,
|
||||
|
||||
5
externals/libressl/crypto/pkcs7/pk7_doit.c
vendored
5
externals/libressl/crypto/pkcs7/pk7_doit.c
vendored
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: pk7_doit.c,v 1.44 2019/10/04 18:03:55 tb Exp $ */
|
||||
/* $OpenBSD: pk7_doit.c,v 1.46 2021/12/12 21:30:14 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -65,6 +65,9 @@
|
||||
#include <openssl/x509.h>
|
||||
#include <openssl/x509v3.h>
|
||||
|
||||
#include "evp_locl.h"
|
||||
#include "x509_lcl.h"
|
||||
|
||||
static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
|
||||
void *value);
|
||||
static ASN1_TYPE *get_attribute(STACK_OF(X509_ATTRIBUTE) *sk, int nid);
|
||||
|
||||
4
externals/libressl/crypto/pkcs7/pk7_lib.c
vendored
4
externals/libressl/crypto/pkcs7/pk7_lib.c
vendored
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: pk7_lib.c,v 1.21 2020/01/21 10:18:52 inoguchi Exp $ */
|
||||
/* $OpenBSD: pk7_lib.c,v 1.23 2021/12/12 21:30:14 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -63,6 +63,8 @@
|
||||
#include <openssl/x509.h>
|
||||
|
||||
#include "asn1_locl.h"
|
||||
#include "evp_locl.h"
|
||||
#include "x509_lcl.h"
|
||||
|
||||
long
|
||||
PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
|
||||
|
||||
4
externals/libressl/crypto/pkcs7/pk7_smime.c
vendored
4
externals/libressl/crypto/pkcs7/pk7_smime.c
vendored
@@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: pk7_smime.c,v 1.22 2017/01/29 17:49:23 beck Exp $ */
|
||||
/* $OpenBSD: pk7_smime.c,v 1.23 2021/11/01 20:53:08 tb Exp $ */
|
||||
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
|
||||
* project.
|
||||
*/
|
||||
@@ -64,6 +64,8 @@
|
||||
#include <openssl/x509.h>
|
||||
#include <openssl/x509v3.h>
|
||||
|
||||
#include "x509_lcl.h"
|
||||
|
||||
static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si);
|
||||
|
||||
PKCS7 *
|
||||
|
||||
Reference in New Issue
Block a user