summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-04-25 18:04:03 +0000
committertb <>2023-04-25 18:04:03 +0000
commitbc3b06740d9de2a6b5fe388450981bfc734b1980 (patch)
tree6551767a95a8649ba4e327b37dab3f10e9d5c8d5
parent49d4e7f13703e6c53400ac3ec96f2fe687d3cb85 (diff)
downloadopenbsd-bc3b06740d9de2a6b5fe388450981bfc734b1980.tar.gz
openbsd-bc3b06740d9de2a6b5fe388450981bfc734b1980.tar.bz2
openbsd-bc3b06740d9de2a6b5fe388450981bfc734b1980.zip
Remove i2d_PKCS7_NDEF
-rw-r--r--src/lib/libcrypto/Symbols.namespace1
-rw-r--r--src/lib/libcrypto/pkcs7/pk7_asn1.c9
-rw-r--r--src/lib/libcrypto/pkcs7/pkcs7.h5
3 files changed, 2 insertions, 13 deletions
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace
index c68e8970de..2e0a638f17 100644
--- a/src/lib/libcrypto/Symbols.namespace
+++ b/src/lib/libcrypto/Symbols.namespace
@@ -76,7 +76,6 @@ _libre_PKCS7_new
76_libre_PKCS7_free 76_libre_PKCS7_free
77_libre_d2i_PKCS7 77_libre_d2i_PKCS7
78_libre_i2d_PKCS7 78_libre_i2d_PKCS7
79_libre_i2d_PKCS7_NDEF
80_libre_PKCS7_print_ctx 79_libre_PKCS7_print_ctx
81_libre_PKCS7_ctrl 80_libre_PKCS7_ctrl
82_libre_PKCS7_set_type 81_libre_PKCS7_set_type
diff --git a/src/lib/libcrypto/pkcs7/pk7_asn1.c b/src/lib/libcrypto/pkcs7/pk7_asn1.c
index f24f6be347..27f4103025 100644
--- a/src/lib/libcrypto/pkcs7/pk7_asn1.c
+++ b/src/lib/libcrypto/pkcs7/pk7_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pk7_asn1.c,v 1.16 2023/03/12 17:29:02 tb Exp $ */ 1/* $OpenBSD: pk7_asn1.c,v 1.17 2023/04/25 18:04:03 tb 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 2000. 3 * project 2000.
4 */ 4 */
@@ -245,13 +245,6 @@ PKCS7_free(PKCS7 *a)
245} 245}
246LCRYPTO_ALIAS(PKCS7_free); 246LCRYPTO_ALIAS(PKCS7_free);
247 247
248int
249i2d_PKCS7_NDEF(PKCS7 *a, unsigned char **out)
250{
251 return ASN1_item_ndef_i2d((ASN1_VALUE *)a, out, &PKCS7_it);
252}
253LCRYPTO_ALIAS(i2d_PKCS7_NDEF);
254
255PKCS7 * 248PKCS7 *
256PKCS7_dup(PKCS7 *x) 249PKCS7_dup(PKCS7 *x)
257{ 250{
diff --git a/src/lib/libcrypto/pkcs7/pkcs7.h b/src/lib/libcrypto/pkcs7/pkcs7.h
index b225562dc3..00a094f5e4 100644
--- a/src/lib/libcrypto/pkcs7/pkcs7.h
+++ b/src/lib/libcrypto/pkcs7/pkcs7.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs7.h,v 1.20 2023/04/24 22:12:28 tb Exp $ */ 1/* $OpenBSD: pkcs7.h,v 1.21 2023/04/25 18:04:03 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 *
@@ -321,9 +321,6 @@ extern const ASN1_ITEM PKCS7_it;
321extern const ASN1_ITEM PKCS7_ATTR_SIGN_it; 321extern const ASN1_ITEM PKCS7_ATTR_SIGN_it;
322extern const ASN1_ITEM PKCS7_ATTR_VERIFY_it; 322extern const ASN1_ITEM PKCS7_ATTR_VERIFY_it;
323 323
324#if !defined(LIBRESSL_NEXT_API) || defined(LIBRESSL_INTERNAL)
325int i2d_PKCS7_NDEF(PKCS7 *a, unsigned char **out);
326#endif
327int PKCS7_print_ctx(BIO *out, PKCS7 *x, int indent, const ASN1_PCTX *pctx); 324int PKCS7_print_ctx(BIO *out, PKCS7 *x, int indent, const ASN1_PCTX *pctx);
328 325
329long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg); 326long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);