{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752719589, "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":"66ef48deee404cf340269bb07f4ab76b", "commit": {"type":"commit", "time": 1710766230, "time_ofs": 0, "oid_tree": { "oid": "f44b0e014e6705f1b0a14284f0e952632f2ced96", "alias": []}, "oid":{ "oid": "0d76f0950aecaa420da2ab8f19baaf79111150da", "alias": []}, "msg": "mbedtls_wrapper: Modify 'd2i_X509' with standard declaration in openssl", "sig_commit": { "git_time": { "time": 1710766230, "offset": 0 }, "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" }, "sig_author": { "git_time": { "time": 1710761923, "offset": 480 }, "name": "makejian", "email": "makejian@xiaomi.com", "md5": "f6bd2c28af36681568621f09cb296018" }}, "body": "mbedtls_wrapper: Modify 'd2i_X509' with standard declaration in openssl\n\nhttps://github.com/warmcat/libwebsockets/pull/3095\n\nSigned-off-by: makejian \u003cmakejian@xiaomi.com\u003e\n" , "diff": "diff --git a/lib/tls/mbedtls/mbedtls-client.c b/lib/tls/mbedtls/mbedtls-client.c\nindex 187e860..e396f17 100644\n--- a/lib/tls/mbedtls/mbedtls-client.c\n+++ b/lib/tls/mbedtls/mbedtls-client.c\n@@ -378,7 +378,7 @@ lws_tls_client_create_vhost_context(struct lws_vhost *vh,\n \t\t\t\t\tunsigned int key_mem_len\n \t\t\t\t\t)\n {\n-\tX509 *d2i_X509(X509 **cert, const unsigned char *buffer, long len);\n+\tX509 *d2i_X509(X509 **cert, const unsigned char **buffer, long len);\n \tSSL_METHOD *method \u003d (SSL_METHOD *)TLS_client_method();\n \tunsigned long error;\n \tint n;\n@@ -418,13 +418,13 @@ lws_tls_client_create_vhost_context(struct lws_vhost *vh,\n \t\t\tlwsl_err(\u0022Load CA cert file %s failed\u005cn\u0022, ca_filepath);\n \t\t\treturn 1;\n \t\t}\n-\t\tvh-\u003etls.x509_client_CA \u003d d2i_X509(NULL, buf, (long)len);\n+\t\tvh-\u003etls.x509_client_CA \u003d d2i_X509(NULL, (const uint8_t **)\u0026buf, (long)len);\n \t\tfree(buf);\n \n \t\tlwsl_info(\u0022Loading vh %s client CA for verification %s\u005cn\u0022, vh-\u003ename, ca_filepath);\n #endif\n \t} else {\n-\t\tvh-\u003etls.x509_client_CA \u003d d2i_X509(NULL, (uint8_t*)ca_mem, (long)ca_mem_len);\n+\t\tvh-\u003etls.x509_client_CA \u003d d2i_X509(NULL, (const uint8_t **)\u0026ca_mem, (long)ca_mem_len);\n \t\tlwsl_info(\u0022%s: using mem client CA cert %d\u005cn\u0022,\n \t\t\t __func__, ca_mem_len);\n \t}\ndiff --git a/lib/tls/mbedtls/wrapper/include/internal/ssl_x509.h b/lib/tls/mbedtls/wrapper/include/internal/ssl_x509.h\nindex 98e0268..55eb889 100644\n--- a/lib/tls/mbedtls/wrapper/include/internal/ssl_x509.h\n+++ b/lib/tls/mbedtls/wrapper/include/internal/ssl_x509.h\n@@ -52,7 +52,7 @@ X509* X509_new(void);\n *\n * @return X509 certification object point\n */\n-X509* d2i_X509(X509 **cert, const unsigned char *buffer, long len);\n+X509* d2i_X509(X509 **cert, const unsigned char **buffer, long len);\n \n /**\n * @brief free a X509 certification object\ndiff --git a/lib/tls/mbedtls/wrapper/library/ssl_x509.c b/lib/tls/mbedtls/wrapper/library/ssl_x509.c\nindex 7d8bbff..0c6015d 100644\n--- a/lib/tls/mbedtls/wrapper/library/ssl_x509.c\n+++ b/lib/tls/mbedtls/wrapper/library/ssl_x509.c\n@@ -86,7 +86,7 @@ void X509_free(X509 *x)\n * @brief load a character certification context into system context. If '*cert' is pointed to the\n * certification, then load certification into it. Or create a new X509 certification object\n */\n-X509* d2i_X509(X509 **cert, const unsigned char *buffer, long len)\n+X509* d2i_X509(X509 **cert, const unsigned char **buffer, long len)\n {\n int m \u003d 0;\n int ret;\n@@ -106,7 +106,7 @@ X509* d2i_X509(X509 **cert, const unsigned char *buffer, long len)\n m \u003d 1;\n }\n \n- ret \u003d X509_METHOD_CALL(load, x, buffer, (int)len);\n+ ret \u003d X509_METHOD_CALL(load, x, *buffer, (int)len);\n if (ret) {\n SSL_DEBUG(SSL_PKEY_ERROR_LEVEL, \u0022X509_METHOD_CALL(load) return %d\u0022, ret);\n goto failed2;\n@@ -178,7 +178,7 @@ int SSL_CTX_add_client_CA_ASN1(SSL_CTX *ctx, int len,\n {\n \tSSL_ASSERT1(ctx);\n \n-\tif (!d2i_X509(\u0026ctx-\u003eclient_CA, d, len)) {\n+\tif (!d2i_X509(\u0026ctx-\u003eclient_CA, \u0026d, len)) {\n \t\tSSL_DEBUG(SSL_PKEY_ERROR_LEVEL, \u0022d2i_X509() return NULL\u0022);\n \t\treturn 0;\n \t}\n@@ -259,7 +259,7 @@ int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len,\n int ret;\n X509 *x;\n \n- x \u003d d2i_X509(NULL, d, len);\n+ x \u003d d2i_X509(NULL, \u0026d, len);\n if (!x) {\n SSL_DEBUG(SSL_PKEY_ERROR_LEVEL, \u0022d2i_X509() return NULL\u0022);\n goto failed1;\n@@ -287,7 +287,7 @@ int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len)\n int ret;\n X509 *x;\n \n- x \u003d d2i_X509(NULL, d, len);\n+ x \u003d d2i_X509(NULL, \u0026d, len);\n if (!x) {\n SSL_DEBUG(SSL_PKEY_ERROR_LEVEL, \u0022d2i_X509() return NULL\u0022);\n goto failed1;\n","s":{"c":1752719589,"u": 2725}} ],"g": 4393,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}