From fdfad9e1701882b4e72b41155a9c8e4ef338ddbf Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 2 Mar 2024 10:17:37 +0000 Subject: Remove most PBEPARAM stuff from public visibility The struct itself needs to remain public, unfortunately. ok jsing --- src/lib/libcrypto/asn1/p5_pbe.c | 4 +++- src/lib/libcrypto/asn1/p5_pbev2.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/lib/libcrypto/asn1') diff --git a/src/lib/libcrypto/asn1/p5_pbe.c b/src/lib/libcrypto/asn1/p5_pbe.c index 204e818286..0b628b36d9 100644 --- a/src/lib/libcrypto/asn1/p5_pbe.c +++ b/src/lib/libcrypto/asn1/p5_pbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p5_pbe.c,v 1.25 2023/07/07 19:37:52 beck Exp $ */ +/* $OpenBSD: p5_pbe.c,v 1.26 2024/03/02 10:17:37 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -64,6 +64,8 @@ #include #include +#include "x509_local.h" + /* PKCS#5 password based encryption structure */ static const ASN1_TEMPLATE PBEPARAM_seq_tt[] = { diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c index 8ee752c020..ebb20c296f 100644 --- a/src/lib/libcrypto/asn1/p5_pbev2.c +++ b/src/lib/libcrypto/asn1/p5_pbev2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p5_pbev2.c,v 1.31 2024/02/18 15:44:10 tb Exp $ */ +/* $OpenBSD: p5_pbev2.c,v 1.32 2024/03/02 10:17:37 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999-2004. */ @@ -65,6 +65,7 @@ #include #include "evp_local.h" +#include "x509_local.h" /* PKCS#5 v2.0 password based encryption structures */ -- cgit v1.2.3-55-g6feb