summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2022-05-12 19:55:58 +0000
committerjsing <>2022-05-12 19:55:58 +0000
commit540bbdf30960c9ead73d3d602b60c159183caf60 (patch)
treeb5e23269e739d47dba6f5486f7f9278b96a620db /src
parente8199cf293a6f652731639de25892b965772a617 (diff)
downloadopenbsd-540bbdf30960c9ead73d3d602b60c159183caf60.tar.gz
openbsd-540bbdf30960c9ead73d3d602b60c159183caf60.tar.bz2
openbsd-540bbdf30960c9ead73d3d602b60c159183caf60.zip
Rename asn1_enc_free() to asn1_enc_cleanup().
This function does not actually free an ASN1_ENCODING, which are embedded in a struct. Name suggested by tb@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/asn1/asn1_locl.h4
-rw-r--r--src/lib/libcrypto/asn1/tasn_fre.c4
-rw-r--r--src/lib/libcrypto/asn1/tasn_utl.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/asn1/asn1_locl.h b/src/lib/libcrypto/asn1/asn1_locl.h
index 3a0e5091e3..eaf2c1af66 100644
--- a/src/lib/libcrypto/asn1/asn1_locl.h
+++ b/src/lib/libcrypto/asn1/asn1_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1_locl.h,v 1.30 2022/05/12 19:33:19 jsing Exp $ */ 1/* $OpenBSD: asn1_locl.h,v 1.31 2022/05/12 19:55:58 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006. 3 * project 2006.
4 */ 4 */
@@ -171,7 +171,7 @@ const ASN1_TEMPLATE *asn1_do_adb(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt, int
171int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it); 171int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it);
172 172
173void asn1_enc_init(ASN1_VALUE **pval, const ASN1_ITEM *it); 173void asn1_enc_init(ASN1_VALUE **pval, const ASN1_ITEM *it);
174void asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it); 174void asn1_enc_cleanup(ASN1_VALUE **pval, const ASN1_ITEM *it);
175int asn1_enc_save(ASN1_VALUE **pval, CBS *cbs, const ASN1_ITEM *it); 175int asn1_enc_save(ASN1_VALUE **pval, CBS *cbs, const ASN1_ITEM *it);
176int asn1_enc_restore(int *len, unsigned char **out, ASN1_VALUE **pval, const ASN1_ITEM *it); 176int asn1_enc_restore(int *len, unsigned char **out, ASN1_VALUE **pval, const ASN1_ITEM *it);
177 177
diff --git a/src/lib/libcrypto/asn1/tasn_fre.c b/src/lib/libcrypto/asn1/tasn_fre.c
index dbf6bf1e8e..cc7b838cc5 100644
--- a/src/lib/libcrypto/asn1/tasn_fre.c
+++ b/src/lib/libcrypto/asn1/tasn_fre.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tasn_fre.c,v 1.19 2022/05/10 05:19:22 jsing Exp $ */ 1/* $OpenBSD: tasn_fre.c,v 1.20 2022/05/12 19:55:58 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -144,7 +144,7 @@ asn1_item_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
144 if (i == 2) 144 if (i == 2)
145 return; 145 return;
146 } 146 }
147 asn1_enc_free(pval, it); 147 asn1_enc_cleanup(pval, it);
148 /* If we free up as normal we will invalidate any 148 /* If we free up as normal we will invalidate any
149 * ANY DEFINED BY field and we wont be able to 149 * ANY DEFINED BY field and we wont be able to
150 * determine the type of the field it defines. So 150 * determine the type of the field it defines. So
diff --git a/src/lib/libcrypto/asn1/tasn_utl.c b/src/lib/libcrypto/asn1/tasn_utl.c
index 1fd061f9f8..86cd42eec7 100644
--- a/src/lib/libcrypto/asn1/tasn_utl.c
+++ b/src/lib/libcrypto/asn1/tasn_utl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tasn_utl.c,v 1.16 2022/05/12 19:33:19 jsing Exp $ */ 1/* $OpenBSD: tasn_utl.c,v 1.17 2022/05/12 19:55:58 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -161,7 +161,7 @@ asn1_enc_clear(ASN1_ENCODING *aenc)
161} 161}
162 162
163void 163void
164asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it) 164asn1_enc_cleanup(ASN1_VALUE **pval, const ASN1_ITEM *it)
165{ 165{
166 ASN1_ENCODING *aenc; 166 ASN1_ENCODING *aenc;
167 167