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 A32CE49E62 for ; Mon, 15 Apr 2024 02:35:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 77BF768D3D7; Mon, 15 Apr 2024 05:35:46 +0300 (EEST) Received: from PUWP216CU001.outbound.protection.outlook.com (mail-koreasouthazon11020003.outbound.protection.outlook.com [52.101.156.3]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F6FA68D383 for ; Mon, 15 Apr 2024 05:35:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Az78ksRKvyLnSmoO8mJXkbC56mJdJfzBioRXtgMWoSlXmXGaPTFNf+na08Qmb7oPPwfMalS/qFKCD9C8SHgv7qKMnuEVEM43wQp/cQpO+I9NVQAXm9Sq688bkOze899MuUapFBSrWqn3ZuGGG1lZVtPG4hdClae7xsc3c3/oB7ZVLbND2gH085xuyxmczUxHLgMsROu9M9RemYkrYqh8yKKWGNu0sB3vHLgJ381Ue0uQcCuxoja8R5576wkTb1vPJOeOZYsjESFoNS9OI9paZUG+BS/zwtY/wbiviv4h7iSVAz2TYjFZzHaioZTNFmyXavMuL9kA0FUtGFSkDd21ng== 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=gLIjLUOZADmG6Vi59PkbTJJkf3gYgmTBWf5o7eJ32ys=; b=YbkziNtlDG5dkt2Zot/U2c/H022CLGbKSqAXtCpSW8rNS41LDAz1Pm0gu1gW3gLaa6vjXX8OQDDdg39SS8gJyJt7S601oxUWHDP+R259gSTYdeD4soGDE9eQ17FsAGmpc5l2ntLUczVbpsZmMu/F28NiKmvoavFgYstZPma9CiSGSaF8Jnz3N+h4fendJc70Q347OERq6zxfnpgJS9xF3eU3z5Q+zOouDYvpvJyRNhmD8sTfLd1lXBRJAjSvYPdsJJHaWBTf9Al1nnIsY1seZlR9H9e8epPqSS18wqYzbpbNi0yxQLaa8QljCNNM1bejri/dSAkX0d/bpMQm95buOQ== 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=gLIjLUOZADmG6Vi59PkbTJJkf3gYgmTBWf5o7eJ32ys=; b=NotHaLHk7yomA1ABPiTce0qd5pLynqJA9CjeNpnBqY4FLtmOG3IQ08tIgvJd9ApaDYCocBtDkIyHCqb+MSALAom0GJDoajocqEkh33IhU+0xVU5tmpUWHRkqRvAtGo6a++ywAVqseAoIyzZapG+ZgjOLsCrHLIfRHnb8w6sW6XA= Received: from SL2P216MB1481.KORP216.PROD.OUTLOOK.COM (2603:1096:101:1f::7) by PU4P216MB1520.KORP216.PROD.OUTLOOK.COM (2603:1096:301:cf::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Mon, 15 Apr 2024 02:35:35 +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.7452.049; Mon, 15 Apr 2024 02:35:35 +0000 From: =?utf-8?B?7KCV7KeA7JqwIHwgRXVnZW5l?= To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH] avformat/httpauth.c [support both RFC 2617 and RFC 7617] Thread-Index: AdqL5JSWsafkZARdTsaPUb6dbGKGwQBob1MAAFW1PUA= Date: Mon, 15 Apr 2024 02:35:35 +0000 Message-ID: References: In-Reply-To: Accept-Language: ko-KR, en-US Content-Language: ko-KR X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bitsensing.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SL2P216MB1481:EE_|PU4P216MB1520:EE_ x-ms-office365-filtering-correlation-id: c855d8bd-32c6-4a64-9f7c-08dc5cf4ba93 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: =?utf-8?B?aTlZRm5IcUZZQzlKK2c2MXh0ZnBCQkxveXlqN0JNVThNY3pidHprdjRFQ0pn?= =?utf-8?B?dFJPeXo4cXJyMUsxdnkvcGh0N21BaXg2MGN0T3BYZUMwb3hlUytGZnpvOWdY?= =?utf-8?B?QU8zbEJYdk5KQk1KbEdFaFc2MGpSZzRwMlF4Tmd3NStsdzgrYjRYbVhJRjEz?= =?utf-8?B?OUMvQmRSMk1XSWZqNGxoSWxQbVYzbnVIald3dmJtNTJnRXV6Skc3UjlLSFBQ?= =?utf-8?B?ZVpqSFpHRUNHS2dkcHk4T29xOGFQejhvalVjY3FDM1RnbEtXbm9pQ1ByejEv?= =?utf-8?B?T2o5eWxEOHJ6cFZBNDhuUk5xNDhZaDFFSnlYMGdOeHJtVGNEYnlTN2hzWkdK?= =?utf-8?B?VU10aTAwYjg5RDJzRmpkaHBRaVc3SVpSWENxWHVSZThKYVk2bGFQV3VNc0lK?= =?utf-8?B?SXlTN0s0bjVJS3NIV1JkcFIyODczc0c5QXRrQitWUHcxdFFPSlkyZzJRSDU1?= =?utf-8?B?MWhEcHd3N3E2bU5xNFJtN0c2MW1RdGh2Y0NyVFpDaTRLempMZ05wbVpDdXJ1?= =?utf-8?B?dmNUYmNnVUU1TFRnYUtkb2RHaHlSMVVrVWdJVjBrTkowUU1NeWZpS0loeTd6?= =?utf-8?B?OGlMV2t0a3pTTk85K1VwYUlRbHoxejJrMzNEdWRxWVJ4aWR0WWVQN2IrQjZC?= =?utf-8?B?bDQvK0I3QzRMNWZBc0d5VkdwOUwvTUw5WlVqK1pqUlNqMDA3UldaT3dheWxt?= =?utf-8?B?VFhXTE5uYjIzajJ0Tkw1a2lzT0VTK1lQSEt2OEd0NDRsdUZDb2V4UHczWWc1?= =?utf-8?B?WU9jdVZuZW0rS29YcnJxQ0lkSTQwUk9MdlFuejg4VzgwemxYWENEUDRDQVAy?= =?utf-8?B?RDR3S0lWcDBKTkorSFdpRkZkRlVUTW53MnJacktoejcwQ25Cb2ZjYlYzaUVQ?= =?utf-8?B?MWRRZmdFRkIzV3c4VmxrWHJRWGx4VGxvRVZZWklwRXdNeEVKNFNvb2lCN2d2?= =?utf-8?B?RzV4VExwSDUwU3kyaEpLdmhJZXNmNUJnTWpiSGR5MVhNcDUxZ2M3WjRBU2Ji?= =?utf-8?B?OUwreE1KSmFMUDd5QkYyL0hrOVFUWHZic0dyTXhOckhweVloNVJIeGM3YnFm?= =?utf-8?B?Mi9tWkw3Nmg4b3FMdmMxd2xXRDRaeE51bVpESk41L2F0b2MwWXZpSTMvVWwy?= =?utf-8?B?ZkcxU2hmSks1MVZxV0wzU3Npdm04Y2NpSE95aEFJWlg1ZEJyUGhEZUVVRVVY?= =?utf-8?B?MGpUQ2duSndLd212MDB5Wi9YTGJvREw3QVU0ZVlDWDVoSUVIeHNRd3haUGY5?= =?utf-8?B?enZ2YzJzdkt1Kzc5NkpWWTBPTGlNaWhMazhvaHNQRDJzVXNjS3pMeXgrSExI?= =?utf-8?B?N1JKaE1qWnBMYlFwZ2dIbUsrTXRRMDZQN1N3RVNsYUd5Q1o0N0lpNmdCV0Jr?= =?utf-8?B?YmtNN2t0MVBxc053dnFjekcwVFFDVnlXN2QxSEN3V1huQ09qL0Q0NE1ReDBz?= =?utf-8?B?YlpIOG1leTlwY2tiVytWRUJKUk40OEp2ajFPZzQzR0UrZFhhMkpnUUxjOUhS?= =?utf-8?B?aVVEL2pObExQRGJXaVZsYlBBN0Q2QXVMQm5KVzBYWDhoV3VoOXpoZklaY3R5?= =?utf-8?B?M3R6djNlVnZmN3o3MHg4UEpGdExydGpoejVKd1hTRGFWRXFPQnltUFpaNGVD?= =?utf-8?B?UGZaVXVIcCtCUXh1WEtyalJLR3lWUFNzTmtaZnlDRzNURjRHNkFzS1RNNitC?= =?utf-8?B?T1BDaXlTTE5JL0NCOVBCdCswZ3BDcGxUODVmWVNOVTRXQXpiTThWN2hRPT0=?= 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)(376005)(1800799015)(366007)(38070700009); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?UCt0QVRRNzc4V3FROVhJTlh0RTdDVHRHUmVpMVhIZEcvdGlLOCtJL2I4MHAw?= =?utf-8?B?ZEZEVDZCSDlzcnVVck9GOENBL01oWCswUndNbnhvZTJVbFE0ZDdOeHRjNWhh?= =?utf-8?B?UmRBb2NGbW9NQkIrWnVRdjZtbnBueEFuNWJJWVpYVXphNlFBMTF1MFFrR3Ny?= =?utf-8?B?dDlITG9SRGlSYzRJMWVjVzF4UmV5K0tLQXNFeWltdGNLTFV2Snc5U09XSndk?= =?utf-8?B?c211UDloRjN6STF6MUlPNU95cDdGRzV5V1ZnMHZZNHhWcm9xYUlLT25WUTZI?= =?utf-8?B?Z1gwdFNMUlVsK2xpR05MZUg5bWRqcW94cjUyNndZdkVzd290VnRRR3VkVzY4?= =?utf-8?B?d00zZkJVK0pNNUs0ZG55MXBRQTBMbjl2dVF1VVBYRzVLSFBQWS9YYmVSaUZJ?= =?utf-8?B?Mm0rWThVS21MdWdLQ1UrcTcrL1RFa20rSTNlcU1Ba1ZUaGJUdnpSOWJmdnNs?= =?utf-8?B?dm91VEpZUFFTVElpYUdYaFZFR2dnK1JBblJKcmFQTUcvT29KYzQrazFVQTZQ?= =?utf-8?B?bGFldk0rTDVsU3ZWUU1SUTl1dFlUTmhuYUMrNzA2dENsUmkybjhKaTh6a2hO?= =?utf-8?B?anl3RW53cGg4Rm1iRmQwR0I5TExXbzFrZHl3b1RGbmEyVW5YcVhuSVZmM21h?= =?utf-8?B?ZHlXdVF3dmpWVElwbzJ0QnhpSmNiNndDOVhWMFd4WmFnUTFqNGhoczdsbTlk?= =?utf-8?B?L0tpbFg1azFwMklmeC9pRUxENERybGVWSDgyYklPZkRyQzFyWHpkSWd4NHgw?= =?utf-8?B?WmUydi9tOC85VElONHZsRXFvZmx6ekpsVWQ5c1hQTnVkSnJRaG8rSXUySmVH?= =?utf-8?B?VHBHeTV4LzZDUTl2bGpuMXpYTzdCWC9GeGxIZVE2MVB2NlFPWi9WdlhtYnpD?= =?utf-8?B?ZGhGUGJhL2dPZm9NZnZhMVVmbUprNE5YQzdqVW5ZM2ZtdHVKVHBOdnNBNGpj?= =?utf-8?B?WDNxS2xjVTZpeUl6WEJweTRmU21ZNVU1RS8yUW15ZFBmNWd0a3ovTVNHVmo5?= =?utf-8?B?RzgyQnoxZzdYam1NZHhrb1Q1ZnRibldCQ1ZrSWlEZjJmTlkrRUhJVXdGM29M?= =?utf-8?B?a2hCTEs4eUNQUWdkS1RBemg5dzQ5cTNQRkxIczZDcXVTVW1jWXlhR3V0R1Mr?= =?utf-8?B?NnRydUlZZDZ2ZE9Vd1pmUjhnZWo3and5bzdRWmM1b0pvL29Oa29JcER4MzBB?= =?utf-8?B?aStidFRDL1JXY1NkcGFORk93RW9VL2JmcVVxNk10T0RWV3pLL0M2MDlzZmhn?= =?utf-8?B?VHEvYnFRTUVtVzZSTWFuZC91eXJTb3U1SS9ERFF1VzVPK1RHV1RRbjVsRWdD?= =?utf-8?B?WUQxQmdMNStTcVFKb01xRlRyODBkQTJnMGR0dUhjZUVFR0ZiZ3EyK3UrUmV5?= =?utf-8?B?OEZKV1JOU01vdWNBTFNBbmpFTkdqc2xWVjlzYitYM0cxMWJyZzNkanJZRkVs?= =?utf-8?B?TDlTNTlweDVsR0h1N3VMcGRsMk9oc3phV3hocmEwbXdRZkVGVi9HVm1FVTU0?= =?utf-8?B?bkx1WG0vSXpyU2t4WmNVZSs2eEt1ejJGRi9Ua09zek9ncmRsVzh3Q215Tnh6?= =?utf-8?B?OGdXRUE5Wnppa0JLZW1uZnhscXN6Kzk4SVp1MjZjcDRvajdWQlJ5U1lwS0xN?= =?utf-8?B?NHVCcUJJOHhKT2hhQWFzVUo4NkhtcTU3dlJ5dDljNVV1WGZlVjlaNmhobGpr?= =?utf-8?B?UjdZVklqS3N5UmUxTEVsdTVMaGRYeEhqeDZqU3JlSThPcDJEOW0vdnQwc0RL?= =?utf-8?B?QVUrbkt4RE1FeTd1WmZPREd1MWUxeDJieTl2WmZPeGk3c0pFKzg5MFdVL04y?= =?utf-8?B?UmpSeGpjZFV6eG02MW1qVmNBZVVjOTZFaWErKzdwNHE4VDVqUERDSVh5d0RJ?= =?utf-8?B?ejNibmZVZEJNVXduV0pxbCtwY21SSmlQMDZjYWorcUJEV3hBRUdDSzUxTUZn?= =?utf-8?B?cGQ3bXA2akNGY2V4eGU2UEYyLzQyTEhXSDUwWEJMR2dpRWhFTWlDWXNhSTh1?= =?utf-8?B?b2o5Z1FrbXJFNWVGcE50Z0MvOTBaQ2l1M1UvOG5YUVJUOWJYdHM5eTdOWW5D?= =?utf-8?B?TjFIeTV4aE1zbW5wTnUwQmhLT3kwenc1Rnc5dnoxcE9MZ0VvQm42Z3EzSGpN?= =?utf-8?Q?5uGXPJukiYUkQ3SWcpZCiLoE9?= 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: c855d8bd-32c6-4a64-9f7c-08dc5cf4ba93 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Apr 2024 02:35:35.1416 (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: YmmRXlwi+gWNa2pfUzqbYZKfFvvVDyLSxh0HI0jAK+uAUNZ/KEVnSg9/Phi2FRH0/D0pXLGDXqgml0ZTmY1OQA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU4P216MB1520 Subject: Re: [FFmpeg-devel] [PATCH] avformat/httpauth.c [support both RFC 2617 and RFC 7617] 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: Hello, thank you for taking the time to review my code. I've made a new commit incorporating the code style improvements you suggested. This includes adding spaces before pointers, removing unnecessary comments, performing case-insensitive comparisons, applying consistent brace styles, and adding spaces when concatenating strings. Regarding the use of strcmp, I gave it some thought, but decided to stick with av_stristr for now to avoid the complexity of handling all four cases: md5, md5-sess, MD5, and MD5-sess. However, I acknowledge the benefits of strict string comparison with strcmp and will keep exploring this approach for future enhancements. Thank you very much for your thorough review and valuable feedback. -----Original Message----- From: ffmpeg-devel On Behalf Of Stefano Sabatini Sent: Saturday, April 13, 2024 6:38 PM To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] avformat/httpauth.c [support both RFC 2617 and RFC 7617] On date Thursday 2024-04-11 07:48:14 +0000, | Eugene wrote: > - Updated the make_digest_auth() function to support both RFC 2617 and RFC 7617 digest authentication. > - Supports sha256 , sha512-256 along with the existing md5. MD5 and sha256 were tested, but sha512-256 was not tested due to lack of testable server. > - AVHashContext instead of AVMD5 structure. > - update_md5_strings() -> update_hash_strings(). > - There are some lynt issues in the old code of make_digest_auth, but this is a feature update patch, so I didn't fix it. > - modified the implementation of RFC7616 based on community feedback. > > Signed-off-by: Eugene-bitsensing > --- > libavformat/httpauth.c | 105 > ++++++++++++++++++++++------------------- > 1 file changed, 57 insertions(+), 48 deletions(-) > > diff --git a/libavformat/httpauth.c b/libavformat/httpauth.c index > 9780928357..ba2ebea3a4 100644 > --- a/libavformat/httpauth.c > +++ b/libavformat/httpauth.c > @@ -24,7 +24,7 @@ > #include "libavutil/avstring.h" > #include "internal.h" > #include "libavutil/random_seed.h" > -#include "libavutil/md5.h" > +#include "libavutil/hash.h" > #include "urldecode.h" > > static void handle_basic_params(HTTPAuthState *state, const char > *key, @@ -117,35 +117,35 @@ void ff_http_auth_handle_header(HTTPAuthState *state, const char *key, > } > } > > - > -static void update_md5_strings(struct AVMD5 *md5ctx, ...) > +/* Generate hash string, updated to use AVHashContext to support > +other algorithms */ static void update_hash_strings(struct > +AVHashContext* hash_ctx, ...) > { > va_list vl; > > - va_start(vl, md5ctx); > + va_start(vl, hash_ctx); > while (1) { > const char* str = va_arg(vl, const char*); > if (!str) > break; > - av_md5_update(md5ctx, str, strlen(str)); > + av_hash_update(hash_ctx, (const uint8_t*)str, strlen(str)); nit++: (const uint8_t *)str note the space before the "*" > } > va_end(vl); > } > > -/* Generate a digest reply, according to RFC 2617. */ > +/* Generate a digest reply, according to RFC 2617. Update to support > +RFC 7617*/ nit: according to RFC 2617/7617 > static char *make_digest_auth(HTTPAuthState *state, const char *username, > const char *password, const char *uri, > const char *method) { > DigestParams *digest = &state->digest_params; > - int len; > + size_t len; // change int -> size_t drop this comment > uint32_t cnonce_buf[2]; > char cnonce[17]; > char nc[9]; > int i; > - char A1hash[33], A2hash[33], response[33]; > - struct AVMD5 *md5ctx; > - uint8_t hash[16]; > + char a1_hash[65], a2_hash[65], response[65]; // increase hash > + size for SHA-2 same here, drop the comment or this will be confusing without reference to the diff > + struct AVHashContext* hash_ctx = NULL; // use AVHashContext for > + other algorithm support nit: here and below, use: TYPE *VAR rather than: TYPE* VAR style for consistency > + size_t len_hash = 33; // Modifiable hash length, MD5:32, SHA-2:64 > char *authstr; > > digest->nc++; > @@ -156,52 +156,61 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username, > cnonce_buf[i] = av_get_random_seed(); > ff_data_to_hex(cnonce, (const uint8_t*) cnonce_buf, > sizeof(cnonce_buf), 1); > > - md5ctx = av_md5_alloc(); > - if (!md5ctx) > - return NULL; > - > - 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); > - > - 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); > - av_md5_final(md5ctx, hash); > - ff_data_to_hex(A1hash, hash, 16, 1); > - } else { > - /* Unsupported algorithm */ > - av_free(md5ctx); > + /* Generate hash context by algorithm. */ > + const char* algorithm = digest->algorithm; > + const char* hashing_algorithm; > + if (!*algorithm) { > + algorithm = "MD5"; // if empty, use MD5 as Default > + hashing_algorithm = "MD5"; > + } > + else if (av_stristr(algorithm, "md5") || av_stristr(algorithm, > + "MD5")) { this should be case-insensitive so you can skip one check also I wonder if this should be a strcmp, for example can it happen to have "foo-md5-bar" and should the algorithm be tolerant in such cases? style nit: here and below, put { and else on the same line } else ... { > + hashing_algorithm = "MD5"; > + } > + else if (av_stristr(algorithm, "sha256") || av_stristr(algorithm, "sha-256")) { > + hashing_algorithm = "SHA256"; > + len_hash = 65; // SHA-2: 64 characters. > + } > + else if (av_stristr(algorithm, "sha512-256") || av_stristr(algorithm, "sha-512-256")) { > + hashing_algorithm = "SHA512_256"; > + len_hash = 65; // SHA-2: 64 characters. > + } > + else { // Unsupported algorithm > return NULL; > } > > - av_md5_init(md5ctx); > - update_md5_strings(md5ctx, method, ":", uri, NULL); > - av_md5_final(md5ctx, hash); > - ff_data_to_hex(A2hash, hash, 16, 1); > + int ret = av_hash_alloc(&hash_ctx, hashing_algorithm); > + if (ret < 0) > + return NULL; > > - av_md5_init(md5ctx); > - update_md5_strings(md5ctx, A1hash, ":", digest->nonce, NULL); > - if (!strcmp(digest->qop, "auth") || !strcmp(digest->qop, "auth-int")) { > - update_md5_strings(md5ctx, ":", nc, ":", cnonce, ":", digest->qop, NULL); > + /* a1 hash calculation */ > + av_hash_init(hash_ctx); > + update_hash_strings(hash_ctx, username, ":", state->realm, ":", password, NULL); > + if (av_stristr(algorithm, "-sess")) { > + update_hash_strings(hash_ctx, ":", digest->nonce, ":", > + cnonce, NULL); > } > - update_md5_strings(md5ctx, ":", A2hash, NULL); > - av_md5_final(md5ctx, hash); > - ff_data_to_hex(response, hash, 16, 1); > - > - av_free(md5ctx); > - > - if (!strcmp(digest->qop, "") || !strcmp(digest->qop, "auth")) { > - } else if (!strcmp(digest->qop, "auth-int")) { > - /* qop=auth-int not supported */ > - return NULL; > - } else { > - /* Unsupported qop value. */ > + av_hash_final_hex(hash_ctx, a1_hash, len_hash); > + > + /* a2 hash calculation */ > + av_hash_init(hash_ctx); > + update_hash_strings(hash_ctx, method, ":", uri, NULL); > + av_hash_final_hex(hash_ctx, a2_hash, len_hash); > + > + /* response hash calculation */ > + av_hash_init(hash_ctx); > + update_hash_strings(hash_ctx, a1_hash, ":", digest->nonce, NULL); > + if (!strcmp(digest->qop, "auth")) { > + update_hash_strings(hash_ctx, ":", nc, ":", cnonce, ":", digest->qop, NULL); > + } > + else if (!strcmp(digest->qop, "auth-int")) { // unsupported > + av_hash_freep(&hash_ctx); > return NULL; > } > + update_hash_strings(hash_ctx,":", a2_hash, NULL); nit+++: hash_ctx,_":" [...] Should be good otherwise. _______________________________________________ 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". _______________________________________________ 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".