cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-04 04:32:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed POLARSSL_ERROR_C define and added as requirement defing for

Browse Source 
cert_req and cert_write apps
This commit is contained in:
Paul Bakker 2013-09-09 16:01:46 +02:00
parent 80d44fee2e
commit 4122f3eacf
2 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/x509/cert_req.c
View File

@ -41,14 +41,16 @@
#include "polarssl/oid.h" #include "polarssl/oid.h"
#if !defined(POLARSSL_BIGNUM_C) || !defined(POLARSSL_RSA_C) || \ #if !defined(POLARSSL_BIGNUM_C) || !defined(POLARSSL_RSA_C) || \
!defined(POLARSSL_X509_PARSE_C) || !defined(POLARSSL_FS_IO) !defined(POLARSSL_X509_PARSE_C) || !defined(POLARSSL_FS_IO) || \
!defined(POLARSSL_ERROR_C)
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
((void) argc); ((void) argc);
((void) argv); ((void) argv);
printf("POLARSSL_BIGNUM_C and/or POLARSSL_RSA_C and/or " printf("POLARSSL_BIGNUM_C and/or POLARSSL_RSA_C and/or "
"POLARSSL_X509_PARSE_C and/or POLARSSL_FS_IO not defined.\n"); "POLARSSL_X509_PARSE_C and/or POLARSSL_FS_IO and/or "
"POLARSSL_ERROR_C not defined.\n");
return( 0 ); return( 0 );
} }
#else #else
@ -254,9 +256,7 @@ int main( int argc, char *argv[] )
*/ */
if( ( ret = x509write_csr_set_subject_name( &req, opt.subject_name ) ) != 0 ) if( ( ret = x509write_csr_set_subject_name( &req, opt.subject_name ) ) != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509write_csr_set_subject_name returned %d - %s\n\n", ret, buf ); printf( " failed\n ! x509write_csr_set_subject_name returned %d - %s\n\n", ret, buf );
goto exit; goto exit;
} }
@ -271,9 +271,7 @@ int main( int argc, char *argv[] )
if( ret != 0 ) if( ret != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509parse_key_rsa returned %d - %s\n\n", ret, buf ); printf( " failed\n ! x509parse_key_rsa returned %d - %s\n\n", ret, buf );
goto exit; goto exit;
} }
@ -290,9 +288,7 @@ int main( int argc, char *argv[] )
if( ( ret = write_certificate_request( &req, opt.output_file ) ) != 0 ) if( ( ret = write_certificate_request( &req, opt.output_file ) ) != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! write_certifcate_request %d - %s\n\n", ret, buf ); printf( " failed\n ! write_certifcate_request %d - %s\n\n", ret, buf );
goto exit; goto exit;
} }

42
programs/x509/cert_write.c
View File

