From: job <job@openbsd.org>
Date: Thu, 2 Sep 2021 14:14:44 +0000 (+0000)
Subject: Replace OPENSSL_free() with free()
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=95e11b57027bff74e727fe35fb07ef33433b840a;p=openbsd

Replace OPENSSL_free() with free()

OK tb@
---

diff --git a/lib/libcrypto/x509/x509_addr.c b/lib/libcrypto/x509/x509_addr.c
index 5aff2700fb1..2bbecaec975 100644
--- a/lib/libcrypto/x509/x509_addr.c
+++ b/lib/libcrypto/x509/x509_addr.c
@@ -1062,7 +1062,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
                 X509V3_conf_err(val);
                 goto err;
             }
-            OPENSSL_free(s);
+            free(s);
             s = NULL;
             continue;
         }
@@ -1131,7 +1131,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
             goto err;
         }
 
-        OPENSSL_free(s);
+        free(s);
         s = NULL;
     }
 
@@ -1143,7 +1143,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
     return addr;
 
  err:
-    OPENSSL_free(s);
+    free(s);
     sk_IPAddressFamily_pop_free(addr, IPAddressFamily_free);
     return NULL;
 }
diff --git a/lib/libcrypto/x509/x509_asid.c b/lib/libcrypto/x509/x509_asid.c
index a9a13fff8b1..4e45c7ac805 100644
--- a/lib/libcrypto/x509/x509_asid.c
+++ b/lib/libcrypto/x509/x509_asid.c
@@ -174,17 +174,17 @@ static int i2r_ASIdentifierChoice(BIO *out,
                 if ((s = i2s_ASN1_INTEGER(NULL, aor->u.id)) == NULL)
                     return 0;
                 BIO_printf(out, "%*s%s\n", indent + 2, "", s);
-                OPENSSL_free(s);
+                free(s);
                 break;
             case ASIdOrRange_range:
                 if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->min)) == NULL)
                     return 0;
                 BIO_printf(out, "%*s%s-", indent + 2, "", s);
-                OPENSSL_free(s);
+                free(s);
                 if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->max)) == NULL)
                     return 0;
                 BIO_printf(out, "%s\n", s);
-                OPENSSL_free(s);
+                free(s);
                 break;
             default:
                 return 0;
@@ -694,7 +694,7 @@ static void *v2i_ASIdentifiers(const struct v3_ext_method *method,
             s[i1] = '\0';
             min = s2i_ASN1_INTEGER(NULL, s);
             max = s2i_ASN1_INTEGER(NULL, s + i2);
-            OPENSSL_free(s);
+            free(s);
             if (min == NULL || max == NULL) {
                 X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
                 goto err;