{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1713604964, "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":"f9723839438ba3aca89ddb1d24300166", "commit": {"type":"commit", "time": 1518993169, "time_ofs": 480, "oid_tree": { "oid": "e8380158f78b5bd0ae2b611e3a82d6a024cc2716", "alias": []}, "oid":{ "oid": "36620a2ffeef83b9835412b9b276551df0592ae2", "alias": []}, "msg": "mbedtls: adapt to deprecated api in 2.7", "sig_commit": { "git_time": { "time": 1518993169, "offset": 480 }, "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" }, "sig_author": { "git_time": { "time": 1518993169, "offset": 480 }, "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" }}, "body": "mbedtls: adapt to deprecated api in 2.7" , "diff": "diff --git a/lib/misc/lws-genhash.c b/lib/misc/lws-genhash.c\nindex 26bdb31..f9c87ac 100644\n--- a/lib/misc/lws-genhash.c\n+++ b/lib/misc/lws-genhash.c\n@@ -23,6 +23,16 @@\n */\n #include \u0022libwebsockets.h\u0022\n \n+#if defined(LWS_WITH_MBEDTLS)\n+#include \u003cmbedtls/version.h\u003e\n+\n+#if (MBEDTLS_VERSION_NUMBER \u003e\u003d 0x02070000)\n+#define MBA(fn) fn##_ret\n+#else\n+#define MBA(fn) fn\n+#endif\n+#endif\n+\n size_t\n lws_genhash_size(int type)\n {\n@@ -47,15 +57,15 @@ lws_genhash_init(struct lws_genhash_ctx *ctx, int type)\n \tswitch (ctx-\u003etype) {\n \tcase LWS_GENHASH_TYPE_SHA1:\n \t\tmbedtls_sha1_init(\u0026ctx-\u003eu.sha1);\n-\t\tmbedtls_sha1_starts(\u0026ctx-\u003eu.sha1);\n+\t\tMBA(mbedtls_sha1_starts)(\u0026ctx-\u003eu.sha1);\n \t\tbreak;\n \tcase LWS_GENHASH_TYPE_SHA256:\n \t\tmbedtls_sha256_init(\u0026ctx-\u003eu.sha256);\n-\t\tmbedtls_sha256_starts(\u0026ctx-\u003eu.sha256, 0);\n+\t\tMBA(mbedtls_sha256_starts)(\u0026ctx-\u003eu.sha256, 0);\n \t\tbreak;\n \tcase LWS_GENHASH_TYPE_SHA512:\n \t\tmbedtls_sha512_init(\u0026ctx-\u003eu.sha512);\n-\t\tmbedtls_sha512_starts(\u0026ctx-\u003eu.sha512, 0);\n+\t\tMBA(mbedtls_sha512_starts)(\u0026ctx-\u003eu.sha512, 0);\n \t\tbreak;\n \tdefault:\n \t\treturn 1;\n@@ -95,13 +105,13 @@ lws_genhash_update(struct lws_genhash_ctx *ctx, const void *in, size_t len)\n #if defined(LWS_WITH_MBEDTLS)\n \tswitch (ctx-\u003etype) {\n \tcase LWS_GENHASH_TYPE_SHA1:\n-\t\tmbedtls_sha1_update(\u0026ctx-\u003eu.sha1, in, len);\n+\t\tMBA(mbedtls_sha1_update)(\u0026ctx-\u003eu.sha1, in, len);\n \t\tbreak;\n \tcase LWS_GENHASH_TYPE_SHA256:\n-\t\tmbedtls_sha256_update(\u0026ctx-\u003eu.sha256, in, len);\n+\t\tMBA(mbedtls_sha256_update)(\u0026ctx-\u003eu.sha256, in, len);\n \t\tbreak;\n \tcase LWS_GENHASH_TYPE_SHA512:\n-\t\tmbedtls_sha512_update(\u0026ctx-\u003eu.sha512, in, len);\n+\t\tMBA(mbedtls_sha512_update)(\u0026ctx-\u003eu.sha512, in, len);\n \t\tbreak;\n \t}\n #else\n@@ -117,15 +127,15 @@ lws_genhash_destroy(struct lws_genhash_ctx *ctx, void *result)\n #if defined(LWS_WITH_MBEDTLS)\n \tswitch (ctx-\u003etype) {\n \tcase LWS_GENHASH_TYPE_SHA1:\n-\t\tmbedtls_sha1_finish(\u0026ctx-\u003eu.sha1, result);\n+\t\tMBA(mbedtls_sha1_finish)(\u0026ctx-\u003eu.sha1, result);\n \t\tmbedtls_sha1_free(\u0026ctx-\u003eu.sha1);\n \t\tbreak;\n \tcase LWS_GENHASH_TYPE_SHA256:\n-\t\tmbedtls_sha256_finish(\u0026ctx-\u003eu.sha256, result);\n+\t\tMBA(mbedtls_sha256_finish)(\u0026ctx-\u003eu.sha256, result);\n \t\tmbedtls_sha256_free(\u0026ctx-\u003eu.sha256);\n \t\tbreak;\n \tcase LWS_GENHASH_TYPE_SHA512:\n-\t\tmbedtls_sha512_finish(\u0026ctx-\u003eu.sha512, result);\n+\t\tMBA(mbedtls_sha512_finish)(\u0026ctx-\u003eu.sha512, result);\n \t\tmbedtls_sha512_free(\u0026ctx-\u003eu.sha512);\n \t\tbreak;\n \t}\n","s":{"c":1713604964,"u": 861}} ],"g": 10376,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}