mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-17 19:30:36 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee338b7bba |
No files matched your search
+2
-2
@@ -16400,9 +16400,9 @@ static long recv_raw(struct mg_connection *c, void *buf, size_t len) {
|
||||
long n = 0;
|
||||
if (c->is_udp) {
|
||||
union usa usa;
|
||||
socklen_t slen = tousa(&c->rem, &usa);
|
||||
socklen_t slen = sizeof(usa);
|
||||
n = recvfrom(FD(c), (char *) buf, len, 0, &usa.sa, &slen);
|
||||
if (n > 0) tomgaddr(&usa, &c->rem, slen != sizeof(usa.sin));
|
||||
if (n > 0) tomgaddr(&usa, &c->rem, usa.sa.sa_family == AF_INET6);
|
||||
} else {
|
||||
n = recv(FD(c), (char *) buf, len, MSG_NONBLOCKING);
|
||||
}
|
||||
|
||||
+2
-2
@@ -297,9 +297,9 @@ static long recv_raw(struct mg_connection *c, void *buf, size_t len) {
|
||||
long n = 0;
|
||||
if (c->is_udp) {
|
||||
union usa usa;
|
||||
socklen_t slen = tousa(&c->rem, &usa);
|
||||
socklen_t slen = sizeof(usa);
|
||||
n = recvfrom(FD(c), (char *) buf, len, 0, &usa.sa, &slen);
|
||||
if (n > 0) tomgaddr(&usa, &c->rem, slen != sizeof(usa.sin));
|
||||
if (n > 0) tomgaddr(&usa, &c->rem, usa.sa.sa_family == AF_INET6);
|
||||
} else {
|
||||
n = recv(FD(c), (char *) buf, len, MSG_NONBLOCKING);
|
||||
}
|
||||
|
||||
+6
-6
@@ -2762,16 +2762,15 @@ void mg_tls_init(struct mg_connection *c, const struct mg_tls_opts *opts) {
|
||||
tls->ca_bundle_der = all_certs;
|
||||
MG_VERBOSE(("%d-cert bundle", cert_count));
|
||||
} else if (cert_count > 0) {
|
||||
int i;
|
||||
tls->ca_der = all_certs[0];
|
||||
for (i = 1; i < cert_count; i++) mg_free((void *) all_certs[i].buf);
|
||||
tls->ca_der.buf = all_certs[0].buf;
|
||||
tls->ca_der.len = all_certs[0].len;
|
||||
mg_free(all_certs);
|
||||
} else { // parse again for a possible DER (or a truncated begin string)
|
||||
} else { // parse again for a possible DER (or a truncated begin string)
|
||||
if (mg_parse_pem(opts->ca, mg_str_s("CERTIFICATE"), &tls->ca_der) < 0) {
|
||||
mg_error(c, "Failed to load CA certificate");
|
||||
return;
|
||||
}
|
||||
} // ca_bundle_len != 0 && ca_der.len = 0 => bundle
|
||||
} // ca_bundle_len != 0 && ca_der.len = 0 => bundle
|
||||
if (!c->is_client) tls->is_twoway = true; // server + CA: two-way auth
|
||||
}
|
||||
|
||||
@@ -2790,7 +2789,8 @@ void mg_tls_init(struct mg_connection *c, const struct mg_tls_opts *opts) {
|
||||
int cert_count = mg_parse_pem_certs(opts->cert, &all_certs);
|
||||
|
||||
if (cert_count > 0) {
|
||||
tls->cert_der = all_certs[0];
|
||||
tls->cert_der.buf = all_certs[0].buf;
|
||||
tls->cert_der.len = all_certs[0].len;
|
||||
if (cert_count > 1) {
|
||||
tls->chain_len = (size_t) cert_count;
|
||||
tls->chain_der = all_certs;
|
||||
|
||||
Reference in new issue
Block a user