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

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