Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
sgxwallet
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董子豪
sgxwallet
Commits
1fdcafed
Unverified
Commit
1fdcafed
authored
May 07, 2020
by
kladko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed docs
parent
7e006572
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
24 deletions
+7
-24
SGXRegistrationServer.cpp
SGXRegistrationServer.cpp
+3
-20
SGXRegistrationServer.h
SGXRegistrationServer.h
+2
-2
SGXWALLET_VERSION
SGXWALLET_VERSION
+1
-1
ServerInit.cpp
ServerInit.cpp
+1
-1
No files found.
SGXRegistrationServer.cpp
View file @
1fdcafed
...
...
@@ -43,7 +43,7 @@
#include "SGXRegistrationServer.h"
#include "LevelDB.h"
#include "
spdlog/spdl
og.h"
#include "
L
og.h"
#include "common.h"
int
printDebugInfo
=
-
1
;
...
...
@@ -109,7 +109,7 @@ Json::Value signCertificateImpl(const string &_csr, bool _autoSign = false) {
return
result
;
}
Json
::
Value
Get
S
ertificateImpl
(
const
string
&
hash
)
{
Json
::
Value
GetertificateImpl
(
const
string
&
hash
)
{
Json
::
Value
result
;
string
cert
;
...
...
@@ -175,24 +175,7 @@ void SGXRegistrationServer::set_cert_created(bool b) {
}
int
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);
// }
// }
int
SGXRegistrationServer
::
initRegistrationServer
(
bool
_autoSign
)
{
httpServer2
=
new
HttpServer
(
BASE_PORT
+
1
);
registrationServer
=
new
SGXRegistrationServer
(
*
httpServer2
,
...
...
SGXRegistrationServer.h
View file @
1fdcafed
...
...
@@ -45,10 +45,10 @@ public:
virtual
Json
::
Value
SignCertificate
(
const
std
::
string
&
csr
);
virtual
Json
::
Value
GetCertificate
(
const
std
::
string
&
hash
);
}
;
static
int
initRegistrationServer
(
bool
_autoSign
=
false
)
;
};
extern
int
initRegistrationServer
(
bool
_autoSign
=
false
);
...
...
SGXWALLET_VERSION
View file @
1fdcafed
#define SGXWALLET_VERSION "1.48.1"
\ No newline at end of file
#define SGXWALLET_VERSION "1.49.2"
\ No newline at end of file
ServerInit.cpp
View file @
1fdcafed
...
...
@@ -121,7 +121,7 @@ void initAll(uint32_t _logLevel, bool _checkCert, bool _autoSign) {
if
(
useHTTPS
)
{
SGXWalletServer
::
initHttpsServer
(
_checkCert
);
initRegistrationServer
(
_autoSign
);
SGXRegistrationServer
::
initRegistrationServer
(
_autoSign
);
init_csrmanager_server
();
}
else
{
SGXWalletServer
::
initHttpServer
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment