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

- Merged 1397 in branch for 1.2

Browse Source
This commit is contained in:
Paul Bakker 2012-11-02 12:53:26 +00:00
parent 4a2bd0da0f
commit 97872aceb6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/x509parse.c
View File

@ -1878,7 +1878,7 @@ int x509parse_crtpath( x509_cert *chain, const char *path )
char *p; char *p;
int len = strlen( path ); int len = strlen( path );
WIN32_FIND_DATA file_data; WIN32_FIND_DATAW file_data;
HANDLE hFind; HANDLE hFind;
if( len > MAX_PATH - 3 ) if( len > MAX_PATH - 3 )
@ -1893,7 +1893,7 @@ int x509parse_crtpath( x509_cert *chain, const char *path )
w_ret = MultiByteToWideChar( CP_ACP, 0, path, len, szDir, MAX_PATH - 3 ); w_ret = MultiByteToWideChar( CP_ACP, 0, path, len, szDir, MAX_PATH - 3 );
hFind = FindFirstFile( szDir, &file_data ); hFind = FindFirstFileW( szDir, &file_data );
if (hFind == INVALID_HANDLE_VALUE) if (hFind == INVALID_HANDLE_VALUE)
return( POLARSSL_ERR_X509_FILE_IO_ERROR ); return( POLARSSL_ERR_X509_FILE_IO_ERROR );
@ -1919,7 +1919,7 @@ int x509parse_crtpath( x509_cert *chain, const char *path )
ret += w_ret; ret += w_ret;
} }
while( FindNextFile( hFind, &file_data ) != 0 ); while( FindNextFileW( hFind, &file_data ) != 0 );
if (GetLastError() != ERROR_NO_MORE_FILES) if (GetLastError() != ERROR_NO_MORE_FILES)
ret = POLARSSL_ERR_X509_FILE_IO_ERROR; ret = POLARSSL_ERR_X509_FILE_IO_ERROR;
@ -1943,7 +1943,10 @@ cleanup:
snprintf( entry_name, sizeof(entry_name), "%s/%s", path, entry->d_name ); snprintf( entry_name, sizeof(entry_name), "%s/%s", path, entry->d_name );
t_ret = x509parse_crtfile( chain, entry_name ); t_ret = x509parse_crtfile( chain, entry_name );
if( t_ret < 0 ) if( t_ret < 0 )
return( t_ret ); {
ret = t_ret;
break;
}
ret += t_ret; ret += t_ret;
} }