From 72da8b35210342c547a484c8e76a8d33daa1ca6f Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Thu, 22 Feb 2024 12:07:29 +0100
Subject: [PATCH] Don't authorize private access to fields where not actually
 needed

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
---
 programs/fuzz/fuzz_client.c     | 1 -
 programs/fuzz/fuzz_dtlsclient.c | 1 -
 programs/fuzz/fuzz_server.c     | 1 -
 programs/fuzz/fuzz_x509crl.c    | 1 -
 programs/fuzz/fuzz_x509crt.c    | 1 -
 programs/fuzz/fuzz_x509csr.c    | 1 -
 programs/ssl/ssl_test_lib.c     | 1 -
 programs/test/metatest.c        | 1 -
 programs/test/selftest.c        | 2 --
 programs/test/udp_proxy.c       | 1 -
 10 files changed, 11 deletions(-)

diff --git a/programs/fuzz/fuzz_client.c b/programs/fuzz/fuzz_client.c
index d4e1d74cdb..21d03a3c34 100644
--- a/programs/fuzz/fuzz_client.c
+++ b/programs/fuzz/fuzz_client.c
@@ -1,4 +1,3 @@
-#define MBEDTLS_ALLOW_PRIVATE_ACCESS
 
 #include "mbedtls/ssl.h"
 #include "mbedtls/entropy.h"
diff --git a/programs/fuzz/fuzz_dtlsclient.c b/programs/fuzz/fuzz_dtlsclient.c
index 3659026840..53f3f786a5 100644
--- a/programs/fuzz/fuzz_dtlsclient.c
+++ b/programs/fuzz/fuzz_dtlsclient.c
@@ -1,4 +1,3 @@
-#define MBEDTLS_ALLOW_PRIVATE_ACCESS
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/programs/fuzz/fuzz_server.c b/programs/fuzz/fuzz_server.c
index e7678590a2..0c88767cfd 100644
--- a/programs/fuzz/fuzz_server.c
+++ b/programs/fuzz/fuzz_server.c
@@ -1,4 +1,3 @@
-#define MBEDTLS_ALLOW_PRIVATE_ACCESS
 
 #include "mbedtls/ssl.h"
 #include "mbedtls/entropy.h"
diff --git a/programs/fuzz/fuzz_x509crl.c b/programs/fuzz/fuzz_x509crl.c
index 313540d767..89c3ff69bd 100644
--- a/programs/fuzz/fuzz_x509crl.c
+++ b/programs/fuzz/fuzz_x509crl.c
@@ -1,4 +1,3 @@
-#define MBEDTLS_ALLOW_PRIVATE_ACCESS
 
 #include <stdint.h>
 #include "mbedtls/x509_crl.h"
diff --git a/programs/fuzz/fuzz_x509crt.c b/programs/fuzz/fuzz_x509crt.c
index 8442090cd2..9f40cb6ae2 100644
--- a/programs/fuzz/fuzz_x509crt.c
+++ b/programs/fuzz/fuzz_x509crt.c
@@ -1,4 +1,3 @@
-#define MBEDTLS_ALLOW_PRIVATE_ACCESS
 
 #include <stdint.h>
 #include "mbedtls/x509_crt.h"
diff --git a/programs/fuzz/fuzz_x509csr.c b/programs/fuzz/fuzz_x509csr.c
index 395d3c28e1..e19005afe0 100644
--- a/programs/fuzz/fuzz_x509csr.c
+++ b/programs/fuzz/fuzz_x509csr.c
@@ -1,4 +1,3 @@
-#define MBEDTLS_ALLOW_PRIVATE_ACCESS
 
 #include <stdint.h>
 #include "mbedtls/x509_csr.h"
diff --git a/programs/ssl/ssl_test_lib.c b/programs/ssl/ssl_test_lib.c
index a65332ae13..d3ac526f7e 100644
--- a/programs/ssl/ssl_test_lib.c
+++ b/programs/ssl/ssl_test_lib.c
@@ -8,7 +8,6 @@
  *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
  */
 
-#define MBEDTLS_ALLOW_PRIVATE_ACCESS
 
 #include "ssl_test_lib.h"
 
diff --git a/programs/test/metatest.c b/programs/test/metatest.c
index 8e798cd4cd..5a45f710b8 100644
--- a/programs/test/metatest.c
+++ b/programs/test/metatest.c
@@ -26,7 +26,6 @@
  *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
  */
 
-#define MBEDTLS_ALLOW_PRIVATE_ACCESS
 
 #include <mbedtls/platform.h>
 #include <mbedtls/platform_util.h>
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index e132e4c0c5..043209b7ff 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -5,8 +5,6 @@
  *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
  */
 
-#define MBEDTLS_ALLOW_PRIVATE_ACCESS
-
 #include "mbedtls/build_info.h"
 
 #include "mbedtls/entropy.h"
diff --git a/programs/test/udp_proxy.c b/programs/test/udp_proxy.c
index c6b56ec098..beaa8bd5ea 100644
--- a/programs/test/udp_proxy.c
+++ b/programs/test/udp_proxy.c
@@ -11,7 +11,6 @@
  * example of good general usage.
  */
 
-#define MBEDTLS_ALLOW_PRIVATE_ACCESS
 
 #include "mbedtls/build_info.h"