From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Daniel Axtens <dja@axtens.net>

Date: Wed, 10 Jun 2020 17:48:42 +1000

Subject: [PATCH] test_asn1: test module for libtasn1

Import tests from libtasn1 that don't use functionality we don't

import. I have put them here rather than in the libtasn1 directory

because:

 -  They need much more significant changes to run in the grub

    context.

 -  I don't expect they will need to be changed when updating

    libtasn1: I expect the old tests will usually continue to pass on

    new versions.

This doesn't test the full decoder but that will be exercised in

test suites for coming patch sets.

Signed-off-by: Daniel Axtens <dja@axtens.net>

---

 Makefile.util.def                                  |   6 +

 grub-core/Makefile.core.def                        |  13 ++

 .../lib/libtasn1_wrap/tests/CVE-2018-1000654.c     |  61 ++++++

 grub-core/lib/libtasn1_wrap/tests/Test_overflow.c  | 138 ++++++++++++++

 grub-core/lib/libtasn1_wrap/tests/Test_simple.c    | 207 ++++++++++++++++++++

 grub-core/lib/libtasn1_wrap/tests/Test_strings.c   | 150 +++++++++++++++

 .../lib/libtasn1_wrap/tests/object-id-decoding.c   | 116 +++++++++++

 .../lib/libtasn1_wrap/tests/object-id-encoding.c   | 120 ++++++++++++

 grub-core/lib/libtasn1_wrap/tests/octet-string.c   | 211 +++++++++++++++++++++

 grub-core/lib/libtasn1_wrap/tests/reproducers.c    |  81 ++++++++

 grub-core/lib/libtasn1_wrap/wrap_tests.c           |  75 ++++++++

 .../tests/CVE-2018-1000654-1_asn1_tab.h            |  32 ++++

 .../tests/CVE-2018-1000654-2_asn1_tab.h            |  36 ++++

 grub-core/lib/libtasn1_wrap/wrap_tests.h           |  38 ++++

 .gitignore                                         |   1 +

 tests/test_asn1.in                                 |  12 ++

 16 files changed, 1297 insertions(+)

 create mode 100644 grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c

 create mode 100644 grub-core/lib/libtasn1_wrap/tests/Test_overflow.c

 create mode 100644 grub-core/lib/libtasn1_wrap/tests/Test_simple.c

 create mode 100644 grub-core/lib/libtasn1_wrap/tests/Test_strings.c

 create mode 100644 grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c

 create mode 100644 grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c

 create mode 100644 grub-core/lib/libtasn1_wrap/tests/octet-string.c

 create mode 100644 grub-core/lib/libtasn1_wrap/tests/reproducers.c

 create mode 100644 grub-core/lib/libtasn1_wrap/wrap_tests.c

 create mode 100644 grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h

 create mode 100644 grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h

 create mode 100644 grub-core/lib/libtasn1_wrap/wrap_tests.h

 create mode 100644 tests/test_asn1.in

diff --git a/Makefile.util.def b/Makefile.util.def

index e1242f54022..8cfbe69a76e 100644

--- a/Makefile.util.def

+++ b/Makefile.util.def

@@ -1305,6 +1305,12 @@ script = {

   common = tests/syslinux_test.in;

 };

+script = {

+  testcase;

+  name = test_asn1;

+  common = tests/test_asn1.in;

+};

+

 program = {

   testcase;

   name = example_unit_test;

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

index 21d2c541850..b4aaccf7b57 100644

--- a/grub-core/Makefile.core.def

+++ b/grub-core/Makefile.core.def

@@ -2591,3 +2591,16 @@ module = {

   // -Wno-type-limits comes from libtasn1's configure.ac

   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB) -I$(srcdir)/lib/libtasn1/lib -Wno-type-limits';

 };

+

+module = {

+  name = test_asn1;

+  common = lib/libtasn1_wrap/tests/CVE-2018-1000654.c;

+  common = lib/libtasn1_wrap/tests/object-id-decoding.c;

+  common = lib/libtasn1_wrap/tests/object-id-encoding.c;

+  common = lib/libtasn1_wrap/tests/octet-string.c;

+  common = lib/libtasn1_wrap/tests/reproducers.c;

+  common = lib/libtasn1_wrap/tests/Test_overflow.c;

+  common = lib/libtasn1_wrap/tests/Test_simple.c;

+  common = lib/libtasn1_wrap/tests/Test_strings.c;

+  common = lib/libtasn1_wrap/wrap_tests.c;

+};

diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c

new file mode 100644

index 00000000000..534e304521e

--- /dev/null

+++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c

@@ -0,0 +1,61 @@

+/*

+ * Copyright (C) 2002-2018 Free Software Foundation, Inc.

+ *

+ * This file is part of LIBTASN1.

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

+ *

+ */

+

+/****************************************************************/

+/* Description: reproducer for CVE-2018-1000654			*/

+/****************************************************************/

+

+#include <grub/libtasn1.h>

+#include <grub/err.h>

+#include <grub/mm.h>

+#include <grub/misc.h>

+#include <grub/types.h>

+#include "../wrap_tests.h"

+

+#include "CVE-2018-1000654-1_asn1_tab.h"

+#include "CVE-2018-1000654-2_asn1_tab.h"

+

+void

+test_CVE_2018_1000654 (void)

+{

+  int result;

+  asn1_node definitions = NULL;

+  char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];

+

+  result = asn1_array2tree (CVE_2018_1000654_1_asn1_tab, &definitions, errorDescription);

+  if (result != ASN1_RECURSION)

+    {

+      grub_fatal ("Error: %s\nErrorDescription = %s\n\n",

+		  asn1_strerror (result), errorDescription);

+      return;

+    }

+

+  asn1_delete_structure (&definitions);

+

+  result = asn1_array2tree (CVE_2018_1000654_2_asn1_tab, &definitions, errorDescription);

+  if (result != ASN1_RECURSION)

+    {

+      grub_fatal ("Error: %s\nErrorDescription = %s\n\n",

+		  asn1_strerror (result), errorDescription);

+      return;

+    }

+

+  asn1_delete_structure (&definitions);

+}

diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c b/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c

new file mode 100644

index 00000000000..f48aea0ef8b

--- /dev/null

+++ b/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c

@@ -0,0 +1,138 @@

+/*

+ * Copyright (C) 2012-2014 Free Software Foundation, Inc.

+ *

+ * This file is part of LIBTASN1.

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

+ *

+ */

+

+/* Written by Simon Josefsson */

+

+#include <grub/libtasn1.h>

+#include <grub/err.h>

+#include <grub/mm.h>

+#include <grub/misc.h>

+#include <grub/types.h>

+#include "../wrap_tests.h"

+

+void

+test_overflow(void)

