Blame SOURCES/0360-libtasn1-disable-code-not-needed-in-grub.patch

5975ab
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
5975ab
From: Daniel Axtens <dja@axtens.net>
5975ab
Date: Fri, 1 May 2020 17:12:23 +1000
5975ab
Subject: [PATCH] libtasn1: disable code not needed in grub
5975ab
5975ab
We don't expect to be able to write ASN.1, only read it,
5975ab
so we can disable some code.
5975ab
5975ab
Do that with #if 0/#endif, rather than deletion. This means
5975ab
that the difference between upstream and grub is smaller,
5975ab
which should make updating libtasn1 easier in the future.
5975ab
5975ab
With these exclusions we also avoid the need for minmax.h,
5975ab
which is convenient because it means we don't have to
5975ab
import it from gnulib.
5975ab
5975ab
Signed-off-by: Daniel Axtens <dja@axtens.net>
5975ab
---
5975ab
 grub-core/lib/libtasn1/lib/coding.c    | 12 ++++++++++--
5975ab
 grub-core/lib/libtasn1/lib/decoding.c  |  2 ++
5975ab
 grub-core/lib/libtasn1/lib/element.c   |  4 ++--
5975ab
 grub-core/lib/libtasn1/lib/errors.c    |  3 +++
5975ab
 grub-core/lib/libtasn1/lib/structure.c | 10 ++++++----
5975ab
 include/grub/libtasn1.h                | 15 +++++++++++++++
5975ab
 6 files changed, 38 insertions(+), 8 deletions(-)
5975ab
5975ab
diff --git a/grub-core/lib/libtasn1/lib/coding.c b/grub-core/lib/libtasn1/lib/coding.c
09e3cc
index 245ea64cf..52def5983 100644
5975ab
--- a/grub-core/lib/libtasn1/lib/coding.c
5975ab
+++ b/grub-core/lib/libtasn1/lib/coding.c
5975ab
@@ -30,11 +30,11 @@
5975ab
 #include "parser_aux.h"
5975ab
 #include <gstr.h>
5975ab
 #include "element.h"
5975ab
-#include "minmax.h"
5975ab
 #include <structure.h>
5975ab
 
5975ab
 #define MAX_TAG_LEN 16
5975ab
 
5975ab
+#if 0
5975ab
 /******************************************************/
5975ab
 /* Function : _asn1_error_description_value_not_found */
5975ab
 /* Description: creates the ErrorDescription string   */
5975ab
@@ -58,6 +58,7 @@ _asn1_error_description_value_not_found (asn1_node node,
5975ab
   Estrcat (ErrorDescription, "' not found");
5975ab
 
5975ab
 }
5975ab
+#endif
5975ab
 
5975ab
 /**
5975ab
  * asn1_length_der:
5975ab
@@ -244,6 +245,7 @@ asn1_encode_simple_der (unsigned int etype, const unsigned char *str,
5975ab
   return ASN1_SUCCESS;
5975ab
 }
5975ab
 
5975ab
+#if 0
5975ab
 /******************************************************/
5975ab
 /* Function : _asn1_time_der                          */
5975ab
 /* Description: creates the DER coding for a TIME     */
5975ab
@@ -281,7 +283,7 @@ _asn1_time_der (unsigned char *str, int str_len, unsigned char *der,
5975ab
 
5975ab
   return ASN1_SUCCESS;
5975ab
 }
5975ab
-
5975ab
+#endif
5975ab
 
5975ab
 /*
5975ab
 void
5975ab
@@ -520,6 +522,7 @@ asn1_bit_der (const unsigned char *str, int bit_len,
5975ab
 }
5975ab
 
5975ab
 
5975ab
+#if 0
5975ab
 /******************************************************/
5975ab
 /* Function : _asn1_complete_explicit_tag             */
5975ab
 /* Description: add the length coding to the EXPLICIT */
5975ab
@@ -596,6 +599,7 @@ _asn1_complete_explicit_tag (asn1_node node, unsigned char *der,
5975ab
 
5975ab
   return ASN1_SUCCESS;
5975ab
 }
5975ab
+#endif
5975ab
 
