x509parse_crtpath() is now reentrant and uses more portable stat()
Moved from readdir() to readdir_r() and use stat instead of the less portable d_type from struct dirent. (cherry picked from commit cbfcaa9206be586f6bf8ac26586cd63a6c8c8e15)
This commit is contained in:
parent
42c6581110
commit
2c8cdd201f
1 changed files with 24 additions and 17 deletions
|
@ -76,6 +76,7 @@
|
|||
#include <stdio.h>
|
||||
#if !defined(_WIN32)
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <dirent.h>
|
||||
#endif
|
||||
#endif
|
||||
|
@ -1902,11 +1903,8 @@ int x509parse_crtpath( x509_cert *chain, const char *path )
|
|||
|
||||
w_ret = x509parse_crtfile( chain, filename );
|
||||
if( w_ret < 0 )
|
||||
{
|
||||
ret = w_ret;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
ret++;
|
||||
else
|
||||
ret += w_ret;
|
||||
}
|
||||
while( FindNextFileW( hFind, &file_data ) != 0 );
|
||||
|
@ -1917,27 +1915,36 @@ int x509parse_crtpath( x509_cert *chain, const char *path )
|
|||
cleanup:
|
||||
FindClose( hFind );
|
||||
#else
|
||||
int t_ret;
|
||||
struct dirent *entry;
|
||||
int t_ret, i;
|
||||
struct stat sb;
|
||||
struct dirent entry, *result = NULL;
|
||||
char entry_name[255];
|
||||
DIR *dir = opendir( path );
|
||||
|
||||
if( dir == NULL)
|
||||
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;
|
||||
|
||||
snprintf( entry_name, sizeof(entry_name), "%s/%s", path, entry->d_name );
|
||||
// Ignore parse errors
|
||||
//
|
||||
t_ret = x509parse_crtfile( chain, entry_name );
|
||||
if( t_ret < 0 )
|
||||
{
|
||||
ret = t_ret;
|
||||
break;
|
||||
}
|
||||
|
||||
ret++;
|
||||
else
|
||||
ret += t_ret;
|
||||
}
|
||||
closedir( dir );
|
||||
|
|
Loading…
Reference in a new issue