+{

+  /* Test that values larger than long are rejected.  This has worked

+     fine with all versions of libtasn1. */

+

+  {

+    unsigned char der[] = "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF";

+    long l;

+    int len;

+

+    l = asn1_get_length_der (der, sizeof der, &len;;

+

+    if (l != -2L)

+      {

+	grub_fatal ("ERROR: asn1_get_length_der bignum (l %ld len %d)\n", l, len);

+	return;

+      }

+  }

+

+  /* Test that values larger than int but smaller than long are

+     rejected.  This limitation was introduced with libtasn1 2.12. */

+#if (GRUB_LONG_MAX > GRUB_INT_MAX)

+    {

+      unsigned long num = ((long) GRUB_UINT_MAX) << 2;

+      unsigned char der[20];

+      int der_len;

+      long l;

+      int len;

+

+      asn1_length_der (num, der, &der_len);

+

+      l = asn1_get_length_der (der, der_len, &len;;

+

+      if (l != -2L)

+	{

+	  grub_fatal ("ERROR: asn1_get_length_der intnum (l %ld len %d)\n", l,

+		      len);

+	  return;

+	}

+    }

+#endif

+

+  /* Test that values larger than would fit in the input string are

+     rejected.  This problem was fixed in libtasn1 2.12. */

+  {

+    unsigned long num = 64;

+    unsigned char der[20];

+    int der_len;

+    long l;

+    int len;

+

+    asn1_length_der (num, der, &der_len);

+

+    der_len = sizeof (der);

+    l = asn1_get_length_der (der, der_len, &len;;

+

+    if (l != -4L)

+      {

+	grub_fatal ("ERROR: asn1_get_length_der overflow-small (l %ld len %d)\n",

+		    l, len);

+	return;

+      }

+  }

+

+  /* Test that values larger than would fit in the input string are

+     rejected.  This problem was fixed in libtasn1 2.12. */

+  {

+    unsigned long num = 1073741824;

+    unsigned char der[20];

+    int der_len;

+    long l;

+    int len;

+

+    asn1_length_der (num, der, &der_len);

+

+    der_len = sizeof (der);

+    l = asn1_get_length_der (der, der_len, &len;;

+

+    if (l != -4L)

+      {

+	grub_fatal ("ERROR: asn1_get_length_der overflow-large1 (l %ld len %d)\n",

+		    l, len);

+	return;

+      }

+  }

+

+  /* Test that values larger than would fit in the input string are

+     rejected.  This problem was fixed in libtasn1 2.12. */

+  {

+    unsigned long num = 2147483649;

+    unsigned char der[20];

+    int der_len;

+    long l;

+    int len;

+

+    asn1_length_der (num, der, &der_len);

+

+    der_len = sizeof (der);

+    l = asn1_get_length_der (der, der_len, &len;;

+

+    if (l != -2L)

+      {

+	grub_fatal ("ERROR: asn1_get_length_der overflow-large2 (l %ld len %d)\n",

+		    l, len);

+	return;

+      }

+  }

+}

diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_simple.c b/grub-core/lib/libtasn1_wrap/tests/Test_simple.c

new file mode 100644

index 00000000000..9f01006ddf4

--- /dev/null

+++ b/grub-core/lib/libtasn1_wrap/tests/Test_simple.c

@@ -0,0 +1,207 @@

+/*

+ * Copyright (C) 2011-2014 Free Software Foundation, Inc.

+ *

+ * This file is part of LIBTASN1.

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

+ *

+ * Written by Simon Josefsson

+ *

+ */

+

+#include <grub/libtasn1.h>

+#include <grub/mm.h>

+#include <grub/misc.h>

+#include <grub/err.h>

+#include "../wrap_tests.h"

+

+struct tv

+{

+  int bitlen;

+  const char *bitstr;

+  int derlen;

+  const char *der;

+};

+

+static const struct tv tv[] = {

+  {0, "", 2, "\x01\x00"},

+  {1, "\x00", 3, "\x02\x07\x00"},

+  {2, "\x00", 3, "\x02\x06\x00"},

+  {3, "\x00", 3, "\x02\x05\x00"},

+  {4, "\x00", 3, "\x02\x04\x00"},

+  {5, "\x00", 3, "\x02\x03\x00"},

+  {6, "\x00", 3, "\x02\x02\x00"},

+  {7, "\x00", 3, "\x02\x01\x00"},

+  {8, "\x00\x00", 3, "\x02\x00\x00"},

+  {9, "\x00\x00", 4, "\x03\x07\x00\x00"},

+  {10, "\x00\x00", 4, "\x03\x06\x00\x00"},

+  {11, "\x00\x00", 4, "\x03\x05\x00\x00"},

+  {12, "\x00\x00", 4, "\x03\x04\x00\x00"},

+  {13, "\x00\x00", 4, "\x03\x03\x00\x00"},

+  {14, "\x00\x00", 4, "\x03\x02\x00\x00"},

+  {15, "\x00\x00", 4, "\x03\x01\x00\x00"},

+  {16, "\x00\x00", 4, "\x03\x00\x00\x00"},

+  {17, "\x00\x00\x00", 5, "\x04\x07\x00\x00\x00"},

+  {18, "\x00\x00\x00", 5, "\x04\x06\x00\x00\x00"},

+  {19, "\x00\x00\x00", 5, "\x04\x05\x00\x00\x00"},

+  {1, "\xFF", 3, "\x02\x07\x80"},

+  {2, "\xFF", 3, "\x02\x06\xc0"},

+  {3, "\xFF", 3, "\x02\x05\xe0"},

+  {4, "\xFF", 3, "\x02\x04\xf0"},

+  {5, "\xFF", 3, "\x02\x03\xf8"},

+  {6, "\xFF", 3, "\x02\x02\xfc"},

+  {7, "\xFF", 3, "\x02\x01\xfe"},

+  {8, "\xFF\xFF", 3, "\x02\x00\xff"},

+  {9, "\xFF\xFF", 4, "\x03\x07\xff\x80"},

+  {10, "\xFF\xFF", 4, "\x03\x06\xff\xc0"},

+  {11, "\xFF\xFF", 4, "\x03\x05\xff\xe0"},

+  {12, "\xFF\xFF", 4, "\x03\x04\xff\xf0"},

+  {13, "\xFF\xFF", 4, "\x03\x03\xff\xf8"},

+  {14, "\xFF\xFF", 4, "\x03\x02\xff\xfc"},

+  {15, "\xFF\xFF", 4, "\x03\x01\xff\xfe"},

+  {16, "\xFF\xFF", 4, "\x03\x00\xff\xff"},

+  {17, "\xFF\xFF\xFF", 5, "\x04\x07\xff\xff\x80"},

+  {18, "\xFF\xFF\xFF", 5, "\x04\x06\xff\xff\xc0"},

+  {19, "\xFF\xFF\xFF", 5, "\x04\x05\xff\xff\xe0"},

+};

+

+void

+test_simple (void)

+{

+  int result;

+  unsigned char der[100];

+  unsigned char str[100];

+  int der_len = sizeof (der);

+  int str_size = sizeof (str);

+  int ret_len, bit_len;

+  grub_size_t i;

+

+  /* Dummy test */

+

+  asn1_bit_der (NULL, 0, der, &der_len);

+  result = asn1_get_bit_der (der, 0, &ret_len, str, str_size, &bit_len);

+  if (result != ASN1_GENERIC_ERROR)

+    {

+      grub_fatal ("asn1_get_bit_der zero\n");

+      return;

+    }

+

+  /* Encode short strings with increasing bit lengths */

+

+  for (i = 0; i < sizeof (tv) / sizeof (tv[0]); i++)

+    {

+      /* Encode */

+

+      asn1_bit_der ((const unsigned char *) tv[i].bitstr, tv[i].bitlen,

+		    der, &der_len);

+

+#if 0

+      {

+	size_t j;

+	for (j = 0; j < der_len; j++)

+	  printf ("\\x%02x", der[j]);

+	printf ("\n");

+      }

+#endif

+

+      if (der_len != tv[i].derlen || grub_memcmp (der, tv[i].der, der_len) != 0)

+	{

+	  grub_fatal ("asn1_bit_der iter %lu\n", (unsigned long) i);

+	  return;

+	}

+

+      /* Decode it */

+

+      result = asn1_get_bit_der (der, der_len, &ret_len, str,

+				 str_size, &bit_len);

+      if (result != ASN1_SUCCESS || ret_len != tv[i].derlen

+	  || bit_len != tv[i].bitlen)

+	{

+	  grub_fatal ("asn1_get_bit_der iter %lu, err: %d\n", (unsigned long) i, result);

+	  return;

+	}

+    }

+

+

+  /* Decode sample from "A Layman's Guide to a Subset of ASN.1, BER,

+     and DER" section 5.4 "BIT STRING": "The BER encoding of the BIT

+     STRING value "011011100101110111" can be any of the following,

+     among others, depending on the choice of padding bits, the form

+     of length octets [...]".

+   */

+

+  /* 03 04 06 6e 5d c0  DER encoding */

+

+  grub_memcpy (der, "\x04\x06\x6e\x5d\xc0", 5);

+  der_len = 5;

+

+  result = asn1_get_bit_der (der, der_len, &ret_len, str, str_size, &bit_len);

+  if (result != ASN1_SUCCESS || ret_len != 5

+      || bit_len != 18 || grub_memcmp (str, "\x6e\x5d\xc0", 3) != 0)

+    {

+      grub_fatal ("asn1_get_bit_der example\n");

+      return;

+    }

+

+  der_len = sizeof (der);

+  asn1_bit_der (str, bit_len, der, &der_len);

+  if (der_len != 5 || grub_memcmp (der, "\x04\x06\x6e\x5d\xc0", 5) != 0)

+    {

+      grub_fatal ("asn1_bit_der example roundtrip\n");

+      return;

+    }

+

+  /* 03 04 06 6e 5d e0 padded with "100000" */

+

+  grub_memcpy (der, "\x04\x06\x6e\x5d\xe0", 5);

+  der_len = 5;

+

+  result = asn1_get_bit_der (der, der_len, &ret_len, str, str_size, &bit_len);

+  if (result != ASN1_SUCCESS || ret_len != 5

+      || bit_len != 18 || grub_memcmp (str, "\x6e\x5d\xe0", 3) != 0)

+    {

+      grub_fatal ("asn1_get_bit_der example padded\n");

+      return;

+    }

+

+  der_len = sizeof (der);

+  asn1_bit_der (str, bit_len, der, &der_len);

+  if (der_len != 5 || grub_memcmp (der, "\x04\x06\x6e\x5d\xc0", 5) != 0)

+    {

+      grub_fatal ("asn1_bit_der example roundtrip\n");

+      return;

+    }

+

+  /* 03 81 04 06 6e 5d c0 long form of length octets */

+

+  grub_memcpy (der, "\x81\x04\x06\x6e\x5d\xc0", 6);

+  der_len = 6;

+

+  result = asn1_get_bit_der (der, der_len, &ret_len, str, str_size, &bit_len);

+

+  if (result != ASN1_SUCCESS || ret_len != 6

+      || bit_len != 18 || grub_memcmp (str, "\x6e\x5d\xc0", 3) != 0)

+    {

+      grub_fatal ("asn1_get_bit_der example long form\n");

+      return;

+    }

+

+  der_len = sizeof (der);

+  asn1_bit_der (str, bit_len, der, &der_len);

+  if (der_len != 5 || grub_memcmp (der, "\x04\x06\x6e\x5d\xc0", 5) != 0)

+    {

+      grub_fatal ("asn1_bit_der example roundtrip\n");

+      return;

+    }

+}

diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_strings.c b/grub-core/lib/libtasn1_wrap/tests/Test_strings.c

new file mode 100644

index 00000000000..dbe1474b204

--- /dev/null

+++ b/grub-core/lib/libtasn1_wrap/tests/Test_strings.c

@@ -0,0 +1,150 @@

+/*

+ * Copyright (C) 2012-2014 Free Software Foundation, Inc.

+ *

+ * This file is part of LIBTASN1.

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

+ *

+ * Written by Simon Josefsson

+ *

+ */

+

+#include <grub/mm.h>

+#include <grub/err.h>

+#include <grub/misc.h>

+#include <grub/libtasn1.h>

+#include "../wrap_tests.h"

+

+struct tv

+{

+  unsigned int etype;

+  unsigned int str_len;

+  const void *str;

+  unsigned int der_len;

+  const void *der;

+};

+

+static const struct tv tv[] = {

+  {ASN1_ETYPE_IA5_STRING, 20,

+   "\x63\x73\x63\x61\x40\x70\x61\x73\x73\x70\x6f\x72\x74\x2e\x67\x6f\x76\x2e\x67\x72",

+   22,

+   "\x16\x14\x63\x73\x63\x61\x40\x70\x61\x73\x73\x70\x6f\x72\x74\x2e\x67\x6f\x76\x2e\x67\x72"},

+  {ASN1_ETYPE_PRINTABLE_STRING, 5, "\x4e\x69\x6b\x6f\x73",

+   7, "\x13\x05\x4e\x69\x6b\x6f\x73"},

+  {ASN1_ETYPE_UTF8_STRING, 12, "Αττική",

+   14, "\x0c\x0c\xce\x91\xcf\x84\xcf\x84\xce\xb9\xce\xba\xce\xae"},

+  {ASN1_ETYPE_TELETEX_STRING, 15,

+   "\x53\x69\x6d\x6f\x6e\x20\x4a\x6f\x73\x65\x66\x73\x73\x6f\x6e",

+   17,

+   "\x14\x0f\x53\x69\x6d\x6f\x6e\x20\x4a\x6f\x73\x65\x66\x73\x73\x6f\x6e"},

+  {ASN1_ETYPE_OCTET_STRING, 36,

+   "\x30\x22\x80\x0F\x32\x30\x31\x31\x30\x38\x32\x31\x30\x38\x30\x30\x30\x36\x5A\x81\x0F\x32\x30\x31\x31\x30\x38\x32\x33\x32\x30\x35\x39\x35\x39\x5A",

+   38,

+   "\x04\x24\x30\x22\x80\x0F\x32\x30\x31\x31\x30\x38\x32\x31\x30\x38\x30\x30\x30\x36\x5A\x81\x0F\x32\x30\x31\x31\x30\x38\x32\x33\x32\x30\x35\x39\x35\x39\x5A"}

+};

+

+#define SSTR(x) sizeof(x)-1,x

+static const struct tv ber[] = {

+  {ASN1_ETYPE_OCTET_STRING,

+   SSTR("\xa0\xa0"),

+   SSTR("\x24\x80\x04\x82\x00\x02\xa0\xa0\x00\x00")},

+  {ASN1_ETYPE_OCTET_STRING,

+   SSTR("\xa0\xa0\xb0\xb0\xb0"),

+   SSTR("\x24\x80\x04\x82\x00\x02\xa0\xa0\x04\x82\x00\x03\xb0\xb0\xb0\x00\x00")},

+  {ASN1_ETYPE_OCTET_STRING,

+   SSTR("\xa0\xa0\xb0\xb0\xb0\xa1\xa1"),

+   SSTR("\x24\x80\x04\x82\x00\x02\xa0\xa0\x04\x82\x00\x03\xb0\xb0\xb0\x24\x80\x04\x82\x00\x02\xa1\xa1\x00\x00\x00\x00")},

+  {ASN1_ETYPE_OCTET_STRING,

+   SSTR("\xa0\xa0\xb0\xb0\xb0\xa1\xa1\xc1"),

+   SSTR("\x24\x80\x04\x82\x00\x02\xa0\xa0\x04\x82\x00\x03\xb0\xb0\xb0\x24\x80\x04\x82\x00\x02\xa1\xa1\x04\x82\x00\x01\xc1\x00\x00\x00\x00")},

+};

+

+void

+test_strings ()

+{

+  int ret;

+  unsigned char tl[ASN1_MAX_TL_SIZE];

+  unsigned int tl_len, der_len, str_len;

+  const unsigned char *str;

+  unsigned char *b;

+  unsigned int i;

+

+  /* Dummy test */

+

+  for (i = 0; i < sizeof (tv) / sizeof (tv[0]); i++)

+    {

+      /* Encode */

+      tl_len = sizeof (tl);

+      ret = asn1_encode_simple_der (tv[i].etype, tv[i].str, tv[i].str_len,

+				    tl, &tl_len);

+      if (ret != ASN1_SUCCESS)

+	{

+	  grub_fatal ("Encoding error in %u: %s\n", i,

+		   asn1_strerror (ret));

+	  return;

+	}

+      der_len = tl_len + tv[i].str_len;

+

+      if (der_len != tv[i].der_len || grub_memcmp (tl, tv[i].der, tl_len) != 0)

+	{

+	  grub_fatal (

+		   "DER encoding differs in %u! (size: %u, expected: %u)\n",

+		   i, der_len, tv[i].der_len);

+	  return;

+	}

+

+      /* decoding */

+      ret =

+	asn1_decode_simple_der (tv[i].etype, tv[i].der, tv[i].der_len, &str,

+				&str_len);

+      if (ret != ASN1_SUCCESS)

+	{

+	  grub_fatal ("Decoding error in %u: %s\n", i,

+		   asn1_strerror (ret));

+	  return;

+	}

+

+      if (str_len != tv[i].str_len || grub_memcmp (str, tv[i].str, str_len) != 0)

+	{

+	  grub_fatal (

+		   "DER decoded data differ in %u! (size: %u, expected: %u)\n",

+		   i, der_len, tv[i].str_len);

+	  return;

+	}

+    }

+

+  /* BER decoding */

+  for (i = 0; i < sizeof (ber) / sizeof (ber[0]); i++)

+    {

+      /* decoding */

+      ret =

+	asn1_decode_simple_ber (ber[i].etype, ber[i].der, ber[i].der_len, &b,

+				&str_len, NULL);

+      if (ret != ASN1_SUCCESS)

+	{

+	  grub_fatal ("BER decoding error in %u: %s\n", i,

+		   asn1_strerror (ret));

+	  return;

+	}

+

+      if (str_len != ber[i].str_len || grub_memcmp (b, ber[i].str, str_len) != 0)

+	{

+	  grub_fatal (

+		   "BER decoded data differ in %u! (size: %u, expected: %u)\n",

+		   i, str_len, ber[i].str_len);

+	  return;

+	}

+      grub_free(b);

+    }

+}

diff --git a/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c b/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c

new file mode 100644

index 00000000000..d367bbfb5a7

--- /dev/null

+++ b/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c

@@ -0,0 +1,116 @@

+/*

+ * Copyright (C) 2016 Red Hat, Inc.

+ *

+ * This file is part of LIBTASN1.

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

+ *

+ */

+

+#include <grub/libtasn1.h>

+#include <grub/types.h>

+#include <grub/misc.h>

+#include <grub/err.h>

+#include "../wrap_tests.h"

+

+struct tv

+{

+  int der_len;

+  const unsigned char *der;

+  const char *oid;

+  int expected_error;

+};

+

+static const struct tv tv[] = {

+  {.der_len = 5,

+   .der = (void *) "\x06\x03\x80\x37\x03",

+   .oid = "2.999.3",

+   .expected_error = ASN1_DER_ERROR /* leading 0x80 */

+  },

+  {.der_len = 12,

+   .der = (void *) "\x06\x0a\x2b\x06\x01\x80\x01\x92\x08\x09\x05\x01",

+   .oid = "1.3.6.1.4.1.2312.9.5.1",