Project homepage Mailing List  Warmcat.com  API Docs  Github Mirror 
{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1751859870, "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":"6b15fc21456e8e0d94a64d86cc019e4e", "commit": {"type":"commit", "time": 1385274242, "time_ofs": 480, "oid_tree": { "oid": "5eea06a7146f9ea7b34328a942083374aad1e029", "alias": []}, "oid":{ "oid": "e01cb9a49d53603d9ee99dca8740f4a09e2483aa", "alias": []}, "msg": "Subject: [PATCH] Fixed the logging of OpenSSL errors to report the correct details for the cur", "sig_commit": { "git_time": { "time": 1385274242, "offset": 480 }, "name": "Andy Green", "email": "andy.green@linaro.org", "md5": "4863edaebb4491aa6049a4d2d9c98c2c" }, "sig_author": { "git_time": { "time": 1385118866, "offset": 120 }, "name": "Jonti", "email": "jonathanm@forwardslash.com", "md5": "cc9b730d5742a57f641be78a0bfa9775" }}, "body": "Subject: [PATCH] Fixed the logging of OpenSSL errors to report the correct\n details for the current OpenSSL error" , "diff": "diff --git a/lib/client.c b/lib/client.c\nindex fd3b2c8..40612b6 100644\n--- a/lib/client.c\n+++ b/lib/client.c\n@@ -207,8 +207,8 @@ int lws_client_socket_service(struct libwebsocket_context *context,\n \t\t\t\tn \u003d ERR_get_error();\n \t\t\t\tif (n !\u003d SSL_ERROR_NONE) {\n \t\t\t\t\tlwsl_err(\u0022SSL connect error %lu: %s\u005cn\u0022,\n-\t\t\t\t\t\tERR_get_error(),\n-\t\t\t\t\t\tERR_error_string(ERR_get_error(),\n+\t\t\t\t\t\tn,\n+\t\t\t\t\t\tERR_error_string(n,\n \t\t\t\t\t\t\t (char *)context-\u003eservice_buffer));\n \t\t\t\t\treturn 0;\n \t\t\t\t}\n@@ -267,8 +267,8 @@ int lws_client_socket_service(struct libwebsocket_context *context,\n \t\t\t\t\tn \u003d ERR_get_error();\n \t\t\t\t\tif (n !\u003d SSL_ERROR_NONE) {\n \t\t\t\t\t\tlwsl_err(\u0022SSL connect error %lu: %s\u005cn\u0022,\n-\t\t\t\t\t\t\t\t ERR_get_error(),\n-\t\t\t\t\t\t\t\t ERR_error_string(ERR_get_error(),\n+\t\t\t\t\t\t\t\t n,\n+\t\t\t\t\t\t\t\t ERR_error_string(n,\n \t\t\t\t\t\t\t\t\t\t\t\t (char *)context-\u003eservice_buffer));\n \t\t\t\t\t\treturn 0;\n \t\t\t\t\t}\ndiff --git a/lib/libwebsockets.c b/lib/libwebsockets.c\nindex 3c9187a..31e1424 100644\n--- a/lib/libwebsockets.c\n+++ b/lib/libwebsockets.c\n@@ -1986,18 +1986,20 @@ libwebsocket_create_context(struct lws_context_creation_info *info)\n \n \tmethod \u003d (SSL_METHOD *)SSLv23_server_method();\n \tif (!method) {\n+ int error \u003d ERR_get_error();\n \t\tlwsl_err(\u0022problem creating ssl method %lu: %s\u005cn\u0022, \n-\t\t\tERR_get_error(),\n-\t\t\tERR_error_string(ERR_get_error(),\n+\t\t\terror,\n+\t\t\tERR_error_string(error,\n \t\t\t\t\t (char *)context-\u003eservice_buffer));\n \t\tgoto bail;\n \t}\n \tcontext-\u003essl_ctx \u003d SSL_CTX_new(method);\t/* create context */\n \tif (!context-\u003essl_ctx) {\n+ int error \u003d ERR_get_error();\n \t\tlwsl_err(\u0022problem creating ssl context %lu: %s\u005cn\u0022,\n-\t\t\tERR_get_error(),\n-\t\t\tERR_error_string(ERR_get_error(),\n-\t\t\t\t\t (char *)context-\u003eservice_buffer));\n+ error,\n+ ERR_error_string(error,\n+ (char *)context-\u003eservice_buffer));\n \t\tgoto bail;\n \t}\n \n@@ -2016,18 +2018,20 @@ libwebsocket_create_context(struct lws_context_creation_info *info)\n \tif (info-\u003eport \u003d\u003d CONTEXT_PORT_NO_LISTEN) {\n \t\tmethod \u003d (SSL_METHOD *)SSLv23_client_method();\n \t\tif (!method) {\n+ int error \u003d ERR_get_error();\n \t\t\tlwsl_err(\u0022problem creating ssl method %lu: %s\u005cn\u0022,\n-\t\t\t\tERR_get_error(),\n-\t\t\t\tERR_error_string(ERR_get_error(),\n+ error,\n+ ERR_error_string(error,\n \t\t\t\t\t (char *)context-\u003eservice_buffer));\n \t\t\tgoto bail;\n \t\t}\n \t\t/* create context */\n \t\tcontext-\u003essl_client_ctx \u003d SSL_CTX_new(method);\n \t\tif (!context-\u003essl_client_ctx) {\n+ int error \u003d ERR_get_error();\n \t\t\tlwsl_err(\u0022problem creating ssl context %lu: %s\u005cn\u0022,\n-\t\t\t\tERR_get_error(),\n-\t\t\t\tERR_error_string(ERR_get_error(),\n+ error,\n+ ERR_error_string(error,\n \t\t\t\t\t (char *)context-\u003eservice_buffer));\n \t\t\tgoto bail;\n \t\t}\n@@ -2135,10 +2139,11 @@ libwebsocket_create_context(struct lws_context_creation_info *info)\n \t\tn \u003d SSL_CTX_use_certificate_chain_file(context-\u003essl_ctx,\n \t\t\t\t\tinfo-\u003essl_cert_filepath);\n \t\tif (n !\u003d 1) {\n+ int error \u003d ERR_get_error();\n \t\t\tlwsl_err(\u0022problem getting cert '%s' %lu: %s\u005cn\u0022,\n \t\t\t\tinfo-\u003essl_cert_filepath,\n-\t\t\t\tERR_get_error(),\n-\t\t\t\tERR_error_string(ERR_get_error(),\n+\t\t\t\terror,\n+\t\t\t\tERR_error_string(error,\n \t\t\t\t\t (char *)context-\u003eservice_buffer));\n \t\t\tgoto bail;\n \t\t}\n@@ -2146,10 +2151,11 @@ libwebsocket_create_context(struct lws_context_creation_info *info)\n \t\tif (SSL_CTX_use_PrivateKey_file(context-\u003essl_ctx,\n \t\t\t info-\u003essl_private_key_filepath,\n \t\t\t\t\t\t SSL_FILETYPE_PEM) !\u003d 1) {\n+ int error \u003d ERR_get_error();\n \t\t\tlwsl_err(\u0022ssl problem getting key '%s' %lu: %s\u005cn\u0022,\n \t\t\t\tinfo-\u003essl_private_key_filepath,\n-\t\t\t\t\tERR_get_error(),\n-\t\t\t\t\tERR_error_string(ERR_get_error(),\n+\t\t\t\t\terror,\n+\t\t\t\t\tERR_error_string(error,\n \t\t\t\t\t (char *)context-\u003eservice_buffer));\n \t\t\tgoto bail;\n \t\t}\n","s":{"c":1751859870,"u": 4029}} ],"g": 5155,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}