summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2024-03-26 23:41:45 +0000
committertb <>2024-03-26 23:41:45 +0000
commit82695142b4f42e4e555b69033b47b37af40ca94c (patch)
treef0ec8901e3dfe0224e1a0e1678bb82b9df118e5d /src/lib
parent3e1d7cb09e156d378e8f45dce634654ff6f77459 (diff)
downloadopenbsd-82695142b4f42e4e555b69033b47b37af40ca94c.tar.gz
openbsd-82695142b4f42e4e555b69033b47b37af40ca94c.tar.bz2
openbsd-82695142b4f42e4e555b69033b47b37af40ca94c.zip
Cosmetics, mostly removal of silly parentheses
No change in generated assembly
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/x509/x509cset.c40
1 files changed, 19 insertions, 21 deletions
diff --git a/src/lib/libcrypto/x509/x509cset.c b/src/lib/libcrypto/x509/x509cset.c
index 859c9724b5..468831266f 100644
--- a/src/lib/libcrypto/x509/x509cset.c
+++ b/src/lib/libcrypto/x509/x509cset.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509cset.c,v 1.21 2024/03/26 22:45:38 tb Exp $ */ 1/* $OpenBSD: x509cset.c,v 1.22 2024/03/26 23:41:45 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 2001. 3 * project 2001.
4 */ 4 */
@@ -68,8 +68,7 @@
68int 68int
69X509_CRL_up_ref(X509_CRL *x) 69X509_CRL_up_ref(X509_CRL *x)
70{ 70{
71 int refs = CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL); 71 return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL) > 1;
72 return (refs > 1) ? 1 : 0;
73} 72}
74LCRYPTO_ALIAS(X509_CRL_up_ref); 73LCRYPTO_ALIAS(X509_CRL_up_ref);
75 74
@@ -77,28 +76,28 @@ int
77X509_CRL_set_version(X509_CRL *x, long version) 76X509_CRL_set_version(X509_CRL *x, long version)
78{ 77{
79 if (x == NULL) 78 if (x == NULL)
80 return (0); 79 return 0;
81 /* 80 /*
82 * RFC 5280, 4.1: versions 1 - 3 are specified as follows. 81 * RFC 5280, 4.1: versions 1 - 3 are specified as follows.
83 * Version ::= INTEGER { v1(0), v2(1), v3(2) } 82 * Version ::= INTEGER { v1(0), v2(1), v3(2) }
84 * The only specified versions for CRLs are 1 and 2. 83 * The only specified versions for CRLs are 1 and 2.
85 */ 84 */
86 if (version < 0 || version > 1) 85 if (version < 0 || version > 1)
87 return (0); 86 return 0;
88 if (x->crl->version == NULL) { 87 if (x->crl->version == NULL) {
89 if ((x->crl->version = ASN1_INTEGER_new()) == NULL) 88 if ((x->crl->version = ASN1_INTEGER_new()) == NULL)
90 return (0); 89 return 0;
91 } 90 }
92 return (ASN1_INTEGER_set(x->crl->version, version)); 91 return ASN1_INTEGER_set(x->crl->version, version);
93} 92}
94LCRYPTO_ALIAS(X509_CRL_set_version); 93LCRYPTO_ALIAS(X509_CRL_set_version);
95 94
96int 95int
97X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name) 96X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name)
98{ 97{
99 if ((x == NULL) || (x->crl == NULL)) 98 if (x == NULL || x->crl == NULL)
100 return (0); 99 return 0;
101 return (X509_NAME_set(&x->crl->issuer, name)); 100 return X509_NAME_set(&x->crl->issuer, name);
102} 101}
103LCRYPTO_ALIAS(X509_CRL_set_issuer_name); 102LCRYPTO_ALIAS(X509_CRL_set_issuer_name);
104 103
@@ -108,7 +107,7 @@ X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm)
108 ASN1_TIME *in; 107 ASN1_TIME *in;
109 108
110 if (x == NULL) 109 if (x == NULL)
111 return (0); 110 return 0;
112 in = x->crl->lastUpdate; 111 in = x->crl->lastUpdate;
113 if (in != tm) { 112 if (in != tm) {
114 in = ASN1_STRING_dup(tm); 113 in = ASN1_STRING_dup(tm);
@@ -117,7 +116,7 @@ X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm)
117 x->crl->lastUpdate = in; 116 x->crl->lastUpdate = in;
118 } 117 }
119 } 118 }
120 return (in != NULL); 119 return in != NULL;
121} 120}
122LCRYPTO_ALIAS(X509_CRL_set_lastUpdate); 121LCRYPTO_ALIAS(X509_CRL_set_lastUpdate);
123 122
@@ -134,7 +133,7 @@ X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm)
134 ASN1_TIME *in; 133 ASN1_TIME *in;
135 134
136 if (x == NULL) 135 if (x == NULL)
137 return (0); 136 return 0;
138 in = x->crl->nextUpdate; 137 in = x->crl->nextUpdate;
139 if (in != tm) { 138 if (in != tm) {
140 in = ASN1_STRING_dup(tm); 139 in = ASN1_STRING_dup(tm);
@@ -143,7 +142,7 @@ X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm)
143 x->crl->nextUpdate = in; 142 x->crl->nextUpdate = in;
144 } 143 }
145 } 144 }
146 return (in != NULL); 145 return in != NULL;
147} 146}
148LCRYPTO_ALIAS(X509_CRL_set_nextUpdate); 147LCRYPTO_ALIAS(X509_CRL_set_nextUpdate);
149 148
@@ -157,11 +156,10 @@ LCRYPTO_ALIAS(X509_CRL_set1_nextUpdate);
157int 156int
158X509_CRL_sort(X509_CRL *c) 157X509_CRL_sort(X509_CRL *c)
159{ 158{
160 int i;
161 X509_REVOKED *r; 159 X509_REVOKED *r;
160 int i;
162 161
163 /* sort the data so it will be written in serial 162 /* Sort the data so it will be written in serial number order */
164 * number order */
165 sk_X509_REVOKED_sort(c->crl->revoked); 163 sk_X509_REVOKED_sort(c->crl->revoked);
166 for (i = 0; i < sk_X509_REVOKED_num(c->crl->revoked); i++) { 164 for (i = 0; i < sk_X509_REVOKED_num(c->crl->revoked); i++) {
167 r = sk_X509_REVOKED_value(c->crl->revoked, i); 165 r = sk_X509_REVOKED_value(c->crl->revoked, i);
@@ -199,7 +197,7 @@ X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm)
199 ASN1_TIME *in; 197 ASN1_TIME *in;
200 198
201 if (x == NULL) 199 if (x == NULL)
202 return (0); 200 return 0;
203 in = x->revocationDate; 201 in = x->revocationDate;
204 if (in != tm) { 202 if (in != tm) {
205 in = ASN1_STRING_dup(tm); 203 in = ASN1_STRING_dup(tm);
@@ -208,7 +206,7 @@ X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm)
208 x->revocationDate = in; 206 x->revocationDate = in;
209 } 207 }
210 } 208 }
211 return (in != NULL); 209 return in != NULL;
212} 210}
213LCRYPTO_ALIAS(X509_REVOKED_set_revocationDate); 211LCRYPTO_ALIAS(X509_REVOKED_set_revocationDate);
214 212
@@ -218,7 +216,7 @@ X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial)
218 ASN1_INTEGER *in; 216 ASN1_INTEGER *in;
219 217
220 if (x == NULL) 218 if (x == NULL)
221 return (0); 219 return 0;
222 in = x->serialNumber; 220 in = x->serialNumber;
223 if (in != serial) { 221 if (in != serial) {
224 in = ASN1_INTEGER_dup(serial); 222 in = ASN1_INTEGER_dup(serial);
@@ -227,7 +225,7 @@ X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial)
227 x->serialNumber = in; 225 x->serialNumber = in;
228 } 226 }
229 } 227 }
230 return (in != NULL); 228 return in != NULL;
231} 229}
232LCRYPTO_ALIAS(X509_REVOKED_set_serialNumber); 230LCRYPTO_ALIAS(X509_REVOKED_set_serialNumber);
233 231
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-28 11:43:30 +0000