mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-11-27 20:59:00 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #2823 from cesanta/c89

Browse Source 
Fix warnings and allow building chacha with C89 compilers
This commit is contained in:
Sergio R. Caprile 2024-07-08 19:05:30 -03:00 committed by GitHub
commit a9902b55d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mongoose.c
View File

@ -9833,7 +9833,7 @@ static void mg_tls_encrypt(struct mg_connection *c, const uint8_t *msg,
#if CHACHA20 #if CHACHA20
(void) tag; // tag is only used in aes gcm (void) tag; // tag is only used in aes gcm
{ {
uint8_t *enc = malloc(8192); uint8_t *enc = (uint8_t *) malloc(8192);
if (enc == NULL) { if (enc == NULL) {
mg_error(c, "TLS OOM"); mg_error(c, "TLS OOM");
return; return;
@ -11019,8 +11019,8 @@ static void core_block(const uint32_t *restrict start,
static void xor_block(uint8_t *restrict dest, const uint8_t *restrict source, static void xor_block(uint8_t *restrict dest, const uint8_t *restrict source,
const uint32_t *restrict pad, unsigned int chunk_size) { const uint32_t *restrict pad, unsigned int chunk_size) {
unsigned int i, full_blocks = chunk_size / sizeof(uint32_t); unsigned int i, full_blocks = chunk_size / (unsigned int) sizeof(uint32_t);
// have to be carefull, we are going back from uint32 to uint8, so endianess // have to be carefull, we are going back from uint32 to uint8, so endianness
// matters again // matters again
xor32_blocks(dest, source, pad, full_blocks) xor32_blocks(dest, source, pad, full_blocks)

4
mongoose.h
View File

@ -1965,11 +1965,11 @@ extern "C" {
if possible, carefully pick your associated data. if possible, carefully pick your associated data.
*/ */
// Make sure we are either nested in C++ or running in a C99+ compiler /* Make sure we are either nested in C++ or running in a C99+ compiler
#if !defined(__cplusplus) && !defined(_MSC_VER) && \ #if !defined(__cplusplus) && !defined(_MSC_VER) && \
(!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L)
#error "C99 or newer required" #error "C99 or newer required"
#endif #endif */
// #if CHAR_BIT > 8 // #if CHAR_BIT > 8
// # error "Systems without native octals not suppoted" // # error "Systems without native octals not suppoted"

2
src/tls_builtin.c
View File

@ -397,7 +397,7 @@ static void mg_tls_encrypt(struct mg_connection *c, const uint8_t *msg,
#if CHACHA20 #if CHACHA20
(void) tag; // tag is only used in aes gcm (void) tag; // tag is only used in aes gcm
{ {
uint8_t *enc = malloc(8192); uint8_t *enc = (uint8_t *) malloc(8192);
if (enc == NULL) { if (enc == NULL) {
mg_error(c, "TLS OOM"); mg_error(c, "TLS OOM");
return; return;

4
src/tls_chacha20.c
View File

@ -200,8 +200,8 @@ static void core_block(const uint32_t *restrict start,
static void xor_block(uint8_t *restrict dest, const uint8_t *restrict source, static void xor_block(uint8_t *restrict dest, const uint8_t *restrict source,
const uint32_t *restrict pad, unsigned int chunk_size) { const uint32_t *restrict pad, unsigned int chunk_size) {
unsigned int i, full_blocks = chunk_size / sizeof(uint32_t); unsigned int i, full_blocks = chunk_size / (unsigned int) sizeof(uint32_t);
// have to be carefull, we are going back from uint32 to uint8, so endianess // have to be carefull, we are going back from uint32 to uint8, so endianness
// matters again // matters again
xor32_blocks(dest, source, pad, full_blocks) xor32_blocks(dest, source, pad, full_blocks)

4
src/tls_chacha20.h
View File

@ -26,11 +26,11 @@ extern "C" {
if possible, carefully pick your associated data. if possible, carefully pick your associated data.
*/ */
// Make sure we are either nested in C++ or running in a C99+ compiler /* Make sure we are either nested in C++ or running in a C99+ compiler
#if !defined(__cplusplus) && !defined(_MSC_VER) && \ #if !defined(__cplusplus) && !defined(_MSC_VER) && \
(!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L)
#error "C99 or newer required" #error "C99 or newer required"
#endif #endif */
// #if CHAR_BIT > 8 // #if CHAR_BIT > 8
// # error "Systems without native octals not suppoted" // # error "Systems without native octals not suppoted"