Added OpenSSL configuration file path. (qt_wallet issue #10 Some clients on Windows 7 quit/crash on start)
This commit is contained in:
parent
2d51fd7321
commit
4890351b34
4 changed files with 18 additions and 3 deletions
|
|
@ -58,7 +58,7 @@ namespace fc
|
||||||
|
|
||||||
/** Allows to explicitly specify OpenSSL configuration file path to be loaded at OpenSSL library init.
|
/** Allows to explicitly specify OpenSSL configuration file path to be loaded at OpenSSL library init.
|
||||||
If not set OpenSSL will try to load the conf. file (openssl.cnf) from the path it was
|
If not set OpenSSL will try to load the conf. file (openssl.cnf) from the path it was
|
||||||
configured with what caused serious Keyhotee startup bugs on some Win7 machines.
|
configured with what caused serious Keyhotee startup bugs on some Win7, Win8 machines.
|
||||||
\warning to be effective this method should be used before any part using OpenSSL, especially
|
\warning to be effective this method should be used before any part using OpenSSL, especially
|
||||||
before init_openssl call
|
before init_openssl call
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -165,6 +165,9 @@ namespace fc {
|
||||||
*/
|
*/
|
||||||
const path& app_path();
|
const path& app_path();
|
||||||
|
|
||||||
|
/** @return application executable path */
|
||||||
|
const fc::path& current_path();
|
||||||
|
|
||||||
class variant;
|
class variant;
|
||||||
void to_variant( const fc::path&, fc::variant& );
|
void to_variant( const fc::path&, fc::variant& );
|
||||||
void from_variant( const fc::variant& , fc::path& );
|
void from_variant( const fc::variant& , fc::path& );
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,12 @@ namespace fc
|
||||||
|
|
||||||
int init_openssl()
|
int init_openssl()
|
||||||
{
|
{
|
||||||
|
auto strAppDir = current_path();
|
||||||
|
fc::path appDir(strAppDir);
|
||||||
|
fc::path openSSLConf = appDir / "openssl.cnf";
|
||||||
|
if (fc::exists(openSSLConf))
|
||||||
|
fc::store_configuration_path(openSSLConf);
|
||||||
|
|
||||||
static openssl_scope ossl;
|
static openssl_scope ossl;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -421,4 +421,10 @@ namespace fc {
|
||||||
#endif
|
#endif
|
||||||
return appdir;
|
return appdir;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const fc::path& current_path()
|
||||||
|
{
|
||||||
|
static fc::path appCurrentPath = boost::filesystem::current_path();
|
||||||
|
return appCurrentPath;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue