1 files changed, 3 insertions, 6 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_gen.c b/src/lib/libcrypto/asn1/asn1_gen.c
index c66bea2ab4..598a322242 100644
--- a/src/lib/libcrypto/asn1/asn1_gen.c
+++ b/src/lib/libcrypto/asn1/asn1_gen.c
@@ -291,7 +291,7 @@ asn1_cb(const char *elem, int len, void *bitstr)
 
         if (utype == -1) {
                 ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_TAG);
-                ERR_add_error_data(2, "tag=", elem);
+                ERR_asprintf_error_data("tag=%s", elem);
                 return -1;
         }
 
@@ -370,7 +370,6 @@ asn1_cb(const char *elem, int len, void *bitstr)
 static int
 parse_tagging(const char *vstart, int vlen, int *ptag, int *pclass)
 {
-        char erch[2];
         long tag_num;
         char *eptr;
 
@@ -410,10 +409,8 @@ parse_tagging(const char *vstart, int vlen, int *ptag, int *pclass)
                         break;
 
                 default:
-                        erch[0] = *eptr;
-                        erch[1] = 0;
                         ASN1err(ASN1_F_PARSE_TAGGING, ASN1_R_INVALID_MODIFIER);
-                        ERR_add_error_data(2, "Char=", erch);
+                        ERR_asprintf_error_data("Char=%c", *eptr);
                         return 0;
                         break;
 
@@ -777,7 +774,7 @@ asn1_str2type(const char *str, int format, int utype)
         return atmp;
 
 bad_str:
-        ERR_add_error_data(2, "string=", str);
+        ERR_asprintf_error_data("string=%s", str);
 bad_form:
         ASN1_TYPE_free(atmp);
         return NULL;