summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pem
diff options
context:
space:
mode:
authorbeck <>2023-07-07 13:40:44 +0000
committerbeck <>2023-07-07 13:40:44 +0000
commit6f5543ad3e9567cbb0c420be9104b1c9a41f8370 (patch)
tree4ff69f17732c4c2fea8cf75b4552dab0cd48119e /src/lib/libcrypto/pem
parenta9cdc101468391df513beb27c13bf27170418093 (diff)
downloadopenbsd-6f5543ad3e9567cbb0c420be9104b1c9a41f8370.tar.gz
openbsd-6f5543ad3e9567cbb0c420be9104b1c9a41f8370.tar.bz2
openbsd-6f5543ad3e9567cbb0c420be9104b1c9a41f8370.zip
Hide symbols in lhash, pem, and rc2
ok jsing@
Diffstat (limited to 'src/lib/libcrypto/pem')
-rw-r--r--src/lib/libcrypto/pem/pem_all.c60
-rw-r--r--src/lib/libcrypto/pem/pem_err.c3
-rw-r--r--src/lib/libcrypto/pem/pem_info.c5
-rw-r--r--src/lib/libcrypto/pem/pem_lib.c15
-rw-r--r--src/lib/libcrypto/pem/pem_oth.c3
-rw-r--r--src/lib/libcrypto/pem/pem_pk8.c20
-rw-r--r--src/lib/libcrypto/pem/pem_pkey.c10
-rw-r--r--src/lib/libcrypto/pem/pem_sign.c5
-rw-r--r--src/lib/libcrypto/pem/pem_x509.c6
-rw-r--r--src/lib/libcrypto/pem/pem_xaux.c6
-rw-r--r--src/lib/libcrypto/pem/pvkfmt.c10
11 files changed, 131 insertions, 12 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);
diff --git a/src/lib/libcrypto/pem/pem_err.c b/src/lib/libcrypto/pem/pem_err.c
index d817cafff0..a94e2d5ebb 100644
--- a/src/lib/libcrypto/pem/pem_err.c
+++ b/src/lib/libcrypto/pem/pem_err.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem_err.c,v 1.13 2022/07/12 14:42:50 kn Exp $ */ 1/* $OpenBSD: pem_err.c,v 1.14 2023/07/07 13:40:44 beck Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -114,3 +114,4 @@ ERR_load_PEM_strings(void)
114 } 114 }
115#endif 115#endif
116} 116}
117LCRYPTO_ALIAS(ERR_load_PEM_strings);
diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c
index 3cca828cfd..b979c79b33 100644
--- a/src/lib/libcrypto/pem/pem_info.c
+++ b/src/lib/libcrypto/pem/pem_info.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem_info.c,v 1.26 2022/11/26 16:08:53 tb Exp $ */ 1/* $OpenBSD: pem_info.c,v 1.27 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 *
@@ -93,6 +93,7 @@ PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb,
93 BIO_free(b); 93 BIO_free(b);
94 return (ret); 94 return (ret);
95} 95}
96LCRYPTO_ALIAS(PEM_X509_INFO_read);
96 97
97STACK_OF(X509_INFO) * 98STACK_OF(X509_INFO) *
98PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, 99PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb,
@@ -288,6 +289,7 @@ err:
288 289
289 return ret; 290 return ret;
290} 291}
292LCRYPTO_ALIAS(PEM_X509_INFO_read_bio);
291 293
292 294
293/* A TJH addition */ 295/* A TJH addition */
@@ -382,3 +384,4 @@ err:
382 explicit_bzero(buf, PEM_BUFSIZE); 384 explicit_bzero(buf, PEM_BUFSIZE);
383 return (ret); 385 return (ret);
384} 386}
387LCRYPTO_ALIAS(PEM_X509_INFO_write_bio);
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index 72cdd41b0d..3f23a0131b 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/lib/libcrypto/pem/pem_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem_lib.c,v 1.52 2022/11/26 16:08:53 tb Exp $ */ 1/* $OpenBSD: pem_lib.c,v 1.53 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 *
@@ -127,6 +127,7 @@ PEM_def_callback(char *buf, int num, int w, void *key)
127 } 127 }
128 return (int)l; 128 return (int)l;
129} 129}
130LCRYPTO_ALIAS(PEM_def_callback);
130 131
131void 132void
132PEM_proc_type(char *buf, int type) 133PEM_proc_type(char *buf, int type)
@@ -146,6 +147,7 @@ PEM_proc_type(char *buf, int type)
146 strlcat(buf, str, PEM_BUFSIZE); 147 strlcat(buf, str, PEM_BUFSIZE);
147 strlcat(buf, "\n", PEM_BUFSIZE); 148 strlcat(buf, "\n", PEM_BUFSIZE);
148} 149}
150LCRYPTO_ALIAS(PEM_proc_type);
149 151
150void 152void
151PEM_dek_info(char *buf, const char *type, int len, char *str) 153PEM_dek_info(char *buf, const char *type, int len, char *str)
@@ -167,6 +169,7 @@ PEM_dek_info(char *buf, const char *type, int len, char *str)
167 buf[j + i * 2] = '\n'; 169 buf[j + i * 2] = '\n';
168 buf[j + i * 2 + 1] = '\0'; 170 buf[j + i * 2 + 1] = '\0';
169} 171}
172LCRYPTO_ALIAS(PEM_dek_info);
170 173
171void * 174void *
172PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x, 175PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
@@ -184,6 +187,7 @@ PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
184 BIO_free(b); 187 BIO_free(b);
185 return (ret); 188 return (ret);
186} 189}
190LCRYPTO_ALIAS(PEM_ASN1_read);
187 191
188static int 192static int
189check_pem(const char *nm, const char *name) 193check_pem(const char *nm, const char *name)
@@ -322,6 +326,7 @@ err:
322 free(data); 326 free(data);
323 return ret; 327 return ret;
324} 328}
329LCRYPTO_ALIAS(PEM_bytes_read_bio);
325 330
326int 331int
327PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp, void *x, 332PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp, void *x,
@@ -340,6 +345,7 @@ PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp, void *x,
340 BIO_free(b); 345 BIO_free(b);
341 return (ret); 346 return (ret);
342} 347}
348LCRYPTO_ALIAS(PEM_ASN1_write);
343 349
344int 350int
345PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, void *x, 351PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, void *x,
@@ -438,6 +444,7 @@ err:
438 freezero(data, (unsigned int)dsize); 444 freezero(data, (unsigned int)dsize);
439 return (ret); 445 return (ret);
440} 446}
447LCRYPTO_ALIAS(PEM_ASN1_write_bio);
441 448
442int 449int
443PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen, 450PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
@@ -483,6 +490,7 @@ PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
483 *plen = j + i; 490 *plen = j + i;
484 return (1); 491 return (1);
485} 492}
493LCRYPTO_ALIAS(PEM_do_header);
486 494
487int 495int
488PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) 496PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
@@ -544,6 +552,7 @@ PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
544 552
545 return (1); 553 return (1);
546} 554}
555LCRYPTO_ALIAS(PEM_get_EVP_CIPHER_INFO);
547 556
548static int 557static int
549load_iv(char **fromp, unsigned char *to, int num) 558load_iv(char **fromp, unsigned char *to, int num)
@@ -590,6 +599,7 @@ PEM_write(FILE *fp, const char *name, const char *header,
590 BIO_free(b); 599 BIO_free(b);
591 return (ret); 600 return (ret);
592} 601}
602LCRYPTO_ALIAS(PEM_write);
593 603
594int 604int
595PEM_write_bio(BIO *bp, const char *name, const char *header, 605PEM_write_bio(BIO *bp, const char *name, const char *header,
@@ -647,6 +657,7 @@ err:
647 PEMerror(reason); 657 PEMerror(reason);
648 return (0); 658 return (0);
649} 659}
660LCRYPTO_ALIAS(PEM_write_bio);
650 661
651int 662int
652PEM_read(FILE *fp, char **name, char **header, unsigned char **data, long *len) 663PEM_read(FILE *fp, char **name, char **header, unsigned char **data, long *len)
@@ -663,6 +674,7 @@ PEM_read(FILE *fp, char **name, char **header, unsigned char **data, long *len)
663 BIO_free(b); 674 BIO_free(b);
664 return (ret); 675 return (ret);
665} 676}
677LCRYPTO_ALIAS(PEM_read);
666 678
667int 679int
668PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data, 680PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data,
@@ -835,6 +847,7 @@ err:
835 BUF_MEM_free(dataB); 847 BUF_MEM_free(dataB);
836 return (0); 848 return (0);
837} 849}
850LCRYPTO_ALIAS(PEM_read_bio);
838 851
839/* Check pem string and return prefix length. 852/* Check pem string and return prefix length.
840 * If for example the pem_str == "RSA PRIVATE KEY" and suffix = "PRIVATE KEY" 853 * If for example the pem_str == "RSA PRIVATE KEY" and suffix = "PRIVATE KEY"
diff --git a/src/lib/libcrypto/pem/pem_oth.c b/src/lib/libcrypto/pem/pem_oth.c
index 21498cb6b5..2dca978efd 100644
--- a/src/lib/libcrypto/pem/pem_oth.c
+++ b/src/lib/libcrypto/pem/pem_oth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem_oth.c,v 1.8 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: pem_oth.c,v 1.9 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 *
@@ -85,3 +85,4 @@ PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x,
85 free(data); 85 free(data);
86 return (ret); 86 return (ret);
87} 87}
88LCRYPTO_ALIAS(PEM_ASN1_read_bio);
diff --git a/src/lib/libcrypto/pem/pem_pk8.c b/src/lib/libcrypto/pem/pem_pk8.c
index 43581905f0..6d0c0cbd57 100644
--- a/src/lib/libcrypto/pem/pem_pk8.c
+++ b/src/lib/libcrypto/pem/pem_pk8.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem_pk8.c,v 1.13 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: pem_pk8.c,v 1.14 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 *
@@ -84,6 +84,7 @@ PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid, char *kstr,
84{ 84{
85 return do_pk8pkey(bp, x, 0, nid, NULL, kstr, klen, cb, u); 85 return do_pk8pkey(bp, x, 0, nid, NULL, kstr, klen, cb, u);
86} 86}
87LCRYPTO_ALIAS(PEM_write_bio_PKCS8PrivateKey_nid);
87 88
88int 89int
89PEM_write_bio_PKCS8PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc, 90PEM_write_bio_PKCS8PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
@@ -91,6 +92,7 @@ PEM_write_bio_PKCS8PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
91{ 92{
92 return do_pk8pkey(bp, x, 0, -1, enc, kstr, klen, cb, u); 93 return do_pk8pkey(bp, x, 0, -1, enc, kstr, klen, cb, u);
93} 94}
95LCRYPTO_ALIAS(PEM_write_bio_PKCS8PrivateKey);
94 96
95int 97int
96i2d_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc, 98i2d_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
@@ -98,6 +100,7 @@ i2d_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
98{ 100{
99 return do_pk8pkey(bp, x, 1, -1, enc, kstr, klen, cb, u); 101 return do_pk8pkey(bp, x, 1, -1, enc, kstr, klen, cb, u);
100} 102}
103LCRYPTO_ALIAS(i2d_PKCS8PrivateKey_bio);
101 104
102int 105int
103i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid, 106i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid,
@@ -105,6 +108,7 @@ i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid,
105{ 108{
106 return do_pk8pkey(bp, x, 1, nid, NULL, kstr, klen, cb, u); 109 return do_pk8pkey(bp, x, 1, nid, NULL, kstr, klen, cb, u);
107} 110}
111LCRYPTO_ALIAS(i2d_PKCS8PrivateKey_nid_bio);
108 112
109static int 113static int
110do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER *enc, 114do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER *enc,
@@ -188,6 +192,7 @@ d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u)
188 } 192 }
189 return ret; 193 return ret;
190} 194}
195LCRYPTO_ALIAS(d2i_PKCS8PrivateKey_bio);
191 196
192 197
193int 198int
@@ -196,6 +201,7 @@ i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
196{ 201{
197 return do_pk8pkey_fp(fp, x, 1, -1, enc, kstr, klen, cb, u); 202 return do_pk8pkey_fp(fp, x, 1, -1, enc, kstr, klen, cb, u);
198} 203}
204LCRYPTO_ALIAS(i2d_PKCS8PrivateKey_fp);
199 205
200int 206int
201i2d_PKCS8PrivateKey_nid_fp(FILE *fp, EVP_PKEY *x, int nid, char *kstr, 207i2d_PKCS8PrivateKey_nid_fp(FILE *fp, EVP_PKEY *x, int nid, char *kstr,
@@ -203,6 +209,7 @@ i2d_PKCS8PrivateKey_nid_fp(FILE *fp, EVP_PKEY *x, int nid, char *kstr,
203{ 209{
204 return do_pk8pkey_fp(fp, x, 1, nid, NULL, kstr, klen, cb, u); 210 return do_pk8pkey_fp(fp, x, 1, nid, NULL, kstr, klen, cb, u);
205} 211}
212LCRYPTO_ALIAS(i2d_PKCS8PrivateKey_nid_fp);
206 213
207int 214int
208PEM_write_PKCS8PrivateKey_nid(FILE *fp, EVP_PKEY *x, int nid, char *kstr, 215PEM_write_PKCS8PrivateKey_nid(FILE *fp, EVP_PKEY *x, int nid, char *kstr,
@@ -210,6 +217,7 @@ PEM_write_PKCS8PrivateKey_nid(FILE *fp, EVP_PKEY *x, int nid, char *kstr,
210{ 217{
211 return do_pk8pkey_fp(fp, x, 0, nid, NULL, kstr, klen, cb, u); 218 return do_pk8pkey_fp(fp, x, 0, nid, NULL, kstr, klen, cb, u);
212} 219}
220LCRYPTO_ALIAS(PEM_write_PKCS8PrivateKey_nid);
213 221
214int 222int
215PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc, 223PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
@@ -217,6 +225,7 @@ PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
217{ 225{
218 return do_pk8pkey_fp(fp, x, 0, -1, enc, kstr, klen, cb, u); 226 return do_pk8pkey_fp(fp, x, 0, -1, enc, kstr, klen, cb, u);
219} 227}
228LCRYPTO_ALIAS(PEM_write_PKCS8PrivateKey);
220 229
221static int 230static int
222do_pk8pkey_fp(FILE *fp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER *enc, 231do_pk8pkey_fp(FILE *fp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER *enc,
@@ -248,6 +257,7 @@ d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
248 BIO_free(bp); 257 BIO_free(bp);
249 return ret; 258 return ret;
250} 259}
260LCRYPTO_ALIAS(d2i_PKCS8PrivateKey_fp);
251 261
252X509_SIG * 262X509_SIG *
253PEM_read_PKCS8(FILE *fp, X509_SIG **x, pem_password_cb *cb, void *u) 263PEM_read_PKCS8(FILE *fp, X509_SIG **x, pem_password_cb *cb, void *u)
@@ -255,6 +265,7 @@ PEM_read_PKCS8(FILE *fp, X509_SIG **x, pem_password_cb *cb, void *u)
255 return PEM_ASN1_read((d2i_of_void *)d2i_X509_SIG, PEM_STRING_PKCS8, fp, 265 return PEM_ASN1_read((d2i_of_void *)d2i_X509_SIG, PEM_STRING_PKCS8, fp,
256 (void **)x, cb, u); 266 (void **)x, cb, u);
257} 267}
268LCRYPTO_ALIAS(PEM_read_PKCS8);
258 269
259int 270int
260PEM_write_PKCS8(FILE *fp, X509_SIG *x) 271PEM_write_PKCS8(FILE *fp, X509_SIG *x)
@@ -262,6 +273,7 @@ PEM_write_PKCS8(FILE *fp, X509_SIG *x)
262 return PEM_ASN1_write((i2d_of_void *)i2d_X509_SIG, PEM_STRING_PKCS8, fp, 273 return PEM_ASN1_write((i2d_of_void *)i2d_X509_SIG, PEM_STRING_PKCS8, fp,
263 x, NULL, NULL, 0, NULL, NULL); 274 x, NULL, NULL, 0, NULL, NULL);
264} 275}
276LCRYPTO_ALIAS(PEM_write_PKCS8);
265 277
266X509_SIG * 278X509_SIG *
267PEM_read_bio_PKCS8(BIO *bp, X509_SIG **x, pem_password_cb *cb, void *u) 279PEM_read_bio_PKCS8(BIO *bp, X509_SIG **x, pem_password_cb *cb, void *u)
@@ -269,6 +281,7 @@ PEM_read_bio_PKCS8(BIO *bp, X509_SIG **x, pem_password_cb *cb, void *u)
269 return PEM_ASN1_read_bio((d2i_of_void *)d2i_X509_SIG, PEM_STRING_PKCS8, bp, 281 return PEM_ASN1_read_bio((d2i_of_void *)d2i_X509_SIG, PEM_STRING_PKCS8, bp,
270 (void **)x, cb, u); 282 (void **)x, cb, u);
271} 283}
284LCRYPTO_ALIAS(PEM_read_bio_PKCS8);
272 285
273int 286int
274PEM_write_bio_PKCS8(BIO *bp, X509_SIG *x) 287PEM_write_bio_PKCS8(BIO *bp, X509_SIG *x)
@@ -276,6 +289,7 @@ PEM_write_bio_PKCS8(BIO *bp, X509_SIG *x)
276 return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509_SIG, PEM_STRING_PKCS8, bp, 289 return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509_SIG, PEM_STRING_PKCS8, bp,
277 x, NULL, NULL, 0, NULL, NULL); 290 x, NULL, NULL, 0, NULL, NULL);
278} 291}
292LCRYPTO_ALIAS(PEM_write_bio_PKCS8);
279 293
280PKCS8_PRIV_KEY_INFO * 294PKCS8_PRIV_KEY_INFO *
281PEM_read_PKCS8_PRIV_KEY_INFO(FILE *fp, PKCS8_PRIV_KEY_INFO **x, pem_password_cb *cb, void *u) 295PEM_read_PKCS8_PRIV_KEY_INFO(FILE *fp, PKCS8_PRIV_KEY_INFO **x, pem_password_cb *cb, void *u)
@@ -283,6 +297,7 @@ PEM_read_PKCS8_PRIV_KEY_INFO(FILE *fp, PKCS8_PRIV_KEY_INFO **x, pem_password_cb
283 return PEM_ASN1_read((d2i_of_void *)d2i_PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF, fp, 297 return PEM_ASN1_read((d2i_of_void *)d2i_PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF, fp,
284 (void **)x, cb, u); 298 (void **)x, cb, u);
285} 299}
300LCRYPTO_ALIAS(PEM_read_PKCS8_PRIV_KEY_INFO);
286 301
287int 302int
288PEM_write_PKCS8_PRIV_KEY_INFO(FILE *fp, PKCS8_PRIV_KEY_INFO *x) 303PEM_write_PKCS8_PRIV_KEY_INFO(FILE *fp, PKCS8_PRIV_KEY_INFO *x)
@@ -290,6 +305,7 @@ PEM_write_PKCS8_PRIV_KEY_INFO(FILE *fp, PKCS8_PRIV_KEY_INFO *x)
290 return PEM_ASN1_write((i2d_of_void *)i2d_PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF, fp, 305 return PEM_ASN1_write((i2d_of_void *)i2d_PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF, fp,
291 x, NULL, NULL, 0, NULL, NULL); 306 x, NULL, NULL, 0, NULL, NULL);
292} 307}
308LCRYPTO_ALIAS(PEM_write_PKCS8_PRIV_KEY_INFO);
293 309
294PKCS8_PRIV_KEY_INFO * 310PKCS8_PRIV_KEY_INFO *
295PEM_read_bio_PKCS8_PRIV_KEY_INFO(BIO *bp, PKCS8_PRIV_KEY_INFO **x, pem_password_cb *cb, void *u) 311PEM_read_bio_PKCS8_PRIV_KEY_INFO(BIO *bp, PKCS8_PRIV_KEY_INFO **x, pem_password_cb *cb, void *u)
@@ -297,6 +313,7 @@ PEM_read_bio_PKCS8_PRIV_KEY_INFO(BIO *bp, PKCS8_PRIV_KEY_INFO **x, pem_password_
297 return PEM_ASN1_read_bio((d2i_of_void *)d2i_PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF, bp, 313 return PEM_ASN1_read_bio((d2i_of_void *)d2i_PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF, bp,
298 (void **)x, cb, u); 314 (void **)x, cb, u);
299} 315}
316LCRYPTO_ALIAS(PEM_read_bio_PKCS8_PRIV_KEY_INFO);
300 317
301int 318int
302PEM_write_bio_PKCS8_PRIV_KEY_INFO(BIO *bp, PKCS8_PRIV_KEY_INFO *x) 319PEM_write_bio_PKCS8_PRIV_KEY_INFO(BIO *bp, PKCS8_PRIV_KEY_INFO *x)
@@ -304,3 +321,4 @@ PEM_write_bio_PKCS8_PRIV_KEY_INFO(BIO *bp, PKCS8_PRIV_KEY_INFO *x)
304 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF, bp, 321 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF, bp,
305 x, NULL, NULL, 0, NULL, NULL); 322 x, NULL, NULL, 0, NULL, NULL);
306} 323}
324LCRYPTO_ALIAS(PEM_write_bio_PKCS8_PRIV_KEY_INFO);
diff --git a/src/lib/libcrypto/pem/pem_pkey.c b/src/lib/libcrypto/pem/pem_pkey.c
index fa2d38f566..2961952139 100644
--- a/src/lib/libcrypto/pem/pem_pkey.c
+++ b/src/lib/libcrypto/pem/pem_pkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem_pkey.c,v 1.26 2022/11/26 16:08:53 tb Exp $ */ 1/* $OpenBSD: pem_pkey.c,v 1.27 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 @@ err:
147 freezero(data, len); 147 freezero(data, len);
148 return (ret); 148 return (ret);
149} 149}
150LCRYPTO_ALIAS(PEM_read_bio_PrivateKey);
150 151
151int 152int
152PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc, 153PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
@@ -159,6 +160,7 @@ PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
159 return PEM_write_bio_PrivateKey_traditional(bp, x, enc, kstr, klen, cb, 160 return PEM_write_bio_PrivateKey_traditional(bp, x, enc, kstr, klen, cb,
160 u); 161 u);
161} 162}
163LCRYPTO_ALIAS(PEM_write_bio_PrivateKey);
162 164
163int 165int
164PEM_write_bio_PrivateKey_traditional(BIO *bp, EVP_PKEY *x, 166PEM_write_bio_PrivateKey_traditional(BIO *bp, EVP_PKEY *x,
@@ -172,6 +174,7 @@ PEM_write_bio_PrivateKey_traditional(BIO *bp, EVP_PKEY *x,
172 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey, 174 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey,
173 pem_str, bp, x, enc, kstr, klen, cb, u); 175 pem_str, bp, x, enc, kstr, klen, cb, u);
174} 176}
177LCRYPTO_ALIAS(PEM_write_bio_PrivateKey_traditional);
175 178
176EVP_PKEY * 179EVP_PKEY *
177PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x) 180PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x)
@@ -212,6 +215,7 @@ err:
212 free(data); 215 free(data);
213 return (ret); 216 return (ret);
214} 217}
218LCRYPTO_ALIAS(PEM_read_bio_Parameters);
215 219
216int 220int
217PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x) 221PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x)
@@ -226,6 +230,7 @@ PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x)
226 return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode, 230 return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode,
227 pem_str, bp, x, NULL, NULL, 0, 0, NULL); 231 pem_str, bp, x, NULL, NULL, 0, 0, NULL);
228} 232}
233LCRYPTO_ALIAS(PEM_write_bio_Parameters);
229 234
230EVP_PKEY * 235EVP_PKEY *
231PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u) 236PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
@@ -242,6 +247,7 @@ PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
242 BIO_free(b); 247 BIO_free(b);
243 return (ret); 248 return (ret);
244} 249}
250LCRYPTO_ALIAS(PEM_read_PrivateKey);
245 251
246int 252int
247PEM_write_PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc, 253PEM_write_PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
@@ -258,4 +264,4 @@ PEM_write_PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
258 BIO_free(b); 264 BIO_free(b);
259 return ret; 265 return ret;
260} 266}
261 267LCRYPTO_ALIAS(PEM_write_PrivateKey);
diff --git a/src/lib/libcrypto/pem/pem_sign.c b/src/lib/libcrypto/pem/pem_sign.c
index fddeec79f3..461f957445 100644
--- a/src/lib/libcrypto/pem/pem_sign.c
+++ b/src/lib/libcrypto/pem/pem_sign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem_sign.c,v 1.14 2018/08/24 19:51:31 tb Exp $ */ 1/* $OpenBSD: pem_sign.c,v 1.15 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 *
@@ -69,6 +69,7 @@ PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type)
69{ 69{
70 return EVP_DigestInit_ex(ctx, type, NULL); 70 return EVP_DigestInit_ex(ctx, type, NULL);
71} 71}
72LCRYPTO_ALIAS(PEM_SignInit);
72 73
73int 74int
74PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data, 75PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data,
@@ -76,6 +77,7 @@ PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *data,
76{ 77{
77 return EVP_DigestUpdate(ctx, data, count); 78 return EVP_DigestUpdate(ctx, data, count);
78} 79}
80LCRYPTO_ALIAS(PEM_SignUpdate);
79 81
80int 82int
81PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen, 83PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
@@ -103,3 +105,4 @@ err:
103 free(m); 105 free(m);
104 return (ret); 106 return (ret);
105} 107}
108LCRYPTO_ALIAS(PEM_SignFinal);
diff --git a/src/lib/libcrypto/pem/pem_x509.c b/src/lib/libcrypto/pem/pem_x509.c
index f440a9f0aa..0016413b51 100644
--- a/src/lib/libcrypto/pem/pem_x509.c
+++ b/src/lib/libcrypto/pem/pem_x509.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem_x509.c,v 1.8 2016/09/04 16:10:38 jsing Exp $ */ 1/* $OpenBSD: pem_x509.c,v 1.9 2023/07/07 13:40:44 beck 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 */
@@ -71,6 +71,7 @@ PEM_read_X509(FILE *fp, X509 **x, pem_password_cb *cb, void *u)
71 return PEM_ASN1_read((d2i_of_void *)d2i_X509, PEM_STRING_X509, fp, 71 return PEM_ASN1_read((d2i_of_void *)d2i_X509, PEM_STRING_X509, fp,
72 (void **)x, cb, u); 72 (void **)x, cb, u);
73} 73}
74LCRYPTO_ALIAS(PEM_read_X509);
74 75
75int 76int
76PEM_write_X509(FILE *fp, X509 *x) 77PEM_write_X509(FILE *fp, X509 *x)
@@ -78,6 +79,7 @@ PEM_write_X509(FILE *fp, X509 *x)
78 return PEM_ASN1_write((i2d_of_void *)i2d_X509, PEM_STRING_X509, fp, 79 return PEM_ASN1_write((i2d_of_void *)i2d_X509, PEM_STRING_X509, fp,
79 x, NULL, NULL, 0, NULL, NULL); 80 x, NULL, NULL, 0, NULL, NULL);
80} 81}
82LCRYPTO_ALIAS(PEM_write_X509);
81 83
82X509 * 84X509 *
83PEM_read_bio_X509(BIO *bp, X509 **x, pem_password_cb *cb, void *u) 85PEM_read_bio_X509(BIO *bp, X509 **x, pem_password_cb *cb, void *u)
@@ -85,6 +87,7 @@ PEM_read_bio_X509(BIO *bp, X509 **x, pem_password_cb *cb, void *u)
85 return PEM_ASN1_read_bio((d2i_of_void *)d2i_X509, PEM_STRING_X509, bp, 87 return PEM_ASN1_read_bio((d2i_of_void *)d2i_X509, PEM_STRING_X509, bp,
86 (void **)x, cb, u); 88 (void **)x, cb, u);
87} 89}
90LCRYPTO_ALIAS(PEM_read_bio_X509);
88 91
89int 92int
90PEM_write_bio_X509(BIO *bp, X509 *x) 93PEM_write_bio_X509(BIO *bp, X509 *x)
@@ -92,3 +95,4 @@ PEM_write_bio_X509(BIO *bp, X509 *x)
92 return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509, PEM_STRING_X509, bp, 95 return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509, PEM_STRING_X509, bp,
93 x, NULL, NULL, 0, NULL, NULL); 96 x, NULL, NULL, 0, NULL, NULL);
94} 97}
98LCRYPTO_ALIAS(PEM_write_bio_X509);
diff --git a/src/lib/libcrypto/pem/pem_xaux.c b/src/lib/libcrypto/pem/pem_xaux.c
index 68a7851704..5f44a2b5ef 100644
--- a/src/lib/libcrypto/pem/pem_xaux.c
+++ b/src/lib/libcrypto/pem/pem_xaux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem_xaux.c,v 1.10 2021/10/31 16:28:50 tb Exp $ */ 1/* $OpenBSD: pem_xaux.c,v 1.11 2023/07/07 13:40:44 beck 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 */
@@ -71,6 +71,7 @@ PEM_read_X509_AUX(FILE *fp, X509 **x, pem_password_cb *cb, void *u)
71 return PEM_ASN1_read((d2i_of_void *)d2i_X509_AUX, PEM_STRING_X509_TRUSTED, fp, 71 return PEM_ASN1_read((d2i_of_void *)d2i_X509_AUX, PEM_STRING_X509_TRUSTED, fp,
72 (void **)x, cb, u); 72 (void **)x, cb, u);
73} 73}
74LCRYPTO_ALIAS(PEM_read_X509_AUX);
74 75
75int 76int
76PEM_write_X509_AUX(FILE *fp, X509 *x) 77PEM_write_X509_AUX(FILE *fp, X509 *x)
@@ -78,6 +79,7 @@ PEM_write_X509_AUX(FILE *fp, X509 *x)
78 return PEM_ASN1_write((i2d_of_void *)i2d_X509_AUX, PEM_STRING_X509_TRUSTED, fp, 79 return PEM_ASN1_write((i2d_of_void *)i2d_X509_AUX, PEM_STRING_X509_TRUSTED, fp,
79 x, NULL, NULL, 0, NULL, NULL); 80 x, NULL, NULL, 0, NULL, NULL);
80} 81}
82LCRYPTO_ALIAS(PEM_write_X509_AUX);
81 83
82X509 * 84X509 *
83PEM_read_bio_X509_AUX(BIO *bp, X509 **x, pem_password_cb *cb, void *u) 85PEM_read_bio_X509_AUX(BIO *bp, X509 **x, pem_password_cb *cb, void *u)
@@ -85,6 +87,7 @@ PEM_read_bio_X509_AUX(BIO *bp, X509 **x, pem_password_cb *cb, void *u)
85 return PEM_ASN1_read_bio((d2i_of_void *)d2i_X509_AUX, PEM_STRING_X509_TRUSTED, bp, 87 return PEM_ASN1_read_bio((d2i_of_void *)d2i_X509_AUX, PEM_STRING_X509_TRUSTED, bp,
86 (void **)x, cb, u); 88 (void **)x, cb, u);
87} 89}
90LCRYPTO_ALIAS(PEM_read_bio_X509_AUX);
88 91
89int 92int
90PEM_write_bio_X509_AUX(BIO *bp, X509 *x) 93PEM_write_bio_X509_AUX(BIO *bp, X509 *x)
@@ -92,3 +95,4 @@ PEM_write_bio_X509_AUX(BIO *bp, X509 *x)
92 return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509_AUX, PEM_STRING_X509_TRUSTED, bp, 95 return PEM_ASN1_write_bio((i2d_of_void *)i2d_X509_AUX, PEM_STRING_X509_TRUSTED, bp,
93 x, NULL, NULL, 0, NULL, NULL); 96 x, NULL, NULL, 0, NULL, NULL);
94} 97}
98LCRYPTO_ALIAS(PEM_write_bio_X509_AUX);
diff --git a/src/lib/libcrypto/pem/pvkfmt.c b/src/lib/libcrypto/pem/pvkfmt.c
index 1417a7b3c0..816d8b7dc0 100644
--- a/src/lib/libcrypto/pem/pvkfmt.c
+++ b/src/lib/libcrypto/pem/pvkfmt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pvkfmt.c,v 1.26 2022/11/26 16:08:53 tb Exp $ */ 1/* $OpenBSD: pvkfmt.c,v 1.27 2023/07/07 13:40:44 beck 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 2005. 3 * project 2005.
4 */ 4 */
@@ -414,24 +414,28 @@ b2i_PrivateKey(const unsigned char **in, long length)
414{ 414{
415 return do_b2i(in, length, 0); 415 return do_b2i(in, length, 0);
416} 416}
417LCRYPTO_ALIAS(b2i_PrivateKey);
417 418
418EVP_PKEY * 419EVP_PKEY *
419b2i_PublicKey(const unsigned char **in, long length) 420b2i_PublicKey(const unsigned char **in, long length)
420{ 421{
421 return do_b2i(in, length, 1); 422 return do_b2i(in, length, 1);
422} 423}
424LCRYPTO_ALIAS(b2i_PublicKey);
423 425
424EVP_PKEY * 426EVP_PKEY *
425b2i_PrivateKey_bio(BIO *in) 427b2i_PrivateKey_bio(BIO *in)
426{ 428{
427 return do_b2i_bio(in, 0); 429 return do_b2i_bio(in, 0);
428} 430}
431LCRYPTO_ALIAS(b2i_PrivateKey_bio);
429 432
430EVP_PKEY * 433EVP_PKEY *
431b2i_PublicKey_bio(BIO *in) 434b2i_PublicKey_bio(BIO *in)
432{ 435{
433 return do_b2i_bio(in, 1); 436 return do_b2i_bio(in, 1);
434} 437}
438LCRYPTO_ALIAS(b2i_PublicKey_bio);
435 439
436static void 440static void
437write_ledword(unsigned char **out, unsigned int dw) 441write_ledword(unsigned char **out, unsigned int dw)
@@ -646,12 +650,14 @@ i2b_PrivateKey_bio(BIO *out, EVP_PKEY *pk)
646{ 650{
647 return do_i2b_bio(out, pk, 0); 651 return do_i2b_bio(out, pk, 0);
648} 652}
653LCRYPTO_ALIAS(i2b_PrivateKey_bio);
649 654
650int 655int
651i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk) 656i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk)
652{ 657{
653 return do_i2b_bio(out, pk, 1); 658 return do_i2b_bio(out, pk, 1);
654} 659}
660LCRYPTO_ALIAS(i2b_PublicKey_bio);
655 661
656#ifndef OPENSSL_NO_RC4 662#ifndef OPENSSL_NO_RC4
657 663
@@ -837,6 +843,7 @@ b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u)
837 freezero(buf, buflen); 843 freezero(buf, buflen);
838 return ret; 844 return ret;
839} 845}
846LCRYPTO_ALIAS(b2i_PVK_bio);
840 847
841static int 848static int
842i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel, pem_password_cb *cb, 849i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel, pem_password_cb *cb,
@@ -930,6 +937,7 @@ i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel, pem_password_cb *cb, void *u)
930 } 937 }
931 return outlen; 938 return outlen;
932} 939}
940LCRYPTO_ALIAS(i2b_PVK_bio);
933 941
934#endif 942#endif
935 943