SwitchEmu/mbedtls
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/mbedtls.git synced 2026-02-25 02:09:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'iotssl-1770' into development_thomas_dee

Browse Source
This commit is contained in:
Hanno Becker
2018-11-02 10:52:49 +00:00
parent 5517755353 b12fd31415
commit 710f203541
309 changed files with 33188 additions and 10041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
programs/x509/cert_req.c
View File

@@ -29,8 +29,11 @@
#include "mbedtls/platform.h"
#else
#include <stdio.h>
#define mbedtls_printf printf
#endif
#include <stdlib.h>
#define mbedtls_printf printf
#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS
#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
#endif /* MBEDTLS_PLATFORM_C */
#if !defined(MBEDTLS_X509_CSR_WRITE_C) || !defined(MBEDTLS_FS_IO) || \
!defined(MBEDTLS_PK_PARSE_C) || !defined(MBEDTLS_SHA256_C) || \
@@ -143,7 +146,8 @@ int write_certificate_request( mbedtls_x509write_csr *req, const char *output_fi
int main( int argc, char *argv[] )
{
int ret = 0;
int ret = 1;
int exit_code = MBEDTLS_EXIT_FAILURE;
mbedtls_pk_context key;
char buf[1024];
int i;
@@ -165,7 +169,6 @@ int main( int argc, char *argv[] )
{
usage:
mbedtls_printf( USAGE );
ret = 1;
goto exit;
}
@@ -380,9 +383,11 @@ int main( int argc, char *argv[] )
mbedtls_printf( " ok\n" );
exit_code = MBEDTLS_EXIT_SUCCESS;
exit:
if( ret != 0 && ret != 1)
if( exit_code != MBEDTLS_EXIT_SUCCESS )
{
#ifdef MBEDTLS_ERROR_C
mbedtls_strerror( ret, buf, sizeof( buf ) );
@@ -402,7 +407,7 @@ exit:
fflush( stdout ); getchar();
#endif
return( ret );
return( exit_code );
}
#endif /* MBEDTLS_X509_CSR_WRITE_C && MBEDTLS_PK_PARSE_C && MBEDTLS_FS_IO &&
MBEDTLS_ENTROPY_C && MBEDTLS_CTR_DRBG_C && MBEDTLS_PEM_WRITE_C */