{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752063527, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"815ad142ba317b00c085141d1af2bb16", "commit": {"type":"commit", "time": 1487078065, "time_ofs": 0, "oid_tree": { "oid": "7a1f771aefb6c2fed060615749a984407b2e6f61", "alias": []}, "oid":{ "oid": "2248dbebeeedd77f08d67e3dcd9031f6c1f0894f", "alias": []}, "msg": "Various style fixes following review feedback", "sig_commit": { "git_time": { "time": 1487078065, "offset": 0 }, "name": "Matt Caswell", "email": "matt@openssl.org", "md5": "10f7b441a32d5790efad9fc68cae4af2" }, "sig_author": { "git_time": { "time": 1486399649, "offset": 0 }, "name": "Matt Caswell", "email": "matt@openssl.org", "md5": "10f7b441a32d5790efad9fc68cae4af2" }}, "body": "Various style fixes following review feedback\n\nReviewed-by: Richard Levitte \u003clevitte@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/2341)" , "diff": "diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c\nindex 563eb57..8d08b0c 100644\n--- a/ssl/statem/extensions.c\n+++ b/ssl/statem/extensions.c\n@@ -1020,7 +1020,7 @@ static int final_key_share(SSL *s, unsigned int context, int sent, int *al)\n size_t num_curves, clnt_num_curves, i;\n unsigned int group_id;\n \n- /* Check a shared group exists */\n+ /* Check if a shared group exists */\n \n /* Get the clients list of supported groups. */\n if (!tls1_get_curvelist(s, 1, \u0026clntcurves, \u0026clnt_num_curves)) {\ndiff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c\nindex 2516ab9..01a80a0 100644\n--- a/ssl/statem/extensions_clnt.c\n+++ b/ssl/statem/extensions_clnt.c\n@@ -531,8 +531,8 @@ int tls_construct_ctos_psk_kex_modes(SSL *s, WPACKET *pkt, unsigned int context,\n #ifndef OPENSSL_NO_TLS1_3\n static int add_key_share(SSL *s, WPACKET *pkt, unsigned int curve_id)\n {\n- unsigned char *encodedPoint \u003d NULL;\n- EVP_PKEY *key_share_key \u003d NULL;\n+ unsigned char *encoded_point;\n+ EVP_PKEY *key_share_key;\n size_t encodedlen;\n \n key_share_key \u003d ssl_generate_pkey_curve(curve_id);\n@@ -543,7 +543,7 @@ static int add_key_share(SSL *s, WPACKET *pkt, unsigned int curve_id)\n \n /* Encode the public key. */\n encodedlen \u003d EVP_PKEY_get1_tls_encodedpoint(key_share_key,\n- \u0026encodedPoint);\n+ \u0026encoded_point);\n if (encodedlen \u003d\u003d 0) {\n SSLerr(SSL_F_ADD_KEY_SHARE, ERR_R_EC_LIB);\n EVP_PKEY_free(key_share_key);\n@@ -552,10 +552,10 @@ static int add_key_share(SSL *s, WPACKET *pkt, unsigned int curve_id)\n \n /* Create KeyShareEntry */\n if (!WPACKET_put_bytes_u16(pkt, curve_id)\n- || !WPACKET_sub_memcpy_u16(pkt, encodedPoint, encodedlen)) {\n+ || !WPACKET_sub_memcpy_u16(pkt, encoded_point, encodedlen)) {\n SSLerr(SSL_F_ADD_KEY_SHARE, ERR_R_INTERNAL_ERROR);\n EVP_PKEY_free(key_share_key);\n- OPENSSL_free(encodedPoint);\n+ OPENSSL_free(encoded_point);\n return 0;\n }\n \n@@ -566,7 +566,7 @@ static int add_key_share(SSL *s, WPACKET *pkt, unsigned int curve_id)\n */\n s-\u003es3-\u003etmp.pkey \u003d key_share_key;\n s-\u003es3-\u003egroup_id \u003d curve_id;\n- OPENSSL_free(encodedPoint);\n+ OPENSSL_free(encoded_point);\n \n return 1;\n }\ndiff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c\nindex 5860a23..152600b 100644\n--- a/ssl/statem/statem_clnt.c\n+++ b/ssl/statem/statem_clnt.c\n@@ -1466,7 +1466,7 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL *s, PACKET *pkt)\n static MSG_PROCESS_RETURN tls_process_hello_retry_request(SSL *s, PACKET *pkt)\n {\n unsigned int sversion;\n- int protverr;\n+ int errorcode;\n RAW_EXTENSION *extensions \u003d NULL;\n int al;\n PACKET extpkt;\n@@ -1480,10 +1480,10 @@ static MSG_PROCESS_RETURN tls_process_hello_retry_request(SSL *s, PACKET *pkt)\n s-\u003ehello_retry_request \u003d 1;\n \n /* This will fail if it doesn't choose TLSv1.3+ */\n- protverr \u003d ssl_choose_client_version(s, sversion);\n- if (protverr !\u003d 0) {\n+ errorcode \u003d ssl_choose_client_version(s, sversion);\n+ if (errorcode !\u003d 0) {\n al \u003d SSL_AD_PROTOCOL_VERSION;\n- SSLerr(SSL_F_TLS_PROCESS_HELLO_RETRY_REQUEST, protverr);\n+ SSLerr(SSL_F_TLS_PROCESS_HELLO_RETRY_REQUEST, errorcode);\n goto f_err;\n }\n \n","s":{"c":1752063527,"u": 55572}} ],"g": 56557,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}