blob: 1bedb4f753ac111462866f18172a2ddcd8715230 [file] [log] [blame]
William A. Kennington IIIb95905d2021-06-02 12:40:56 -07001From 14fab0772db19297c82dd1b8612c9335369dce41 Mon Sep 17 00:00:00 2001
2From: Alexander Vickberg <wickbergster@gmail.com>
3Date: Mon, 17 May 2021 17:54:13 +0200
4Subject: [PATCH] Prepare for CVE-2021-30004.patch
5
6Without this building fails for CONFIG_TLS=internal
7
8Signed-off-by: Alexander Vickberg <wickbergster@gmail.com>
9---
10 src/tls/asn1.h | 6 ++++++
11 src/utils/includes.h | 1 +
12 2 files changed, 7 insertions(+)
13
14diff --git a/src/tls/asn1.h b/src/tls/asn1.h
15index 6bd7df5..77b94ef 100644
16--- a/src/tls/asn1.h
17+++ b/src/tls/asn1.h
18@@ -66,6 +66,12 @@ void asn1_oid_to_str(const struct asn1_oid *oid, char *buf, size_t len);
19 unsigned long asn1_bit_string_to_long(const u8 *buf, size_t len);
20 int asn1_oid_equal(const struct asn1_oid *a, const struct asn1_oid *b);
21
22+static inline bool asn1_is_null(const struct asn1_hdr *hdr)
23+{
24+ return hdr->class == ASN1_CLASS_UNIVERSAL &&
25+ hdr->tag == ASN1_TAG_NULL;
26+}
27+
28 extern struct asn1_oid asn1_sha1_oid;
29 extern struct asn1_oid asn1_sha256_oid;
30
31diff --git a/src/utils/includes.h b/src/utils/includes.h
32index 75513fc..741fc9c 100644
33--- a/src/utils/includes.h
34+++ b/src/utils/includes.h
35@@ -18,6 +18,7 @@
36
37 #include <stdlib.h>
38 #include <stddef.h>
39+#include <stdbool.h>
40 #include <stdio.h>
41 #include <stdarg.h>
42 #include <string.h>
43--
442.25.1
45