mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-04-18 16:30:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

vtls: fix compiler warnings seen with gcc 7.3.0 and mbedTLS

Browse Source 
Seen with downloaded mingw 7.3.0 when built against MSYS2 mbedTLS 3.6.2:
```
lib/vtls/cipher_suite.c: In function 'cs_zip_to_str':
lib/vtls/cipher_suite.c:789:16: error: conversion to 'uint8_t {aka unsigned char}' from 'int' may alter its value [-Werror=conversion]
   indexes[1] = ((zip[0] << 4) & 0x3F) | zip[1] >> 4;
                ^
lib/vtls/cipher_suite.c:790:16: error: conversion to 'uint8_t {aka unsigned char}' from 'int' may alter its value [-Werror=conversion]
   indexes[2] = ((zip[1] << 2) & 0x3F) | zip[2] >> 6;
                ^
lib/vtls/cipher_suite.c:793:16: error: conversion to 'uint8_t {aka unsigned char}' from 'int' may alter its value [-Werror=conversion]
   indexes[5] = ((zip[3] << 4) & 0x3F) | zip[4] >> 4;
                ^
lib/vtls/cipher_suite.c:794:16: error: conversion to 'uint8_t {aka unsigned char}' from 'int' may alter its value [-Werror=conversion]
   indexes[6] = ((zip[4] << 2) & 0x3F) | zip[5] >> 6;
                ^
```
Ref: https://github.com/curl/curl/actions/runs/13719756989/job/38372409927?pr=16429#step:10:21

Cherry-picked from #16429
Closes #16614
This commit is contained in:
Viktor Szakats 2025-03-07 14:58:22 +01:00
parent 469c037fcf
commit a7c8d2f9bc
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/vtls/cipher_suite.c
View File

@ -786,12 +786,12 @@ static int cs_zip_to_str(const uint8_t zip[6],
/* unzip the 8 indexes */
indexes[0] = zip[0] >> 2;
indexes[1] = ((zip[0] << 4) & 0x3F) | zip[1] >> 4;
indexes[2] = ((zip[1] << 2) & 0x3F) | zip[2] >> 6;
indexes[1] = (uint8_t)(((zip[0] << 4) & 0x3F) | zip[1] >> 4);
indexes[2] = (uint8_t)(((zip[1] << 2) & 0x3F) | zip[2] >> 6);
indexes[3] = ((zip[2] << 0) & 0x3F);
indexes[4] = zip[3] >> 2;
indexes[5] = ((zip[3] << 4) & 0x3F) | zip[4] >> 4;
indexes[6] = ((zip[4] << 2) & 0x3F) | zip[5] >> 6;
indexes[5] = (uint8_t)(((zip[3] << 4) & 0x3F) | zip[4] >> 4);
indexes[6] = (uint8_t)(((zip[4] << 2) & 0x3F) | zip[5] >> 6);
indexes[7] = ((zip[5] << 0) & 0x3F);
if(indexes[0] == CS_TXT_IDX_TLS)