3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-12-28 23:49:44 +08:00
Code Issues Projects Releases Wiki Activity

Use openssl/ssl.h

Browse Source
This commit is contained in:
cpq 2021-01-28 08:45:24 +00:00
parent 5118355732
commit 6678e36278
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mongoose.c
View File

@ -3270,7 +3270,6 @@ void mg_timer_poll(unsigned long now_ms) {
#include <mbedtls/debug.h>
#include <mbedtls/ssl.h>
// Different versions have those in different files, so declare here
#ifndef EXTERN_C
#ifdef __cplusplus
#define EXTERN_C extern "C"
@ -3279,6 +3278,7 @@ void mg_timer_poll(unsigned long now_ms) {
#endif
#endif
// Different versions have those in different files, so declare here
EXTERN_C int mbedtls_net_recv(void *, unsigned char *, size_t);
EXTERN_C int mbedtls_net_send(void *, const unsigned char *, size_t);
@ -3434,13 +3434,8 @@ int mg_tls_free(struct mg_connection *c) {
}
#elif MG_ENABLE_OPENSSL ///////////////////////////////////////// OPENSSL
#include <openssl/err.h>
#include <openssl/ssl.h>
#if defined(_MSC_VER) && _MSC_VER < 1700
typedef long ssize_t;
#endif
extern void ERR_clear_error(void); // Defined in openssl/err.h, but
extern void ERR_print_errors_fp(FILE *fp); // declare here for krypton
struct mg_tls {
SSL_CTX *ctx;
@ -3550,7 +3545,7 @@ fail:
int mg_tls_handshake(struct mg_connection *c) {
struct mg_tls *tls = (struct mg_tls *) c->tls;
int rc;
SSL_set_fd(tls->ssl, (ssize_t) c->fd);
SSL_set_fd(tls->ssl, (long) c->fd);
rc = c->is_client ? SSL_connect(tls->ssl) : SSL_accept(tls->ssl);
if (rc == 1) {
LOG(LL_DEBUG, ("%lu success", c->id));

11
src/tls.c
View File

@ -8,7 +8,6 @@
#include <mbedtls/debug.h>
#include <mbedtls/ssl.h>
// Different versions have those in different files, so declare here
#ifndef EXTERN_C
#ifdef __cplusplus
#define EXTERN_C extern "C"
@ -17,6 +16,7 @@
#endif
#endif
// Different versions have those in different files, so declare here
EXTERN_C int mbedtls_net_recv(void *, unsigned char *, size_t);
EXTERN_C int mbedtls_net_send(void *, const unsigned char *, size_t);
@ -172,13 +172,8 @@ int mg_tls_free(struct mg_connection *c) {
}
#elif MG_ENABLE_OPENSSL ///////////////////////////////////////// OPENSSL
#include <openssl/err.h>
#include <openssl/ssl.h>
#if defined(_MSC_VER) && _MSC_VER < 1700
typedef long ssize_t;
#endif
extern void ERR_clear_error(void); // Defined in openssl/err.h, but
extern void ERR_print_errors_fp(FILE *fp); // declare here for krypton
struct mg_tls {
SSL_CTX *ctx;
@ -288,7 +283,7 @@ fail:
int mg_tls_handshake(struct mg_connection *c) {
struct mg_tls *tls = (struct mg_tls *) c->tls;
int rc;
SSL_set_fd(tls->ssl, (ssize_t) c->fd);
SSL_set_fd(tls->ssl, (long) c->fd);
rc = c->is_client ? SSL_connect(tls->ssl) : SSL_accept(tls->ssl);
if (rc == 1) {
LOG(LL_DEBUG, ("%lu success", c->id));