Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mongoose
Project
Project
Details
Activity
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
esp
mongoose
Commits
24a79369
Commit
24a79369
authored
May 11, 2014
by
Sergey Lyubka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Squashed warning for non-ssl case in ns_set_ssl_ca_cert()
parent
09939941
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
10 deletions
+5
-10
mongoose.c
mongoose.c
+5
-10
No files found.
mongoose.c
View file @
24a79369
...
@@ -203,7 +203,6 @@ struct ns_connection {
...
@@ -203,7 +203,6 @@ struct ns_connection {
#define NSF_CONNECTING (1 << 3)
#define NSF_CONNECTING (1 << 3)
#define NSF_CLOSE_IMMEDIATELY (1 << 4)
#define NSF_CLOSE_IMMEDIATELY (1 << 4)
#define NSF_ACCEPTED (1 << 5)
#define NSF_ACCEPTED (1 << 5)
#define NSF_USER_1 (1 << 26)
#define NSF_USER_1 (1 << 26)
#define NSF_USER_2 (1 << 27)
#define NSF_USER_2 (1 << 27)
#define NSF_USER_3 (1 << 28)
#define NSF_USER_3 (1 << 28)
...
@@ -528,10 +527,10 @@ static int ns_parse_port_string(const char *str, union socket_address *sa) {
...
@@ -528,10 +527,10 @@ static int ns_parse_port_string(const char *str, union socket_address *sa) {
// 'sa' must be an initialized address to bind to
// 'sa' must be an initialized address to bind to
static
sock_t
ns_open_listening_socket
(
union
socket_address
*
sa
)
{
static
sock_t
ns_open_listening_socket
(
union
socket_address
*
sa
)
{
socklen_t
len
=
sizeof
(
*
sa
);
socklen_t
len
=
sizeof
(
*
sa
);
sock_t
sock
=
INVALID_SOCKET
;
#ifndef _WIN32
#ifndef _WIN32
sock_
t
on
=
1
;
in
t
on
=
1
;
#endif
#endif
sock_t
sock
=
INVALID_SOCKET
;
if
((
sock
=
socket
(
sa
->
sa
.
sa_family
,
SOCK_STREAM
,
6
))
!=
INVALID_SOCKET
&&
if
((
sock
=
socket
(
sa
->
sa
.
sa_family
,
SOCK_STREAM
,
6
))
!=
INVALID_SOCKET
&&
#ifndef _WIN32
#ifndef _WIN32
...
@@ -569,23 +568,19 @@ static sock_t ns_open_listening_socket(union socket_address *sa) {
...
@@ -569,23 +568,19 @@ static sock_t ns_open_listening_socket(union socket_address *sa) {
// openssl x509 -req -in client.req -CA ca.pem -CAkey ca.pem -out client.crt
// openssl x509 -req -in client.req -CA ca.pem -CAkey ca.pem -out client.crt
// cat client.key client.crt > client.pem
// cat client.key client.crt > client.pem
int
ns_set_ssl_ca_cert
(
struct
ns_server
*
server
,
const
char
*
cert
)
{
int
ns_set_ssl_ca_cert
(
struct
ns_server
*
server
,
const
char
*
cert
)
{
int
result
=
-
1
;
(
void
)
server
;
(
void
)
cert
;
#ifdef NS_ENABLE_SSL
#ifdef NS_ENABLE_SSL
STACK_OF
(
X509_NAME
)
*
list
=
SSL_load_client_CA_file
(
cert
);
STACK_OF
(
X509_NAME
)
*
list
=
SSL_load_client_CA_file
(
cert
);
if
(
cert
!=
NULL
&&
server
->
ssl_ctx
!=
NULL
&&
list
!=
NULL
)
{
if
(
cert
!=
NULL
&&
server
->
ssl_ctx
!=
NULL
&&
list
!=
NULL
)
{
SSL_CTX_set_client_CA_list
(
server
->
ssl_ctx
,
list
);
SSL_CTX_set_client_CA_list
(
server
->
ssl_ctx
,
list
);
SSL_CTX_set_verify
(
server
->
ssl_ctx
,
SSL_VERIFY_PEER
|
SSL_CTX_set_verify
(
server
->
ssl_ctx
,
SSL_VERIFY_PEER
|
SSL_VERIFY_FAIL_IF_NO_PEER_CERT
,
NULL
);
SSL_VERIFY_FAIL_IF_NO_PEER_CERT
,
NULL
);
re
sult
=
0
;
re
turn
0
;
}
}
#endif
#endif
return
result
;
return
-
1
;
}
}
// To generate self-signed server cert, do:
// openssl req -x509 -newkey rsa:2048 -keyout server.key -out cert.pem -days XXX
// openssl rsa -in server.key -out server2.key # This removes passphrase
// cat server2.key cert.pem > server.pem
int
ns_set_ssl_cert
(
struct
ns_server
*
server
,
const
char
*
cert
)
{
int
ns_set_ssl_cert
(
struct
ns_server
*
server
,
const
char
*
cert
)
{
#ifdef NS_ENABLE_SSL
#ifdef NS_ENABLE_SSL
if
(
cert
!=
NULL
&&
if
(
cert
!=
NULL
&&
...
...
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