mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
agree with nick: this legal-chars-in-filename stuff gets us nothing
svn:r2310
This commit is contained in:
@@ -344,13 +344,6 @@ int crypto_pk_read_private_key_from_filename(crypto_pk_env_t *env, const char *k
|
||||
|
||||
tor_assert(env && keyfile);
|
||||
|
||||
#if 0
|
||||
if(strspn(keyfile,CONFIG_LEGAL_FILENAME_CHARACTERS) != strlen(keyfile)) {
|
||||
/* filename contains nonlegal characters */
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* open the keyfile */
|
||||
f_pr=fopen(keyfile,"rb");
|
||||
if (!f_pr)
|
||||
|
||||
+1
-8
@@ -1507,13 +1507,6 @@ char *read_file_to_str(const char *filename) {
|
||||
|
||||
tor_assert(filename);
|
||||
|
||||
#if 0
|
||||
if(strcspn(filename,CONFIG_LEGAL_FILENAME_CHARACTERS) != 0) {
|
||||
log_fn(LOG_WARN,"Filename %s contains illegal characters.",filename);
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
if(stat(filename, &statbuf) < 0) {
|
||||
log_fn(LOG_INFO,"Could not stat %s.",filename);
|
||||
return NULL;
|
||||
@@ -1624,7 +1617,7 @@ int replace_file(const char *from, const char *to)
|
||||
#ifndef MS_WINDOWS
|
||||
return rename(from,to);
|
||||
#else
|
||||
switch(file_status(to))
|
||||
switch(file_status(to))
|
||||
{
|
||||
case FN_NOENT:
|
||||
break;
|
||||
|
||||
@@ -74,17 +74,6 @@ struct timeval {
|
||||
#define tor_close_socket(s) close(s)
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
/* XXXX Remove this -- These lists are incomplete, and detecting bad filenames
|
||||
* is the OS's job. -NM */
|
||||
/** Legal characters in a filename */
|
||||
#ifdef MS_WINDOWS
|
||||
#define CONFIG_LEGAL_FILENAME_CHARACTERS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_/\\ "
|
||||
#else
|
||||
#define CONFIG_LEGAL_FILENAME_CHARACTERS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_/ "
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define HEX_CHARACTERS "0123456789ABCDEFabcdef"
|
||||
|
||||
size_t strlcat(char *dst, const char *src, size_t siz);
|
||||
|
||||
Reference in New Issue
Block a user