Merge tag 'efi-2020-07-rc2-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

Pull request for UEFI sub-system for efi-2020-07-rc2-2

This patch contains error corrections and code simplifications for the UEFI
sub-system.

1 files changed, 0 insertions, 65 deletions

diff --git a/lib/crypto/pkcs7_parser.h b/lib/crypto/pkcs7_parser.h
deleted file mode 100644
index 6565fdc2d4c..00000000000
--- a/lib/crypto/pkcs7_parser.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/* PKCS#7 crypto data parser internal definitions
- *
- * Copyright (C) 2012 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- */
-
-#include <linux/oid_registry.h>
-#include <crypto/pkcs7.h>
-#include "x509_parser.h"
-
-#define kenter(FMT, ...) \
-	pr_devel("==> %s("FMT")\n", __func__, ##__VA_ARGS__)
-#define kleave(FMT, ...) \
-	pr_devel("<== %s()"FMT"\n", __func__, ##__VA_ARGS__)
-
-struct pkcs7_signed_info {
-	struct pkcs7_signed_info *next;
-	struct x509_certificate *signer; /* Signing certificate (in msg->certs) */
-	unsigned	index;
-	bool		unsupported_crypto;	/* T if not usable due to missing crypto */
-	bool		blacklisted;
-
-	/* Message digest - the digest of the Content Data (or NULL) */
-	const void	*msgdigest;
-	unsigned	msgdigest_len;
-
-	/* Authenticated Attribute data (or NULL) */
-	unsigned	authattrs_len;
-	const void	*authattrs;
-	unsigned long	aa_set;
-#define	sinfo_has_content_type		0
-#define	sinfo_has_signing_time		1
-#define	sinfo_has_message_digest	2
-#define sinfo_has_smime_caps		3
-#define	sinfo_has_ms_opus_info		4
-#define	sinfo_has_ms_statement_type	5
-	time64_t	signing_time;
-
-	/* Message signature.
-	 *
-	 * This contains the generated digest of _either_ the Content Data or
-	 * the Authenticated Attributes [RFC2315 9.3].  If the latter, one of
-	 * the attributes contains the digest of the the Content Data within
-	 * it.
-	 *
-	 * THis also contains the issuing cert serial number and issuer's name
-	 * [PKCS#7 or CMS ver 1] or issuing cert's SKID [CMS ver 3].
-	 */
-	struct public_key_signature *sig;
-};
-
-struct pkcs7_message {
-	struct x509_certificate *certs;	/* Certificate list */
-	struct x509_certificate *crl;	/* Revocation list */
-	struct pkcs7_signed_info *signed_infos;
-	u8		version;	/* Version of cert (1 -> PKCS#7 or CMS; 3 -> CMS) */
-	bool		have_authattrs;	/* T if have authattrs */
-
-	/* Content Data (or NULL) */
-	enum OID	data_type;	/* Type of Data */
-	size_t		data_len;	/* Length of Data */
-	size_t		data_hdrlen;	/* Length of Data ASN.1 header */
-	const void	*data;		/* Content Data (or 0) */
-};