Unverified Commit 1fdcafed authored by kladko's avatar kladko

Fixed docs

parent 7e006572
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include "SGXRegistrationServer.h" #include "SGXRegistrationServer.h"
#include "LevelDB.h" #include "LevelDB.h"
#include "spdlog/spdlog.h" #include "Log.h"
#include "common.h" #include "common.h"
int printDebugInfo = -1; int printDebugInfo = -1;
...@@ -109,7 +109,7 @@ Json::Value signCertificateImpl(const string &_csr, bool _autoSign = false) { ...@@ -109,7 +109,7 @@ Json::Value signCertificateImpl(const string &_csr, bool _autoSign = false) {
return result; return result;
} }
Json::Value GetSertificateImpl(const string &hash) { Json::Value GetertificateImpl(const string &hash) {
Json::Value result; Json::Value result;
string cert; string cert;
...@@ -175,24 +175,7 @@ void SGXRegistrationServer::set_cert_created(bool b) { ...@@ -175,24 +175,7 @@ void SGXRegistrationServer::set_cert_created(bool b) {
} }
int initRegistrationServer(bool _autoSign) { int SGXRegistrationServer::initRegistrationServer(bool _autoSign) {
// string certPath = "cert/SGXCACertificate.crt";
// string keyPath = "cert/SGXCACertificate.key";
//
// if (access(certPath.c_str(), F_OK) != 0){
// cerr << "CERTIFICATE IS GOING TO BE CREATED" << endl;
//
// string genCert = "cd cert && ./self-signed-tls -c=US -s=California -l=San-Francisco -o=\"Skale Labs\" -u=\"Department of Software Engineering\" -n=\"SGXCACertificate\" -e=info@skalelabs.com";
//
// if (system(genCert.c_str()) == 0){
// cerr << "CERTIFICATE IS SUCCESSFULLY GENERATED" << endl;
// }
// else{
// cerr << "CERTIFICATE GENERATION FAILED" << endl;
// exit(-1);
// }
// }
httpServer2 = new HttpServer(BASE_PORT + 1); httpServer2 = new HttpServer(BASE_PORT + 1);
registrationServer = new SGXRegistrationServer(*httpServer2, registrationServer = new SGXRegistrationServer(*httpServer2,
......
...@@ -45,10 +45,10 @@ public: ...@@ -45,10 +45,10 @@ public:
virtual Json::Value SignCertificate(const std::string& csr); virtual Json::Value SignCertificate(const std::string& csr);
virtual Json::Value GetCertificate(const std::string& hash); virtual Json::Value GetCertificate(const std::string& hash);
}; static int initRegistrationServer(bool _autoSign = false);
};
extern int initRegistrationServer(bool _autoSign = false);
......
#define SGXWALLET_VERSION "1.48.1" #define SGXWALLET_VERSION "1.49.2"
\ No newline at end of file \ No newline at end of file
...@@ -121,7 +121,7 @@ void initAll(uint32_t _logLevel, bool _checkCert, bool _autoSign) { ...@@ -121,7 +121,7 @@ void initAll(uint32_t _logLevel, bool _checkCert, bool _autoSign) {
if (useHTTPS) { if (useHTTPS) {
SGXWalletServer::initHttpsServer(_checkCert); SGXWalletServer::initHttpsServer(_checkCert);
initRegistrationServer(_autoSign); SGXRegistrationServer::initRegistrationServer(_autoSign);
init_csrmanager_server(); init_csrmanager_server();
} else { } else {
SGXWalletServer::initHttpServer(); SGXWalletServer::initHttpServer();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment