summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2023-04-25 17:51:36 +0000
committertb <>2023-04-25 17:51:36 +0000
commit2f8f1e0023bc4ce676a027be79712b1001d283bc (patch)
treec3ec51375bfdff754ada8ce0c441f75ae4ecc75c /src/lib
parentc99645e206c6a6fd786d7548a1c886d5b2d6c9cb (diff)
downloadopenbsd-2f8f1e0023bc4ce676a027be79712b1001d283bc.tar.gz
openbsd-2f8f1e0023bc4ce676a027be79712b1001d283bc.tar.bz2
openbsd-2f8f1e0023bc4ce676a027be79712b1001d283bc.zip
Remove PEM wrappers for NETSCAPE_CERT_SEQUENCE
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/pem/pem.h6
-rw-r--r--src/lib/libcrypto/pem/pem_all.c32
2 files changed, 2 insertions, 36 deletions
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h
index 092d815c58..130acbccf4 100644
--- a/src/lib/libcrypto/pem/pem.h
+++ b/src/lib/libcrypto/pem/pem.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: pem.h,v 1.25 2023/04/24 22:24:39 tb Exp $ */ 1/* $OpenBSD: pem.h,v 1.26 2023/04/25 17:51:36 tb Exp $ */
2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -425,10 +425,6 @@ DECLARE_PEM_rw(X509_CRL, X509_CRL)
425 425
426DECLARE_PEM_rw(PKCS7, PKCS7) 426DECLARE_PEM_rw(PKCS7, PKCS7)
427 427
428#if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL)
429DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
430#endif
431
432DECLARE_PEM_rw(PKCS8, X509_SIG) 428DECLARE_PEM_rw(PKCS8, X509_SIG)
433 429
434DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO) 430DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
diff --git a/src/lib/libcrypto/pem/pem_all.c b/src/lib/libcrypto/pem/pem_all.c
index 2420bfa973..9fa5184ec0 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.19 2023/04/25 11:03:37 tb Exp $ */ 1/* $OpenBSD: pem_all.c,v 1.20 2023/04/25 17:51:36 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 *
@@ -239,36 +239,6 @@ PEM_write_bio_PKCS7(BIO *bp, PKCS7 *x)
239 x, NULL, NULL, 0, NULL, NULL); 239 x, NULL, NULL, 0, NULL, NULL);
240} 240}
241 241
242#if !defined(LIBRESSL_NEXT_API)
243int
244PEM_write_NETSCAPE_CERT_SEQUENCE(FILE *fp, NETSCAPE_CERT_SEQUENCE *x)
245{
246 return PEM_ASN1_write((i2d_of_void *)i2d_NETSCAPE_CERT_SEQUENCE, PEM_STRING_X509, fp,
247 x, NULL, NULL, 0, NULL, NULL);
248}
249
250NETSCAPE_CERT_SEQUENCE *
251PEM_read_NETSCAPE_CERT_SEQUENCE(FILE *fp, NETSCAPE_CERT_SEQUENCE **x, pem_password_cb *cb, void *u)
252{
253 return PEM_ASN1_read((d2i_of_void *)d2i_NETSCAPE_CERT_SEQUENCE, PEM_STRING_X509, fp,
254 (void **)x, cb, u);
255}
256
257NETSCAPE_CERT_SEQUENCE *
258PEM_read_bio_NETSCAPE_CERT_SEQUENCE(BIO *bp, NETSCAPE_CERT_SEQUENCE **x, pem_password_cb *cb, void *u)
259{
260 return PEM_ASN1_read_bio((d2i_of_void *)d2i_NETSCAPE_CERT_SEQUENCE, PEM_STRING_X509, bp,
261 (void **)x, cb, u);
262}
263
264int
265PEM_write_bio_NETSCAPE_CERT_SEQUENCE(BIO *bp, NETSCAPE_CERT_SEQUENCE *x)
266{
267 return PEM_ASN1_write_bio((i2d_of_void *)i2d_NETSCAPE_CERT_SEQUENCE, PEM_STRING_X509, bp,
268 x, NULL, NULL, 0, NULL, NULL);
269}
270#endif
271
272#ifndef OPENSSL_NO_RSA 242#ifndef OPENSSL_NO_RSA
273 243
274/* We treat RSA or DSA private keys as a special case. 244/* We treat RSA or DSA private keys as a special case.