2011-01-21 11:21:11 +01:00
|
|
|
/*
|
|
|
|
* generic message digest layer demonstration program
|
|
|
|
*
|
2015-07-27 11:11:48 +02:00
|
|
|
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
|
2015-09-04 14:21:07 +02:00
|
|
|
* SPDX-License-Identifier: Apache-2.0
|
2011-01-21 11:21:11 +01:00
|
|
|
*
|
2015-09-04 14:21:07 +02:00
|
|
|
* 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
|
2011-01-21 11:21:11 +01:00
|
|
|
*
|
2015-09-04 14:21:07 +02:00
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
2011-01-21 11:21:11 +01:00
|
|
|
*
|
2015-09-04 14:21:07 +02:00
|
|
|
* 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.
|
2011-01-21 11:21:11 +01:00
|
|
|
*
|
2015-09-04 14:21:07 +02:00
|
|
|
* This file is part of mbed TLS (https://tls.mbed.org)
|
2011-01-21 11:21:11 +01:00
|
|
|
*/
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if !defined(MBEDTLS_CONFIG_FILE)
|
2015-03-09 18:05:11 +01:00
|
|
|
#include "mbedtls/config.h"
|
2014-04-29 12:39:06 +02:00
|
|
|
#else
|
2015-04-08 12:49:31 +02:00
|
|
|
#include MBEDTLS_CONFIG_FILE
|
2014-04-29 12:39:06 +02:00
|
|
|
#endif
|
2011-01-21 11:21:11 +01:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_PLATFORM_C)
|
2015-03-09 18:05:11 +01:00
|
|
|
#include "mbedtls/platform.h"
|
2015-01-19 15:26:37 +01:00
|
|
|
#else
|
2015-02-11 15:06:19 +01:00
|
|
|
#include <stdio.h>
|
2018-04-29 23:35:36 +02:00
|
|
|
#include <stdlib.h>
|
|
|
|
#define mbedtls_fprintf fprintf
|
|
|
|
#define mbedtls_printf printf
|
2018-12-10 14:31:45 +01:00
|
|
|
#define mbedtls_exit exit
|
2018-04-30 23:42:33 +02:00
|
|
|
#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS
|
2018-04-29 23:35:36 +02:00
|
|
|
#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
|
|
|
|
#endif /* MBEDTLS_PLATFORM_C */
|
2015-01-19 15:26:37 +01:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if defined(MBEDTLS_MD_C) && defined(MBEDTLS_FS_IO)
|
2015-03-09 18:05:11 +01:00
|
|
|
#include "mbedtls/md.h"
|
2011-01-21 11:21:11 +01:00
|
|
|
|
2015-02-11 15:06:19 +01:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#endif
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
#if !defined(MBEDTLS_MD_C) || !defined(MBEDTLS_FS_IO)
|
2015-02-12 12:37:29 +01:00
|
|
|
int main( void )
|
2011-05-26 15:16:06 +02:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_printf("MBEDTLS_MD_C and/or MBEDTLS_FS_IO not defined.\n");
|
Merge mbedtls 2.16.6 into baremetal
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>
2020-05-18 17:47:25 +02:00
|
|
|
mbedtls_exit( 0 );
|
2011-05-26 15:16:06 +02:00
|
|
|
}
|
|
|
|
#else
|
2018-12-10 14:31:45 +01:00
|
|
|
|
2019-10-04 11:52:42 +02:00
|
|
|
#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
|
2018-12-10 14:31:45 +01:00
|
|
|
|
2019-07-17 12:21:02 +02:00
|
|
|
static int generic_wrapper( mbedtls_md_handle_t md_info, char *filename, unsigned char *sum )
|
2011-01-21 11:21:11 +01:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
int ret = mbedtls_md_file( md_info, filename, sum );
|
2011-01-21 11:21:11 +01:00
|
|
|
|
|
|
|
if( ret == 1 )
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_fprintf( stderr, "failed to open: %s\n", filename );
|
2011-01-21 11:21:11 +01:00
|
|
|
|
|
|
|
if( ret == 2 )
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_fprintf( stderr, "failed to read: %s\n", filename );
|
2011-01-21 11:21:11 +01:00
|
|
|
|
|
|
|
return( ret );
|
|
|
|
}
|
|
|
|
|
2019-07-17 12:21:02 +02:00
|
|
|
static int generic_print( mbedtls_md_handle_t md_info, char *filename )
|
2011-01-21 11:21:11 +01:00
|
|
|
{
|
|
|
|
int i;
|
2015-04-08 12:49:31 +02:00
|
|
|
unsigned char sum[MBEDTLS_MD_MAX_SIZE];
|
2011-01-21 11:21:11 +01:00
|
|
|
|
|
|
|
if( generic_wrapper( md_info, filename, sum ) != 0 )
|
|
|
|
return( 1 );
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
for( i = 0; i < mbedtls_md_get_size( md_info ); i++ )
|
|
|
|
mbedtls_printf( "%02x", sum[i] );
|
2011-01-21 11:21:11 +01:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_printf( " %s\n", filename );
|
2011-01-21 11:21:11 +01:00
|
|
|
return( 0 );
|
|
|
|
}
|
|
|
|
|
2019-07-17 12:21:02 +02:00
|
|
|
static int generic_check( mbedtls_md_handle_t md_info, char *filename )
|
2011-01-21 11:21:11 +01:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
size_t n;
|
|
|
|
FILE *f;
|
|
|
|
int nb_err1, nb_err2;
|
|
|
|
int nb_tot1, nb_tot2;
|
2015-04-08 12:49:31 +02:00
|
|
|
unsigned char sum[MBEDTLS_MD_MAX_SIZE];
|
2016-05-12 13:46:02 +02:00
|
|
|
char line[1024];
|
2013-10-28 12:51:32 +01:00
|
|
|
char diff;
|
2016-05-12 13:46:02 +02:00
|
|
|
#if defined(__clang_analyzer__)
|
|
|
|
char buf[MBEDTLS_MD_MAX_SIZE * 2 + 1] = { };
|
|
|
|
#else
|
|
|
|
char buf[MBEDTLS_MD_MAX_SIZE * 2 + 1];
|
|
|
|
#endif
|
2011-01-21 11:21:11 +01:00
|
|
|
|
|
|
|
if( ( f = fopen( filename, "rb" ) ) == NULL )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_printf( "failed to open: %s\n", filename );
|
2011-01-21 11:21:11 +01:00
|
|
|
return( 1 );
|
|
|
|
}
|
|
|
|
|
|
|
|
nb_err1 = nb_err2 = 0;
|
|
|
|
nb_tot1 = nb_tot2 = 0;
|
|
|
|
|
|
|
|
memset( line, 0, sizeof( line ) );
|
|
|
|
|
|
|
|
n = sizeof( line );
|
|
|
|
|
2011-04-24 10:57:21 +02:00
|
|
|
while( fgets( line, (int) n - 1, f ) != NULL )
|
2011-01-21 11:21:11 +01:00
|
|
|
{
|
|
|
|
n = strlen( line );
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
if( n < (size_t) 2 * mbedtls_md_get_size( md_info ) + 4 )
|
2011-01-21 11:21:11 +01:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_printf("No '%s' hash found on line.\n", mbedtls_md_get_name( md_info ));
|
2011-01-21 11:21:11 +01:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
if( line[2 * mbedtls_md_get_size( md_info )] != ' ' || line[2 * mbedtls_md_get_size( md_info ) + 1] != ' ' )
|
2011-01-21 11:21:11 +01:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_printf("No '%s' hash found on line.\n", mbedtls_md_get_name( md_info ));
|
2011-01-21 11:21:11 +01:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( line[n - 1] == '\n' ) { n--; line[n] = '\0'; }
|
|
|
|
if( line[n - 1] == '\r' ) { n--; line[n] = '\0'; }
|
|
|
|
|
|
|
|
nb_tot1++;
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
if( generic_wrapper( md_info, line + 2 + 2 * mbedtls_md_get_size( md_info ), sum ) != 0 )
|
2011-01-21 11:21:11 +01:00
|
|
|
{
|
|
|
|
nb_err1++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
nb_tot2++;
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
for( i = 0; i < mbedtls_md_get_size( md_info ); i++ )
|
2011-01-21 11:21:11 +01:00
|
|
|
sprintf( buf + i * 2, "%02x", sum[i] );
|
|
|
|
|
2013-10-28 12:51:32 +01:00
|
|
|
/* Use constant-time buffer comparison */
|
|
|
|
diff = 0;
|
2015-04-08 12:49:31 +02:00
|
|
|
for( i = 0; i < 2 * mbedtls_md_get_size( md_info ); i++ )
|
2013-10-28 12:51:32 +01:00
|
|
|
diff |= line[i] ^ buf[i];
|
|
|
|
|
|
|
|
if( diff != 0 )
|
2011-01-21 11:21:11 +01:00
|
|
|
{
|
|
|
|
nb_err2++;
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_fprintf( stderr, "wrong checksum: %s\n", line + 66 );
|
2011-01-21 11:21:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
n = sizeof( line );
|
|
|
|
}
|
|
|
|
|
|
|
|
if( nb_err1 != 0 )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_printf( "WARNING: %d (out of %d) input files could "
|
2011-01-21 11:21:11 +01:00
|
|
|
"not be read\n", nb_err1, nb_tot1 );
|
|
|
|
}
|
|
|
|
|
|
|
|
if( nb_err2 != 0 )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_printf( "WARNING: %d (out of %d) computed checksums did "
|
2011-01-21 11:21:11 +01:00
|
|
|
"not match\n", nb_err2, nb_tot2 );
|
|
|
|
}
|
|
|
|
|
2014-02-06 15:03:06 +01:00
|
|
|
fclose( f );
|
|
|
|
|
2011-01-21 11:21:11 +01:00
|
|
|
return( nb_err1 != 0 || nb_err2 != 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
int main( int argc, char *argv[] )
|
|
|
|
{
|
2018-04-29 23:35:36 +02:00
|
|
|
int ret = 1, i;
|
|
|
|
int exit_code = MBEDTLS_EXIT_FAILURE;
|
2019-07-17 12:21:02 +02:00
|
|
|
mbedtls_md_handle_t md_info;
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_md_context_t md_ctx;
|
2011-01-21 11:21:11 +01:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_md_init( &md_ctx );
|
2011-01-21 11:21:11 +01:00
|
|
|
|
|
|
|
if( argc == 1 )
|
|
|
|
{
|
|
|
|
const int *list;
|
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_printf( "print mode: generic_sum <mbedtls_md> <file> <file> ...\n" );
|
|
|
|
mbedtls_printf( "check mode: generic_sum <mbedtls_md> -c <checksum file>\n" );
|
2011-01-21 11:21:11 +01:00
|
|
|
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_printf( "\nAvailable message digests:\n" );
|
|
|
|
list = mbedtls_md_list();
|
2011-01-21 11:21:11 +01:00
|
|
|
while( *list )
|
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
md_info = mbedtls_md_info_from_type( *list );
|
|
|
|
mbedtls_printf( " %s\n", mbedtls_md_get_name( md_info ) );
|
2011-01-21 11:21:11 +01:00
|
|
|
list++;
|
|
|
|
}
|
|
|
|
|
2011-11-18 15:26:47 +01:00
|
|
|
#if defined(_WIN32)
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_printf( "\n Press Enter to exit this program.\n" );
|
2011-01-21 11:21:11 +01:00
|
|
|
fflush( stdout ); getchar();
|
|
|
|
#endif
|
|
|
|
|
Merge mbedtls 2.16.6 into baremetal
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>
2020-05-18 17:47:25 +02:00
|
|
|
mbedtls_exit( exit_code );
|
2011-01-21 11:21:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read the MD from the command line
|
|
|
|
*/
|
2015-04-08 12:49:31 +02:00
|
|
|
md_info = mbedtls_md_info_from_string( argv[1] );
|
2019-07-17 12:21:02 +02:00
|
|
|
if( md_info == MBEDTLS_MD_INVALID_HANDLE )
|
2011-01-21 11:21:11 +01:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_fprintf( stderr, "Message Digest '%s' not found\n", argv[1] );
|
Merge mbedtls 2.16.6 into baremetal
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>
2020-05-18 17:47:25 +02:00
|
|
|
mbedtls_exit( exit_code );
|
2011-01-21 11:21:11 +01:00
|
|
|
}
|
2015-04-08 12:49:31 +02:00
|
|
|
if( mbedtls_md_setup( &md_ctx, md_info, 0 ) )
|
2011-01-21 11:21:11 +01:00
|
|
|
{
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_fprintf( stderr, "Failed to initialize context.\n" );
|
Merge mbedtls 2.16.6 into baremetal
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>
2020-05-18 17:47:25 +02:00
|
|
|
mbedtls_exit( exit_code );
|
2011-01-21 11:21:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
if( argc == 4 && strcmp( "-c", argv[2] ) == 0 )
|
|
|
|
{
|
|
|
|
ret |= generic_check( md_info, argv[3] );
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
for( i = 2; i < argc; i++ )
|
|
|
|
ret |= generic_print( md_info, argv[i] );
|
|
|
|
|
2018-04-29 23:35:36 +02:00
|
|
|
if ( ret == 0 )
|
|
|
|
exit_code = MBEDTLS_EXIT_SUCCESS;
|
|
|
|
|
2011-01-21 11:21:11 +01:00
|
|
|
exit:
|
2015-04-08 12:49:31 +02:00
|
|
|
mbedtls_md_free( &md_ctx );
|
2011-01-21 11:21:11 +01:00
|
|
|
|
Merge mbedtls 2.16.6 into baremetal
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>
2020-05-18 17:47:25 +02:00
|
|
|
mbedtls_exit( exit_code );
|
2011-01-21 11:21:11 +01:00
|
|
|
}
|
2015-04-08 12:49:31 +02:00
|
|
|
#endif /* MBEDTLS_MD_C && MBEDTLS_FS_IO */
|