yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 01:05:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small PK cleanups

Browse Source 
- better error codes
- rm now-useless include
This commit is contained in:
Manuel Pégourié-Gonnard 2013-08-14 19:22:48 +02:00
parent 3fb5c5ee1c
commit 15699380e5
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/polarssl/error.h
View File

@ -77,7 +77,7 @@
* PEM 1 9
* PKCS#12 1 4 (Started from top)
* X509 2 25
* PK 2 1 (Started from top)
* PK 2 3 (Started from top)
* DHM 3 6
* PKCS5 3 4 (Started from top)
* RSA 4 9

3
include/polarssl/pk.h
View File

@ -43,7 +43,8 @@
#endif
#define POLARSSL_ERR_PK_MALLOC_FAILED -0x2F80 /**< Memory alloation failed. */
#define POLARSSL_ERR_PK_TYPE_MISMATCH -0x2F00 /**< Type mismatch, eg attempt to use a RSA key as EC, or to modify key type */
#define POLARSSL_ERR_PK_TYPE_MISMATCH -0x2F00 /**< Type mismatch, eg attempt to use a RSA key as EC, or to modify key type. */
#define POLARSSL_ERR_PK_BAD_INPUT_DATA -0x2E80 /**< Bad input parameters to function. */
#if defined(POLARSSL_RSA_C)
/**

2
library/error.c
View File

@ -252,6 +252,8 @@ void polarssl_strerror( int ret, char *buf, size_t buflen )
snprintf( buf, buflen, "PK - Memory alloation failed" );
if( use_ret == -(POLARSSL_ERR_PK_TYPE_MISMATCH) )
snprintf( buf, buflen, "PK - Type mismatch, eg attempt to use a RSA key as EC, or to modify key type" );
if( use_ret == -(POLARSSL_ERR_PK_BAD_INPUT_DATA) )
snprintf( buf, buflen, "PK - Bad input parameters to function" );
#endif /* POLARSSL_PK_C */
#if defined(POLARSSL_PKCS12_C)

15
library/pk.c
View File

@ -38,15 +38,6 @@
#include "polarssl/ecdsa.h"
#endif
#if defined(POLARSSL_MEMORY_C)
#include "polarssl/memory.h"
#else
#define polarssl_malloc malloc
#define polarssl_free free
#endif
#include <stdlib.h>
/*
* Initialise a pk_context
*/
@ -114,7 +105,7 @@ int pk_set_type( pk_context *ctx, pk_type_t type )
}
if( ( info = pk_info_from_type( type ) ) == NULL )
return( POLARSSL_ERR_PK_TYPE_MISMATCH );
return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
if( ( ctx->pk_ctx = info->ctx_alloc_func() ) == NULL )
return( POLARSSL_ERR_PK_MALLOC_FAILED );
@ -144,7 +135,7 @@ int pk_verify( pk_context *ctx,
const unsigned char *sig, size_t sig_len )
{
if( ctx == NULL || ctx->pk_info == NULL )
return( POLARSSL_ERR_PK_TYPE_MISMATCH ); // TODO
return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
return( ctx->pk_info->verify_func( ctx->pk_ctx, hash, md_info, sig, sig_len ) );
}
@ -166,7 +157,7 @@ size_t pk_get_size( const pk_context *ctx )
int pk_debug( const pk_context *ctx, pk_debug_item *items )
{
if( ctx == NULL || ctx->pk_info == NULL )
return( POLARSSL_ERR_PK_TYPE_MISMATCH ); // TODO
return( POLARSSL_ERR_PK_BAD_INPUT_DATA );
ctx->pk_info->debug_func( ctx->pk_ctx, items );
return( 0 );