diff options
author | job <> | 2021-09-02 14:14:44 +0000 |
---|---|---|
committer | job <> | 2021-09-02 14:14:44 +0000 |
commit | cabd06e4e9d5e5f974e375ae0ad65292062917af (patch) | |
tree | 5096035c7bd89ef16905aeb857055ade8b32bf2a /src/lib | |
parent | f8d2ca55e0deef329fbfad1cff4e4c971e484f99 (diff) | |
download | openbsd-cabd06e4e9d5e5f974e375ae0ad65292062917af.tar.gz openbsd-cabd06e4e9d5e5f974e375ae0ad65292062917af.tar.bz2 openbsd-cabd06e4e9d5e5f974e375ae0ad65292062917af.zip |
Replace OPENSSL_free() with free()
OK tb@
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/x509/x509_addr.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_asid.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/x509/x509_addr.c b/src/lib/libcrypto/x509/x509_addr.c index 5aff2700fb..2bbecaec97 100644 --- a/src/lib/libcrypto/x509/x509_addr.c +++ b/src/lib/libcrypto/x509/x509_addr.c | |||
@@ -1062,7 +1062,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method, | |||
1062 | X509V3_conf_err(val); | 1062 | X509V3_conf_err(val); |
1063 | goto err; | 1063 | goto err; |
1064 | } | 1064 | } |
1065 | OPENSSL_free(s); | 1065 | free(s); |
1066 | s = NULL; | 1066 | s = NULL; |
1067 | continue; | 1067 | continue; |
1068 | } | 1068 | } |
@@ -1131,7 +1131,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method, | |||
1131 | goto err; | 1131 | goto err; |
1132 | } | 1132 | } |
1133 | 1133 | ||
1134 | OPENSSL_free(s); | 1134 | free(s); |
1135 | s = NULL; | 1135 | s = NULL; |
1136 | } | 1136 | } |
1137 | 1137 | ||
@@ -1143,7 +1143,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method, | |||
1143 | return addr; | 1143 | return addr; |
1144 | 1144 | ||
1145 | err: | 1145 | err: |
1146 | OPENSSL_free(s); | 1146 | free(s); |
1147 | sk_IPAddressFamily_pop_free(addr, IPAddressFamily_free); | 1147 | sk_IPAddressFamily_pop_free(addr, IPAddressFamily_free); |
1148 | return NULL; | 1148 | return NULL; |
1149 | } | 1149 | } |
diff --git a/src/lib/libcrypto/x509/x509_asid.c b/src/lib/libcrypto/x509/x509_asid.c index a9a13fff8b..4e45c7ac80 100644 --- a/src/lib/libcrypto/x509/x509_asid.c +++ b/src/lib/libcrypto/x509/x509_asid.c | |||
@@ -174,17 +174,17 @@ static int i2r_ASIdentifierChoice(BIO *out, | |||
174 | if ((s = i2s_ASN1_INTEGER(NULL, aor->u.id)) == NULL) | 174 | if ((s = i2s_ASN1_INTEGER(NULL, aor->u.id)) == NULL) |
175 | return 0; | 175 | return 0; |
176 | BIO_printf(out, "%*s%s\n", indent + 2, "", s); | 176 | BIO_printf(out, "%*s%s\n", indent + 2, "", s); |
177 | OPENSSL_free(s); | 177 | free(s); |
178 | break; | 178 | break; |
179 | case ASIdOrRange_range: | 179 | case ASIdOrRange_range: |
180 | if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->min)) == NULL) | 180 | if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->min)) == NULL) |
181 | return 0; | 181 | return 0; |
182 | BIO_printf(out, "%*s%s-", indent + 2, "", s); | 182 | BIO_printf(out, "%*s%s-", indent + 2, "", s); |
183 | OPENSSL_free(s); | 183 | free(s); |
184 | if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->max)) == NULL) | 184 | if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->max)) == NULL) |
185 | return 0; | 185 | return 0; |
186 | BIO_printf(out, "%s\n", s); | 186 | BIO_printf(out, "%s\n", s); |
187 | OPENSSL_free(s); | 187 | free(s); |
188 | break; | 188 | break; |
189 | default: | 189 | default: |
190 | return 0; | 190 | return 0; |
@@ -694,7 +694,7 @@ static void *v2i_ASIdentifiers(const struct v3_ext_method *method, | |||
694 | s[i1] = '\0'; | 694 | s[i1] = '\0'; |
695 | min = s2i_ASN1_INTEGER(NULL, s); | 695 | min = s2i_ASN1_INTEGER(NULL, s); |
696 | max = s2i_ASN1_INTEGER(NULL, s + i2); | 696 | max = s2i_ASN1_INTEGER(NULL, s + i2); |
697 | OPENSSL_free(s); | 697 | free(s); |
698 | if (min == NULL || max == NULL) { | 698 | if (min == NULL || max == NULL) { |
699 | X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE); | 699 | X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE); |
700 | goto err; | 700 | goto err; |