5975ab
 const tag_and_class_st _asn1_tags[] = {
5975ab
   [ASN1_ETYPE_GENERALSTRING] =
5975ab
@@ -648,6 +652,8 @@ const tag_and_class_st _asn1_tags[] = {
5975ab
 
5975ab
 unsigned int _asn1_tags_size = sizeof (_asn1_tags) / sizeof (_asn1_tags[0]);
5975ab
 
5975ab
+
5975ab
+#if 0
5975ab
 /******************************************************/
5975ab
 /* Function : _asn1_insert_tag_der                    */
5975ab
 /* Description: creates the DER coding of tags of one */
5975ab
@@ -1413,3 +1419,5 @@ error:
5975ab
   asn1_delete_structure (&node);
5975ab
   return err;
5975ab
 }
5975ab
+
5975ab
+#endif
5975ab
\ No newline at end of file
5975ab
diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c
09e3cc
index ff04eb778..42f9a92b5 100644
5975ab
--- a/grub-core/lib/libtasn1/lib/decoding.c
5975ab
+++ b/grub-core/lib/libtasn1/lib/decoding.c
5975ab
@@ -1613,6 +1613,7 @@ asn1_der_decoding (asn1_node * element, const void *ider, int ider_len,
5975ab
   return asn1_der_decoding2 (element, ider, &ider_len, 0, errorDescription);
5975ab
 }
5975ab
 
5975ab
+#if 0
5975ab
 /**
5975ab
  * asn1_der_decoding_element:
5975ab
  * @structure: pointer to an ASN1 structure
5975ab
@@ -1643,6 +1644,7 @@ asn1_der_decoding_element (asn1_node * structure, const char *elementName,
5975ab
 {
5975ab
   return asn1_der_decoding(structure, ider, len, errorDescription);
5975ab
 }
5975ab
+#endif
5975ab
 
5975ab
 /**
5975ab
  * asn1_der_decoding_startEnd:
5975ab
diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c
09e3cc
index 997eb2725..539008d8e 100644
5975ab
--- a/grub-core/lib/libtasn1/lib/element.c
5975ab
+++ b/grub-core/lib/libtasn1/lib/element.c
5975ab
@@ -191,7 +191,7 @@ _asn1_append_sequence_set (asn1_node node, struct node_tail_cache_st *pcache)
5975ab
   return ASN1_SUCCESS;
5975ab
 }
5975ab
 
5975ab
-
5975ab
+#if 0
5975ab
 /**
5975ab
  * asn1_write_value:
5975ab
  * @node_root: pointer to a structure
5975ab
@@ -645,7 +645,7 @@ asn1_write_value (asn1_node node_root, const char *name,
5975ab
 
5975ab
   return ASN1_SUCCESS;
5975ab
 }
5975ab
-
5975ab
+#endif
5975ab
 
5975ab
 #define PUT_VALUE( ptr, ptr_size, data, data_size) \
5975ab
 	*len = data_size; \
5975ab
diff --git a/grub-core/lib/libtasn1/lib/errors.c b/grub-core/lib/libtasn1/lib/errors.c
09e3cc
index cee74daf7..42785e862 100644
5975ab
--- a/grub-core/lib/libtasn1/lib/errors.c
5975ab
+++ b/grub-core/lib/libtasn1/lib/errors.c
5975ab
@@ -57,6 +57,8 @@ static const libtasn1_error_entry error_algorithms[] = {
5975ab
   {0, 0}
5975ab
 };
5975ab
 
5975ab
+
5975ab
+#if 0
5975ab
 /**
5975ab
  * asn1_perror:
5975ab
  * @error: is an error returned by a libtasn1 function.
5975ab
@@ -73,6 +75,7 @@ asn1_perror (int error)
5975ab
   const char *str = asn1_strerror (error);
5975ab
   fprintf (stderr, "LIBTASN1 ERROR: %s\n", str ? str : "(null)");
5975ab
 }
5975ab
+#endif
5975ab
 
5975ab
 /**
5975ab
  * asn1_strerror:
5975ab
diff --git a/grub-core/lib/libtasn1/lib/structure.c b/grub-core/lib/libtasn1/lib/structure.c
09e3cc
index 8189c56a4..fcfde01a3 100644
5975ab
--- a/grub-core/lib/libtasn1/lib/structure.c
5975ab
+++ b/grub-core/lib/libtasn1/lib/structure.c
5975ab
@@ -76,7 +76,7 @@ _asn1_find_left (asn1_node_const node)
5975ab
   return node->left;
5975ab
 }
5975ab
 
5975ab
-
5975ab
+#if 0
5975ab
 int
5975ab
 _asn1_create_static_structure (asn1_node_const pointer, char *output_file_name,
5975ab
 			       char *vector_name)
5975ab
@@ -155,7 +155,7 @@ _asn1_create_static_structure (asn1_node_const pointer, char *output_file_name,
5975ab
 
5975ab
   return ASN1_SUCCESS;
5975ab
 }
5975ab
-
5975ab
+#endif
5975ab
 
5975ab
 /**
5975ab
  * asn1_array2tree:
5975ab
@@ -718,7 +718,7 @@ asn1_create_element (asn1_node_const definitions, const char *source_name,
5975ab
   return res;
5975ab
 }
5975ab
 
5975ab
-
5975ab
+#if 0
5975ab
 /**
5975ab
  * asn1_print_structure:
5975ab
  * @out: pointer to the output file (e.g. stdout).
5975ab
@@ -1058,7 +1058,7 @@ asn1_print_structure (FILE * out, asn1_node_const structure, const char *name,
5975ab
 	}
5975ab
     }
5975ab
 }
5975ab
-
5975ab
+#endif
5975ab
 
5975ab
 
5975ab
 /**
5975ab
@@ -1153,6 +1153,7 @@ asn1_find_structure_from_oid (asn1_node_const definitions, const char *oidValue)
5975ab
   return NULL;			/* ASN1_ELEMENT_NOT_FOUND; */
5975ab
 }
