yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 09:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use pk_load_file() in X509

Browse source 
Saves a bit of ROM. X509 depends on PK anyway.
This commit is contained in:
Manuel Pégourié-Gonnard 2014-11-21 09:49:43 +01:00
parent 2457fa0915
commit 9439f93ea4
7 changed files with 14 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/polarssl/pk.h
View file

@ -638,6 +638,14 @@ int pk_write_pubkey( unsigned char **p, unsigned char *start,
const pk_context *key ); const pk_context *key );
#endif /* POLARSSL_PK_WRITE_C */ #endif /* POLARSSL_PK_WRITE_C */
/*
* Internal module functions. You probably do not want to use these unless you
* know you do.
*/
#if defined(POLARSSL_FS_IO)
int pk_load_file( const char *path, unsigned char **buf, size_t *n );
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

1
include/polarssl/x509.h
View file

@ -307,7 +307,6 @@ int x509_get_serial( unsigned char **p, const unsigned char *end,
x509_buf *serial ); x509_buf *serial );
int x509_get_ext( unsigned char **p, const unsigned char *end, int x509_get_ext( unsigned char **p, const unsigned char *end,
x509_buf *ext, int tag ); x509_buf *ext, int tag );
int x509_load_file( const char *path, unsigned char **buf, size_t *n );
int x509_sig_alg_gets( char *buf, size_t size, const x509_buf *sig_oid, int x509_sig_alg_gets( char *buf, size_t size, const x509_buf *sig_oid,
pk_type_t pk_alg, md_type_t md_alg, pk_type_t pk_alg, md_type_t md_alg,
const void *sig_opts ); const void *sig_opts );

6
library/pkparse.c
View file

@ -71,7 +71,7 @@ static void polarssl_zeroize( void *v, size_t n ) {
/* /*
* Load all data from a file into a given buffer. * Load all data from a file into a given buffer.
*/ */
static int load_file( const char *path, unsigned char **buf, size_t *n ) int pk_load_file( const char *path, unsigned char **buf, size_t *n )
{ {
FILE *f; FILE *f;
long size; long size;
@ -120,7 +120,7 @@ int pk_parse_keyfile( pk_context *ctx,
size_t n; size_t n;
unsigned char *buf; unsigned char *buf;
if( ( ret = load_file( path, &buf, &n ) ) != 0 ) if( ( ret = pk_load_file( path, &buf, &n ) ) != 0 )
return( ret ); return( ret );
if( pwd == NULL ) if( pwd == NULL )
@ -144,7 +144,7 @@ int pk_parse_public_keyfile( pk_context *ctx, const char *path )
size_t n; size_t n;
unsigned char *buf; unsigned char *buf;
if( ( ret = load_file( path, &buf, &n ) ) != 0 ) if( ( ret = pk_load_file( path, &buf, &n ) ) != 0 )
return( ret ); return( ret );
ret = pk_parse_public_key( ctx, buf, n ); ret = pk_parse_public_key( ctx, buf, n );

44
library/x509.c
View file

@ -636,50 +636,6 @@ int x509_get_ext( unsigned char **p, const unsigned char *end,
return( 0 ); return( 0 );
} }
#if defined(POLARSSL_FS_IO)
/*
* Load all data from a file into a given buffer.
*/
int x509_load_file( const char *path, unsigned char **buf, size_t *n )
{
FILE *f;
long size;
if( ( f = fopen( path, "rb" ) ) == NULL )
return( POLARSSL_ERR_X509_FILE_IO_ERROR );
fseek( f, 0, SEEK_END );
if( ( size = ftell( f ) ) == -1 )
{
fclose( f );
return( POLARSSL_ERR_X509_FILE_IO_ERROR );
}
fseek( f, 0, SEEK_SET );
*n = (size_t) size;
if( *n + 1 == 0 ||
( *buf = (unsigned char *) polarssl_malloc( *n + 1 ) ) == NULL )
{
fclose( f );
return( POLARSSL_ERR_X509_MALLOC_FAILED );
}
if( fread( *buf, 1, *n, f ) != *n )
{
fclose( f );
polarssl_free( *buf );
return( POLARSSL_ERR_X509_FILE_IO_ERROR );
}
fclose( f );
(*buf)[*n] = '\0';
return( 0 );
}
#endif /* POLARSSL_FS_IO */
#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \ #if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \
!defined(EFI32) !defined(EFI32)
#include <stdarg.h> #include <stdarg.h>

2
library/x509_crl.c
View file

@ -549,7 +549,7 @@ int x509_crl_parse_file( x509_crl *chain, const char *path )
size_t n; size_t n;
unsigned char *buf; unsigned char *buf;
if( ( ret = x509_load_file( path, &buf, &n ) ) != 0 ) if( ( ret = pk_load_file( path, &buf, &n ) ) != 0 )
return( ret ); return( ret );
ret = x509_crl_parse( chain, buf, n ); ret = x509_crl_parse( chain, buf, n );

2
library/x509_crt.c
View file

@ -953,7 +953,7 @@ int x509_crt_parse_file( x509_crt *chain, const char *path )
size_t n; size_t n;
unsigned char *buf; unsigned char *buf;
if( ( ret = x509_load_file( path, &buf, &n ) ) != 0 ) if( ( ret = pk_load_file( path, &buf, &n ) ) != 0 )
return( ret ); return( ret );
ret = x509_crt_parse( chain, buf, n ); ret = x509_crt_parse( chain, buf, n );

2
library/x509_csr.c
View file

@ -310,7 +310,7 @@ int x509_csr_parse_file( x509_csr *csr, const char *path )
size_t n; size_t n;
unsigned char *buf; unsigned char *buf;
if( ( ret = x509_load_file( path, &buf, &n ) ) != 0 ) if( ( ret = pk_load_file( path, &buf, &n ) ) != 0 )
return( ret ); return( ret );
ret = x509_csr_parse( csr, buf, n ); ret = x509_csr_parse( csr, buf, n );