summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1
diff options
context:
space:
mode:
authortb <>2024-03-02 09:04:07 +0000
committertb <>2024-03-02 09:04:07 +0000
commit072e3a802a3e57c8384497865cc93a9245048694 (patch)
treed5564ffb0781bc28f8fa65e9c16a5077018980c9 /src/lib/libcrypto/asn1
parenta73fc18db0f7a430051a0c4c25c3154278ae50a0 (diff)
downloadopenbsd-072e3a802a3e57c8384497865cc93a9245048694.tar.gz
openbsd-072e3a802a3e57c8384497865cc93a9245048694.tar.bz2
openbsd-072e3a802a3e57c8384497865cc93a9245048694.zip
Remove ASN1_PCTX nonsense
This is only used by the fuzzing code. Another bit of poorly thought out extensibility that makes people pass NULL pointers to a bunch of APIs. ok jsing
Diffstat (limited to 'src/lib/libcrypto/asn1')
-rw-r--r--src/lib/libcrypto/asn1/asn1.h14
-rw-r--r--src/lib/libcrypto/asn1/tasn_prn.c95
2 files changed, 2 insertions, 107 deletions
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index c44f85113b..c9099465db 100644
--- a/src/lib/libcrypto/asn1/asn1.h
+++ b/src/lib/libcrypto/asn1/asn1.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1.h,v 1.89 2024/03/02 09:02:04 tb Exp $ */ 1/* $OpenBSD: asn1.h,v 1.90 2024/03/02 09:04:07 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -866,18 +866,6 @@ ASN1_TYPE *ASN1_generate_v3(const char *str, X509V3_CTX *cnf);
866 866
867int ASN1_item_print(BIO *out, ASN1_VALUE *ifld, int indent, 867int ASN1_item_print(BIO *out, ASN1_VALUE *ifld, int indent,
868 const ASN1_ITEM *it, const ASN1_PCTX *pctx); 868 const ASN1_ITEM *it, const ASN1_PCTX *pctx);
869ASN1_PCTX *ASN1_PCTX_new(void);
870void ASN1_PCTX_free(ASN1_PCTX *p);
871unsigned long ASN1_PCTX_get_flags(const ASN1_PCTX *p);
872void ASN1_PCTX_set_flags(ASN1_PCTX *p, unsigned long flags);
873unsigned long ASN1_PCTX_get_nm_flags(const ASN1_PCTX *p);
874void ASN1_PCTX_set_nm_flags(ASN1_PCTX *p, unsigned long flags);
875unsigned long ASN1_PCTX_get_cert_flags(const ASN1_PCTX *p);
876void ASN1_PCTX_set_cert_flags(ASN1_PCTX *p, unsigned long flags);
877unsigned long ASN1_PCTX_get_oid_flags(const ASN1_PCTX *p);
878void ASN1_PCTX_set_oid_flags(ASN1_PCTX *p, unsigned long flags);
879unsigned long ASN1_PCTX_get_str_flags(const ASN1_PCTX *p);
880void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags);
881 869
882int SMIME_crlf_copy(BIO *in, BIO *out, int flags); 870int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
883int SMIME_text(BIO *in, BIO *out); 871int SMIME_text(BIO *in, BIO *out);
diff --git a/src/lib/libcrypto/asn1/tasn_prn.c b/src/lib/libcrypto/asn1/tasn_prn.c
index d404838c68..07764fc091 100644
--- a/src/lib/libcrypto/asn1/tasn_prn.c
+++ b/src/lib/libcrypto/asn1/tasn_prn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tasn_prn.c,v 1.26 2023/12/20 14:26:47 tb Exp $ */ 1/* $OpenBSD: tasn_prn.c,v 1.27 2024/03/02 09:04:07 tb 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 */
@@ -76,99 +76,6 @@ static const ASN1_PCTX default_pctx = {
76 .flags = ASN1_PCTX_FLAGS_SHOW_ABSENT, 76 .flags = ASN1_PCTX_FLAGS_SHOW_ABSENT,
77}; 77};
78 78
79ASN1_PCTX *
80ASN1_PCTX_new(void)
81{
82 ASN1_PCTX *p;
83
84 if ((p = calloc(1, sizeof(ASN1_PCTX))) == NULL) {
85 ASN1error(ERR_R_MALLOC_FAILURE);
86 return NULL;
87 }
88
89 return p;
90}
91LCRYPTO_ALIAS(ASN1_PCTX_new);
92
93void
94ASN1_PCTX_free(ASN1_PCTX *p)
95{
96 free(p);
97}
98LCRYPTO_ALIAS(ASN1_PCTX_free);
99
100unsigned long
101ASN1_PCTX_get_flags(const ASN1_PCTX *p)
102{
103 return p->flags;
104}
105LCRYPTO_ALIAS(ASN1_PCTX_get_flags);
106
107void
108ASN1_PCTX_set_flags(ASN1_PCTX *p, unsigned long flags)
109{
110 p->flags = flags;
111}
112LCRYPTO_ALIAS(ASN1_PCTX_set_flags);
113
114unsigned long
115ASN1_PCTX_get_nm_flags(const ASN1_PCTX *p)
116{
117 return p->nm_flags;
118}
119LCRYPTO_ALIAS(ASN1_PCTX_get_nm_flags);
120
121void
122ASN1_PCTX_set_nm_flags(ASN1_PCTX *p, unsigned long flags)
123{
124 p->nm_flags = flags;
125}
126LCRYPTO_ALIAS(ASN1_PCTX_set_nm_flags);
127
128unsigned long
129ASN1_PCTX_get_cert_flags(const ASN1_PCTX *p)
130{
131 return p->cert_flags;
132}
133LCRYPTO_ALIAS(ASN1_PCTX_get_cert_flags);
134
135void
136ASN1_PCTX_set_cert_flags(ASN1_PCTX *p, unsigned long flags)
137{
138 p->cert_flags = flags;
139}
140LCRYPTO_ALIAS(ASN1_PCTX_set_cert_flags);
141
142unsigned long
143ASN1_PCTX_get_oid_flags(const ASN1_PCTX *p)
144{
145 return p->oid_flags;
146}
147LCRYPTO_ALIAS(ASN1_PCTX_get_oid_flags);
148
149void
150ASN1_PCTX_set_oid_flags(ASN1_PCTX *p, unsigned long flags)
151{
152 p->oid_flags = flags;
153}
154LCRYPTO_ALIAS(ASN1_PCTX_set_oid_flags);
155
156unsigned long
157ASN1_PCTX_get_str_flags(const ASN1_PCTX *p)
158{
159 return p->str_flags;
160}
161LCRYPTO_ALIAS(ASN1_PCTX_get_str_flags);
162
163void
164ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags)
165{
166 p->str_flags = flags;
167}
168LCRYPTO_ALIAS(ASN1_PCTX_set_str_flags);
169
170/* Main print routines */
171
172static int asn1_item_print_ctx(BIO *out, ASN1_VALUE **fld, int indent, 79static int asn1_item_print_ctx(BIO *out, ASN1_VALUE **fld, int indent,
173 const ASN1_ITEM *it, const char *fname, const char *sname, int nohdr, 80 const ASN1_ITEM *it, const char *fname, const char *sname, int nohdr,
174 const ASN1_PCTX *pctx); 81 const ASN1_PCTX *pctx);