@ -41,14 +41,16 @@
#include "polarssl/oid.h" #include "polarssl/oid.h"
#if !defined(POLARSSL_BIGNUM_C) || !defined(POLARSSL_RSA_C) || \ #if !defined(POLARSSL_BIGNUM_C) || !defined(POLARSSL_RSA_C) || \
!defined(POLARSSL_X509_WRITE_C) || !defined(POLARSSL_FS_IO) !defined(POLARSSL_X509_WRITE_C) || !defined(POLARSSL_FS_IO) || \
!defined(POLARSSL_ERROR_C)
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
((void) argc); ((void) argc);
((void) argv); ((void) argv);
printf("POLARSSL_BIGNUM_C and/or POLARSSL_RSA_C and/or " printf("POLARSSL_BIGNUM_C and/or POLARSSL_RSA_C and/or "
"POLARSSL_X509_WRITE_C and/or POLARSSL_FS_IO not defined.\n"); "POLARSSL_X509_WRITE_C and/or POLARSSL_FS_IO and/or "
"POLARSSL_ERROR_C not defined.\n");
return( 0 ); return( 0 );
} }
#else #else
@ -335,9 +337,7 @@ int main( int argc, char *argv[] )
// //
if( ( ret = mpi_read_string( &serial, 10, opt.serial ) ) != 0 ) if( ( ret = mpi_read_string( &serial, 10, opt.serial ) ) != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! mpi_read_string returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! mpi_read_string returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -354,9 +354,7 @@ int main( int argc, char *argv[] )
if( ( ret = x509parse_crtfile( &issuer_crt, opt.issuer_crt ) ) != 0 ) if( ( ret = x509parse_crtfile( &issuer_crt, opt.issuer_crt ) ) != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509parse_crtfile returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509parse_crtfile returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -365,9 +363,7 @@ int main( int argc, char *argv[] )
&issuer_crt.issuer ); &issuer_crt.issuer );
if( ret < 0 ) if( ret < 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509parse_dn_gets returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509parse_dn_gets returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -389,9 +385,7 @@ int main( int argc, char *argv[] )
if( ( ret = x509parse_csrfile( &csr, opt.request_file ) ) != 0 ) if( ( ret = x509parse_csrfile( &csr, opt.request_file ) ) != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509parse_csrfile returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509parse_csrfile returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -400,9 +394,7 @@ int main( int argc, char *argv[] )
&csr.subject ); &csr.subject );
if( ret < 0 ) if( ret < 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509parse_dn_gets returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509parse_dn_gets returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -411,9 +403,7 @@ int main( int argc, char *argv[] )
if( ( ret = rsa_copy( &subject_rsa, pk_rsa( csr.pk ) ) ) != 0 ) if( ( ret = rsa_copy( &subject_rsa, pk_rsa( csr.pk ) ) ) != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! rsa_copy returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! rsa_copy returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -426,18 +416,14 @@ int main( int argc, char *argv[] )
*/ */
if( ( ret = x509write_crt_set_subject_name( &crt, opt.subject_name ) ) != 0 ) if( ( ret = x509write_crt_set_subject_name( &crt, opt.subject_name ) ) != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509write_crt_set_subject_name returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509write_crt_set_subject_name returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
if( ( ret = x509write_crt_set_issuer_name( &crt, opt.issuer_name ) ) != 0 ) if( ( ret = x509write_crt_set_issuer_name( &crt, opt.issuer_name ) ) != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509write_crt_set_issuer_name returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509write_crt_set_issuer_name returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -454,9 +440,7 @@ int main( int argc, char *argv[] )
opt.subject_pwd ); opt.subject_pwd );
if( ret != 0 ) if( ret != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509parse_keyfile_rsa returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509parse_keyfile_rsa returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -474,9 +458,7 @@ int main( int argc, char *argv[] )
if( ret != 0 ) if( ret != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509parse_keyfile_rsa returned -x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509parse_keyfile_rsa returned -x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -505,9 +487,7 @@ int main( int argc, char *argv[] )
ret = x509write_crt_set_serial( &crt, &serial ); ret = x509write_crt_set_serial( &crt, &serial );
if( ret != 0 ) if( ret != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509write_crt_set_serial returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509write_crt_set_serial returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -515,9 +495,7 @@ int main( int argc, char *argv[] )
ret = x509write_crt_set_validity( &crt, opt.not_before, opt.not_after ); ret = x509write_crt_set_validity( &crt, opt.not_before, opt.not_after );
if( ret != 0 ) if( ret != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509write_crt_set_validity returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509write_crt_set_validity returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -531,9 +509,7 @@ int main( int argc, char *argv[] )
opt.max_pathlen ); opt.max_pathlen );
if( ret != 0 ) if( ret != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509write_crt_set_basic_contraints returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509write_crt_set_basic_contraints returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -546,9 +522,7 @@ int main( int argc, char *argv[] )
ret = x509write_crt_set_subject_key_identifier( &crt ); ret = x509write_crt_set_subject_key_identifier( &crt );
if( ret != 0 ) if( ret != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509write_crt_set_subject_key_identifier returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509write_crt_set_subject_key_identifier returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -561,9 +535,7 @@ int main( int argc, char *argv[] )
ret = x509write_crt_set_authority_key_identifier( &crt ); ret = x509write_crt_set_authority_key_identifier( &crt );
if( ret != 0 ) if( ret != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509write_crt_set_authority_key_identifier returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509write_crt_set_authority_key_identifier returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -578,9 +550,7 @@ int main( int argc, char *argv[] )
ret = x509write_crt_set_key_usage( &crt, opt.key_usage ); ret = x509write_crt_set_key_usage( &crt, opt.key_usage );
if( ret != 0 ) if( ret != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509write_crt_set_key_usage returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509write_crt_set_key_usage returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -596,9 +566,7 @@ int main( int argc, char *argv[] )
ret = x509write_crt_set_ns_cert_type( &crt, opt.ns_cert_type ); ret = x509write_crt_set_ns_cert_type( &crt, opt.ns_cert_type );
if( ret != 0 ) if( ret != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! x509write_crt_set_ns_cert_type returned -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! x509write_crt_set_ns_cert_type returned -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }
@ -614,9 +582,7 @@ int main( int argc, char *argv[] )
if( ( ret = write_certificate( &crt, opt.output_file ) ) != 0 ) if( ( ret = write_certificate( &crt, opt.output_file ) ) != 0 )
{ {
#ifdef POLARSSL_ERROR_C
error_strerror( ret, buf, 1024 ); error_strerror( ret, buf, 1024 );
#endif
printf( " failed\n ! write_certifcate -0x%02x - %s\n\n", -ret, buf ); printf( " failed\n ! write_certifcate -0x%02x - %s\n\n", -ret, buf );
goto exit; goto exit;
} }