mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-29 12:14:21 +01:00
825ebd483f
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626
, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
117 lines
3.3 KiB
C
117 lines
3.3 KiB
C
/*
|
|
* Zeroize application for debugger-driven testing
|
|
*
|
|
* This is a simple test application used for debugger-driven testing to check
|
|
* whether calls to mbedtls_platform_zeroize() are being eliminated by compiler
|
|
* optimizations. This application is used by the GDB script at
|
|
* tests/scripts/test_zeroize.gdb under the assumption that the code does not
|
|
* change often (as opposed to the library code) because the script sets a
|
|
* breakpoint at the last return statement in the main() function of this
|
|
* program. The debugger facilities are then used to manually inspect the
|
|
* memory and verify that the call to mbedtls_platform_zeroize() was not
|
|
* eliminated.
|
|
*
|
|
* Copyright (C) 2018, Arm Limited, All Rights Reserved
|
|
* 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.
|
|
*
|
|
* This file is part of mbed TLS (https://tls.mbed.org)
|
|
*/
|
|
|
|
#if !defined(MBEDTLS_CONFIG_FILE)
|
|
#include "mbedtls/config.h"
|
|
#else
|
|
#include MBEDTLS_CONFIG_FILE
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
|
|
#if defined(MBEDTLS_PLATFORM_C)
|
|
#include "mbedtls/platform.h"
|
|
#else
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#define mbedtls_printf printf
|
|
#define mbedtls_exit exit
|
|
#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS
|
|
#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
|
|
#endif
|
|
|
|
#include "mbedtls/platform_util.h"
|
|
|
|
#define BUFFER_LEN 1024
|
|
|
|
void usage( void )
|
|
{
|
|
mbedtls_printf( "Zeroize is a simple program to assist with testing\n" );
|
|
mbedtls_printf( "the mbedtls_platform_zeroize() function by using the\n" );
|
|
mbedtls_printf( "debugger. This program takes a file as input and\n" );
|
|
mbedtls_printf( "prints the first %d characters. Usage:\n\n", BUFFER_LEN );
|
|
mbedtls_printf( " zeroize <FILE>\n" );
|
|
}
|
|
|
|
int main( int argc, char** argv )
|
|
{
|
|
int exit_code = MBEDTLS_EXIT_FAILURE;
|
|
FILE *fp;
|
|
char buf[BUFFER_LEN];
|
|
char *p = buf;
|
|
char *end = p + BUFFER_LEN;
|
|
int c;
|
|
|
|
if( argc != 2 )
|
|
{
|
|
mbedtls_printf( "This program takes exactly 1 agument\n" );
|
|
usage();
|
|
mbedtls_exit( exit_code );
|
|
}
|
|
|
|
fp = fopen( argv[1], "r" );
|
|
if( fp == NULL )
|
|
{
|
|
mbedtls_printf( "Could not open file '%s'\n", argv[1] );
|
|
mbedtls_exit( exit_code );
|
|
}
|
|
|
|
while( ( c = fgetc( fp ) ) != EOF && p < end - 1 )
|
|
*p++ = (char)c;
|
|
*p = '\0';
|
|
|
|
if( p - buf != 0 )
|
|
{
|
|
mbedtls_printf( "%s\n", buf );
|
|
exit_code = MBEDTLS_EXIT_SUCCESS;
|
|
}
|
|
else
|
|
mbedtls_printf( "The file is empty!\n" );
|
|
|
|
fclose( fp );
|
|
mbedtls_platform_zeroize( buf, sizeof( buf ) );
|
|
|
|
mbedtls_exit( exit_code );
|
|
}
|
|
|
|
#if defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
|
|
int mbedtls_hardware_poll( void *data, unsigned char *output,
|
|
size_t len, size_t *olen )
|
|
{
|
|
size_t i;
|
|
(void) data;
|
|
for( i = 0; i < len; ++i )
|
|
output[i] = rand();
|
|
*olen = len;
|
|
return( 0 );
|
|
}
|
|
#endif
|