enabled additional compiler errors
This commit is contained in:
parent
f1a8a186e0
commit
eb8bad55ee
2
dependencies/tlibc
vendored
2
dependencies/tlibc
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 223406d4e45503318b197bd069d8f75335fee64f
|
Subproject commit fe9e44a660e23c28255ba27522d15ab94044f55b
|
||||||
@ -6,8 +6,8 @@ CMP_C="gcc"
|
|||||||
CMP_CPP="g++"
|
CMP_CPP="g++"
|
||||||
STD_C="c99"
|
STD_C="c99"
|
||||||
STD_CPP="c++11"
|
STD_CPP="c++11"
|
||||||
WARN_C="-Wall -Wextra -Wno-unused-parameter"
|
WARN_C="-Wall -Wextra -Werror=return-type -Werror=pointer-arith -Wno-unused-parameter"
|
||||||
WARN_CPP="-Wall -Wextra -Wno-unused-parameter"
|
WARN_CPP="-Wall -Wextra -Werror=return-type -Werror=pointer-arith -Wno-unused-parameter"
|
||||||
SRC_C="$(find src -name '*.c')"
|
SRC_C="$(find src -name '*.c')"
|
||||||
#SRC_CPP="$(find src -name '*.cpp')"
|
#SRC_CPP="$(find src -name '*.cpp')"
|
||||||
|
|
||||||
|
|||||||
@ -28,17 +28,17 @@ void EncryptorAES_encrypt(EncryptorAES* ptr, Array(u8) src, Array(u8) dst){
|
|||||||
br_aes_ct64_cbcenc_run(&ptr->enc_ctx, ptr->iv, ptr->buf, header_size);
|
br_aes_ct64_cbcenc_run(&ptr->enc_ctx, ptr->iv, ptr->buf, header_size);
|
||||||
// write encrypted header to dst
|
// write encrypted header to dst
|
||||||
memcpy(dst.data, ptr->buf, header_size);
|
memcpy(dst.data, ptr->buf, header_size);
|
||||||
dst.data += header_size;
|
dst.data = (u8*)dst.data + header_size;
|
||||||
dst.size -= header_size;
|
dst.size -= header_size;
|
||||||
|
|
||||||
// write full blocks
|
// write full blocks
|
||||||
while(src.size > __AES_BUFFER_SIZE){
|
while(src.size > __AES_BUFFER_SIZE){
|
||||||
memcpy(ptr->buf, src.data, __AES_BUFFER_SIZE);
|
memcpy(ptr->buf, src.data, __AES_BUFFER_SIZE);
|
||||||
src.data += __AES_BUFFER_SIZE;
|
src.data = (u8*)src.data + __AES_BUFFER_SIZE;
|
||||||
src.size -= __AES_BUFFER_SIZE;
|
src.size -= __AES_BUFFER_SIZE;
|
||||||
br_aes_ct64_cbcenc_run(&ptr->enc_ctx, ptr->iv, ptr->buf, __AES_BUFFER_SIZE);
|
br_aes_ct64_cbcenc_run(&ptr->enc_ctx, ptr->iv, ptr->buf, __AES_BUFFER_SIZE);
|
||||||
memcpy(dst.data, ptr->buf, __AES_BUFFER_SIZE);
|
memcpy(dst.data, ptr->buf, __AES_BUFFER_SIZE);
|
||||||
dst.data += __AES_BUFFER_SIZE;
|
dst.data = (u8*)dst.data + __AES_BUFFER_SIZE;
|
||||||
dst.size -= __AES_BUFFER_SIZE;
|
dst.size -= __AES_BUFFER_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -66,7 +66,7 @@ void DecryptorAES_decrypt(DecryptorAES* ptr, Array(u8) src, Array(u8) dst, u32*
|
|||||||
// copy encrypted header from src to buffer
|
// copy encrypted header from src to buffer
|
||||||
const u32 header_size = __AES_RANDOM_BYTES_N + sizeof(EncryptedBlockInfo);
|
const u32 header_size = __AES_RANDOM_BYTES_N + sizeof(EncryptedBlockInfo);
|
||||||
memcpy(ptr->buf, src.data, header_size);
|
memcpy(ptr->buf, src.data, header_size);
|
||||||
src.data += header_size;
|
src.data = (u8*)src.data + header_size;
|
||||||
src.size -= header_size;
|
src.size -= header_size;
|
||||||
// decrypt buffer
|
// decrypt buffer
|
||||||
br_aes_ct64_cbcdec_run(&ptr->dec_ctx, ptr->iv, &ptr->buf, header_size);
|
br_aes_ct64_cbcdec_run(&ptr->dec_ctx, ptr->iv, &ptr->buf, header_size);
|
||||||
@ -78,11 +78,11 @@ void DecryptorAES_decrypt(DecryptorAES* ptr, Array(u8) src, Array(u8) dst, u32*
|
|||||||
// write full blocks
|
// write full blocks
|
||||||
while(src.size > __AES_BUFFER_SIZE){
|
while(src.size > __AES_BUFFER_SIZE){
|
||||||
memcpy(ptr->buf, src.data, __AES_BUFFER_SIZE);
|
memcpy(ptr->buf, src.data, __AES_BUFFER_SIZE);
|
||||||
src.data += __AES_BUFFER_SIZE;
|
src.data = (u8*)src.data + __AES_BUFFER_SIZE;
|
||||||
src.size -= __AES_BUFFER_SIZE;
|
src.size -= __AES_BUFFER_SIZE;
|
||||||
br_aes_ct64_cbcdec_run(&ptr->dec_ctx, ptr->iv, ptr->buf, __AES_BUFFER_SIZE);
|
br_aes_ct64_cbcdec_run(&ptr->dec_ctx, ptr->iv, ptr->buf, __AES_BUFFER_SIZE);
|
||||||
memcpy(dst.data, ptr->buf, __AES_BUFFER_SIZE);
|
memcpy(dst.data, ptr->buf, __AES_BUFFER_SIZE);
|
||||||
dst.data += __AES_BUFFER_SIZE;
|
dst.data = (u8*)dst.data + __AES_BUFFER_SIZE;
|
||||||
dst.size -= __AES_BUFFER_SIZE;
|
dst.size -= __AES_BUFFER_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "socket.h"
|
#include "socket.h"
|
||||||
#include "errno.h"
|
#include <assert.h>
|
||||||
#include "assert.h"
|
|
||||||
|
|
||||||
Result(Socket) socket_open_TCP(){
|
Result(Socket) socket_open_TCP(){
|
||||||
Socket s = socket(AF_INET, SOCK_STREAM, 0);
|
Socket s = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user