romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-02 02:05:10 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl_sha512_256: fix result code on error

Browse source 
Replace result code `CURLE_SSL_CIPHER` with
`CURLE_BAD_FUNCTION_ARGUMENT` in case of a low-level digest function
fails. Functionality is related to vauth, not SSL, and the operation is
a digest, not a cipher.

Also fix a indentation.

Follow-up to 05268cf801 #13070

Closes #21767
This commit is contained in:
Viktor Szakats 2026-05-27 10:21:24 +02:00
parent 7bcf34672d
commit c7f0267eb7
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/curl_sha512_256.c
View file

@ -145,7 +145,7 @@ static CURLcode Curl_sha512_256_update(void *context,
Curl_sha512_256_ctx * const ctx = (Curl_sha512_256_ctx *)context;
if(!EVP_DigestUpdate(*ctx, data, length))
return CURLE_SSL_CIPHER;
return CURLE_BAD_FUNCTION_ARGUMENT;
return CURLE_OK;
}
@ -169,13 +169,13 @@ static CURLcode Curl_sha512_256_finish(unsigned char *digest, void *context)
https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=58039 */
unsigned char tmp_digest[CURL_SHA512_256_DIGEST_SIZE * 2];
result = EVP_DigestFinal_ex(*ctx, tmp_digest, NULL) ?
CURLE_OK : CURLE_SSL_CIPHER;
CURLE_OK : CURLE_BAD_FUNCTION_ARGUMENT;
if(result == CURLE_OK)
memcpy(digest, tmp_digest, CURL_SHA512_256_DIGEST_SIZE);
curlx_memzero(tmp_digest, sizeof(tmp_digest));
#else /* !NEED_NETBSD_SHA512_256_WORKAROUND */
result = EVP_DigestFinal_ex(*ctx, digest, NULL) ?
CURLE_OK : CURLE_SSL_CIPHER;
CURLE_OK : CURLE_BAD_FUNCTION_ARGUMENT;
#endif /* NEED_NETBSD_SHA512_256_WORKAROUND */
EVP_MD_CTX_destroy(*ctx);
@ -206,7 +206,7 @@ static CURLcode Curl_sha512_256_update(void *ctx,
do {
word32 ilen = (word32)CURLMIN(length, UINT_MAX);
if(wc_Sha512_256Update(ctx, data, ilen))
return CURLE_SSL_CIPHER;
return CURLE_BAD_FUNCTION_ARGUMENT;
length -= ilen;
data += ilen;
} while(length);
@ -216,7 +216,7 @@ static CURLcode Curl_sha512_256_update(void *ctx,
static CURLcode Curl_sha512_256_finish(unsigned char *digest, void *ctx)
{
if(wc_Sha512_256Final(ctx, digest))
return CURLE_SSL_CIPHER;
return CURLE_BAD_FUNCTION_ARGUMENT;
return CURLE_OK;
}