From d77b86cc5b98c385243d03154a64fa04e7284f89 Mon Sep 17 00:00:00 2001
From: Gabor Mezei <gabor.mezei@arm.com>
Date: Thu, 18 Nov 2021 16:57:00 +0100
Subject: [PATCH] Delete base64_invasive.h due to functions are moved to the
constant-time module
Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
---
library/base64.c | 1 -
library/base64_invasive.h | 55 -------------------------
tests/suites/test_suite_base64.function | 1 -
3 files changed, 57 deletions(-)
delete mode 100644 library/base64_invasive.h
diff --git a/library/base64.c b/library/base64.c
index b2e6dabcb1..83daa0bcc6 100644
--- a/library/base64.c
+++ b/library/base64.c
@@ -22,7 +22,6 @@
#if defined(MBEDTLS_BASE64_C)
#include "mbedtls/base64.h"
-#include "base64_invasive.h"
#include "constant_time_internal.h"
#include <stdint.h>
diff --git a/library/base64_invasive.h b/library/base64_invasive.h
deleted file mode 100644
index fcb8331554..0000000000
--- a/library/base64_invasive.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * \file base_invasive.h
- *
- * \brief Base64 module: interfaces for invasive testing only.
- *
- * The interfaces in this file are intended for testing purposes only.
- * They SHOULD NOT be made available in library integrations except when
- * building the library for testing.
- */
-/*
- * Copyright The Mbed TLS Contributors
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef MBEDTLS_BASE64_INVASIVE_H
-#define MBEDTLS_BASE64_INVASIVE_H
-
-#include "common.h"
-
-#if defined(MBEDTLS_TEST_HOOKS)
-/* Return 0xff if low <= c <= high, 0 otherwise.
- *
- * Constant flow with respect to c.
- */
-unsigned char mbedtls_ct_uchar_mask_of_range( unsigned char low,
- unsigned char high,
- unsigned char c );
-
-/* Given a value in the range 0..63, return the corresponding Base64 digit.
- *
- * Operates in constant time (no branches or memory access depending on val).
- */
-unsigned char mbedtls_ct_base64_enc_char( unsigned char val );
-
-/* Given a Base64 digit, return its value.
- * If c is not a Base64 digit ('A'..'Z', 'a'..'z', '0'..'9', '+' or '/'),
- * return -1.
- *
- * Operates in constant time (no branches or memory access depending on c).
- */
-signed char mbedtls_ct_base64_dec_value( unsigned char c );
-#endif /* MBEDTLS_TEST_HOOKS */
-
-#endif /* MBEDTLS_BASE64_INVASIVE_H */
diff --git a/tests/suites/test_suite_base64.function b/tests/suites/test_suite_base64.function
index 89982047fe..7baa3d501c 100644
--- a/tests/suites/test_suite_base64.function
+++ b/tests/suites/test_suite_base64.function
@@ -1,6 +1,5 @@
/* BEGIN_HEADER */
#include "mbedtls/base64.h"
-#include "base64_invasive.h"
#include "constant_time_internal.h"
#include "constant_time_invasive.h"
#include <test/constant_flow.h>