Project homepage Mailing List  Warmcat.com  API Docs  Github Mirror 
{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1711673938, "reponame":"libwebsockets", "desc":"libwebsockets lightweight C networking library", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://libwebsockets.org/repo/libwebsockets", "f":3, "items": [ {"schema":"libjg2-1", "cid":"ca7ca92ddb4cc549ed6d43f2b54ec8a4", "commit": {"type":"commit", "time": 1524873327, "time_ofs": 480, "oid_tree": { "oid": "f5ddd7e1c352b4b84d137f76c35aad3f13c6f64d", "alias": []}, "oid":{ "oid": "65b68bdc704b8bfcd219521582b7e9a559626d4f", "alias": []}, "msg": "wolfSSL updates", "sig_commit": { "git_time": { "time": 1524873327, "offset": 480 }, "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" }, "sig_author": { "git_time": { "time": 1524873249, "offset": 480 }, "name": "kaleb-himes", "email": "kaleb@wolfssl.com", "md5": "9d8bd817d19f77ddf30e44a8abc9f222" }}, "body": "wolfSSL updates\n" , "diff": "diff --git a/CMakeLists.txt b/CMakeLists.txt\nindex 6690934..eb8f7aa 100644\n--- a/CMakeLists.txt\n+++ b/CMakeLists.txt\n@@ -404,6 +404,7 @@ if (LWS_WITH_SSL AND LWS_WITH_WOLFSSL)\n \t\tset(WOLFSSL_FOUND 1)\n \tendif()\n \tset(USE_WOLFSSL 1)\n+\tset(LWS_WITH_TLS 1)\n \tif (LWS_WITH_CYASSL)\n \t\tset(USE_OLD_CYASSL 1)\n \tendif()\ndiff --git a/lib/libwebsockets.h b/lib/libwebsockets.h\nindex a565cd8..cd05afb 100644\n--- a/lib/libwebsockets.h\n+++ b/lib/libwebsockets.h\n@@ -182,9 +182,30 @@ typedef unsigned long long lws_intptr_t;\n \n #ifdef USE_WOLFSSL\n #ifdef USE_OLD_CYASSL\n+#ifdef _WIN32\n+/*\n+ * Include user-controlled settings for windows from\n+ * \u003cwolfssl-root\u003e/IDE/WIN/user_settings.h\n+ */\n+#include \u003cIDE/WIN/user_settings.h\u003e\n+#include \u003ccyassl/ctaocrypt/settings.h\u003e\n+#else\n+#include \u003ccyassl/options.h\u003e\n+#endif\n #include \u003ccyassl/openssl/ssl.h\u003e\n #include \u003ccyassl/error-ssl.h\u003e\n+\n #else\n+#ifdef _WIN32\n+/*\n+ * Include user-controlled settings for windows from\n+ * \u003cwolfssl-root\u003e/IDE/WIN/user_settings.h\n+ */\n+#include \u003cIDE/WIN/user_settings.h\u003e\n+#include \u003cwolfssl/wolfcrypt/settings.h\u003e\n+#else\n+#include \u003cwolfssl/options.h\u003e\n+#endif\n #include \u003cwolfssl/openssl/ssl.h\u003e\n #include \u003cwolfssl/error-ssl.h\u003e\n #endif /* not USE_OLD_CYASSL */\ndiff --git a/lib/tls/openssl/openssl-server.c b/lib/tls/openssl/openssl-server.c\nindex 578376b..0158b37 100644\n--- a/lib/tls/openssl/openssl-server.c\n+++ b/lib/tls/openssl/openssl-server.c\n@@ -181,9 +181,17 @@ lws_tls_server_certs_load(struct lws_vhost *vhost, struct lws *wsi,\n \t\t * The passed memory-buffer cert image is in DER, and the\n \t\t * memory-buffer private key image is PEM.\n \t\t */\n+#ifndef USE_WOLFSSL\n \t\tif (SSL_CTX_use_certificate_ASN1(vhost-\u003essl_ctx,\n \t\t\t\t\t\t (int)len_mem_cert,\n \t\t\t\t\t\t (uint8_t *)mem_cert) !\u003d 1) {\n+#else\n+\t\tif (wolfSSL_CTX_use_certificate_buffer(vhost-\u003essl_ctx,\n+\t\t\t\t\t\t (uint8_t *)mem_cert,\n+\t\t\t\t\t\t (int)len_mem_cert,\n+\t\t\t\t\t\t WOLFSSL_FILETYPE_ASN1) !\u003d 1) {\n+\n+#endif\n \t\t\tlwsl_err(\u0022Problem loading update cert\u005cn\u0022);\n \n \t\t\treturn 1;\n@@ -196,8 +204,13 @@ lws_tls_server_certs_load(struct lws_vhost *vhost, struct lws *wsi,\n \n \t\t\treturn 1;\n \t\t}\n+#ifndef USE_WOLFSSL\n \t\tif (SSL_CTX_use_PrivateKey_ASN1(EVP_PKEY_RSA, vhost-\u003essl_ctx,\n \t\t\t\t\t\tp, (long)(long long)flen) !\u003d 1) {\n+#else\n+\t\tif (wolfSSL_CTX_use_PrivateKey_buffer(vhost-\u003essl_ctx,\n+\t\t\t\t\t\tp, flen, WOLFSSL_FILETYPE_ASN1) !\u003d 1) {\n+#endif\n \t\t\tlwsl_notice(\u0022unable to use memory privkey\u005cn\u0022);\n \n \t\t\treturn 1;\ndiff --git a/lib/tls/openssl/ssl.c b/lib/tls/openssl/ssl.c\nindex 4a2743c..1b7d998 100644\n--- a/lib/tls/openssl/ssl.c\n+++ b/lib/tls/openssl/ssl.c\n@@ -348,9 +348,15 @@ lws_ssl_info_callback(const SSL *ssl, int where, int ret)\n \tstruct lws_context *context;\n \tstruct lws_ssl_info si;\n \n+#ifndef USE_WOLFSSL\n \tcontext \u003d (struct lws_context *)SSL_CTX_get_ex_data(\n \t\t\t\t\tSSL_get_SSL_CTX(ssl),\n \t\t\t\t\topenssl_SSL_CTX_private_data_index);\n+#else\n+\tcontext \u003d (struct lws_context *)SSL_CTX_get_ex_data(\n+\t\t\t\t\tSSL_get_SSL_CTX((SSL*) ssl),\n+\t\t\t\t\topenssl_SSL_CTX_private_data_index);\n+#endif\n \tif (!context)\n \t\treturn;\n \twsi \u003d wsi_from_fd(context, SSL_get_fd(ssl));\n@@ -596,6 +602,7 @@ lws_tls_openssl_cert_info(X509 *x509, enum lws_tls_cert_info type,\n \n \tcase LWS_TLS_CERT_INFO_OPAQUE_PUBLIC_KEY:\n \t{\n+#ifndef USE_WOLFSSL\n \t\tsize_t klen \u003d i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x509), NULL);\n \t\tuint8_t *tmp, *ptmp;\n \n@@ -621,7 +628,7 @@ lws_tls_openssl_cert_info(X509 *x509, enum lws_tls_cert_info type,\n \t\tbuf-\u003ens.len \u003d (int)klen;\n \t\tmemcpy(buf-\u003ens.name, tmp, klen);\n \t\tOPENSSL_free(tmp);\n-\n+#endif\n \t\treturn 0;\n \t}\n \tdefault:\ndiff --git a/lib/tls/private.h b/lib/tls/private.h\nindex 1038cee..7e7ab8b 100644\n--- a/lib/tls/private.h\n+++ b/lib/tls/private.h\n@@ -23,9 +23,21 @@\n \n #if defined(USE_WOLFSSL)\n #if defined(USE_OLD_CYASSL)\n+ #if defined(_WIN32)\n+ #include \u003cIDE/WIN/user_settings.h\u003e\n+ #include \u003ccyassl/ctaocrypt/settings.h\u003e\n+ #else\n+ #include \u003ccyassl/options.h\u003e\n+ #endif\n #include \u003ccyassl/openssl/ssl.h\u003e\n #include \u003ccyassl/error-ssl.h\u003e\n #else\n+ #if defined(_WIN32)\n+ #include \u003cIDE/WIN/user_settings.h\u003e\n+ #include \u003cwolfssl/wolfcrypt/settings.h\u003e\n+ #else\n+ #include \u003cwolfssl/options.h\u003e\n+ #endif\n #include \u003cwolfssl/openssl/ssl.h\u003e\n #include \u003cwolfssl/error-ssl.h\u003e\n #define OPENSSL_NO_TLSEXT\n@@ -198,4 +210,4 @@ lws_context_init_client_ssl(const struct lws_context_creation_info *info,\n \t\t\t struct lws_vhost *vhost);\n \n LWS_EXTERN void\n-lws_ssl_info_callback(const lws_tls_conn *ssl, int where, int ret);\n\u005c No newline at end of file\n+lws_ssl_info_callback(const lws_tls_conn *ssl, int where, int ret);\n","s":{"c":1711673938,"u": 7065}} ],"g": 8291,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}