diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x_all.c')
-rw-r--r-- | src/lib/libcrypto/x509/x_all.c | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/src/lib/libcrypto/x509/x_all.c b/src/lib/libcrypto/x509/x_all.c index 819162dc31..cd6da9f409 100644 --- a/src/lib/libcrypto/x509/x_all.c +++ b/src/lib/libcrypto/x509/x_all.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x_all.c,v 1.29 2022/11/26 16:08:55 tb Exp $ */ | 1 | /* $OpenBSD: x_all.c,v 1.30 2023/02/16 08:38:17 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 | * |
@@ -80,84 +80,84 @@ d2i_X509_bio(BIO *bp, X509 **x509) | |||
80 | { | 80 | { |
81 | return ASN1_item_d2i_bio(&X509_it, bp, x509); | 81 | return ASN1_item_d2i_bio(&X509_it, bp, x509); |
82 | } | 82 | } |
83 | LCRYPTO_ALIAS(d2i_X509_bio) | 83 | LCRYPTO_ALIAS(d2i_X509_bio); |
84 | 84 | ||
85 | int | 85 | int |
86 | i2d_X509_bio(BIO *bp, X509 *x509) | 86 | i2d_X509_bio(BIO *bp, X509 *x509) |
87 | { | 87 | { |
88 | return ASN1_item_i2d_bio(&X509_it, bp, x509); | 88 | return ASN1_item_i2d_bio(&X509_it, bp, x509); |
89 | } | 89 | } |
90 | LCRYPTO_ALIAS(i2d_X509_bio) | 90 | LCRYPTO_ALIAS(i2d_X509_bio); |
91 | 91 | ||
92 | X509 * | 92 | X509 * |
93 | d2i_X509_fp(FILE *fp, X509 **x509) | 93 | d2i_X509_fp(FILE *fp, X509 **x509) |
94 | { | 94 | { |
95 | return ASN1_item_d2i_fp(&X509_it, fp, x509); | 95 | return ASN1_item_d2i_fp(&X509_it, fp, x509); |
96 | } | 96 | } |
97 | LCRYPTO_ALIAS(d2i_X509_fp) | 97 | LCRYPTO_ALIAS(d2i_X509_fp); |
98 | 98 | ||
99 | int | 99 | int |
100 | i2d_X509_fp(FILE *fp, X509 *x509) | 100 | i2d_X509_fp(FILE *fp, X509 *x509) |
101 | { | 101 | { |
102 | return ASN1_item_i2d_fp(&X509_it, fp, x509); | 102 | return ASN1_item_i2d_fp(&X509_it, fp, x509); |
103 | } | 103 | } |
104 | LCRYPTO_ALIAS(i2d_X509_fp) | 104 | LCRYPTO_ALIAS(i2d_X509_fp); |
105 | 105 | ||
106 | X509_CRL * | 106 | X509_CRL * |
107 | d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl) | 107 | d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl) |
108 | { | 108 | { |
109 | return ASN1_item_d2i_bio(&X509_CRL_it, bp, crl); | 109 | return ASN1_item_d2i_bio(&X509_CRL_it, bp, crl); |
110 | } | 110 | } |
111 | LCRYPTO_ALIAS(d2i_X509_CRL_bio) | 111 | LCRYPTO_ALIAS(d2i_X509_CRL_bio); |
112 | 112 | ||
113 | int | 113 | int |
114 | i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl) | 114 | i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl) |
115 | { | 115 | { |
116 | return ASN1_item_i2d_bio(&X509_CRL_it, bp, crl); | 116 | return ASN1_item_i2d_bio(&X509_CRL_it, bp, crl); |
117 | } | 117 | } |
118 | LCRYPTO_ALIAS(i2d_X509_CRL_bio) | 118 | LCRYPTO_ALIAS(i2d_X509_CRL_bio); |
119 | 119 | ||
120 | X509_CRL * | 120 | X509_CRL * |
121 | d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl) | 121 | d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl) |
122 | { | 122 | { |
123 | return ASN1_item_d2i_fp(&X509_CRL_it, fp, crl); | 123 | return ASN1_item_d2i_fp(&X509_CRL_it, fp, crl); |
124 | } | 124 | } |
125 | LCRYPTO_ALIAS(d2i_X509_CRL_fp) | 125 | LCRYPTO_ALIAS(d2i_X509_CRL_fp); |
126 | 126 | ||
127 | int | 127 | int |
128 | i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl) | 128 | i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl) |
129 | { | 129 | { |
130 | return ASN1_item_i2d_fp(&X509_CRL_it, fp, crl); | 130 | return ASN1_item_i2d_fp(&X509_CRL_it, fp, crl); |
131 | } | 131 | } |
132 | LCRYPTO_ALIAS(i2d_X509_CRL_fp) | 132 | LCRYPTO_ALIAS(i2d_X509_CRL_fp); |
133 | 133 | ||
134 | X509_REQ * | 134 | X509_REQ * |
135 | d2i_X509_REQ_bio(BIO *bp, X509_REQ **req) | 135 | d2i_X509_REQ_bio(BIO *bp, X509_REQ **req) |
136 | { | 136 | { |
137 | return ASN1_item_d2i_bio(&X509_REQ_it, bp, req); | 137 | return ASN1_item_d2i_bio(&X509_REQ_it, bp, req); |
138 | } | 138 | } |
139 | LCRYPTO_ALIAS(d2i_X509_REQ_bio) | 139 | LCRYPTO_ALIAS(d2i_X509_REQ_bio); |
140 | 140 | ||
141 | int | 141 | int |
142 | i2d_X509_REQ_bio(BIO *bp, X509_REQ *req) | 142 | i2d_X509_REQ_bio(BIO *bp, X509_REQ *req) |
143 | { | 143 | { |
144 | return ASN1_item_i2d_bio(&X509_REQ_it, bp, req); | 144 | return ASN1_item_i2d_bio(&X509_REQ_it, bp, req); |
145 | } | 145 | } |
146 | LCRYPTO_ALIAS(i2d_X509_REQ_bio) | 146 | LCRYPTO_ALIAS(i2d_X509_REQ_bio); |
147 | 147 | ||
148 | X509_REQ * | 148 | X509_REQ * |
149 | d2i_X509_REQ_fp(FILE *fp, X509_REQ **req) | 149 | d2i_X509_REQ_fp(FILE *fp, X509_REQ **req) |
150 | { | 150 | { |
151 | return ASN1_item_d2i_fp(&X509_REQ_it, fp, req); | 151 | return ASN1_item_d2i_fp(&X509_REQ_it, fp, req); |
152 | } | 152 | } |
153 | LCRYPTO_ALIAS(d2i_X509_REQ_fp) | 153 | LCRYPTO_ALIAS(d2i_X509_REQ_fp); |
154 | 154 | ||
155 | int | 155 | int |
156 | i2d_X509_REQ_fp(FILE *fp, X509_REQ *req) | 156 | i2d_X509_REQ_fp(FILE *fp, X509_REQ *req) |
157 | { | 157 | { |
158 | return ASN1_item_i2d_fp(&X509_REQ_it, fp, req); | 158 | return ASN1_item_i2d_fp(&X509_REQ_it, fp, req); |
159 | } | 159 | } |
160 | LCRYPTO_ALIAS(i2d_X509_REQ_fp) | 160 | LCRYPTO_ALIAS(i2d_X509_REQ_fp); |
161 | 161 | ||
162 | #ifndef OPENSSL_NO_RSA | 162 | #ifndef OPENSSL_NO_RSA |
163 | RSA * | 163 | RSA * |
@@ -165,56 +165,56 @@ d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa) | |||
165 | { | 165 | { |
166 | return ASN1_item_d2i_bio(&RSAPrivateKey_it, bp, rsa); | 166 | return ASN1_item_d2i_bio(&RSAPrivateKey_it, bp, rsa); |
167 | } | 167 | } |
168 | LCRYPTO_ALIAS(d2i_RSAPrivateKey_bio) | 168 | LCRYPTO_ALIAS(d2i_RSAPrivateKey_bio); |
169 | 169 | ||
170 | int | 170 | int |
171 | i2d_RSAPrivateKey_bio(BIO *bp, RSA *rsa) | 171 | i2d_RSAPrivateKey_bio(BIO *bp, RSA *rsa) |
172 | { | 172 | { |
173 | return ASN1_item_i2d_bio(&RSAPrivateKey_it, bp, rsa); | 173 | return ASN1_item_i2d_bio(&RSAPrivateKey_it, bp, rsa); |
174 | } | 174 | } |
175 | LCRYPTO_ALIAS(i2d_RSAPrivateKey_bio) | 175 | LCRYPTO_ALIAS(i2d_RSAPrivateKey_bio); |
176 | 176 | ||
177 | RSA * | 177 | RSA * |
178 | d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa) | 178 | d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa) |
179 | { | 179 | { |
180 | return ASN1_item_d2i_fp(&RSAPrivateKey_it, fp, rsa); | 180 | return ASN1_item_d2i_fp(&RSAPrivateKey_it, fp, rsa); |
181 | } | 181 | } |
182 | LCRYPTO_ALIAS(d2i_RSAPrivateKey_fp) | 182 | LCRYPTO_ALIAS(d2i_RSAPrivateKey_fp); |
183 | 183 | ||
184 | int | 184 | int |
185 | i2d_RSAPrivateKey_fp(FILE *fp, RSA *rsa) | 185 | i2d_RSAPrivateKey_fp(FILE *fp, RSA *rsa) |
186 | { | 186 | { |
187 | return ASN1_item_i2d_fp(&RSAPrivateKey_it, fp, rsa); | 187 | return ASN1_item_i2d_fp(&RSAPrivateKey_it, fp, rsa); |
188 | } | 188 | } |
189 | LCRYPTO_ALIAS(i2d_RSAPrivateKey_fp) | 189 | LCRYPTO_ALIAS(i2d_RSAPrivateKey_fp); |
190 | 190 | ||
191 | RSA * | 191 | RSA * |
192 | d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa) | 192 | d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa) |
193 | { | 193 | { |
194 | return ASN1_item_d2i_bio(&RSAPublicKey_it, bp, rsa); | 194 | return ASN1_item_d2i_bio(&RSAPublicKey_it, bp, rsa); |
195 | } | 195 | } |
196 | LCRYPTO_ALIAS(d2i_RSAPublicKey_bio) | 196 | LCRYPTO_ALIAS(d2i_RSAPublicKey_bio); |
197 | 197 | ||
198 | int | 198 | int |
199 | i2d_RSAPublicKey_bio(BIO *bp, RSA *rsa) | 199 | i2d_RSAPublicKey_bio(BIO *bp, RSA *rsa) |
200 | { | 200 | { |
201 | return ASN1_item_i2d_bio(&RSAPublicKey_it, bp, rsa); | 201 | return ASN1_item_i2d_bio(&RSAPublicKey_it, bp, rsa); |
202 | } | 202 | } |
203 | LCRYPTO_ALIAS(i2d_RSAPublicKey_bio) | 203 | LCRYPTO_ALIAS(i2d_RSAPublicKey_bio); |
204 | 204 | ||
205 | RSA * | 205 | RSA * |
206 | d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa) | 206 | d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa) |
207 | { | 207 | { |
208 | return ASN1_item_d2i_fp(&RSAPublicKey_it, fp, rsa); | 208 | return ASN1_item_d2i_fp(&RSAPublicKey_it, fp, rsa); |
209 | } | 209 | } |
210 | LCRYPTO_ALIAS(d2i_RSAPublicKey_fp) | 210 | LCRYPTO_ALIAS(d2i_RSAPublicKey_fp); |
211 | 211 | ||
212 | int | 212 | int |
213 | i2d_RSAPublicKey_fp(FILE *fp, RSA *rsa) | 213 | i2d_RSAPublicKey_fp(FILE *fp, RSA *rsa) |
214 | { | 214 | { |
215 | return ASN1_item_i2d_fp(&RSAPublicKey_it, fp, rsa); | 215 | return ASN1_item_i2d_fp(&RSAPublicKey_it, fp, rsa); |
216 | } | 216 | } |
217 | LCRYPTO_ALIAS(i2d_RSAPublicKey_fp) | 217 | LCRYPTO_ALIAS(i2d_RSAPublicKey_fp); |
218 | #endif | 218 | #endif |
219 | 219 | ||
220 | #ifndef OPENSSL_NO_DSA | 220 | #ifndef OPENSSL_NO_DSA |
@@ -223,28 +223,28 @@ d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa) | |||
223 | { | 223 | { |
224 | return ASN1_item_d2i_bio(&DSAPrivateKey_it, bp, dsa); | 224 | return ASN1_item_d2i_bio(&DSAPrivateKey_it, bp, dsa); |
225 | } | 225 | } |
226 | LCRYPTO_ALIAS(d2i_DSAPrivateKey_bio) | 226 | LCRYPTO_ALIAS(d2i_DSAPrivateKey_bio); |
227 | 227 | ||
228 | int | 228 | int |
229 | i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa) | 229 | i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa) |
230 | { | 230 | { |
231 | return ASN1_item_i2d_bio(&DSAPrivateKey_it, bp, dsa); | 231 | return ASN1_item_i2d_bio(&DSAPrivateKey_it, bp, dsa); |
232 | } | 232 | } |
233 | LCRYPTO_ALIAS(i2d_DSAPrivateKey_bio) | 233 | LCRYPTO_ALIAS(i2d_DSAPrivateKey_bio); |
234 | 234 | ||
235 | DSA * | 235 | DSA * |
236 | d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa) | 236 | d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa) |
237 | { | 237 | { |
238 | return ASN1_item_d2i_fp(&DSAPrivateKey_it, fp, dsa); | 238 | return ASN1_item_d2i_fp(&DSAPrivateKey_it, fp, dsa); |
239 | } | 239 | } |
240 | LCRYPTO_ALIAS(d2i_DSAPrivateKey_fp) | 240 | LCRYPTO_ALIAS(d2i_DSAPrivateKey_fp); |
241 | 241 | ||
242 | int | 242 | int |
243 | i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa) | 243 | i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa) |
244 | { | 244 | { |
245 | return ASN1_item_i2d_fp(&DSAPrivateKey_it, fp, dsa); | 245 | return ASN1_item_i2d_fp(&DSAPrivateKey_it, fp, dsa); |
246 | } | 246 | } |
247 | LCRYPTO_ALIAS(i2d_DSAPrivateKey_fp) | 247 | LCRYPTO_ALIAS(i2d_DSAPrivateKey_fp); |
248 | #endif | 248 | #endif |
249 | 249 | ||
250 | #ifndef OPENSSL_NO_EC | 250 | #ifndef OPENSSL_NO_EC |
@@ -253,28 +253,28 @@ d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey) | |||
253 | { | 253 | { |
254 | return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, bp, eckey); | 254 | return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, bp, eckey); |
255 | } | 255 | } |
256 | LCRYPTO_ALIAS(d2i_ECPrivateKey_bio) | 256 | LCRYPTO_ALIAS(d2i_ECPrivateKey_bio); |
257 | 257 | ||
258 | int | 258 | int |
259 | i2d_ECPrivateKey_bio(BIO *bp, EC_KEY *eckey) | 259 | i2d_ECPrivateKey_bio(BIO *bp, EC_KEY *eckey) |
260 | { | 260 | { |
261 | return ASN1_i2d_bio_of(EC_KEY, i2d_ECPrivateKey, bp, eckey); | 261 | return ASN1_i2d_bio_of(EC_KEY, i2d_ECPrivateKey, bp, eckey); |
262 | } | 262 | } |
263 | LCRYPTO_ALIAS(i2d_ECPrivateKey_bio) | 263 | LCRYPTO_ALIAS(i2d_ECPrivateKey_bio); |
264 | 264 | ||
265 | EC_KEY * | 265 | EC_KEY * |
266 | d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey) | 266 | d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey) |
267 | { | 267 | { |
268 | return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, fp, eckey); | 268 | return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, fp, eckey); |
269 | } | 269 | } |
270 | LCRYPTO_ALIAS(d2i_ECPrivateKey_fp) | 270 | LCRYPTO_ALIAS(d2i_ECPrivateKey_fp); |
271 | 271 | ||
272 | int | 272 | int |
273 | i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey) | 273 | i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey) |
274 | { | 274 | { |
275 | return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey); | 275 | return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey); |
276 | } | 276 | } |
277 | LCRYPTO_ALIAS(i2d_ECPrivateKey_fp) | 277 | LCRYPTO_ALIAS(i2d_ECPrivateKey_fp); |
278 | #endif | 278 | #endif |
279 | 279 | ||
280 | X509_SIG * | 280 | X509_SIG * |
@@ -282,28 +282,28 @@ d2i_PKCS8_bio(BIO *bp, X509_SIG **p8) | |||
282 | { | 282 | { |
283 | return ASN1_item_d2i_bio(&X509_SIG_it, bp, p8); | 283 | return ASN1_item_d2i_bio(&X509_SIG_it, bp, p8); |
284 | } | 284 | } |
285 | LCRYPTO_ALIAS(d2i_PKCS8_bio) | 285 | LCRYPTO_ALIAS(d2i_PKCS8_bio); |
286 | 286 | ||
287 | int | 287 | int |
288 | i2d_PKCS8_bio(BIO *bp, X509_SIG *p8) | 288 | i2d_PKCS8_bio(BIO *bp, X509_SIG *p8) |
289 | { | 289 | { |
290 | return ASN1_item_i2d_bio(&X509_SIG_it, bp, p8); | 290 | return ASN1_item_i2d_bio(&X509_SIG_it, bp, p8); |
291 | } | 291 | } |
292 | LCRYPTO_ALIAS(i2d_PKCS8_bio) | 292 | LCRYPTO_ALIAS(i2d_PKCS8_bio); |
293 | 293 | ||
294 | X509_SIG * | 294 | X509_SIG * |
295 | d2i_PKCS8_fp(FILE *fp, X509_SIG **p8) | 295 | d2i_PKCS8_fp(FILE *fp, X509_SIG **p8) |
296 | { | 296 | { |
297 | return ASN1_item_d2i_fp(&X509_SIG_it, fp, p8); | 297 | return ASN1_item_d2i_fp(&X509_SIG_it, fp, p8); |
298 | } | 298 | } |
299 | LCRYPTO_ALIAS(d2i_PKCS8_fp) | 299 | LCRYPTO_ALIAS(d2i_PKCS8_fp); |
300 | 300 | ||
301 | int | 301 | int |
302 | i2d_PKCS8_fp(FILE *fp, X509_SIG *p8) | 302 | i2d_PKCS8_fp(FILE *fp, X509_SIG *p8) |
303 | { | 303 | { |
304 | return ASN1_item_i2d_fp(&X509_SIG_it, fp, p8); | 304 | return ASN1_item_i2d_fp(&X509_SIG_it, fp, p8); |
305 | } | 305 | } |
306 | LCRYPTO_ALIAS(i2d_PKCS8_fp) | 306 | LCRYPTO_ALIAS(i2d_PKCS8_fp); |
307 | 307 | ||
308 | PKCS8_PRIV_KEY_INFO * | 308 | PKCS8_PRIV_KEY_INFO * |
309 | d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO **p8inf) | 309 | d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO **p8inf) |
@@ -311,7 +311,7 @@ d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO **p8inf) | |||
311 | return ASN1_item_d2i_bio(&PKCS8_PRIV_KEY_INFO_it, bp, | 311 | return ASN1_item_d2i_bio(&PKCS8_PRIV_KEY_INFO_it, bp, |
312 | p8inf); | 312 | p8inf); |
313 | } | 313 | } |
314 | LCRYPTO_ALIAS(d2i_PKCS8_PRIV_KEY_INFO_bio) | 314 | LCRYPTO_ALIAS(d2i_PKCS8_PRIV_KEY_INFO_bio); |
315 | 315 | ||
316 | int | 316 | int |
317 | i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO *p8inf) | 317 | i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO *p8inf) |
@@ -319,7 +319,7 @@ i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO *p8inf) | |||
319 | return ASN1_item_i2d_bio(&PKCS8_PRIV_KEY_INFO_it, bp, | 319 | return ASN1_item_i2d_bio(&PKCS8_PRIV_KEY_INFO_it, bp, |
320 | p8inf); | 320 | p8inf); |
321 | } | 321 | } |
322 | LCRYPTO_ALIAS(i2d_PKCS8_PRIV_KEY_INFO_bio) | 322 | LCRYPTO_ALIAS(i2d_PKCS8_PRIV_KEY_INFO_bio); |
323 | 323 | ||
324 | PKCS8_PRIV_KEY_INFO * | 324 | PKCS8_PRIV_KEY_INFO * |
325 | d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO **p8inf) | 325 | d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO **p8inf) |
@@ -327,7 +327,7 @@ d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO **p8inf) | |||
327 | return ASN1_item_d2i_fp(&PKCS8_PRIV_KEY_INFO_it, fp, | 327 | return ASN1_item_d2i_fp(&PKCS8_PRIV_KEY_INFO_it, fp, |
328 | p8inf); | 328 | p8inf); |
329 | } | 329 | } |
330 | LCRYPTO_ALIAS(d2i_PKCS8_PRIV_KEY_INFO_fp) | 330 | LCRYPTO_ALIAS(d2i_PKCS8_PRIV_KEY_INFO_fp); |
331 | 331 | ||
332 | int | 332 | int |
333 | i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO *p8inf) | 333 | i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO *p8inf) |
@@ -335,7 +335,7 @@ i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO *p8inf) | |||
335 | return ASN1_item_i2d_fp(&PKCS8_PRIV_KEY_INFO_it, fp, | 335 | return ASN1_item_i2d_fp(&PKCS8_PRIV_KEY_INFO_it, fp, |
336 | p8inf); | 336 | p8inf); |
337 | } | 337 | } |
338 | LCRYPTO_ALIAS(i2d_PKCS8_PRIV_KEY_INFO_fp) | 338 | LCRYPTO_ALIAS(i2d_PKCS8_PRIV_KEY_INFO_fp); |
339 | 339 | ||
340 | EVP_PKEY * | 340 | EVP_PKEY * |
341 | d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a) | 341 | d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a) |
@@ -343,14 +343,14 @@ d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a) | |||
343 | return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, | 343 | return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, |
344 | bp, a); | 344 | bp, a); |
345 | } | 345 | } |
346 | LCRYPTO_ALIAS(d2i_PrivateKey_bio) | 346 | LCRYPTO_ALIAS(d2i_PrivateKey_bio); |
347 | 347 | ||
348 | int | 348 | int |
349 | i2d_PrivateKey_bio(BIO *bp, EVP_PKEY *pkey) | 349 | i2d_PrivateKey_bio(BIO *bp, EVP_PKEY *pkey) |
350 | { | 350 | { |
351 | return ASN1_i2d_bio_of(EVP_PKEY, i2d_PrivateKey, bp, pkey); | 351 | return ASN1_i2d_bio_of(EVP_PKEY, i2d_PrivateKey, bp, pkey); |
352 | } | 352 | } |
353 | LCRYPTO_ALIAS(i2d_PrivateKey_bio) | 353 | LCRYPTO_ALIAS(i2d_PrivateKey_bio); |
354 | 354 | ||
355 | EVP_PKEY * | 355 | EVP_PKEY * |
356 | d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a) | 356 | d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a) |
@@ -358,14 +358,14 @@ d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a) | |||
358 | return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, | 358 | return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, |
359 | fp, a); | 359 | fp, a); |
360 | } | 360 | } |
361 | LCRYPTO_ALIAS(d2i_PrivateKey_fp) | 361 | LCRYPTO_ALIAS(d2i_PrivateKey_fp); |
362 | 362 | ||
363 | int | 363 | int |
364 | i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey) | 364 | i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey) |
365 | { | 365 | { |
366 | return ASN1_i2d_fp_of(EVP_PKEY, i2d_PrivateKey, fp, pkey); | 366 | return ASN1_i2d_fp_of(EVP_PKEY, i2d_PrivateKey, fp, pkey); |
367 | } | 367 | } |
368 | LCRYPTO_ALIAS(i2d_PrivateKey_fp) | 368 | LCRYPTO_ALIAS(i2d_PrivateKey_fp); |
369 | 369 | ||
370 | int | 370 | int |
371 | i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, EVP_PKEY *key) | 371 | i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, EVP_PKEY *key) |
@@ -380,7 +380,7 @@ i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, EVP_PKEY *key) | |||
380 | PKCS8_PRIV_KEY_INFO_free(p8inf); | 380 | PKCS8_PRIV_KEY_INFO_free(p8inf); |
381 | return ret; | 381 | return ret; |
382 | } | 382 | } |
383 | LCRYPTO_ALIAS(i2d_PKCS8PrivateKeyInfo_bio) | 383 | LCRYPTO_ALIAS(i2d_PKCS8PrivateKeyInfo_bio); |
384 | 384 | ||
385 | int | 385 | int |
386 | i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, EVP_PKEY *key) | 386 | i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, EVP_PKEY *key) |
@@ -394,7 +394,7 @@ i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, EVP_PKEY *key) | |||
394 | PKCS8_PRIV_KEY_INFO_free(p8inf); | 394 | PKCS8_PRIV_KEY_INFO_free(p8inf); |
395 | return ret; | 395 | return ret; |
396 | } | 396 | } |
397 | LCRYPTO_ALIAS(i2d_PKCS8PrivateKeyInfo_fp) | 397 | LCRYPTO_ALIAS(i2d_PKCS8PrivateKeyInfo_fp); |
398 | 398 | ||
399 | int | 399 | int |
400 | X509_verify(X509 *a, EVP_PKEY *r) | 400 | X509_verify(X509 *a, EVP_PKEY *r) |
@@ -404,7 +404,7 @@ X509_verify(X509 *a, EVP_PKEY *r) | |||
404 | return (ASN1_item_verify(&X509_CINF_it, a->sig_alg, | 404 | return (ASN1_item_verify(&X509_CINF_it, a->sig_alg, |
405 | a->signature, a->cert_info, r)); | 405 | a->signature, a->cert_info, r)); |
406 | } | 406 | } |
407 | LCRYPTO_ALIAS(X509_verify) | 407 | LCRYPTO_ALIAS(X509_verify); |
408 | 408 | ||
409 | int | 409 | int |
410 | X509_REQ_verify(X509_REQ *a, EVP_PKEY *r) | 410 | X509_REQ_verify(X509_REQ *a, EVP_PKEY *r) |
@@ -412,7 +412,7 @@ X509_REQ_verify(X509_REQ *a, EVP_PKEY *r) | |||
412 | return (ASN1_item_verify(&X509_REQ_INFO_it, | 412 | return (ASN1_item_verify(&X509_REQ_INFO_it, |
413 | a->sig_alg, a->signature, a->req_info, r)); | 413 | a->sig_alg, a->signature, a->req_info, r)); |
414 | } | 414 | } |
415 | LCRYPTO_ALIAS(X509_REQ_verify) | 415 | LCRYPTO_ALIAS(X509_REQ_verify); |
416 | 416 | ||
417 | int | 417 | int |
418 | NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r) | 418 | NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r) |
@@ -420,7 +420,7 @@ NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r) | |||
420 | return (ASN1_item_verify(&NETSCAPE_SPKAC_it, | 420 | return (ASN1_item_verify(&NETSCAPE_SPKAC_it, |
421 | a->sig_algor, a->signature, a->spkac, r)); | 421 | a->sig_algor, a->signature, a->spkac, r)); |
422 | } | 422 | } |
423 | LCRYPTO_ALIAS(NETSCAPE_SPKI_verify) | 423 | LCRYPTO_ALIAS(NETSCAPE_SPKI_verify); |
424 | 424 | ||
425 | int | 425 | int |
426 | X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md) | 426 | X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md) |
@@ -430,7 +430,7 @@ X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md) | |||
430 | x->cert_info->signature, x->sig_alg, x->signature, | 430 | x->cert_info->signature, x->sig_alg, x->signature, |
431 | x->cert_info, pkey, md)); | 431 | x->cert_info, pkey, md)); |
432 | } | 432 | } |
433 | LCRYPTO_ALIAS(X509_sign) | 433 | LCRYPTO_ALIAS(X509_sign); |
434 | 434 | ||
435 | int | 435 | int |
436 | X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx) | 436 | X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx) |
@@ -440,7 +440,7 @@ X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx) | |||
440 | x->cert_info->signature, x->sig_alg, x->signature, | 440 | x->cert_info->signature, x->sig_alg, x->signature, |
441 | x->cert_info, ctx); | 441 | x->cert_info, ctx); |
442 | } | 442 | } |
443 | LCRYPTO_ALIAS(X509_sign_ctx) | 443 | LCRYPTO_ALIAS(X509_sign_ctx); |
444 | 444 | ||
445 | int | 445 | int |
446 | X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md) | 446 | X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md) |
@@ -448,7 +448,7 @@ X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md) | |||
448 | return (ASN1_item_sign(&X509_REQ_INFO_it, | 448 | return (ASN1_item_sign(&X509_REQ_INFO_it, |
449 | x->sig_alg, NULL, x->signature, x->req_info, pkey, md)); | 449 | x->sig_alg, NULL, x->signature, x->req_info, pkey, md)); |
450 | } | 450 | } |
451 | LCRYPTO_ALIAS(X509_REQ_sign) | 451 | LCRYPTO_ALIAS(X509_REQ_sign); |
452 | 452 | ||
453 | int | 453 | int |
454 | X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx) | 454 | X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx) |
@@ -456,7 +456,7 @@ X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx) | |||
456 | return ASN1_item_sign_ctx(&X509_REQ_INFO_it, | 456 | return ASN1_item_sign_ctx(&X509_REQ_INFO_it, |
457 | x->sig_alg, NULL, x->signature, x->req_info, ctx); | 457 | x->sig_alg, NULL, x->signature, x->req_info, ctx); |
458 | } | 458 | } |
459 | LCRYPTO_ALIAS(X509_REQ_sign_ctx) | 459 | LCRYPTO_ALIAS(X509_REQ_sign_ctx); |
460 | 460 | ||
461 | int | 461 | int |
462 | X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md) | 462 | X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md) |
@@ -465,7 +465,7 @@ X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md) | |||
465 | return(ASN1_item_sign(&X509_CRL_INFO_it, x->crl->sig_alg, | 465 | return(ASN1_item_sign(&X509_CRL_INFO_it, x->crl->sig_alg, |
466 | x->sig_alg, x->signature, x->crl, pkey, md)); | 466 | x->sig_alg, x->signature, x->crl, pkey, md)); |
467 | } | 467 | } |
468 | LCRYPTO_ALIAS(X509_CRL_sign) | 468 | LCRYPTO_ALIAS(X509_CRL_sign); |
469 | 469 | ||
470 | int | 470 | int |
471 | X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx) | 471 | X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx) |
@@ -474,7 +474,7 @@ X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx) | |||
474 | return ASN1_item_sign_ctx(&X509_CRL_INFO_it, | 474 | return ASN1_item_sign_ctx(&X509_CRL_INFO_it, |
475 | x->crl->sig_alg, x->sig_alg, x->signature, x->crl, ctx); | 475 | x->crl->sig_alg, x->sig_alg, x->signature, x->crl, ctx); |
476 | } | 476 | } |
477 | LCRYPTO_ALIAS(X509_CRL_sign_ctx) | 477 | LCRYPTO_ALIAS(X509_CRL_sign_ctx); |
478 | 478 | ||
479 | int | 479 | int |
480 | NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md) | 480 | NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md) |
@@ -482,7 +482,7 @@ NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md) | |||
482 | return (ASN1_item_sign(&NETSCAPE_SPKAC_it, | 482 | return (ASN1_item_sign(&NETSCAPE_SPKAC_it, |
483 | x->sig_algor, NULL, x->signature, x->spkac, pkey, md)); | 483 | x->sig_algor, NULL, x->signature, x->spkac, pkey, md)); |
484 | } | 484 | } |
485 | LCRYPTO_ALIAS(NETSCAPE_SPKI_sign) | 485 | LCRYPTO_ALIAS(NETSCAPE_SPKI_sign); |
486 | 486 | ||
487 | int | 487 | int |
488 | X509_pubkey_digest(const X509 *data, const EVP_MD *type, unsigned char *md, | 488 | X509_pubkey_digest(const X509 *data, const EVP_MD *type, unsigned char *md, |
@@ -494,7 +494,7 @@ X509_pubkey_digest(const X509 *data, const EVP_MD *type, unsigned char *md, | |||
494 | return 0; | 494 | return 0; |
495 | return EVP_Digest(key->data, key->length, md, len, type, NULL); | 495 | return EVP_Digest(key->data, key->length, md, len, type, NULL); |
496 | } | 496 | } |
497 | LCRYPTO_ALIAS(X509_pubkey_digest) | 497 | LCRYPTO_ALIAS(X509_pubkey_digest); |
498 | 498 | ||
499 | int | 499 | int |
500 | X509_digest(const X509 *data, const EVP_MD *type, unsigned char *md, | 500 | X509_digest(const X509 *data, const EVP_MD *type, unsigned char *md, |
@@ -503,7 +503,7 @@ X509_digest(const X509 *data, const EVP_MD *type, unsigned char *md, | |||
503 | return (ASN1_item_digest(&X509_it, type, (char *)data, | 503 | return (ASN1_item_digest(&X509_it, type, (char *)data, |
504 | md, len)); | 504 | md, len)); |
505 | } | 505 | } |
506 | LCRYPTO_ALIAS(X509_digest) | 506 | LCRYPTO_ALIAS(X509_digest); |
507 | 507 | ||
508 | int | 508 | int |
509 | X509_CRL_digest(const X509_CRL *data, const EVP_MD *type, unsigned char *md, | 509 | X509_CRL_digest(const X509_CRL *data, const EVP_MD *type, unsigned char *md, |
@@ -512,7 +512,7 @@ X509_CRL_digest(const X509_CRL *data, const EVP_MD *type, unsigned char *md, | |||
512 | return (ASN1_item_digest(&X509_CRL_it, type, (char *)data, | 512 | return (ASN1_item_digest(&X509_CRL_it, type, (char *)data, |
513 | md, len)); | 513 | md, len)); |
514 | } | 514 | } |
515 | LCRYPTO_ALIAS(X509_CRL_digest) | 515 | LCRYPTO_ALIAS(X509_CRL_digest); |
516 | 516 | ||
517 | int | 517 | int |
518 | X509_REQ_digest(const X509_REQ *data, const EVP_MD *type, unsigned char *md, | 518 | X509_REQ_digest(const X509_REQ *data, const EVP_MD *type, unsigned char *md, |
@@ -521,7 +521,7 @@ X509_REQ_digest(const X509_REQ *data, const EVP_MD *type, unsigned char *md, | |||
521 | return (ASN1_item_digest(&X509_REQ_it, type, (char *)data, | 521 | return (ASN1_item_digest(&X509_REQ_it, type, (char *)data, |
522 | md, len)); | 522 | md, len)); |
523 | } | 523 | } |
524 | LCRYPTO_ALIAS(X509_REQ_digest) | 524 | LCRYPTO_ALIAS(X509_REQ_digest); |
525 | 525 | ||
526 | int | 526 | int |
527 | X509_NAME_digest(const X509_NAME *data, const EVP_MD *type, unsigned char *md, | 527 | X509_NAME_digest(const X509_NAME *data, const EVP_MD *type, unsigned char *md, |
@@ -530,7 +530,7 @@ X509_NAME_digest(const X509_NAME *data, const EVP_MD *type, unsigned char *md, | |||
530 | return (ASN1_item_digest(&X509_NAME_it, type, (char *)data, | 530 | return (ASN1_item_digest(&X509_NAME_it, type, (char *)data, |
531 | md, len)); | 531 | md, len)); |
532 | } | 532 | } |
533 | LCRYPTO_ALIAS(X509_NAME_digest) | 533 | LCRYPTO_ALIAS(X509_NAME_digest); |
534 | 534 | ||
535 | int | 535 | int |
536 | X509_up_ref(X509 *x) | 536 | X509_up_ref(X509 *x) |
@@ -538,4 +538,4 @@ X509_up_ref(X509 *x) | |||
538 | int i = CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); | 538 | int i = CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); |
539 | return i > 1 ? 1 : 0; | 539 | return i > 1 ? 1 : 0; |
540 | } | 540 | } |
541 | LCRYPTO_ALIAS(X509_up_ref) | 541 | LCRYPTO_ALIAS(X509_up_ref); |