From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id AEE1749B92 for ; Wed, 3 Apr 2024 08:50:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BEBA168D109; Wed, 3 Apr 2024 11:50:48 +0300 (EEST) Received: from SE2P216CU007.outbound.protection.outlook.com (mail-koreacentralazon11020003.outbound.protection.outlook.com [52.101.154.3]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A0DD68C5B9 for ; Wed, 3 Apr 2024 11:50:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j0nmXH+36tz2U/Q/6ajFZQwNwh3RJJqD/8huJp5fxb2aydelyOG9FvYHi2AMt7PazObeHxvdRwoxfo4/mxzPAse5dbFVx10H6JaxA4I5+wF12LWcZzgorGaCT1TJdNZkCkWBYIoDUFaf0QkfhsmorhXp/QxJDelIztAJFMgfz3YBN2EsotKZa/Rf1osWCTaDz3Cq0EEUASgOjA4BhbIxhqm/SwhiVJ7xMxitWU/JGniEUkLWKe/UotOSMzaf0NAMMqnV9KIXzYRwvL2tLEHCzL71yy/iQlKOvex1SJMfnjXUCWnC30zWGiUPqW28436xaGg1JQBe5pt+zt3ChTv6tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AbzwfWHZzCI70E2iqqP5Q3NxWcYjo/7XR2vfhj7enno=; b=FVQX1RJT8eztvKo3C+/fxAyFegje9tKXa+vUnA1m6H2m3OjXT2g9x7cMhvPmktHW2N0vlLofAXsCmLB+4b6PfRVG6toE0WWV2OlXFEEZBsg8P68UWZ6EoaDrdvNceX4zlx/rmPeiR4qa7cIDi+vOQMOQJd/8omKpvxDPQmL33xXVIc5dA+THpfAONUoz/KBI/amughzvv226wrEIQuYQ5uvgvLMvqXoQ0oeuSW4JlTUUXyIMEOjI8ON20vk+h/vPvNJKQnayYFx2DXQe/5eaI6L4OSSgJM/N1v8D0jtO0nwzy3L9bMpwGu3e+hxAKI94E2LFPy22hB877IgE4JZEBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bitsensing.com; dmarc=pass action=none header.from=bitsensing.com; dkim=pass header.d=bitsensing.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bitsensing.onmicrosoft.com; s=selector1-bitsensing-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AbzwfWHZzCI70E2iqqP5Q3NxWcYjo/7XR2vfhj7enno=; b=j+lPAFdsaGuQlxnaW3baxHLLZwIW1AOon6hk8dCvWe1yUoKfwTHOENRcN5/WQwi/YdUuqPH8cpLpsEifJYhVoKtfcHbhGNpJkrm8qnfINQkte8JzOP2gzt4Lv9LNH6ZHxQBC4dVHX/I2NubGTk+CuaevEGFWkX/tmVG2sAmn2Ik= Received: from SL2P216MB1481.KORP216.PROD.OUTLOOK.COM (2603:1096:101:1f::7) by SE2P216MB2054.KORP216.PROD.OUTLOOK.COM (2603:1096:101:11e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 3 Apr 2024 08:50:37 +0000 Received: from SL2P216MB1481.KORP216.PROD.OUTLOOK.COM ([fe80::98b3:5aed:a402:9e22]) by SL2P216MB1481.KORP216.PROD.OUTLOOK.COM ([fe80::98b3:5aed:a402:9e22%4]) with mapi id 15.20.7409.042; Wed, 3 Apr 2024 08:50:37 +0000 From: =?ks_c_5601-1987?B?waTB9r/sIHwgRXVnZW5l?= To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] fix typo(1),style(1),nit(4) issue Thread-Index: AdqFmZXELAFGhs1LQXm5MvfjCnDuUw== Date: Wed, 3 Apr 2024 08:50:36 +0000 Message-ID: Accept-Language: ko-KR, en-US Content-Language: ko-KR X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SL2P216MB1481:EE_|SE2P216MB2054:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: N6PiQ3o8rfFXiAfuzhNV+0HiWl6Az+3RaAjIg52Spwi8Dx9kA5HnBiCcngzBtnKt91t4iS4sQ42hXNpTJyrn41aePXiWnfp6ArNhqHDP+aLSwLCIsMPIOOcLDdvQY8F8O1wMvuNsGdusIr2lon7Wr0pqySUjHePEcLqDdaqgOuxHFSdPVDLJGGuZpWjg6bVZ7so7fCrM9zgiqWILQLVLHb5yfGsroBRRkwDGjm21VHVMNck6NSHHZxYF775Ivq6nQYK2xsIMhGZksePU3NVeFNNEGuJi1Yuqwb0QtkQGQiJ+lQ3u4lygEED+YrzavaGvB2Vspmwd6b4NR5v0OjRe4gBsU0vTUXES/ae6VJHRwhjwld6zbmEo/tSU6GvLtx21Qzl152aNRIFSI74PUrsKBfTMTZ/XVdBqzXjVJ3SX61GFsOeXTjLLlX984XVdrF4rgP7Os0KjS4EezWQrF13588zc+ZOOUB15IbzrcI4d5uTOhTaoB0Kqag7+astrhgkStdz91zLu8E9E+x2tuKhXUje633rOMFWHGaM7BdpJGPMdbH033+vYGU5Fl6ahHOVi7EGEnPXwTfEd0zuuGtnYCMOWcrqxCRMma0uHgWkoju6ECcp1Ui8+mDlsxR00uAhnZNnkPzvrFOSPgNCJw4TZTAz5cD4i8NUoQV8hzm5UcZQ= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:ko; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SL2P216MB1481.KORP216.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(376005); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?ks_c_5601-1987?B?Y0JRY1RsZTVOd1RWOUFlUy84T1R5dG1ITzc4Zjg2Ujk3c3Q0Sitv?= =?ks_c_5601-1987?B?RUpMYnFoVDV0QU5QZTRxaHVvWEZsa0tkWHV2Q0x3bTJSMkIyTFNO?= =?ks_c_5601-1987?B?WjhhMFpaNElJMHltUGhIcVcwNXk5eWk5a2ROWWFtNmtOenJpQXhp?= =?ks_c_5601-1987?B?MmpZRTdTN3lUSnVLaW1rc3NvQlc5TDN5NUMwbWZRVHZzRHB5ODRi?= =?ks_c_5601-1987?B?K1ZLbHJqbWphRitSclIzUGRsRUljdXgwVlZlYWVtOEVWV2JWcUoz?= =?ks_c_5601-1987?B?MXNhSlErSlZZRnRNUkRpNHByTGRXbWpKY0FsQ3lHa3cvNkFoVU10?= =?ks_c_5601-1987?B?NkZ0STVvMkZUNzZjWDlUMlZlemp3QzVydEZlM1IwenpodkR0WXpa?= =?ks_c_5601-1987?B?Q3U4UG9rK3N6MVczcm1JcWpSdlpFYmdtb0E2MnRLYWJleEhaSUdT?= =?ks_c_5601-1987?B?NmJPOXVmcXBtSisxT0NzUm01MEp5TTFRMnBHcWNlNTV6UGQ1SHpG?= =?ks_c_5601-1987?B?Y2ltMzg2eW5kRjg4RXRNSUk2NU5VNXFYaS9ucm1HbzlmT2k5aGhC?= =?ks_c_5601-1987?B?ZC9KR3NnN080ZTdKM0FmR2xvYng1SnpnMmwrZzcxNjVNN2l6Unh4?= =?ks_c_5601-1987?B?T1djeFptbyt3MkllWGNvY1ZpbHdEV256VjJaS2E2RURmWStWcFJP?= =?ks_c_5601-1987?B?b2tQbDlTYkxSNC9CODIyVVJqd1FqNTJXdlhrcS9aQzRUdWI0RFNs?= =?ks_c_5601-1987?B?cEZIWEFsZ1Q0R2dSQnJpWWJOTGZGZW5jNEFNbHNuOFkrcEVtQVdM?= =?ks_c_5601-1987?B?UEtYL2E0d3dRV0ZYN3BJMUt4Zlh4Zk94MXdLSTJHTE10ekl2Q0pS?= =?ks_c_5601-1987?B?ZWdRRmpZUXl2UC82eHN0N1AwRStsbnA4M201MWJVUFJQUER5R1Na?= =?ks_c_5601-1987?B?ekVacTVlWm1rck83RmZYRHZkcGtFdkF4ZXdyWTYzUnJidUZZQWxM?= =?ks_c_5601-1987?B?Y3NGZDJRazhpSGJHeTkzcnZDTFhOallWTHlrYWY2akF3Q1lmVTlF?= =?ks_c_5601-1987?B?cFZ4eUM5MmhWdXNyakdZK3U2VmhmN1N1R1BoOVQyaGNFWjdna1ll?= =?ks_c_5601-1987?B?c2d2WGlkcU5pOUR5RXVhcm56ank4bVBYNmY3Nmt6ZGFRaFdlaVhF?= =?ks_c_5601-1987?B?SGNlcUJkMWhHRGo2UDBpTE8wS3duWXVDY1pzb0NpZGNvQmZrNDN3?= =?ks_c_5601-1987?B?cFRjVUlmT2xYaDJwdWVManI5MTJpRU1uUmtHcUd2dHd3M21QczBh?= =?ks_c_5601-1987?B?M2RVeE94Vk1vWGRpQ25XS0hjejBHb0kyVElsa2ZSSlNqeXB5dk11?= =?ks_c_5601-1987?B?cUUzTjdDc1lIdE13Qk5mZGJxYUttelN1Z05DeXBZazVFRUhVQ01r?= =?ks_c_5601-1987?B?ZmRWbmtRZE9FcFFOdjJIVG5xb0ZSWkhoaHJBOVRLeTlZUmJ5OVJx?= =?ks_c_5601-1987?B?S2t1RDFWY0NzSDlDcHVnTlE2M3JJM01JRTNKcEpVY1dEWkZaaS9T?= =?ks_c_5601-1987?B?bjh0VDlxeVBJUy9vZnpoSkhBaU9xQzhzdWduVmgvQ1BtNFNUM0Fw?= =?ks_c_5601-1987?B?ck1YT3dzTjVXRHBHZHNCV3d1RCtBcERFTEhaZHA3Mkg2eDhrZkVm?= =?ks_c_5601-1987?B?N3dzdW5vNEY4bllHR0NVczlndmV2VnhyNmtSNDA5N242enJNK0Z2?= =?ks_c_5601-1987?B?bUtsaFVnU1hmMDg2bzBxYVhYYlBwK3F6QjBzaEdsUFhocmxTV2Jh?= =?ks_c_5601-1987?B?aUE5S05qdjAvMk1GQWV4RmNGVHZKRmpPNWZKZHg5R0hDNFNjTm1h?= =?ks_c_5601-1987?B?NkRFRlJIWnd6MTBBbXBlWlQ3dXluNDBpQ280b3ZNdG9OazE3OXUz?= =?ks_c_5601-1987?B?a0EraWF0VUovY0RmeDN4QmVYdnJVOUhJdEtGS2hUaUh3RDF3b01a?= =?ks_c_5601-1987?B?dUM3eXdXRitOcGdzVXBvU2RYbGRpWG1sNjVIQnFpamVNbWNEVTNW?= =?ks_c_5601-1987?B?V0wyYVpwZldmTGJKclZqTVFtREN5aEV1U1UxR0hEdVBiSEZNZTZ0?= =?ks_c_5601-1987?B?aEE0VlZiUzRRdW5VSk5jRmM4OEhNU1VlU2x0WVZVQU83WGpHTzkr?= =?ks_c_5601-1987?B?Sm9mQWVQSVZQWUx0a0EzcEZ6cUdvV2VybU15WXZpTC80ZGV2OHFk?= =?ks_c_5601-1987?B?a0cwVmdlV2FOTENwWjdSd0E3WFFxb1o3ZnZOLzd1MzM4dUNHNmQ2?= =?ks_c_5601-1987?B?UGc2S2lvZVVkM1ROTm13bmRpRUJEYXo3MHlNdUp3K1o3MWdLSVNl?= =?ks_c_5601-1987?B?cDZWditMVFJjeUk5UGdGcUllK2xCUHdqdWtLQ0NEbDhVRk9GanNh?= =?ks_c_5601-1987?Q?A8ItnPN8ekSWHOssv5O+MjFM9VYl8KG5qiRH4P+h?= MIME-Version: 1.0 X-OriginatorOrg: bitsensing.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SL2P216MB1481.KORP216.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 6d0c181f-2144-4439-c2f8-08dc53bb21cc X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Apr 2024 08:50:37.0252 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5039430d-7fb7-4b01-9192-aeefd0db9500 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: YBAe5vJad54rZ+7sr2veV5hjYV5zVb1deDO8i9tmCZ9DTcRqXRQNN/CzXrZjxNHUkdXGrjc8RYEXVbGM98g3Mw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SE2P216MB2054 Subject: [FFmpeg-devel] [PATCH] fix typo(1),style(1),nit(4) issue X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: - typo(1) : Line 242 : RFIC7616 ->RFC7616 - style(1) : make_digest_auth() , make_digest_auth_sha() : A1hash-> a1_hash and A2hash -> a2_hash - nit(3) : httpauth.c: Line 245,265,389: - nit(1) : httpauth.h: Line 85 Signed-off-by: Eugene-bitsensing --- libavformat/httpauth.c | 34 +++++++++++++++++----------------- libavformat/httpauth.h | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libavformat/httpauth.c b/libavformat/httpauth.c index 8391b6f32f..6069523bca 100644 --- a/libavformat/httpauth.c +++ b/libavformat/httpauth.c @@ -144,7 +144,7 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username, char cnonce[17]; char nc[9]; int i; - char A1hash[33], A2hash[33], response[33]; + char a1_hash[33], a2_hash[33], response[33]; struct AVMD5 *md5ctx; uint8_t hash[16]; char *authstr; @@ -164,14 +164,14 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username, av_md5_init(md5ctx); update_md5_strings(md5ctx, username, ":", state->realm, ":", password, NULL); av_md5_final(md5ctx, hash); - ff_data_to_hex(A1hash, hash, 16, 1); + ff_data_to_hex(a1_hash, hash, 16, 1); if (!strcmp(digest->algorithm, "") || !strcmp(digest->algorithm, "MD5")) { } else if (!strcmp(digest->algorithm, "MD5-sess")) { av_md5_init(md5ctx); - update_md5_strings(md5ctx, A1hash, ":", digest->nonce, ":", cnonce, NULL); + update_md5_strings(md5ctx, a1_hash, ":", digest->nonce, ":", cnonce, NULL); av_md5_final(md5ctx, hash); - ff_data_to_hex(A1hash, hash, 16, 1); + ff_data_to_hex(a1_hash, hash, 16, 1); } else { /* Unsupported algorithm */ av_free(md5ctx); @@ -181,14 +181,14 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username, av_md5_init(md5ctx); update_md5_strings(md5ctx, method, ":", uri, NULL); av_md5_final(md5ctx, hash); - ff_data_to_hex(A2hash, hash, 16, 1); + ff_data_to_hex(a2_hash, hash, 16, 1); av_md5_init(md5ctx); - update_md5_strings(md5ctx, A1hash, ":", digest->nonce, NULL); + update_md5_strings(md5ctx, a1_hash, ":", digest->nonce, NULL); if (!strcmp(digest->qop, "auth") || !strcmp(digest->qop, "auth-int")) { update_md5_strings(md5ctx, ":", nc, ":", cnonce, ":", digest->qop, NULL); } - update_md5_strings(md5ctx, ":", A2hash, NULL); + update_md5_strings(md5ctx, ":", a2_hash, NULL); av_md5_final(md5ctx, hash); ff_data_to_hex(response, hash, 16, 1); @@ -239,11 +239,11 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username, /** * Generate a digest reply SHA-256, according to RFC 7616. - * TODO : support other RFIC 7616 Algorithm + * TODO : support other RFC 7616 Algorithm */ static char *make_digest_auth_sha(HTTPAuthState *state, const char *username, - const char *password, const char *uri, - const char *method, const char *algorithm) + const char *password, const char *uri, + const char *method, const char *algorithm) { DigestParams *digest = &state->digest_params; int len; @@ -251,7 +251,7 @@ static char *make_digest_auth_sha(HTTPAuthState *state, const char *username, char cnonce[17]; char nc[9]; int i; - char A1hash[65], A2hash[65], response[65]; + char a1_hash[65], a2_hash[65], response[65]; struct AVHashContext *hashctx; uint8_t hash[64]; char *authstr; @@ -262,7 +262,7 @@ static char *make_digest_auth_sha(HTTPAuthState *state, const char *username, /* Generate a client nonce. */ for (i = 0; i < 2; i++) cnonce_buf[i] = av_get_random_seed(); - ff_data_to_hex(cnonce, (const uint8_t*) cnonce_buf, sizeof(cnonce_buf), 1); + ff_data_to_hex(cnonce, (const uint8_t *)cnonce_buf, sizeof(cnonce_buf), 1); /* Allocate a hash context based on the provided algorithm */ int ret = av_hash_alloc(&hashctx, algorithm); @@ -280,7 +280,7 @@ static char *make_digest_auth_sha(HTTPAuthState *state, const char *username, av_hash_update(hashctx, (const uint8_t *)":", 1); av_hash_update(hashctx, (const uint8_t *)password, strlen(password)); av_hash_final(hashctx, hash); - ff_data_to_hex(A1hash, hash, av_hash_get_size(hashctx), 1); + ff_data_to_hex(a1_hash, hash, av_hash_get_size(hashctx), 1); /* Initialize the hash context for A2 */ av_hash_init(hashctx); @@ -288,11 +288,11 @@ static char *make_digest_auth_sha(HTTPAuthState *state, const char *username, av_hash_update(hashctx, (const uint8_t *)":", 1); av_hash_update(hashctx, (const uint8_t *)uri, strlen(uri)); av_hash_final(hashctx, hash); - ff_data_to_hex(A2hash, hash, av_hash_get_size(hashctx), 1); + ff_data_to_hex(a2_hash, hash, av_hash_get_size(hashctx), 1); /* Initialize the hash context for response */ av_hash_init(hashctx); - av_hash_update(hashctx, (const uint8_t *)A1hash, strlen(A1hash)); + av_hash_update(hashctx, (const uint8_t *)a1_hash, strlen(a1_hash)); av_hash_update(hashctx, (const uint8_t *)":", 1); av_hash_update(hashctx, (const uint8_t *)digest->nonce, strlen(digest->nonce)); av_hash_update(hashctx, (const uint8_t *)":", 1); @@ -302,7 +302,7 @@ static char *make_digest_auth_sha(HTTPAuthState *state, const char *username, av_hash_update(hashctx, (const uint8_t *)":", 1); av_hash_update(hashctx, (const uint8_t *)digest->qop, strlen(digest->qop)); av_hash_update(hashctx, (const uint8_t *)":", 1); - av_hash_update(hashctx, (const uint8_t *)A2hash, strlen(A2hash)); + av_hash_update(hashctx, (const uint8_t *)a2_hash, strlen(a2_hash)); av_hash_final(hashctx, hash); ff_data_to_hex(response, hash, av_hash_get_size(hashctx), 1); @@ -386,7 +386,7 @@ char *ff_http_auth_create_response(HTTPAuthState *state, const char *auth, if ((password = strchr(username, ':'))) { *password++ = 0; /* add digest algorithm SHA-256 */ - if (!strcmp(state->digest_params.algorithm, "SHA-256")) { + if (!strcmp(state->digest_params.algorithm, "SHA256")) { authstr = make_digest_auth_sha(state, username, password, path, method,"SHA256"); } else { authstr = make_digest_auth(state, username, password, path, method); diff --git a/libavformat/httpauth.h b/libavformat/httpauth.h index 4f45b4a0b9..a55986ea3e 100644 --- a/libavformat/httpauth.h +++ b/libavformat/httpauth.h @@ -82,6 +82,6 @@ char *ff_http_auth_create_response(HTTPAuthState *state, const char *auth, * SHA-256-sess, SHA-512-256 and SHA-512-256-sess not supported yet */ static char *make_digest_auth_sha(HTTPAuthState *state, const char *username, - const char *password, const char *uri, - const char *method, const char *algorithm); + const char *password, const char *uri, + const char *method, const char *algorithm); #endif /* AVFORMAT_HTTPAUTH_H */ -- 2.42.0.windows.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".