mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-25 19:45:44 +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>
296 lines
6.7 KiB
C
296 lines
6.7 KiB
C
/*
|
|
* Convert PEM to DER
|
|
*
|
|
* Copyright (C) 2006-2015, 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
|
|
|
|
#if defined(MBEDTLS_PLATFORM_C)
|
|
#include "mbedtls/platform.h"
|
|
#else
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#define mbedtls_free free
|
|
#define mbedtls_calloc calloc
|
|
#define mbedtls_printf printf
|
|
#define mbedtls_exit exit
|
|
#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS
|
|
#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
|
|
#endif /* MBEDTLS_PLATFORM_C */
|
|
|
|
#if defined(MBEDTLS_BASE64_C) && defined(MBEDTLS_FS_IO)
|
|
#include "mbedtls/error.h"
|
|
#include "mbedtls/base64.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#define DFL_FILENAME "file.pem"
|
|
#define DFL_OUTPUT_FILENAME "file.der"
|
|
|
|
#define USAGE \
|
|
"\n usage: pem2der param=<>...\n" \
|
|
"\n acceptable parameters:\n" \
|
|
" filename=%%s default: file.pem\n" \
|
|
" output_file=%%s default: file.der\n" \
|
|
"\n"
|
|
|
|
#if !defined(MBEDTLS_BASE64_C) || !defined(MBEDTLS_FS_IO)
|
|
int main( void )
|
|
{
|
|
mbedtls_printf("MBEDTLS_BASE64_C and/or MBEDTLS_FS_IO not defined.\n");
|
|
mbedtls_exit( 0 );
|
|
}
|
|
#else
|
|
|
|
|
|
/*
|
|
* global options
|
|
*/
|
|
struct options
|
|
{
|
|
const char *filename; /* filename of the input file */
|
|
const char *output_file; /* where to store the output */
|
|
} opt;
|
|
|
|
int convert_pem_to_der( const unsigned char *input, size_t ilen,
|
|
unsigned char *output, size_t *olen )
|
|
{
|
|
int ret;
|
|
const unsigned char *s1, *s2, *end = input + ilen;
|
|
size_t len = 0;
|
|
|
|
s1 = (unsigned char *) strstr( (const char *) input, "-----BEGIN" );
|
|
if( s1 == NULL )
|
|
return( -1 );
|
|
|
|
s2 = (unsigned char *) strstr( (const char *) input, "-----END" );
|
|
if( s2 == NULL )
|
|
return( -1 );
|
|
|
|
s1 += 10;
|
|
while( s1 < end && *s1 != '-' )
|
|
s1++;
|
|
while( s1 < end && *s1 == '-' )
|
|
s1++;
|
|
if( *s1 == '\r' ) s1++;
|
|
if( *s1 == '\n' ) s1++;
|
|
|
|
if( s2 <= s1 || s2 > end )
|
|
return( -1 );
|
|
|
|
ret = mbedtls_base64_decode( NULL, 0, &len, (const unsigned char *) s1, s2 - s1 );
|
|
if( ret == MBEDTLS_ERR_BASE64_INVALID_CHARACTER )
|
|
return( ret );
|
|
|
|
if( len > *olen )
|
|
return( -1 );
|
|
|
|
if( ( ret = mbedtls_base64_decode( output, len, &len, (const unsigned char *) s1,
|
|
s2 - s1 ) ) != 0 )
|
|
{
|
|
return( ret );
|
|
}
|
|
|
|
*olen = len;
|
|
|
|
return( 0 );
|
|
}
|
|
|
|
/*
|
|
* Load all data from a file into a given buffer.
|
|
*/
|
|
static int load_file( const char *path, unsigned char **buf, size_t *n )
|
|
{
|
|
FILE *f;
|
|
long size;
|
|
|
|
if( ( f = fopen( path, "rb" ) ) == NULL )
|
|
return( -1 );
|
|
|
|
fseek( f, 0, SEEK_END );
|
|
if( ( size = ftell( f ) ) == -1 )
|
|
{
|
|
fclose( f );
|
|
return( -1 );
|
|
}
|
|
fseek( f, 0, SEEK_SET );
|
|
|
|
*n = (size_t) size;
|
|
|
|
if( *n + 1 == 0 ||
|
|
( *buf = mbedtls_calloc( 1, *n + 1 ) ) == NULL )
|
|
{
|
|
fclose( f );
|
|
return( -1 );
|
|
}
|
|
|
|
if( fread( *buf, 1, *n, f ) != *n )
|
|
{
|
|
fclose( f );
|
|
free( *buf );
|
|
*buf = NULL;
|
|
return( -1 );
|
|
}
|
|
|
|
fclose( f );
|
|
|
|
(*buf)[*n] = '\0';
|
|
|
|
return( 0 );
|
|
}
|
|
|
|
/*
|
|
* Write buffer to a file
|
|
*/
|
|
static int write_file( const char *path, unsigned char *buf, size_t n )
|
|
{
|
|
FILE *f;
|
|
|
|
if( ( f = fopen( path, "wb" ) ) == NULL )
|
|
return( -1 );
|
|
|
|
if( fwrite( buf, 1, n, f ) != n )
|
|
{
|
|
fclose( f );
|
|
return( -1 );
|
|
}
|
|
|
|
fclose( f );
|
|
return( 0 );
|
|
}
|
|
|
|
int main( int argc, char *argv[] )
|
|
{
|
|
int ret = 1;
|
|
int exit_code = MBEDTLS_EXIT_FAILURE;
|
|
unsigned char *pem_buffer = NULL;
|
|
unsigned char der_buffer[4096];
|
|
char buf[1024];
|
|
size_t pem_size, der_size = sizeof(der_buffer);
|
|
int i;
|
|
char *p, *q;
|
|
|
|
/*
|
|
* Set to sane values
|
|
*/
|
|
memset( buf, 0, sizeof(buf) );
|
|
memset( der_buffer, 0, sizeof(der_buffer) );
|
|
|
|
if( argc == 0 )
|
|
{
|
|
usage:
|
|
mbedtls_printf( USAGE );
|
|
goto exit;
|
|
}
|
|
|
|
opt.filename = DFL_FILENAME;
|
|
opt.output_file = DFL_OUTPUT_FILENAME;
|
|
|
|
for( i = 1; i < argc; i++ )
|
|
{
|
|
|
|
p = argv[i];
|
|
if( ( q = strchr( p, '=' ) ) == NULL )
|
|
goto usage;
|
|
*q++ = '\0';
|
|
|
|
if( strcmp( p, "filename" ) == 0 )
|
|
opt.filename = q;
|
|
else if( strcmp( p, "output_file" ) == 0 )
|
|
opt.output_file = q;
|
|
else
|
|
goto usage;
|
|
}
|
|
|
|
/*
|
|
* 1.1. Load the PEM file
|
|
*/
|
|
mbedtls_printf( "\n . Loading the PEM file ..." );
|
|
fflush( stdout );
|
|
|
|
ret = load_file( opt.filename, &pem_buffer, &pem_size );
|
|
|
|
if( ret != 0 )
|
|
{
|
|
#ifdef MBEDTLS_ERROR_C
|
|
mbedtls_strerror( ret, buf, 1024 );
|
|
#endif
|
|
mbedtls_printf( " failed\n ! load_file returned %d - %s\n\n", ret, buf );
|
|
goto exit;
|
|
}
|
|
|
|
mbedtls_printf( " ok\n" );
|
|
|
|
/*
|
|
* 1.2. Convert from PEM to DER
|
|
*/
|
|
mbedtls_printf( " . Converting from PEM to DER ..." );
|
|
fflush( stdout );
|
|
|
|
if( ( ret = convert_pem_to_der( pem_buffer, pem_size, der_buffer, &der_size ) ) != 0 )
|
|
{
|
|
#ifdef MBEDTLS_ERROR_C
|
|
mbedtls_strerror( ret, buf, 1024 );
|
|
#endif
|
|
mbedtls_printf( " failed\n ! convert_pem_to_der %d - %s\n\n", ret, buf );
|
|
goto exit;
|
|
}
|
|
|
|
mbedtls_printf( " ok\n" );
|
|
|
|
/*
|
|
* 1.3. Write the DER file
|
|
*/
|
|
mbedtls_printf( " . Writing the DER file ..." );
|
|
fflush( stdout );
|
|
|
|
ret = write_file( opt.output_file, der_buffer, der_size );
|
|
|
|
if( ret != 0 )
|
|
{
|
|
#ifdef MBEDTLS_ERROR_C
|
|
mbedtls_strerror( ret, buf, 1024 );
|
|
#endif
|
|
mbedtls_printf( " failed\n ! write_file returned %d - %s\n\n", ret, buf );
|
|
goto exit;
|
|
}
|
|
|
|
mbedtls_printf( " ok\n" );
|
|
|
|
exit_code = MBEDTLS_EXIT_SUCCESS;
|
|
|
|
exit:
|
|
free( pem_buffer );
|
|
|
|
#if defined(_WIN32)
|
|
mbedtls_printf( " + Press Enter to exit this program.\n" );
|
|
fflush( stdout ); getchar();
|
|
#endif
|
|
|
|
mbedtls_exit( exit_code );
|
|
}
|
|
#endif /* MBEDTLS_BASE64_C && MBEDTLS_FS_IO */
|