commit 44364c90289e1faa300e4da885fb10af1ab14c4b
parent 40d7cfe04ba75747031402053c50cf09ef3ac18c
Author: lash <dev@holbrook.no>
Date: Sun, 30 Mar 2025 04:21:40 +0100
Remove warnings
Diffstat:
6 files changed, 28 insertions(+), 46 deletions(-)
diff --git a/src/crypto/gcrypt.c b/src/crypto/gcrypt.c
@@ -59,8 +59,7 @@ static const char *gpg_version = NULL;
static int gpg_cfg_idx_dir;
/// default digest id.
-//static int gpg_passphrase_digest = GCRY_MD_SHA256;
-static int gpg_passphrase_digest = GCRY_MD_SHA512;
+static int gpg_passphrase_digest = GCRY_MD_SHA256;
/// digest length of hashed password.
static int gpg_passphrase_digest_len;
@@ -86,7 +85,7 @@ int lq_crypto_init(const char *base) {
char path[LQ_PATH_MAX];
if (gpg_version == NULL) {
- v = gcry_check_version(GPG_MIN_VERSION);
+ v = (char*)gcry_check_version(GPG_MIN_VERSION);
if (v == NULL) {
return ERR_NOCRYPTO;
}
@@ -142,7 +141,7 @@ static void pad(char *indata_raw, size_t outsize, const char *indata) { //std::s
}
static int create_handle(gcry_cipher_hd_t *h, const char *key, const char *nonce) {
- char *p;
+ const char *p;
gcry_error_t e;
e = gcry_cipher_open(h, GCRY_CIPHER_CHACHA20, GCRY_CIPHER_MODE_POLY1305, GCRY_CIPHER_SECURE);
@@ -384,7 +383,6 @@ static int key_create_store(struct gpg_store *gpg, const char *passphrase, size_
int r;
int kl;
char v[LQ_CRYPTO_BUFLEN];
- int i;
int l;
size_t c;
size_t m;
@@ -421,7 +419,7 @@ static int key_create_store(struct gpg_store *gpg, const char *passphrase, size_
c = get_padsize(m, LQ_CRYPTO_BLOCKSIZE);
// Hash the encryption key to the expected length.
- r = calculate_digest_algo(passphrase, passphrase_len, passphrase_hash, GCRY_MD_SHA256);
+ r = calculate_digest_algo(passphrase, passphrase_len, passphrase_hash, gpg_passphrase_digest);
if (r) {
return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "passphrase hash");
}
@@ -553,7 +551,6 @@ static int key_from_data(gcry_sexp_t *key, const char *indata, size_t indata_len
static int key_from_store(struct gpg_store *gpg, const char *passphrase, size_t passphrase_len) {
char *nonce;
char *p;
- int l;
int r;
LQStore *store;
char inkey[LQ_FP_LEN];
@@ -586,7 +583,7 @@ static int key_from_store(struct gpg_store *gpg, const char *passphrase, size_t
}
// Hash the encryption key to the expected length.
- r = calculate_digest_algo(passphrase, passphrase_len, passphrase_hash, GCRY_MD_SHA256);
+ r = calculate_digest_algo(passphrase, passphrase_len, passphrase_hash, gpg_passphrase_digest);
if (r) {
return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "passphrase hash");
}
@@ -667,18 +664,10 @@ static int gpg_key_load(struct gpg_store *gpg, const char *passphrase, size_t pa
/// Implements the interface to load a private key from storage.
LQPrivKey* lq_privatekey_load(const char *passphrase, size_t passphrase_len, const char *fingerprint) {
- LQStore *store;
LQPrivKey *pk;
- char *p;
enum gpg_find_mode_e m;
struct gpg_store *gpg;
int r;
-
- //char passphrase_hash[gpg_passphrase_digest_len];
- //r = calculate_digest_algo(passphrase, passphrase_len, passphrase_hash, gpg_passphrase_digest);
- //if (r) {
- // return NULL;
- //}
gpg = lq_alloc(sizeof(struct gpg_store));
lq_zero(gpg, sizeof(struct gpg_store));
@@ -687,7 +676,6 @@ LQPrivKey* lq_privatekey_load(const char *passphrase, size_t passphrase_len, con
lq_cpy(gpg->fingerprint, fingerprint, LQ_FP_LEN);
m = GPG_FIND_FINGERPRINT;
}
- //r = gpg_key_load(gpg, passphrase_hash, GPG_FIND_MAIN, NULL);
r = gpg_key_load(gpg, passphrase, passphrase_len, m, NULL);
if (r) {
return NULL;
@@ -844,7 +832,7 @@ LQSig* lq_privatekey_sign(LQPrivKey *pk, const char *data, size_t data_len, cons
}
LQSig* lq_signature_from_bytes(const char *sig_data, size_t sig_len, LQPubKey *pubkey) {
-
+ return NULL;
}
size_t lq_signature_bytes(LQSig *sig, char **out) {
@@ -973,7 +961,6 @@ LQPubKey* lq_publickey_new(const char *full) {
}
size_t lq_publickey_fingerprint(LQPubKey* pubk, char **out) {
- size_t c;
struct gpg_store *gpg;
gpg = (struct gpg_store*)pubk->impl;
diff --git a/src/debug.c b/src/debug.c
@@ -97,7 +97,7 @@ int debug_logerr(enum lloglvl_e lvl, int err, char *msg) {
if (msg == 0) {
msg = "debug logerr";
}
- s = rerrpfx(err);
+ s = (char*)rerrpfx(err);
e = llog_new_ns(lvl, msg, s);
e = llog_add_x("errcode", err);
s = rerrstrv(err);
diff --git a/src/lq/config.c b/src/lq/config.c
@@ -87,7 +87,7 @@ int lq_config_register(enum lq_typ_e typ, const char *name) {
return -1;
}
*(config.typs+config.last) = typ;
- *(config_idx + config.last) = name; // name must survive, or NULL for no reverse.
+ *(config_idx + config.last) = (char*)name; // name must survive, or NULL for no reverse.
l = config.last;
config.last++;
diff --git a/src/store/file.c b/src/store/file.c
@@ -37,7 +37,6 @@ int lq_file_content_count(enum payload_e typ, LQStore *store, const char *key, s
int lq_file_content_get(enum payload_e typ, LQStore *store, const char *key, size_t key_len, char *value, size_t *value_len) {
int f;
- int r;
size_t l;
size_t c;
char buf[LQ_DIGEST_LEN * 2 + 1];
@@ -84,7 +83,6 @@ int lq_file_content_get(enum payload_e typ, LQStore *store, const char *key, siz
}
int lq_file_content_put(enum payload_e typ, LQStore *store, const char *key, size_t *key_len, char *value, size_t value_len) {
- int r;
size_t c;
size_t l;
char buf[LQ_STORE_KEY_MAX - 1];
diff --git a/src/test/test_cert.c b/src/test/test_cert.c
@@ -11,13 +11,13 @@
const char *data = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
const char *data_two = "Que trata de la condición y ejercicio del famoso hidalgo D. Quijote de la Mancha En un lugar de la Mancha, de cuyo nombre no quiero acordarme, no ha mucho tiempo que vivía un hidalgo de los de lanza en astillero, adarga antigua, rocín flaco y galgo corredor.";
-// sha256sum "foo" 2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
-static const char privkeydata[32] = {
- 0x2c, 0x26, 0xb4, 0x6b, 0x68, 0xff, 0xc6, 0x8f,
- 0xf9, 0x9b, 0x45, 0x3c, 0x1d, 0x30, 0x41, 0x34,
- 0x13, 0x42, 0x2d, 0x70, 0x64, 0x83, 0xbf, 0xa0,
- 0xf9, 0x8a, 0x5e, 0x88, 0x62, 0x66, 0xe7, 0xae,
-};
+//// sha256sum "foo" 2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
+//static const char privkeydata[32] = {
+// 0x2c, 0x26, 0xb4, 0x6b, 0x68, 0xff, 0xc6, 0x8f,
+// 0xf9, 0x9b, 0x45, 0x3c, 0x1d, 0x30, 0x41, 0x34,
+// 0x13, 0x42, 0x2d, 0x70, 0x64, 0x83, 0xbf, 0xa0,
+// 0xf9, 0x8a, 0x5e, 0x88, 0x62, 0x66, 0xe7, 0xae,
+//};
// sha256sum "bar" fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9
static const char passphrase[32] = {
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
@@ -10,13 +10,13 @@
const char *data = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
const char *salt = "spamspamspamspamspamspamspamspam";
-// sha256sum "foo" 2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
-static const char privkeydata[32] = {
- 0x2c, 0x26, 0xb4, 0x6b, 0x68, 0xff, 0xc6, 0x8f,
- 0xf9, 0x9b, 0x45, 0x3c, 0x1d, 0x30, 0x41, 0x34,
- 0x13, 0x42, 0x2d, 0x70, 0x64, 0x83, 0xbf, 0xa0,
- 0xf9, 0x8a, 0x5e, 0x88, 0x62, 0x66, 0xe7, 0xae,
-};
+//// sha256sum "foo" 2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
+//static const char privkeydata[32] = {
+// 0x2c, 0x26, 0xb4, 0x6b, 0x68, 0xff, 0xc6, 0x8f,
+// 0xf9, 0x9b, 0x45, 0x3c, 0x1d, 0x30, 0x41, 0x34,
+// 0x13, 0x42, 0x2d, 0x70, 0x64, 0x83, 0xbf, 0xa0,
+// 0xf9, 0x8a, 0x5e, 0x88, 0x62, 0x66, 0xe7, 0xae,
+//};
// "1233"
static const size_t passphrase_len = 4;
@@ -40,7 +40,6 @@ START_TEST(check_digest) {
END_TEST
START_TEST(check_privatekey) {
- int r;
LQPrivKey *pk;
pk = lq_privatekey_new(passphrase, passphrase_len);
@@ -97,7 +96,6 @@ START_TEST(check_verify) {
char r;
LQPrivKey *pk;
LQSig *sig;
- char *sigdata;
pk = lq_privatekey_new(passphrase, 32);
sig = lq_privatekey_sign(pk, data, strlen(data), salt);
@@ -150,18 +148,17 @@ START_TEST(check_load_specific) {
END_TEST
Suite * common_suite(void) {
- int r;
Suite *s;
TCase *tc;
s = suite_create("crypto");
tc = tcase_create("file");
-// tcase_add_test(tc, check_digest);
-// tcase_add_test(tc, check_privatekey);
-// tcase_add_test(tc, check_publickey);
-// tcase_add_test(tc, check_signature);
-// tcase_add_test(tc, check_verify);
-// tcase_add_test(tc, check_create_load);
+ tcase_add_test(tc, check_digest);
+ tcase_add_test(tc, check_privatekey);
+ tcase_add_test(tc, check_publickey);
+ tcase_add_test(tc, check_signature);
+ tcase_add_test(tc, check_verify);
+ tcase_add_test(tc, check_create_load);
tcase_add_test(tc, check_load_specific);
suite_add_tcase(s, tc);
