diff options
author | tb <> | 2023-04-24 22:24:39 +0000 |
---|---|---|
committer | tb <> | 2023-04-24 22:24:39 +0000 |
commit | a2fa981183523a8a6c9e5eac345fcbfff0f0c560 (patch) | |
tree | c386aba8ff946644d95e6b264a309b2fa996f0a6 /src/lib/libcrypto/pem | |
parent | 34f65b1630984fcebe128bbb2b21fd91fce3c846 (diff) | |
download | openbsd-a2fa981183523a8a6c9e5eac345fcbfff0f0c560.tar.gz openbsd-a2fa981183523a8a6c9e5eac345fcbfff0f0c560.tar.bz2 openbsd-a2fa981183523a8a6c9e5eac345fcbfff0f0c560.zip |
Mark NETSCAPE_CERT_SEQUENCE for removal
discussed with beck and jsing
Diffstat (limited to 'src/lib/libcrypto/pem')
-rw-r--r-- | src/lib/libcrypto/pem/pem.h | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/pem/pem_all.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h index a0f7d78c01..092d815c58 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.24 2022/07/12 14:42:50 kn Exp $ */ | 1 | /* $OpenBSD: pem.h,v 1.25 2023/04/24 22:24:39 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,7 +425,9 @@ DECLARE_PEM_rw(X509_CRL, X509_CRL) | |||
425 | 425 | ||
426 | DECLARE_PEM_rw(PKCS7, PKCS7) | 426 | DECLARE_PEM_rw(PKCS7, PKCS7) |
427 | 427 | ||
428 | #if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) | ||
428 | DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE) | 429 | DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE) |
430 | #endif | ||
429 | 431 | ||
430 | DECLARE_PEM_rw(PKCS8, X509_SIG) | 432 | DECLARE_PEM_rw(PKCS8, X509_SIG) |
431 | 433 | ||
diff --git a/src/lib/libcrypto/pem/pem_all.c b/src/lib/libcrypto/pem/pem_all.c index f5211f29a6..82c7fc43d3 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.17 2016/09/04 16:10:38 jsing Exp $ */ | 1 | /* $OpenBSD: pem_all.c,v 1.18 2023/04/24 22:24:39 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,12 +239,14 @@ 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) | ||
242 | int | 243 | int |
243 | PEM_write_NETSCAPE_CERT_SEQUENCE(FILE *fp, NETSCAPE_CERT_SEQUENCE *x) | 244 | PEM_write_NETSCAPE_CERT_SEQUENCE(FILE *fp, NETSCAPE_CERT_SEQUENCE *x) |
244 | { | 245 | { |
245 | return PEM_ASN1_write((i2d_of_void *)i2d_NETSCAPE_CERT_SEQUENCE, PEM_STRING_X509, fp, | 246 | return PEM_ASN1_write((i2d_of_void *)i2d_NETSCAPE_CERT_SEQUENCE, PEM_STRING_X509, fp, |
246 | x, NULL, NULL, 0, NULL, NULL); | 247 | x, NULL, NULL, 0, NULL, NULL); |
247 | } | 248 | } |
249 | #endif | ||
248 | 250 | ||
249 | NETSCAPE_CERT_SEQUENCE * | 251 | NETSCAPE_CERT_SEQUENCE * |
250 | PEM_read_NETSCAPE_CERT_SEQUENCE(FILE *fp, NETSCAPE_CERT_SEQUENCE **x, pem_password_cb *cb, void *u) | 252 | PEM_read_NETSCAPE_CERT_SEQUENCE(FILE *fp, NETSCAPE_CERT_SEQUENCE **x, pem_password_cb *cb, void *u) |