summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pem/pem_all.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pem/pem_all.c')
-rw-r--r--src/lib/libcrypto/pem/pem_all.c60
1 files changed, 59 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pem/pem_all.c b/src/lib/libcrypto/pem/pem_all.c
index 9fa5184ec0..21e325b9f1 100644
--- a/src/lib/libcrypto/pem/pem_all.c
+++ b/src/lib/libcrypto/pem/pem_all.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem_all.c,v 1.20 2023/04/25 17:51:36 tb Exp $ */ 1/* $OpenBSD: pem_all.c,v 1.21 2023/07/07 13:40:44 beck 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 *
@@ -147,6 +147,7 @@ PEM_read_X509_REQ(FILE *fp, X509_REQ **x, pem_password_cb *cb, void *u)
147 return PEM_ASN1_read((d2i_of_void *)d2i_X509_REQ, PEM_STRING_X509_REQ, fp, 147 return PEM_ASN1_read((d2i_of_void *)d2i_X509_REQ, PEM_STRING_X509_REQ, fp,
148 (void **)x, cb, u); 148 (void **)x, cb, u);
149} 149}
150LCRYPTO_ALIAS(PEM_read_X509_REQ);
150 151
151int 152int
152PEM_write_X509_REQ(FILE *fp, X509_REQ *x) 153PEM_write_X509_REQ(FILE *fp, X509_REQ *x)
@@ -154,6 +155,7 @@ PEM_write_X509_REQ(FILE *fp, X509_REQ *x)
154 return PEM_ASN1_write((i2d_of_void *)i2d_X509_REQ, PEM_STRING_X509_REQ, fp, 155 return PEM_ASN1_write((i2d_of_void *)i2d_X509_REQ, PEM_STRING_X509_REQ, fp,
155 x, NULL, NULL, 0, NULL, NULL); 156 x, NULL, NULL, 0, NULL, NULL);
156} 157}
158LCRYPTO_ALIAS(PEM_write_X509_REQ);
157 159
158X509_REQ * 160X509_REQ *
159PEM_read_bio_X509_REQ(BIO *bp, X509_REQ **x, pem_password_cb *cb, void *u) 161PEM_read_bio_X509_REQ(BIO *bp, X509_REQ **x, pem_password_cb *cb, void *u)
@@ -161,6 +163,7 @@ PEM_read_bio_X509_REQ(BIO *bp, X509_REQ **x, pem_password_cb *cb, void *u)
161 return PEM_ASN1_read_bio((d2i_of_void *)d2i_X509_REQ, PEM_STRING_X509_REQ, bp, 163 return PEM_ASN1_read_bio((d2i_of_void *)d2i_X509_REQ, PEM_STRING_X509_REQ, bp,
162 (void **)x, cb, u); 164 (void **)x, cb, u);
163} 165}
166LCRYPTO_ALIAS(PEM_read_bio_X509_REQ);
164 167
165int 168int
166PEM_write_bio_X509_REQ(BIO *bp, X509_REQ *x) 169PEM_write_bio_X509_REQ(BIO *bp, X509_REQ *x)
@@ -168,6 +171,7 @@ PEM_write_bio_X509_REQ(BIO *bp, X509_REQ *x)
168 return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509_REQ, PEM_STRING_X509_REQ, bp, 171 return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509_REQ, PEM_STRING_X509_REQ, bp,
169 x, NULL, NULL, 0, NULL, NULL); 172 x, NULL, NULL, 0, NULL, NULL);
170} 173}
174LCRYPTO_ALIAS(PEM_write_bio_X509_REQ);
171 175
172int 176int
173PEM_write_X509_REQ_NEW(FILE *fp, X509_REQ *x) 177PEM_write_X509_REQ_NEW(FILE *fp, X509_REQ *x)
@@ -175,6 +179,7 @@ PEM_write_X509_REQ_NEW(FILE *fp, X509_REQ *x)
175 return PEM_ASN1_write((i2d_of_void *)i2d_X509_REQ, PEM_STRING_X509_REQ_OLD, fp, 179 return PEM_ASN1_write((i2d_of_void *)i2d_X509_REQ, PEM_STRING_X509_REQ_OLD, fp,
176 x, NULL, NULL, 0, NULL, NULL); 180 x, NULL, NULL, 0, NULL, NULL);
177} 181}
182LCRYPTO_ALIAS(PEM_write_X509_REQ_NEW);
178 183
179int 184int
180PEM_write_bio_X509_REQ_NEW(BIO *bp, X509_REQ *x) 185PEM_write_bio_X509_REQ_NEW(BIO *bp, X509_REQ *x)
@@ -182,6 +187,7 @@ PEM_write_bio_X509_REQ_NEW(BIO *bp, X509_REQ *x)
182 return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509_REQ, PEM_STRING_X509_REQ_OLD, bp, 187 return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509_REQ, PEM_STRING_X509_REQ_OLD, bp,
183 x, NULL, NULL, 0, NULL, NULL); 188 x, NULL, NULL, 0, NULL, NULL);
184} 189}
190LCRYPTO_ALIAS(PEM_write_bio_X509_REQ_NEW);
185 191
186X509_CRL * 192X509_CRL *
187PEM_read_X509_CRL(FILE *fp, X509_CRL **x, pem_password_cb *cb, void *u) 193PEM_read_X509_CRL(FILE *fp, X509_CRL **x, pem_password_cb *cb, void *u)
@@ -189,6 +195,7 @@ PEM_read_X509_CRL(FILE *fp, X509_CRL **x, pem_password_cb *cb, void *u)
189 return PEM_ASN1_read((d2i_of_void *)d2i_X509_CRL, PEM_STRING_X509_CRL, fp, 195 return PEM_ASN1_read((d2i_of_void *)d2i_X509_CRL, PEM_STRING_X509_CRL, fp,
190 (void **)x, cb, u); 196 (void **)x, cb, u);
191} 197}
198LCRYPTO_ALIAS(PEM_read_X509_CRL);
192 199
193int 200int
194PEM_write_X509_CRL(FILE *fp, X509_CRL *x) 201PEM_write_X509_CRL(FILE *fp, X509_CRL *x)
@@ -196,6 +203,7 @@ PEM_write_X509_CRL(FILE *fp, X509_CRL *x)
196 return PEM_ASN1_write((i2d_of_void *)i2d_X509_CRL, PEM_STRING_X509_CRL, fp, 203 return PEM_ASN1_write((i2d_of_void *)i2d_X509_CRL, PEM_STRING_X509_CRL, fp,
197 x, NULL, NULL, 0, NULL, NULL); 204 x, NULL, NULL, 0, NULL, NULL);
198} 205}
206LCRYPTO_ALIAS(PEM_write_X509_CRL);
199 207
200X509_CRL * 208X509_CRL *
201PEM_read_bio_X509_CRL(BIO *bp, X509_CRL **x, pem_password_cb *cb, void *u) 209PEM_read_bio_X509_CRL(BIO *bp, X509_CRL **x, pem_password_cb *cb, void *u)
@@ -203,6 +211,7 @@ PEM_read_bio_X509_CRL(BIO *bp, X509_CRL **x, pem_password_cb *cb, void *u)
203 return PEM_ASN1_read_bio((d2i_of_void *)d2i_X509_CRL, PEM_STRING_X509_CRL, bp, 211 return PEM_ASN1_read_bio((d2i_of_void *)d2i_X509_CRL, PEM_STRING_X509_CRL, bp,
204 (void **)x, cb, u); 212 (void **)x, cb, u);
205} 213}
214LCRYPTO_ALIAS(PEM_read_bio_X509_CRL);
206 215
207int 216int
208PEM_write_bio_X509_CRL(BIO *bp, X509_CRL *x) 217PEM_write_bio_X509_CRL(BIO *bp, X509_CRL *x)
@@ -210,6 +219,7 @@ PEM_write_bio_X509_CRL(BIO *bp, X509_CRL *x)
210 return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509_CRL, PEM_STRING_X509_CRL, bp, 219 return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509_CRL, PEM_STRING_X509_CRL, bp,
211 x, NULL, NULL, 0, NULL, NULL); 220 x, NULL, NULL, 0, NULL, NULL);
212} 221}
222LCRYPTO_ALIAS(PEM_write_bio_X509_CRL);
213 223
214PKCS7 * 224PKCS7 *
215PEM_read_PKCS7(FILE *fp, PKCS7 **x, pem_password_cb *cb, void *u) 225PEM_read_PKCS7(FILE *fp, PKCS7 **x, pem_password_cb *cb, void *u)
@@ -217,6 +227,7 @@ PEM_read_PKCS7(FILE *fp, PKCS7 **x, pem_password_cb *cb, void *u)
217 return PEM_ASN1_read((d2i_of_void *)d2i_PKCS7, PEM_STRING_PKCS7, fp, 227 return PEM_ASN1_read((d2i_of_void *)d2i_PKCS7, PEM_STRING_PKCS7, fp,
218 (void **)x, cb, u); 228 (void **)x, cb, u);
219} 229}
230LCRYPTO_ALIAS(PEM_read_PKCS7);
220 231
221int 232int
222PEM_write_PKCS7(FILE *fp, PKCS7 *x) 233PEM_write_PKCS7(FILE *fp, PKCS7 *x)
@@ -224,6 +235,7 @@ PEM_write_PKCS7(FILE *fp, PKCS7 *x)
224 return PEM_ASN1_write((i2d_of_void *)i2d_PKCS7, PEM_STRING_PKCS7, fp, 235 return PEM_ASN1_write((i2d_of_void *)i2d_PKCS7, PEM_STRING_PKCS7, fp,
225 x, NULL, NULL, 0, NULL, NULL); 236 x, NULL, NULL, 0, NULL, NULL);
226} 237}
238LCRYPTO_ALIAS(PEM_write_PKCS7);
227 239
228PKCS7 * 240PKCS7 *
229PEM_read_bio_PKCS7(BIO *bp, PKCS7 **x, pem_password_cb *cb, void *u) 241PEM_read_bio_PKCS7(BIO *bp, PKCS7 **x, pem_password_cb *cb, void *u)
@@ -231,6 +243,7 @@ PEM_read_bio_PKCS7(BIO *bp, PKCS7 **x, pem_password_cb *cb, void *u)
231 return PEM_ASN1_read_bio((d2i_of_void *)d2i_PKCS7, PEM_STRING_PKCS7, bp, 243 return PEM_ASN1_read_bio((d2i_of_void *)d2i_PKCS7, PEM_STRING_PKCS7, bp,
232 (void **)x, cb, u); 244 (void **)x, cb, u);
233} 245}
246LCRYPTO_ALIAS(PEM_read_bio_PKCS7);
234 247
235int 248int
236PEM_write_bio_PKCS7(BIO *bp, PKCS7 *x) 249PEM_write_bio_PKCS7(BIO *bp, PKCS7 *x)
@@ -238,6 +251,7 @@ PEM_write_bio_PKCS7(BIO *bp, PKCS7 *x)
238 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PKCS7, PEM_STRING_PKCS7, bp, 251 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PKCS7, PEM_STRING_PKCS7, bp,
239 x, NULL, NULL, 0, NULL, NULL); 252 x, NULL, NULL, 0, NULL, NULL);
240} 253}
254LCRYPTO_ALIAS(PEM_write_bio_PKCS7);
241 255
242#ifndef OPENSSL_NO_RSA 256#ifndef OPENSSL_NO_RSA
243 257
@@ -275,6 +289,7 @@ PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u)
275 pktmp = PEM_read_PrivateKey(fp, NULL, cb, u); 289 pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);
276 return pkey_get_rsa(pktmp, rsa); 290 return pkey_get_rsa(pktmp, rsa);
277} 291}
292LCRYPTO_ALIAS(PEM_read_RSAPrivateKey);
278 293
279int 294int
280PEM_write_RSAPrivateKey(FILE *fp, RSA *x, const EVP_CIPHER *enc, 295PEM_write_RSAPrivateKey(FILE *fp, RSA *x, const EVP_CIPHER *enc,
@@ -283,6 +298,7 @@ PEM_write_RSAPrivateKey(FILE *fp, RSA *x, const EVP_CIPHER *enc,
283 return PEM_ASN1_write((i2d_of_void *)i2d_RSAPrivateKey, PEM_STRING_RSA, fp, 298 return PEM_ASN1_write((i2d_of_void *)i2d_RSAPrivateKey, PEM_STRING_RSA, fp,
284 x, enc, kstr, klen, cb, u); 299 x, enc, kstr, klen, cb, u);
285} 300}
301LCRYPTO_ALIAS(PEM_write_RSAPrivateKey);
286 302
287RSA * 303RSA *
288PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **rsa, pem_password_cb *cb, void *u) 304PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **rsa, pem_password_cb *cb, void *u)
@@ -292,6 +308,7 @@ PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **rsa, pem_password_cb *cb, void *u)
292 pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u); 308 pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
293 return pkey_get_rsa(pktmp, rsa); 309 return pkey_get_rsa(pktmp, rsa);
294} 310}
311LCRYPTO_ALIAS(PEM_read_bio_RSAPrivateKey);
295 312
296int 313int
297PEM_write_bio_RSAPrivateKey(BIO *bp, RSA *x, 314PEM_write_bio_RSAPrivateKey(BIO *bp, RSA *x,
@@ -301,6 +318,7 @@ PEM_write_bio_RSAPrivateKey(BIO *bp, RSA *x,
301 return PEM_ASN1_write_bio((i2d_of_void *)i2d_RSAPrivateKey, PEM_STRING_RSA, bp, 318 return PEM_ASN1_write_bio((i2d_of_void *)i2d_RSAPrivateKey, PEM_STRING_RSA, bp,
302 x, enc, kstr, klen, cb, u); 319 x, enc, kstr, klen, cb, u);
303} 320}
321LCRYPTO_ALIAS(PEM_write_bio_RSAPrivateKey);
304 322
305RSA * 323RSA *
306PEM_read_RSAPublicKey(FILE *fp, RSA **x, pem_password_cb *cb, void *u) 324PEM_read_RSAPublicKey(FILE *fp, RSA **x, pem_password_cb *cb, void *u)
@@ -308,6 +326,7 @@ PEM_read_RSAPublicKey(FILE *fp, RSA **x, pem_password_cb *cb, void *u)
308 return PEM_ASN1_read((d2i_of_void *)d2i_RSAPublicKey, PEM_STRING_RSA_PUBLIC, fp, 326 return PEM_ASN1_read((d2i_of_void *)d2i_RSAPublicKey, PEM_STRING_RSA_PUBLIC, fp,
309 (void **)x, cb, u); 327 (void **)x, cb, u);
310} 328}
329LCRYPTO_ALIAS(PEM_read_RSAPublicKey);
311 330
312int 331int
313PEM_write_RSAPublicKey(FILE *fp, const RSA *x) 332PEM_write_RSAPublicKey(FILE *fp, const RSA *x)
@@ -315,6 +334,7 @@ PEM_write_RSAPublicKey(FILE *fp, const RSA *x)
315 return PEM_ASN1_write((i2d_of_void *)i2d_RSAPublicKey, PEM_STRING_RSA_PUBLIC, fp, 334 return PEM_ASN1_write((i2d_of_void *)i2d_RSAPublicKey, PEM_STRING_RSA_PUBLIC, fp,
316 (void *)x, NULL, NULL, 0, NULL, NULL); 335 (void *)x, NULL, NULL, 0, NULL, NULL);
317} 336}
337LCRYPTO_ALIAS(PEM_write_RSAPublicKey);
318 338
319RSA * 339RSA *
320PEM_read_bio_RSAPublicKey(BIO *bp, RSA **x, pem_password_cb *cb, void *u) 340PEM_read_bio_RSAPublicKey(BIO *bp, RSA **x, pem_password_cb *cb, void *u)
@@ -322,6 +342,7 @@ PEM_read_bio_RSAPublicKey(BIO *bp, RSA **x, pem_password_cb *cb, void *u)
322 return PEM_ASN1_read_bio((d2i_of_void *)d2i_RSAPublicKey, PEM_STRING_RSA_PUBLIC, bp, 342 return PEM_ASN1_read_bio((d2i_of_void *)d2i_RSAPublicKey, PEM_STRING_RSA_PUBLIC, bp,
323 (void **)x, cb, u); 343 (void **)x, cb, u);
324} 344}
345LCRYPTO_ALIAS(PEM_read_bio_RSAPublicKey);
325 346
326int 347int
327PEM_write_bio_RSAPublicKey(BIO *bp, const RSA *x) 348PEM_write_bio_RSAPublicKey(BIO *bp, const RSA *x)
@@ -329,6 +350,7 @@ PEM_write_bio_RSAPublicKey(BIO *bp, const RSA *x)
329 return PEM_ASN1_write_bio((i2d_of_void *)i2d_RSAPublicKey, PEM_STRING_RSA_PUBLIC, bp, 350 return PEM_ASN1_write_bio((i2d_of_void *)i2d_RSAPublicKey, PEM_STRING_RSA_PUBLIC, bp,
330 (void *)x, NULL, NULL, 0, NULL, NULL); 351 (void *)x, NULL, NULL, 0, NULL, NULL);
331} 352}
353LCRYPTO_ALIAS(PEM_write_bio_RSAPublicKey);
332 354
333RSA * 355RSA *
334PEM_read_RSA_PUBKEY(FILE *fp, RSA **x, pem_password_cb *cb, void *u) 356PEM_read_RSA_PUBKEY(FILE *fp, RSA **x, pem_password_cb *cb, void *u)
@@ -336,6 +358,7 @@ PEM_read_RSA_PUBKEY(FILE *fp, RSA **x, pem_password_cb *cb, void *u)
336 return PEM_ASN1_read((d2i_of_void *)d2i_RSA_PUBKEY, PEM_STRING_PUBLIC, fp, 358 return PEM_ASN1_read((d2i_of_void *)d2i_RSA_PUBKEY, PEM_STRING_PUBLIC, fp,
337 (void **)x, cb, u); 359 (void **)x, cb, u);
338} 360}
361LCRYPTO_ALIAS(PEM_read_RSA_PUBKEY);
339 362
340int 363int
341PEM_write_RSA_PUBKEY(FILE *fp, RSA *x) 364PEM_write_RSA_PUBKEY(FILE *fp, RSA *x)
@@ -343,6 +366,7 @@ PEM_write_RSA_PUBKEY(FILE *fp, RSA *x)
343 return PEM_ASN1_write((i2d_of_void *)i2d_RSA_PUBKEY, PEM_STRING_PUBLIC, fp, 366 return PEM_ASN1_write((i2d_of_void *)i2d_RSA_PUBKEY, PEM_STRING_PUBLIC, fp,
344 x, NULL, NULL, 0, NULL, NULL); 367 x, NULL, NULL, 0, NULL, NULL);
345} 368}
369LCRYPTO_ALIAS(PEM_write_RSA_PUBKEY);
346 370
347RSA * 371RSA *
348PEM_read_bio_RSA_PUBKEY(BIO *bp, RSA **x, pem_password_cb *cb, void *u) 372PEM_read_bio_RSA_PUBKEY(BIO *bp, RSA **x, pem_password_cb *cb, void *u)
@@ -350,6 +374,7 @@ PEM_read_bio_RSA_PUBKEY(BIO *bp, RSA **x, pem_password_cb *cb, void *u)
350 return PEM_ASN1_read_bio((d2i_of_void *)d2i_RSA_PUBKEY, PEM_STRING_PUBLIC, bp, 374 return PEM_ASN1_read_bio((d2i_of_void *)d2i_RSA_PUBKEY, PEM_STRING_PUBLIC, bp,
351 (void **)x, cb, u); 375 (void **)x, cb, u);
352} 376}
377LCRYPTO_ALIAS(PEM_read_bio_RSA_PUBKEY);
353 378
354int 379int
355PEM_write_bio_RSA_PUBKEY(BIO *bp, RSA *x) 380PEM_write_bio_RSA_PUBKEY(BIO *bp, RSA *x)
@@ -357,6 +382,7 @@ PEM_write_bio_RSA_PUBKEY(BIO *bp, RSA *x)
357 return PEM_ASN1_write_bio((i2d_of_void *)i2d_RSA_PUBKEY, PEM_STRING_PUBLIC, bp, 382 return PEM_ASN1_write_bio((i2d_of_void *)i2d_RSA_PUBKEY, PEM_STRING_PUBLIC, bp,
358 x, NULL, NULL, 0, NULL, NULL); 383 x, NULL, NULL, 0, NULL, NULL);
359} 384}
385LCRYPTO_ALIAS(PEM_write_bio_RSA_PUBKEY);
360 386
361#endif 387#endif
362 388
@@ -388,6 +414,7 @@ PEM_read_DSAPrivateKey(FILE *fp, DSA **dsa, pem_password_cb *cb, void *u)
388 pktmp = PEM_read_PrivateKey(fp, NULL, cb, u); 414 pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);
389 return pkey_get_dsa(pktmp, dsa); /* will free pktmp */ 415 return pkey_get_dsa(pktmp, dsa); /* will free pktmp */
390} 416}
417LCRYPTO_ALIAS(PEM_read_DSAPrivateKey);
391 418
392int 419int
393PEM_write_DSAPrivateKey(FILE *fp, DSA *x, const EVP_CIPHER *enc, 420PEM_write_DSAPrivateKey(FILE *fp, DSA *x, const EVP_CIPHER *enc,
@@ -396,6 +423,7 @@ PEM_write_DSAPrivateKey(FILE *fp, DSA *x, const EVP_CIPHER *enc,
396 return PEM_ASN1_write((i2d_of_void *)i2d_DSAPrivateKey, PEM_STRING_DSA, fp, 423 return PEM_ASN1_write((i2d_of_void *)i2d_DSAPrivateKey, PEM_STRING_DSA, fp,
397 x, enc, kstr, klen, cb, u); 424 x, enc, kstr, klen, cb, u);
398} 425}
426LCRYPTO_ALIAS(PEM_write_DSAPrivateKey);
399 427
400DSA * 428DSA *
401PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **dsa, pem_password_cb *cb, void *u) 429PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **dsa, pem_password_cb *cb, void *u)
@@ -405,6 +433,7 @@ PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **dsa, pem_password_cb *cb, void *u)
405 pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u); 433 pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
406 return pkey_get_dsa(pktmp, dsa); /* will free pktmp */ 434 return pkey_get_dsa(pktmp, dsa); /* will free pktmp */
407} 435}
436LCRYPTO_ALIAS(PEM_read_bio_DSAPrivateKey);
408 437
409int 438int
410PEM_write_bio_DSAPrivateKey(BIO *bp, DSA *x, 439PEM_write_bio_DSAPrivateKey(BIO *bp, DSA *x,
@@ -414,6 +443,7 @@ PEM_write_bio_DSAPrivateKey(BIO *bp, DSA *x,
414 return PEM_ASN1_write_bio((i2d_of_void *)i2d_DSAPrivateKey, PEM_STRING_DSA, bp, 443 return PEM_ASN1_write_bio((i2d_of_void *)i2d_DSAPrivateKey, PEM_STRING_DSA, bp,
415 x, enc, kstr, klen, cb, u); 444 x, enc, kstr, klen, cb, u);
416} 445}
446LCRYPTO_ALIAS(PEM_write_bio_DSAPrivateKey);
417 447
418DSA * 448DSA *
419PEM_read_DSA_PUBKEY(FILE *fp, DSA **x, pem_password_cb *cb, void *u) 449PEM_read_DSA_PUBKEY(FILE *fp, DSA **x, pem_password_cb *cb, void *u)
@@ -421,6 +451,7 @@ PEM_read_DSA_PUBKEY(FILE *fp, DSA **x, pem_password_cb *cb, void *u)
421 return PEM_ASN1_read((d2i_of_void *)d2i_DSA_PUBKEY, PEM_STRING_PUBLIC, fp, 451 return PEM_ASN1_read((d2i_of_void *)d2i_DSA_PUBKEY, PEM_STRING_PUBLIC, fp,
422 (void **)x, cb, u); 452 (void **)x, cb, u);
423} 453}
454LCRYPTO_ALIAS(PEM_read_DSA_PUBKEY);
424 455
425int 456int
426PEM_write_DSA_PUBKEY(FILE *fp, DSA *x) 457PEM_write_DSA_PUBKEY(FILE *fp, DSA *x)
@@ -428,6 +459,7 @@ PEM_write_DSA_PUBKEY(FILE *fp, DSA *x)
428 return PEM_ASN1_write((i2d_of_void *)i2d_DSA_PUBKEY, PEM_STRING_PUBLIC, fp, 459 return PEM_ASN1_write((i2d_of_void *)i2d_DSA_PUBKEY, PEM_STRING_PUBLIC, fp,
429 x, NULL, NULL, 0, NULL, NULL); 460 x, NULL, NULL, 0, NULL, NULL);
430} 461}
462LCRYPTO_ALIAS(PEM_write_DSA_PUBKEY);
431 463
432int 464int
433PEM_write_bio_DSA_PUBKEY(BIO *bp, DSA *x) 465PEM_write_bio_DSA_PUBKEY(BIO *bp, DSA *x)
@@ -435,6 +467,7 @@ PEM_write_bio_DSA_PUBKEY(BIO *bp, DSA *x)
435 return PEM_ASN1_write_bio((i2d_of_void *)i2d_DSA_PUBKEY, PEM_STRING_PUBLIC, bp, 467 return PEM_ASN1_write_bio((i2d_of_void *)i2d_DSA_PUBKEY, PEM_STRING_PUBLIC, bp,
436 x, NULL, NULL, 0, NULL, NULL); 468 x, NULL, NULL, 0, NULL, NULL);
437} 469}
470LCRYPTO_ALIAS(PEM_write_bio_DSA_PUBKEY);
438 471
439DSA * 472DSA *
440PEM_read_bio_DSA_PUBKEY(BIO *bp, DSA **x, pem_password_cb *cb, void *u) 473PEM_read_bio_DSA_PUBKEY(BIO *bp, DSA **x, pem_password_cb *cb, void *u)
@@ -442,6 +475,7 @@ PEM_read_bio_DSA_PUBKEY(BIO *bp, DSA **x, pem_password_cb *cb, void *u)
442 return PEM_ASN1_read_bio((d2i_of_void *)d2i_DSA_PUBKEY, PEM_STRING_PUBLIC, bp, 475 return PEM_ASN1_read_bio((d2i_of_void *)d2i_DSA_PUBKEY, PEM_STRING_PUBLIC, bp,
443 (void **)x, cb, u); 476 (void **)x, cb, u);
444} 477}
478LCRYPTO_ALIAS(PEM_read_bio_DSA_PUBKEY);
445 479
446DSA * 480DSA *
447PEM_read_DSAparams(FILE *fp, DSA **x, pem_password_cb *cb, void *u) 481PEM_read_DSAparams(FILE *fp, DSA **x, pem_password_cb *cb, void *u)
@@ -449,6 +483,7 @@ PEM_read_DSAparams(FILE *fp, DSA **x, pem_password_cb *cb, void *u)
449 return PEM_ASN1_read((d2i_of_void *)d2i_DSAparams, PEM_STRING_DSAPARAMS, fp, 483 return PEM_ASN1_read((d2i_of_void *)d2i_DSAparams, PEM_STRING_DSAPARAMS, fp,
450 (void **)x, cb, u); 484 (void **)x, cb, u);
451} 485}
486LCRYPTO_ALIAS(PEM_read_DSAparams);
452 487
453int 488int
454PEM_write_DSAparams(FILE *fp, const DSA *x) 489PEM_write_DSAparams(FILE *fp, const DSA *x)
@@ -456,6 +491,7 @@ PEM_write_DSAparams(FILE *fp, const DSA *x)
456 return PEM_ASN1_write((i2d_of_void *)i2d_DSAparams, PEM_STRING_DSAPARAMS, fp, 491 return PEM_ASN1_write((i2d_of_void *)i2d_DSAparams, PEM_STRING_DSAPARAMS, fp,
457 (void *)x, NULL, NULL, 0, NULL, NULL); 492 (void *)x, NULL, NULL, 0, NULL, NULL);
458} 493}
494LCRYPTO_ALIAS(PEM_write_DSAparams);
459 495
460DSA * 496DSA *
461PEM_read_bio_DSAparams(BIO *bp, DSA **x, pem_password_cb *cb, void *u) 497PEM_read_bio_DSAparams(BIO *bp, DSA **x, pem_password_cb *cb, void *u)
@@ -463,6 +499,7 @@ PEM_read_bio_DSAparams(BIO *bp, DSA **x, pem_password_cb *cb, void *u)
463 return PEM_ASN1_read_bio((d2i_of_void *)d2i_DSAparams, PEM_STRING_DSAPARAMS, bp, 499 return PEM_ASN1_read_bio((d2i_of_void *)d2i_DSAparams, PEM_STRING_DSAPARAMS, bp,
464 (void **)x, cb, u); 500 (void **)x, cb, u);
465} 501}
502LCRYPTO_ALIAS(PEM_read_bio_DSAparams);
466 503
467int 504int
468PEM_write_bio_DSAparams(BIO *bp, const DSA *x) 505PEM_write_bio_DSAparams(BIO *bp, const DSA *x)
@@ -470,6 +507,7 @@ PEM_write_bio_DSAparams(BIO *bp, const DSA *x)
470 return PEM_ASN1_write_bio((i2d_of_void *)i2d_DSAparams, PEM_STRING_DSAPARAMS, bp, 507 return PEM_ASN1_write_bio((i2d_of_void *)i2d_DSAparams, PEM_STRING_DSAPARAMS, bp,
471 (void *)x, NULL, NULL, 0, NULL, NULL); 508 (void *)x, NULL, NULL, 0, NULL, NULL);
472} 509}
510LCRYPTO_ALIAS(PEM_write_bio_DSAparams);
473 511
474#endif 512#endif
475 513
@@ -499,6 +537,7 @@ PEM_read_ECPKParameters(FILE *fp, EC_GROUP **x, pem_password_cb *cb, void *u)
499 return PEM_ASN1_read((d2i_of_void *)d2i_ECPKParameters, PEM_STRING_ECPARAMETERS, fp, 537 return PEM_ASN1_read((d2i_of_void *)d2i_ECPKParameters, PEM_STRING_ECPARAMETERS, fp,
500 (void **)x, cb, u); 538 (void **)x, cb, u);
501} 539}
540LCRYPTO_ALIAS(PEM_read_ECPKParameters);
502 541
503int 542int
504PEM_write_ECPKParameters(FILE *fp, const EC_GROUP *x) 543PEM_write_ECPKParameters(FILE *fp, const EC_GROUP *x)
@@ -506,6 +545,7 @@ PEM_write_ECPKParameters(FILE *fp, const EC_GROUP *x)
506 return PEM_ASN1_write((i2d_of_void *)i2d_ECPKParameters, PEM_STRING_ECPARAMETERS, fp, 545 return PEM_ASN1_write((i2d_of_void *)i2d_ECPKParameters, PEM_STRING_ECPARAMETERS, fp,
507 (void *)x, NULL, NULL, 0, NULL, NULL); 546 (void *)x, NULL, NULL, 0, NULL, NULL);
508} 547}
548LCRYPTO_ALIAS(PEM_write_ECPKParameters);
509 549
510EC_GROUP * 550EC_GROUP *
511PEM_read_bio_ECPKParameters(BIO *bp, EC_GROUP **x, pem_password_cb *cb, void *u) 551PEM_read_bio_ECPKParameters(BIO *bp, EC_GROUP **x, pem_password_cb *cb, void *u)
@@ -513,6 +553,7 @@ PEM_read_bio_ECPKParameters(BIO *bp, EC_GROUP **x, pem_password_cb *cb, void *u)
513 return PEM_ASN1_read_bio((d2i_of_void *)d2i_ECPKParameters, PEM_STRING_ECPARAMETERS, bp, 553 return PEM_ASN1_read_bio((d2i_of_void *)d2i_ECPKParameters, PEM_STRING_ECPARAMETERS, bp,
514 (void **)x, cb, u); 554 (void **)x, cb, u);
515} 555}
556LCRYPTO_ALIAS(PEM_read_bio_ECPKParameters);
516 557
517int 558int
518PEM_write_bio_ECPKParameters(BIO *bp, const EC_GROUP *x) 559PEM_write_bio_ECPKParameters(BIO *bp, const EC_GROUP *x)
@@ -520,6 +561,7 @@ PEM_write_bio_ECPKParameters(BIO *bp, const EC_GROUP *x)
520 return PEM_ASN1_write_bio((i2d_of_void *)i2d_ECPKParameters, PEM_STRING_ECPARAMETERS, bp, 561 return PEM_ASN1_write_bio((i2d_of_void *)i2d_ECPKParameters, PEM_STRING_ECPARAMETERS, bp,
521 (void *)x, NULL, NULL, 0, NULL, NULL); 562 (void *)x, NULL, NULL, 0, NULL, NULL);
522} 563}
564LCRYPTO_ALIAS(PEM_write_bio_ECPKParameters);
523 565
524EC_KEY * 566EC_KEY *
525PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb, void *u) 567PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb, void *u)
@@ -529,6 +571,7 @@ PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb, void *u)
529 pktmp = PEM_read_PrivateKey(fp, NULL, cb, u); 571 pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);
530 return pkey_get_eckey(pktmp, eckey); /* will free pktmp */ 572 return pkey_get_eckey(pktmp, eckey); /* will free pktmp */
531} 573}
574LCRYPTO_ALIAS(PEM_read_ECPrivateKey);
532 575
533int 576int
534PEM_write_ECPrivateKey(FILE *fp, EC_KEY *x, const EVP_CIPHER *enc, 577PEM_write_ECPrivateKey(FILE *fp, EC_KEY *x, const EVP_CIPHER *enc,
@@ -537,6 +580,7 @@ PEM_write_ECPrivateKey(FILE *fp, EC_KEY *x, const EVP_CIPHER *enc,
537 return PEM_ASN1_write((i2d_of_void *)i2d_ECPrivateKey, PEM_STRING_ECPRIVATEKEY, fp, 580 return PEM_ASN1_write((i2d_of_void *)i2d_ECPrivateKey, PEM_STRING_ECPRIVATEKEY, fp,
538 x, enc, kstr, klen, cb, u); 581 x, enc, kstr, klen, cb, u);
539} 582}
583LCRYPTO_ALIAS(PEM_write_ECPrivateKey);
540 584
541EC_KEY * 585EC_KEY *
542PEM_read_bio_ECPrivateKey(BIO *bp, EC_KEY **key, pem_password_cb *cb, void *u) 586PEM_read_bio_ECPrivateKey(BIO *bp, EC_KEY **key, pem_password_cb *cb, void *u)
@@ -545,6 +589,7 @@ PEM_read_bio_ECPrivateKey(BIO *bp, EC_KEY **key, pem_password_cb *cb, void *u)
545 pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u); 589 pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
546 return pkey_get_eckey(pktmp, key); /* will free pktmp */ 590 return pkey_get_eckey(pktmp, key); /* will free pktmp */
547} 591}
592LCRYPTO_ALIAS(PEM_read_bio_ECPrivateKey);
548 593
549int 594int
550PEM_write_bio_ECPrivateKey(BIO *bp, EC_KEY *x, 595PEM_write_bio_ECPrivateKey(BIO *bp, EC_KEY *x,
@@ -554,6 +599,7 @@ PEM_write_bio_ECPrivateKey(BIO *bp, EC_KEY *x,
554 return PEM_ASN1_write_bio((i2d_of_void *)i2d_ECPrivateKey, PEM_STRING_ECPRIVATEKEY, bp, 599 return PEM_ASN1_write_bio((i2d_of_void *)i2d_ECPrivateKey, PEM_STRING_ECPRIVATEKEY, bp,
555 x, enc, kstr, klen, cb, u); 600 x, enc, kstr, klen, cb, u);
556} 601}
602LCRYPTO_ALIAS(PEM_write_bio_ECPrivateKey);
557 603
558EC_KEY * 604EC_KEY *
559PEM_read_EC_PUBKEY(FILE *fp, EC_KEY **x, pem_password_cb *cb, void *u) 605PEM_read_EC_PUBKEY(FILE *fp, EC_KEY **x, pem_password_cb *cb, void *u)
@@ -561,6 +607,7 @@ PEM_read_EC_PUBKEY(FILE *fp, EC_KEY **x, pem_password_cb *cb, void *u)
561 return PEM_ASN1_read((d2i_of_void *)d2i_EC_PUBKEY, PEM_STRING_PUBLIC, fp, 607 return PEM_ASN1_read((d2i_of_void *)d2i_EC_PUBKEY, PEM_STRING_PUBLIC, fp,
562 (void **)x, cb, u); 608 (void **)x, cb, u);
563} 609}
610LCRYPTO_ALIAS(PEM_read_EC_PUBKEY);
564 611
565int 612int
566PEM_write_EC_PUBKEY(FILE *fp, EC_KEY *x) 613PEM_write_EC_PUBKEY(FILE *fp, EC_KEY *x)
@@ -568,6 +615,7 @@ PEM_write_EC_PUBKEY(FILE *fp, EC_KEY *x)
568 return PEM_ASN1_write((i2d_of_void *)i2d_EC_PUBKEY, PEM_STRING_PUBLIC, fp, 615 return PEM_ASN1_write((i2d_of_void *)i2d_EC_PUBKEY, PEM_STRING_PUBLIC, fp,
569 x, NULL, NULL, 0, NULL, NULL); 616 x, NULL, NULL, 0, NULL, NULL);
570} 617}
618LCRYPTO_ALIAS(PEM_write_EC_PUBKEY);
571 619
572EC_KEY * 620EC_KEY *
573PEM_read_bio_EC_PUBKEY(BIO *bp, EC_KEY **x, pem_password_cb *cb, void *u) 621PEM_read_bio_EC_PUBKEY(BIO *bp, EC_KEY **x, pem_password_cb *cb, void *u)
@@ -575,6 +623,7 @@ PEM_read_bio_EC_PUBKEY(BIO *bp, EC_KEY **x, pem_password_cb *cb, void *u)
575 return PEM_ASN1_read_bio((d2i_of_void *)d2i_EC_PUBKEY, PEM_STRING_PUBLIC, bp, 623 return PEM_ASN1_read_bio((d2i_of_void *)d2i_EC_PUBKEY, PEM_STRING_PUBLIC, bp,
576 (void **)x, cb, u); 624 (void **)x, cb, u);
577} 625}
626LCRYPTO_ALIAS(PEM_read_bio_EC_PUBKEY);
578 627
579int 628int
580PEM_write_bio_EC_PUBKEY(BIO *bp, EC_KEY *x) 629PEM_write_bio_EC_PUBKEY(BIO *bp, EC_KEY *x)
@@ -582,6 +631,7 @@ PEM_write_bio_EC_PUBKEY(BIO *bp, EC_KEY *x)
582 return PEM_ASN1_write_bio((i2d_of_void *)i2d_EC_PUBKEY, PEM_STRING_PUBLIC, bp, 631 return PEM_ASN1_write_bio((i2d_of_void *)i2d_EC_PUBKEY, PEM_STRING_PUBLIC, bp,
583 x, NULL, NULL, 0, NULL, NULL); 632 x, NULL, NULL, 0, NULL, NULL);
584} 633}
634LCRYPTO_ALIAS(PEM_write_bio_EC_PUBKEY);
585 635
586#endif 636#endif
587 637
@@ -593,6 +643,7 @@ PEM_read_DHparams(FILE *fp, DH **x, pem_password_cb *cb, void *u)
593 return PEM_ASN1_read((d2i_of_void *)d2i_DHparams, PEM_STRING_DHPARAMS, fp, 643 return PEM_ASN1_read((d2i_of_void *)d2i_DHparams, PEM_STRING_DHPARAMS, fp,
594 (void **)x, cb, u); 644 (void **)x, cb, u);
595} 645}
646LCRYPTO_ALIAS(PEM_read_DHparams);
596 647
597int 648int
598PEM_write_DHparams(FILE *fp, const DH *x) 649PEM_write_DHparams(FILE *fp, const DH *x)
@@ -600,6 +651,7 @@ PEM_write_DHparams(FILE *fp, const DH *x)
600 return PEM_ASN1_write((i2d_of_void *)i2d_DHparams, PEM_STRING_DHPARAMS, fp, 651 return PEM_ASN1_write((i2d_of_void *)i2d_DHparams, PEM_STRING_DHPARAMS, fp,
601 (void *)x, NULL, NULL, 0, NULL, NULL); 652 (void *)x, NULL, NULL, 0, NULL, NULL);
602} 653}
654LCRYPTO_ALIAS(PEM_write_DHparams);
603 655
604DH * 656DH *
605PEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) 657PEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u)
@@ -607,6 +659,7 @@ PEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u)
607 return PEM_ASN1_read_bio((d2i_of_void *)d2i_DHparams, PEM_STRING_DHPARAMS, bp, 659 return PEM_ASN1_read_bio((d2i_of_void *)d2i_DHparams, PEM_STRING_DHPARAMS, bp,
608 (void **)x, cb, u); 660 (void **)x, cb, u);
609} 661}
662LCRYPTO_ALIAS(PEM_read_bio_DHparams);
610 663
611int 664int
612PEM_write_bio_DHparams(BIO *bp, const DH *x) 665PEM_write_bio_DHparams(BIO *bp, const DH *x)
@@ -614,6 +667,7 @@ PEM_write_bio_DHparams(BIO *bp, const DH *x)
614 return PEM_ASN1_write_bio((i2d_of_void *)i2d_DHparams, PEM_STRING_DHPARAMS, bp, 667 return PEM_ASN1_write_bio((i2d_of_void *)i2d_DHparams, PEM_STRING_DHPARAMS, bp,
615 (void *)x, NULL, NULL, 0, NULL, NULL); 668 (void *)x, NULL, NULL, 0, NULL, NULL);
616} 669}
670LCRYPTO_ALIAS(PEM_write_bio_DHparams);
617 671
618#endif 672#endif
619 673
@@ -623,6 +677,7 @@ PEM_read_PUBKEY(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
623 return PEM_ASN1_read((d2i_of_void *)d2i_PUBKEY, PEM_STRING_PUBLIC, fp, 677 return PEM_ASN1_read((d2i_of_void *)d2i_PUBKEY, PEM_STRING_PUBLIC, fp,
624 (void **)x, cb, u); 678 (void **)x, cb, u);
625} 679}
680LCRYPTO_ALIAS(PEM_read_PUBKEY);
626 681
627int 682int
628PEM_write_PUBKEY(FILE *fp, EVP_PKEY *x) 683PEM_write_PUBKEY(FILE *fp, EVP_PKEY *x)
@@ -630,6 +685,7 @@ PEM_write_PUBKEY(FILE *fp, EVP_PKEY *x)
630 return PEM_ASN1_write((i2d_of_void *)i2d_PUBKEY, PEM_STRING_PUBLIC, fp, 685 return PEM_ASN1_write((i2d_of_void *)i2d_PUBKEY, PEM_STRING_PUBLIC, fp,
631 x, NULL, NULL, 0, NULL, NULL); 686 x, NULL, NULL, 0, NULL, NULL);
632} 687}
688LCRYPTO_ALIAS(PEM_write_PUBKEY);
633 689
634EVP_PKEY * 690EVP_PKEY *
635PEM_read_bio_PUBKEY(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u) 691PEM_read_bio_PUBKEY(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u)
@@ -637,6 +693,7 @@ PEM_read_bio_PUBKEY(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u)
637 return PEM_ASN1_read_bio((d2i_of_void *)d2i_PUBKEY, PEM_STRING_PUBLIC, bp, 693 return PEM_ASN1_read_bio((d2i_of_void *)d2i_PUBKEY, PEM_STRING_PUBLIC, bp,
638 (void **)x, cb, u); 694 (void **)x, cb, u);
639} 695}
696LCRYPTO_ALIAS(PEM_read_bio_PUBKEY);
640 697
641int 698int
642PEM_write_bio_PUBKEY(BIO *bp, EVP_PKEY *x) 699PEM_write_bio_PUBKEY(BIO *bp, EVP_PKEY *x)
@@ -644,3 +701,4 @@ PEM_write_bio_PUBKEY(BIO *bp, EVP_PKEY *x)
644 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PUBKEY, PEM_STRING_PUBLIC, bp, 701 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PUBKEY, PEM_STRING_PUBLIC, bp,
645 x, NULL, NULL, 0, NULL, NULL); 702 x, NULL, NULL, 0, NULL, NULL);
646} 703}
704LCRYPTO_ALIAS(PEM_write_bio_PUBKEY);