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

x509parse_crtpath() is now reentrant and uses more portable stat()

Browse Source 
Moved from readdir() to readdir_r() and use stat instead of the less
portable d_type from struct dirent.
(cherry picked from commit cbfcaa9206)
This commit is contained in:
Paul Bakker 2013-06-24 19:22:42 +02:00
parent 42c6581110
commit 2c8cdd201f
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
library/x509parse.c
View File

@ -76,6 +76,7 @@
#include <stdio.h> #include <stdio.h>
#if !defined(_WIN32) #if !defined(_WIN32)
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h> #include <dirent.h>
#endif #endif
#endif #endif
@ -1902,12 +1903,9 @@ int x509parse_crtpath( x509_cert *chain, const char *path )
w_ret = x509parse_crtfile( chain, filename ); w_ret = x509parse_crtfile( chain, filename );
if( w_ret < 0 ) if( w_ret < 0 )
{ ret++;
ret = w_ret; else
goto cleanup; ret += w_ret;
}
ret += w_ret;
} }
while( FindNextFileW( hFind, &file_data ) != 0 ); while( FindNextFileW( hFind, &file_data ) != 0 );
@ -1917,28 +1915,37 @@ int x509parse_crtpath( x509_cert *chain, const char *path )
cleanup: cleanup:
FindClose( hFind ); FindClose( hFind );
#else #else
int t_ret; int t_ret, i;
struct dirent *entry; struct stat sb;
struct dirent entry, *result = NULL;
char entry_name[255]; char entry_name[255];
DIR *dir = opendir( path ); DIR *dir = opendir( path );
if( dir == NULL) if( dir == NULL)
return( POLARSSL_ERR_X509_FILE_IO_ERROR ); return( POLARSSL_ERR_X509_FILE_IO_ERROR );
while( ( entry = readdir( dir ) ) != NULL ) while( ( t_ret = readdir_r( dir, &entry, &result ) ) == 0 )
{ {
if( entry->d_type != DT_REG ) if( result == NULL )
break;
snprintf( entry_name, sizeof(entry_name), "%s/%s", path, entry.d_name );
i = stat( entry_name, &sb );
if( i == -1 )
return( POLARSSL_ERR_X509_FILE_IO_ERROR );
if( !S_ISREG( sb.st_mode ) )
continue; continue;
snprintf( entry_name, sizeof(entry_name), "%s/%s", path, entry->d_name ); // Ignore parse errors
//
t_ret = x509parse_crtfile( chain, entry_name ); t_ret = x509parse_crtfile( chain, entry_name );
if( t_ret < 0 ) if( t_ret < 0 )
{ ret++;
ret = t_ret; else
break; ret += t_ret;
}
ret += t_ret;
} }
closedir( dir ); closedir( dir );
#endif #endif