yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-01 22:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error code in pk.h

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2013-07-09 10:04:07 +02:00
parent 8838099330
commit 7a6c946446
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/polarssl/error.h
View File

@ -76,7 +76,8 @@
* Name ID Nr of Errors * Name ID Nr of Errors
* PEM 1 9 * PEM 1 9
* PKCS#12 1 4 (Started from top) * PKCS#12 1 4 (Started from top)
* X509 2 23 * X509 2 25
* PK 2 1 (Started from top)
* DHM 3 6 * DHM 3 6
* PKCS5 3 4 (Started from top) * PKCS5 3 4 (Started from top)
* RSA 4 9 * RSA 4 9

5
include/polarssl/pk.h
View File

@ -27,6 +27,8 @@
#ifndef POLARSSL_PK_H #ifndef POLARSSL_PK_H
#define POLARSSL_PK_H #define POLARSSL_PK_H
#define POLARSSL_ERR_PK_MALLOC_FAILED -0x2F80 /**< Memory alloation failed. */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -66,8 +68,7 @@ void pk_free( pk_context *ctx );
* \param ctx Context to initialize * \param ctx Context to initialize
* \param type Type of key * \param type Type of key
* *
* \return O on success, -1 on memory allocation error * \return O on success, or POLARSSL_ERR_PK_MALLOC_FAILED
* TODO: use appropriate error constant
*/ */
int pk_set_type( pk_context *ctx, pk_type_t type ); int pk_set_type( pk_context *ctx, pk_type_t type );

13
library/error.c
View File

@ -113,6 +113,10 @@
#include "polarssl/pem.h" #include "polarssl/pem.h"
#endif #endif
#if defined(POLARSSL_PK_C)
#include "polarssl/pk.h"
#endif
#if defined(POLARSSL_PKCS12_C) #if defined(POLARSSL_PKCS12_C)
#include "polarssl/pkcs12.h" #include "polarssl/pkcs12.h"
#endif #endif
@ -243,6 +247,11 @@ void polarssl_strerror( int ret, char *buf, size_t buflen )
snprintf( buf, buflen, "PEM - Bad input parameters to function" ); snprintf( buf, buflen, "PEM - Bad input parameters to function" );
#endif /* POLARSSL_PEM_C */ #endif /* POLARSSL_PEM_C */
#if defined(POLARSSL_PK_C)
if( use_ret == -(POLARSSL_ERR_PK_MALLOC_FAILED) )
snprintf( buf, buflen, "PK - Memory alloation failed" );
#endif /* POLARSSL_PK_C */
#if defined(POLARSSL_PKCS12_C) #if defined(POLARSSL_PKCS12_C)
if( use_ret == -(POLARSSL_ERR_PKCS12_BAD_INPUT_DATA) ) if( use_ret == -(POLARSSL_ERR_PKCS12_BAD_INPUT_DATA) )
snprintf( buf, buflen, "PKCS12 - Bad input parameters to function" ); snprintf( buf, buflen, "PKCS12 - Bad input parameters to function" );
@ -388,7 +397,7 @@ void polarssl_strerror( int ret, char *buf, size_t buflen )
if( use_ret == -(POLARSSL_ERR_X509_CERT_UNKNOWN_SIG_ALG) ) if( use_ret == -(POLARSSL_ERR_X509_CERT_UNKNOWN_SIG_ALG) )
snprintf( buf, buflen, "X509 - Signature algorithm (oid) is unsupported" ); snprintf( buf, buflen, "X509 - Signature algorithm (oid) is unsupported" );
if( use_ret == -(POLARSSL_ERR_X509_UNKNOWN_PK_ALG) ) if( use_ret == -(POLARSSL_ERR_X509_UNKNOWN_PK_ALG) )
snprintf( buf, buflen, "X509 - Key algorithm is unsupported (only RSA is supported)" ); snprintf( buf, buflen, "X509 - Key algorithm is unsupported (only RSA and EC are supported)" );
if( use_ret == -(POLARSSL_ERR_X509_CERT_SIG_MISMATCH) ) if( use_ret == -(POLARSSL_ERR_X509_CERT_SIG_MISMATCH) )
snprintf( buf, buflen, "X509 - Certificate signature algorithms do not match. (see \\c ::x509_cert sig_oid)" ); snprintf( buf, buflen, "X509 - Certificate signature algorithms do not match. (see \\c ::x509_cert sig_oid)" );
if( use_ret == -(POLARSSL_ERR_X509_CERT_VERIFY_FAILED) ) if( use_ret == -(POLARSSL_ERR_X509_CERT_VERIFY_FAILED) )
@ -409,6 +418,8 @@ void polarssl_strerror( int ret, char *buf, size_t buflen )
snprintf( buf, buflen, "X509 - Private key password can't be empty" ); snprintf( buf, buflen, "X509 - Private key password can't be empty" );
if( use_ret == -(POLARSSL_ERR_X509_PASSWORD_MISMATCH) ) if( use_ret == -(POLARSSL_ERR_X509_PASSWORD_MISMATCH) )
snprintf( buf, buflen, "X509 - Given private key password does not allow for correct decryption" ); snprintf( buf, buflen, "X509 - Given private key password does not allow for correct decryption" );
if( use_ret == -(POLARSSL_ERR_X509_UNKNOWN_NAMED_CURVE) )
snprintf( buf, buflen, "X509 - Elliptic curve is unsupported (only NIST curves are supported)" );
#endif /* POLARSSL_X509_PARSE_C */ #endif /* POLARSSL_X509_PARSE_C */
if( strlen( buf ) == 0 ) if( strlen( buf ) == 0 )

2
library/pk.c
View File

@ -84,7 +84,7 @@ int pk_set_type( pk_context *ctx, pk_type_t type )
return( 0 ); return( 0 );
if( ( ctx->data = malloc( size ) ) == NULL ) if( ( ctx->data = malloc( size ) ) == NULL )
return( -1 ); return( POLARSSL_ERR_PK_MALLOC_FAILED );
memset( ctx->data, 0, size ); memset( ctx->data, 0, size );
ctx->type = type; ctx->type = type;

2
scripts/generate_errors.pl
View File

@ -13,7 +13,7 @@ my @low_level_modules = ( "AES", "ASN1", "BLOWFISH", "CAMELLIA", "BIGNUM",
"PADLOCK", "DES", "NET", "CTR_DRBG", "ENTROPY", "PADLOCK", "DES", "NET", "CTR_DRBG", "ENTROPY",
"MD2", "MD4", "MD5", "SHA1", "SHA256", "SHA512", "GCM" ); "MD2", "MD4", "MD5", "SHA1", "SHA256", "SHA512", "GCM" );
my @high_level_modules = ( "PEM", "X509", "DHM", "RSA", "ECP", "MD", "CIPHER", "SSL", my @high_level_modules = ( "PEM", "X509", "DHM", "RSA", "ECP", "MD", "CIPHER", "SSL",
"PKCS12", "PKCS5" ); "PK", "PKCS12", "PKCS5" );
my $line_separator = $/; my $line_separator = $/;
undef $/; undef $/;