5975ab
 
5975ab
+#if 0
5975ab
 /**
5975ab
  * asn1_copy_node:
5975ab
  * @dst: Destination asn1 node.
5975ab
@@ -1202,6 +1203,7 @@ asn1_copy_node (asn1_node dst, const char *dst_name,
5975ab
 
5975ab
   return result;
5975ab
 }
5975ab
+#endif
5975ab
 
5975ab
 /**
5975ab
  * asn1_dup_node:
5975ab
diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h
09e3cc
index 6fd7a30dc..785eda2ae 100644
5975ab
--- a/include/grub/libtasn1.h
5975ab
+++ b/include/grub/libtasn1.h
5975ab
@@ -319,6 +319,8 @@ typedef struct asn1_data_node_st asn1_data_node_st;
5975ab
 /*  Functions definitions          */
5975ab
 /***********************************/
5975ab
 
5975ab
+/* These functions are not used in grub and should not be referenced. */
5975ab
+#if 0
5975ab
 extern ASN1_API int
5975ab
   asn1_parser2tree (const char *file,
5975ab
 		      asn1_node * definitions, char *error_desc);
5975ab
@@ -327,14 +329,17 @@ extern ASN1_API int
5975ab
   asn1_parser2array (const char *inputFileName,
5975ab
 		       const char *outputFileName,
5975ab
 		       const char *vectorName, char *error_desc);
5975ab
+#endif
5975ab
 
5975ab
 extern ASN1_API int
5975ab
   asn1_array2tree (const asn1_static_node * array,
5975ab
 		     asn1_node * definitions, char *errorDescription);
5975ab
 
5975ab
+#if 0
5975ab
 extern ASN1_API void
5975ab
   asn1_print_structure (FILE * out, asn1_node_const structure,
5975ab
 			  const char *name, int mode);
5975ab
+#endif
5975ab
 
5975ab
 extern ASN1_API int
5975ab
   asn1_create_element (asn1_node_const definitions,
5975ab
@@ -347,9 +352,11 @@ extern ASN1_API int asn1_delete_structure2 (asn1_node * structure, unsigned int
5975ab
 extern ASN1_API int
5975ab
   asn1_delete_element (asn1_node structure, const char *element_name);
5975ab
 
5975ab
+#if 0
5975ab
 extern ASN1_API int
5975ab
   asn1_write_value (asn1_node node_root, const char *name,
5975ab
 		      const void *ivalue, int len);
5975ab
+#endif
5975ab
 
5975ab
 extern ASN1_API int
5975ab
   asn1_read_value (asn1_node_const root, const char *name,
5975ab
@@ -365,9 +372,11 @@ extern ASN1_API int
5975ab
 extern ASN1_API int
5975ab
   asn1_number_of_elements (asn1_node_const element, const char *name, int *num);
5975ab
 
5975ab
+#if 0
5975ab
 extern ASN1_API int
5975ab
   asn1_der_coding (asn1_node_const element, const char *name,
5975ab
 		     void *ider, int *len, char *ErrorDescription);
5975ab
+#endif
5975ab
 
5975ab
 extern ASN1_API int
5975ab
   asn1_der_decoding2 (asn1_node *element, const void *ider,
5975ab
@@ -378,12 +387,14 @@ extern ASN1_API int
5975ab
   asn1_der_decoding (asn1_node * element, const void *ider,
5975ab
 		       int ider_len, char *errorDescription);
5975ab
 
5975ab
+#if 0
5975ab
 /* Do not use. Use asn1_der_decoding() instead. */
5975ab
 extern ASN1_API int
5975ab
   asn1_der_decoding_element (asn1_node * structure,
5975ab
 			       const char *elementName,
5975ab
 			       const void *ider, int len,
5975ab
 			       char *errorDescription) _ASN1_GCC_ATTR_DEPRECATED;
5975ab
+#endif
5975ab
 
5975ab
 extern ASN1_API int
5975ab
   asn1_der_decoding_startEnd (asn1_node element,
5975ab
@@ -408,13 +419,17 @@ extern ASN1_API const char *asn1_find_structure_from_oid (asn1_node_const
5975ab
 							    const char
5975ab
 							    *oidValue);
5975ab
 
5975ab
+#if 0
5975ab
 __LIBTASN1_PURE__
5975ab
 extern ASN1_API const char *asn1_check_version (const char *req_version);
5975ab
+#endif
5975ab
 
5975ab
 __LIBTASN1_PURE__
5975ab
 extern ASN1_API const char *asn1_strerror (int error);
5975ab
 
5975ab
+#if 0
5975ab
 extern ASN1_API void asn1_perror (int error);
5975ab
+#endif
5975ab
 
5975ab
 #define ASN1_MAX_TAG_SIZE 4
5975ab
 #define ASN1_MAX_LENGTH_SIZE 9