mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2025-12-10 07:44:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use openssl compatibility layer for wolfssl variant

Browse source
This commit is contained in:
vdutta 2022-06-07 19:16:43 +05:30
parent 5f5bdd6e13
commit a3be4dd092
3 changed files with 13 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -5,7 +5,7 @@ include:
variables:
DEBUG: 'TRUE'
COMMON_IMAGE: "iopsys/code-analysis:0.27"
RUN_CPPCHECK: "cppcheck --force --enable=all --error-exitcode=1 -D_GNU_SOURCE --suppress=unusedFunction -i ./test/ --inline-suppr"
RUN_CPPCHECK: "cppcheck --enable=all --error-exitcode=1 -D_GNU_SOURCE --suppress=unusedFunction -i ./test/ --inline-suppr"
SOURCE_FOLDER: "."
CWMP_WORKER_PROCESSES: 1
NBI_WORKER_PROCESSES: 1

11
digauth.c
View file

@ -33,11 +33,12 @@
#define MD5_UPDATE MD5_Update
#define MD5_FINAL MD5_Final
#else
#include <wolfssl/wolfcrypt/md5.h>
#define MD5_CTX Md5
#define MD5_INIT wc_InitMd5
#define MD5_UPDATE wc_Md5Update
#define MD5_FINAL(X, Y) wc_Md5Final(Y, X)
#include <wolfssl/options.h>
#include <wolfssl/openssl/md5.h>
#define MD5_CTX MD5_CTX
#define MD5_INIT MD5_Init
#define MD5_UPDATE MD5_Update
#define MD5_FINAL MD5_Final
#endif
#ifndef MD5_DIGEST_SIZE

32
ssl_utils.c
View file

@ -31,8 +31,8 @@
#endif
#ifdef LWOLFSSL
#include <wolfssl/wolfcrypt/hmac.h>
#include <wolfssl/wolfcrypt/random.h>
#include <wolfssl/options.h>
#include <wolfssl/openssl/ssl.h>
#endif
#include <string.h>
@ -55,11 +55,10 @@ static int rand_bytes(unsigned char *output, size_t len)
FILE *urand = fopen("/dev/urandom", "r");
if (urand) {
size_t bytes = fread(&rand_buffer.seed, sizeof(rand_buffer.seed), 1, urand);
size_t bytes = fread(&rand_buffer.seed, 1, sizeof(rand_buffer.seed), urand);
fclose(urand);
if (bytes < sizeof(rand_buffer.seed)) {
CWMP_LOG(ERROR, "Failed to seed random");
return -1;
CWMP_LOG(INFO, "Failed to seed random [%d::%d]", sizeof(rand_buffer.seed), bytes);
}
} else {
rand_buffer.seed = (uint64_t)clock();
@ -83,20 +82,8 @@ end:
mbedtls_ctr_drbg_free(&cd_ctx);
mbedtls_entropy_free(&ec);
return res;
#elif LOPENSSL
return RAND_bytes(output, len);
#else
RNG rng;
int res;
res = wc_InitRng(&rng);
if (res == 0) {
res = wc_RNG_GenerateBlock(&rng, output, len);
}
wc_FreeRng(&rng);
return res;
return RAND_bytes(output, len);
#endif
}
@ -140,17 +127,10 @@ void message_compute_signature(char *msg_out, char *signature, size_t len)
const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
mbedtls_md_hmac(md_info, (unsigned char *)conf->acs_passwd, CWMP_STRLEN(conf->acs_passwd), (unsigned char *)msg_out, CWMP_STRLEN(msg_out), result);
#elif LOPENSSL
#else
unsigned char result[EVP_MAX_MD_SIZE] = {0};
HMAC(EVP_sha1(), conf->acs_passwd, CWMP_STRLEN(conf->acs_passwd), (unsigned char *)msg_out, CWMP_STRLEN(msg_out), result, NULL);
#else
Hmac hmac;
byte result[SHA_DIGEST_SIZE];
wc_HmacSetKey(&hmac, SHA, (unsigned char *)conf->acs_passwd, CWMP_STRLEN(conf->acs_passwd));
wc_HmacUpdate(&hmac, (unsigned char *)msg_out, CWMP_STRLEN(msg_out));
wc_HmacFinal(&hmac, result);
#endif
for (int i = 0; i < result_len; i++) {