From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 13 Aug 2021 11:01:29 +0000 (+0200)
Subject: Revert "make update (adds a new function code)"
X-Git-Tag: OpenSSL_1_1_1l~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b169d433c026188219f3b4ca0b92d08e3012e58;p=thirdparty%2Fopenssl.git

Revert "make update (adds a new function code)"

This reverts commit ea26844c4f624ef515d9228d3b623761a369b049.

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/16308)
---

diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c
index 50003a8531c..cc0a59ca4c8 100644
--- a/crypto/asn1/asn1_err.c
+++ b/crypto/asn1/asn1_err.c
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -82,8 +82,6 @@ static const ERR_STRING_DATA ASN1_str_functs[] = {
      "ASN1_STRING_type_new"},
     {ERR_PACK(ERR_LIB_ASN1, ASN1_F_ASN1_TEMPLATE_EX_D2I, 0),
      "asn1_template_ex_d2i"},
-    {ERR_PACK(ERR_LIB_ASN1, ASN1_F_ASN1_TEMPLATE_EX_I2D, 0),
-     "asn1_template_ex_i2d"},
     {ERR_PACK(ERR_LIB_ASN1, ASN1_F_ASN1_TEMPLATE_NEW, 0), "asn1_template_new"},
     {ERR_PACK(ERR_LIB_ASN1, ASN1_F_ASN1_TEMPLATE_NOEXP_D2I, 0),
      "asn1_template_noexp_d2i"},
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index 34b1bb8b84b..017a9a66527 100644
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -60,7 +60,6 @@ ASN1_F_ASN1_STRING_TABLE_ADD:129:ASN1_STRING_TABLE_add
 ASN1_F_ASN1_STRING_TO_BN:228:asn1_string_to_bn
 ASN1_F_ASN1_STRING_TYPE_NEW:130:ASN1_STRING_type_new
 ASN1_F_ASN1_TEMPLATE_EX_D2I:132:asn1_template_ex_d2i
-ASN1_F_ASN1_TEMPLATE_EX_I2D:145:asn1_template_ex_i2d
 ASN1_F_ASN1_TEMPLATE_NEW:133:asn1_template_new
 ASN1_F_ASN1_TEMPLATE_NOEXP_D2I:131:asn1_template_noexp_d2i
 ASN1_F_ASN1_TIME_ADJ:217:ASN1_TIME_adj
diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h
index fc72bb70f49..e1ad1fefeca 100644
--- a/include/openssl/asn1err.h
+++ b/include/openssl/asn1err.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -75,7 +75,6 @@ int ERR_load_ASN1_strings(void);
 # define ASN1_F_ASN1_STRING_TO_BN                         228
 # define ASN1_F_ASN1_STRING_TYPE_NEW                      130
 # define ASN1_F_ASN1_TEMPLATE_EX_D2I                      132
-# define ASN1_F_ASN1_TEMPLATE_EX_I2D                      145
 # define ASN1_F_ASN1_TEMPLATE_NEW                         133
 # define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I                   131
 # define ASN1_F_ASN1_TIME_ADJ                             217