summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-05-14 07:35:23 +0000
committertb <>2024-05-14 07:35:23 +0000
commit9d34abde0383382131d8b66fd09f0e36c31f2d6a (patch)
treef87cdb1563184a0c6f9aa34b80549cc758e7534c
parentd2994f03ab0e4e928f34d6dcc889f755858bfd7e (diff)
downloadopenbsd-9d34abde0383382131d8b66fd09f0e36c31f2d6a.tar.gz
openbsd-9d34abde0383382131d8b66fd09f0e36c31f2d6a.tar.bz2
openbsd-9d34abde0383382131d8b66fd09f0e36c31f2d6a.zip
x509_ext.c: remove lots of extraneous parentheses
No change in the generated assembly
-rw-r--r--src/lib/libcrypto/x509/x509_ext.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/lib/libcrypto/x509/x509_ext.c b/src/lib/libcrypto/x509/x509_ext.c
index ce316d25bd..6faafc4bf0 100644
--- a/src/lib/libcrypto/x509/x509_ext.c
+++ b/src/lib/libcrypto/x509/x509_ext.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_ext.c,v 1.16 2023/02/16 08:38:17 tb Exp $ */ 1/* $OpenBSD: x509_ext.c,v 1.17 2024/05/14 07:35:23 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 *
@@ -70,42 +70,42 @@
70int 70int
71X509_CRL_get_ext_count(const X509_CRL *x) 71X509_CRL_get_ext_count(const X509_CRL *x)
72{ 72{
73 return (X509v3_get_ext_count(x->crl->extensions)); 73 return X509v3_get_ext_count(x->crl->extensions);
74} 74}
75LCRYPTO_ALIAS(X509_CRL_get_ext_count); 75LCRYPTO_ALIAS(X509_CRL_get_ext_count);
76 76
77int 77int
78X509_CRL_get_ext_by_NID(const X509_CRL *x, int nid, int lastpos) 78X509_CRL_get_ext_by_NID(const X509_CRL *x, int nid, int lastpos)
79{ 79{
80 return (X509v3_get_ext_by_NID(x->crl->extensions, nid, lastpos)); 80 return X509v3_get_ext_by_NID(x->crl->extensions, nid, lastpos);
81} 81}
82LCRYPTO_ALIAS(X509_CRL_get_ext_by_NID); 82LCRYPTO_ALIAS(X509_CRL_get_ext_by_NID);
83 83
84int 84int
85X509_CRL_get_ext_by_OBJ(const X509_CRL *x, const ASN1_OBJECT *obj, int lastpos) 85X509_CRL_get_ext_by_OBJ(const X509_CRL *x, const ASN1_OBJECT *obj, int lastpos)
86{ 86{
87 return (X509v3_get_ext_by_OBJ(x->crl->extensions, obj, lastpos)); 87 return X509v3_get_ext_by_OBJ(x->crl->extensions, obj, lastpos);
88} 88}
89LCRYPTO_ALIAS(X509_CRL_get_ext_by_OBJ); 89LCRYPTO_ALIAS(X509_CRL_get_ext_by_OBJ);
90 90
91int 91int
92X509_CRL_get_ext_by_critical(const X509_CRL *x, int crit, int lastpos) 92X509_CRL_get_ext_by_critical(const X509_CRL *x, int crit, int lastpos)
93{ 93{
94 return (X509v3_get_ext_by_critical(x->crl->extensions, crit, lastpos)); 94 return X509v3_get_ext_by_critical(x->crl->extensions, crit, lastpos);
95} 95}
96LCRYPTO_ALIAS(X509_CRL_get_ext_by_critical); 96LCRYPTO_ALIAS(X509_CRL_get_ext_by_critical);
97 97
98X509_EXTENSION * 98X509_EXTENSION *
99X509_CRL_get_ext(const X509_CRL *x, int loc) 99X509_CRL_get_ext(const X509_CRL *x, int loc)
100{ 100{
101 return (X509v3_get_ext(x->crl->extensions, loc)); 101 return X509v3_get_ext(x->crl->extensions, loc);
102} 102}
103LCRYPTO_ALIAS(X509_CRL_get_ext); 103LCRYPTO_ALIAS(X509_CRL_get_ext);
104 104
105X509_EXTENSION * 105X509_EXTENSION *
106X509_CRL_delete_ext(X509_CRL *x, int loc) 106X509_CRL_delete_ext(X509_CRL *x, int loc)
107{ 107{
108 return (X509v3_delete_ext(x->crl->extensions, loc)); 108 return X509v3_delete_ext(x->crl->extensions, loc);
109} 109}
110LCRYPTO_ALIAS(X509_CRL_delete_ext); 110LCRYPTO_ALIAS(X509_CRL_delete_ext);
111 111
@@ -127,57 +127,57 @@ LCRYPTO_ALIAS(X509_CRL_add1_ext_i2d);
127int 127int
128X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc) 128X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc)
129{ 129{
130 return (X509v3_add_ext(&(x->crl->extensions), ex, loc) != NULL); 130 return X509v3_add_ext(&x->crl->extensions, ex, loc) != NULL;
131} 131}
132LCRYPTO_ALIAS(X509_CRL_add_ext); 132LCRYPTO_ALIAS(X509_CRL_add_ext);
133 133
134int 134int
135X509_get_ext_count(const X509 *x) 135X509_get_ext_count(const X509 *x)
136{ 136{
137 return (X509v3_get_ext_count(x->cert_info->extensions)); 137 return X509v3_get_ext_count(x->cert_info->extensions);
138} 138}
139LCRYPTO_ALIAS(X509_get_ext_count); 139LCRYPTO_ALIAS(X509_get_ext_count);
140 140
141int 141int
142X509_get_ext_by_NID(const X509 *x, int nid, int lastpos) 142X509_get_ext_by_NID(const X509 *x, int nid, int lastpos)
143{ 143{
144 return (X509v3_get_ext_by_NID(x->cert_info->extensions, nid, lastpos)); 144 return X509v3_get_ext_by_NID(x->cert_info->extensions, nid, lastpos);
145} 145}
146LCRYPTO_ALIAS(X509_get_ext_by_NID); 146LCRYPTO_ALIAS(X509_get_ext_by_NID);
147 147
148int 148int
149X509_get_ext_by_OBJ(const X509 *x, const ASN1_OBJECT *obj, int lastpos) 149X509_get_ext_by_OBJ(const X509 *x, const ASN1_OBJECT *obj, int lastpos)
150{ 150{
151 return (X509v3_get_ext_by_OBJ(x->cert_info->extensions, obj, lastpos)); 151 return X509v3_get_ext_by_OBJ(x->cert_info->extensions, obj, lastpos);
152} 152}
153LCRYPTO_ALIAS(X509_get_ext_by_OBJ); 153LCRYPTO_ALIAS(X509_get_ext_by_OBJ);
154 154
155int 155int
156X509_get_ext_by_critical(const X509 *x, int crit, int lastpos) 156X509_get_ext_by_critical(const X509 *x, int crit, int lastpos)
157{ 157{
158 return (X509v3_get_ext_by_critical(x->cert_info->extensions, crit, 158 return X509v3_get_ext_by_critical(x->cert_info->extensions, crit,
159 lastpos)); 159 lastpos);
160} 160}
161LCRYPTO_ALIAS(X509_get_ext_by_critical); 161LCRYPTO_ALIAS(X509_get_ext_by_critical);
162 162
163X509_EXTENSION * 163X509_EXTENSION *
164X509_get_ext(const X509 *x, int loc) 164X509_get_ext(const X509 *x, int loc)
165{ 165{
166 return (X509v3_get_ext(x->cert_info->extensions, loc)); 166 return X509v3_get_ext(x->cert_info->extensions, loc);
167} 167}
168LCRYPTO_ALIAS(X509_get_ext); 168LCRYPTO_ALIAS(X509_get_ext);
169 169
170X509_EXTENSION * 170X509_EXTENSION *
171X509_delete_ext(X509 *x, int loc) 171X509_delete_ext(X509 *x, int loc)
172{ 172{
173 return (X509v3_delete_ext(x->cert_info->extensions, loc)); 173 return X509v3_delete_ext(x->cert_info->extensions, loc);
174} 174}
175LCRYPTO_ALIAS(X509_delete_ext); 175LCRYPTO_ALIAS(X509_delete_ext);
176 176
177int 177int
178X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc) 178X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc)
179{ 179{
180 return (X509v3_add_ext(&(x->cert_info->extensions), ex, loc) != NULL); 180 return X509v3_add_ext(&x->cert_info->extensions, ex, loc) != NULL;
181} 181}
182LCRYPTO_ALIAS(X509_add_ext); 182LCRYPTO_ALIAS(X509_add_ext);
183 183
@@ -199,14 +199,14 @@ LCRYPTO_ALIAS(X509_add1_ext_i2d);
199int 199int
200X509_REVOKED_get_ext_count(const X509_REVOKED *x) 200X509_REVOKED_get_ext_count(const X509_REVOKED *x)
201{ 201{
202 return (X509v3_get_ext_count(x->extensions)); 202 return X509v3_get_ext_count(x->extensions);
203} 203}
204LCRYPTO_ALIAS(X509_REVOKED_get_ext_count); 204LCRYPTO_ALIAS(X509_REVOKED_get_ext_count);
205 205
206int 206int
207X509_REVOKED_get_ext_by_NID(const X509_REVOKED *x, int nid, int lastpos) 207X509_REVOKED_get_ext_by_NID(const X509_REVOKED *x, int nid, int lastpos)
208{ 208{
209 return (X509v3_get_ext_by_NID(x->extensions, nid, lastpos)); 209 return X509v3_get_ext_by_NID(x->extensions, nid, lastpos);
210} 210}
211LCRYPTO_ALIAS(X509_REVOKED_get_ext_by_NID); 211LCRYPTO_ALIAS(X509_REVOKED_get_ext_by_NID);
212 212
@@ -214,35 +214,35 @@ int
214X509_REVOKED_get_ext_by_OBJ(const X509_REVOKED *x, const ASN1_OBJECT *obj, 214X509_REVOKED_get_ext_by_OBJ(const X509_REVOKED *x, const ASN1_OBJECT *obj,
215 int lastpos) 215 int lastpos)
216{ 216{
217 return (X509v3_get_ext_by_OBJ(x->extensions, obj, lastpos)); 217 return X509v3_get_ext_by_OBJ(x->extensions, obj, lastpos);
218} 218}
219LCRYPTO_ALIAS(X509_REVOKED_get_ext_by_OBJ); 219LCRYPTO_ALIAS(X509_REVOKED_get_ext_by_OBJ);
220 220
221int 221int
222X509_REVOKED_get_ext_by_critical(const X509_REVOKED *x, int crit, int lastpos) 222X509_REVOKED_get_ext_by_critical(const X509_REVOKED *x, int crit, int lastpos)
223{ 223{
224 return (X509v3_get_ext_by_critical(x->extensions, crit, lastpos)); 224 return X509v3_get_ext_by_critical(x->extensions, crit, lastpos);
225} 225}
226LCRYPTO_ALIAS(X509_REVOKED_get_ext_by_critical); 226LCRYPTO_ALIAS(X509_REVOKED_get_ext_by_critical);
227 227
228X509_EXTENSION * 228X509_EXTENSION *
229X509_REVOKED_get_ext(const X509_REVOKED *x, int loc) 229X509_REVOKED_get_ext(const X509_REVOKED *x, int loc)
230{ 230{
231 return (X509v3_get_ext(x->extensions, loc)); 231 return X509v3_get_ext(x->extensions, loc);
232} 232}
233LCRYPTO_ALIAS(X509_REVOKED_get_ext); 233LCRYPTO_ALIAS(X509_REVOKED_get_ext);
234 234
235X509_EXTENSION * 235X509_EXTENSION *
236X509_REVOKED_delete_ext(X509_REVOKED *x, int loc) 236X509_REVOKED_delete_ext(X509_REVOKED *x, int loc)
237{ 237{
238 return (X509v3_delete_ext(x->extensions, loc)); 238 return X509v3_delete_ext(x->extensions, loc);
239} 239}
240LCRYPTO_ALIAS(X509_REVOKED_delete_ext); 240LCRYPTO_ALIAS(X509_REVOKED_delete_ext);
241 241
242int 242int
243X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc) 243X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc)
244{ 244{
245 return (X509v3_add_ext(&(x->extensions), ex, loc) != NULL); 245 return X509v3_add_ext(&x->extensions, ex, loc) != NULL;
246} 246}
247LCRYPTO_ALIAS(X509_REVOKED_add_ext); 247LCRYPTO_ALIAS(X509_REVOKED_add_ext);
248 248