diff options
author | tb <> | 2023-04-24 22:12:28 +0000 |
---|---|---|
committer | tb <> | 2023-04-24 22:12:28 +0000 |
commit | 34f65b1630984fcebe128bbb2b21fd91fce3c846 (patch) | |
tree | 0bdec671564bee59bb0cd5f453599f4f7d679288 /src/lib/libcrypto/asn1 | |
parent | dfba72c01dc2b402f36fe59f6539bba570f5aae2 (diff) | |
download | openbsd-34f65b1630984fcebe128bbb2b21fd91fce3c846.tar.gz openbsd-34f65b1630984fcebe128bbb2b21fd91fce3c846.tar.bz2 openbsd-34f65b1630984fcebe128bbb2b21fd91fce3c846.zip |
Mark the NDEF API for removal
Discussed with jsing and beck
Diffstat (limited to 'src/lib/libcrypto/asn1')
-rw-r--r-- | src/lib/libcrypto/asn1/asn1.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h index 03d7a2939f..8b224c1535 100644 --- a/src/lib/libcrypto/asn1/asn1.h +++ b/src/lib/libcrypto/asn1/asn1.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: asn1.h,v 1.74 2023/04/18 08:47:28 tb Exp $ */ | 1 | /* $OpenBSD: asn1.h,v 1.75 2023/04/24 22:12:28 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 | * |
@@ -880,7 +880,10 @@ void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it); | |||
880 | ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in, | 880 | ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in, |
881 | long len, const ASN1_ITEM *it); | 881 | long len, const ASN1_ITEM *it); |
882 | int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it); | 882 | int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it); |
883 | |||
884 | #if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_VERSION_NUMBER) | ||
883 | int ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it); | 885 | int ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it); |
886 | #endif | ||
884 | 887 | ||
885 | void ASN1_add_oid_module(void); | 888 | void ASN1_add_oid_module(void); |
886 | 889 | ||
@@ -925,6 +928,7 @@ void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags); | |||
925 | 928 | ||
926 | const BIO_METHOD *BIO_f_asn1(void); | 929 | const BIO_METHOD *BIO_f_asn1(void); |
927 | 930 | ||
931 | #if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL) | ||
928 | BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it); | 932 | BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it); |
929 | 933 | ||
930 | int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags, | 934 | int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags, |
@@ -935,6 +939,7 @@ int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags, | |||
935 | int ctype_nid, int econt_nid, STACK_OF(X509_ALGOR) *mdalgs, | 939 | int ctype_nid, int econt_nid, STACK_OF(X509_ALGOR) *mdalgs, |
936 | const ASN1_ITEM *it); | 940 | const ASN1_ITEM *it); |
937 | ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it); | 941 | ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it); |
942 | #endif | ||
938 | int SMIME_crlf_copy(BIO *in, BIO *out, int flags); | 943 | int SMIME_crlf_copy(BIO *in, BIO *out, int flags); |
939 | int SMIME_text(BIO *in, BIO *out); | 944 | int SMIME_text(BIO *in, BIO *out); |
940 | 945 | ||