commit 7b136ce4b58e78a450393403a51bf5f8db82b937
parent 231aa532059a960b8b2050946b81d5166f662445
Author: lash <dev@holbrook.no>
Date: Sun, 30 Mar 2025 13:39:29 +0100
Implement RERR, but tests flaky when activated
Diffstat:
13 files changed, 190 insertions(+), 106 deletions(-)
diff --git a/src/Makefile b/src/Makefile
@@ -1,5 +1,5 @@
INCLUDES := -I. -I./aux/include
-CFLAGS += $(INCLUDES) -Wall
+CFLAGS += $(INCLUDES) -Wall -DRERR
all: all-gpg
all-dummy: asn1 aux core dummy
diff --git a/src/aux/liblash/src/rerr/rerr.c b/src/aux/liblash/src/rerr/rerr.c
@@ -3,21 +3,40 @@
#ifdef RERR
static char** rerr[RERR_N_PFX + 1];
static const char* rerr_pfx[RERR_N_PFX + 1];
+#ifdef RERR_EXT
+char *rerr_base[14] = {
+#else
char *rerr_base[3] = {
+#endif
"OK",
- "FAIL",
- "UNSUPPORTED",
+ "Failed",
+ "Not supported",
+#ifdef RERR_EXT
+ "Initialization",
+ "No change",
+ "Not found",
+ "Read",
+ "Write",
+ "Memory",
+ "Incompatible",
+ "Encoding",
+ "Wrong byteorder",
+ "Value too large",
+ "Value too small",
+#endif
};
#endif
void rerr_init(const char *coreprefix) {
#ifdef RERR
int i;
+ char *rerr_x;
for (i = 1; i < RERR_N_PFX + 1; i++) {
rerr[i] = 0x0;
rerr_pfx[i] = 0x0;
}
+
rerr[0] = rerr_base;
rerr_pfx[0] = coreprefix;
#endif
@@ -41,7 +60,13 @@ static void splitcode(int code, short *k, char *v) {
}
static char *strv(short k, char v) {
- return (char*)(*(rerr[k]+v));
+ char **e;
+
+ e = rerr[k];
+ if (e == 0x0) {
+ return RERR_NOTFOUND_RESPONSE;
+ }
+ return (char*)(*(e+v));
}
#endif
diff --git a/src/aux/liblash/src/rerr/rerr.h b/src/aux/liblash/src/rerr/rerr.h
@@ -1,14 +1,31 @@
#ifndef RERR_H_
#define RERR_H_
-#define ERR_OK 0x0
-#define ERR_FAIL 0x1
-#define ERR_UNSUPPORTED 0x2
+enum err_base_e {
+ ERR_OK,
+ ERR_FAIL,
+ ERR_SUPPORT,
+ ERR_INIT,
+ ERR_NOOP,
+ ERR_NOENT,
+ ERR_READ,
+ ERR_WRITE,
+ ERR_MEM,
+ ERR_COMPAT,
+ ERR_ENCODING,
+ ERR_BYTEORDER,
+ ERR_OVERFLOW,
+ ERR_UNDERFLOW,
+};
#ifndef RERR_N_PFX
#define RERR_N_PFX 0
#endif
+#ifndef RERR_NOTFOUND_RESPONSE
+#define RERR_NOTFOUND_RESPONSE "(unregistered)"
+#endif
+
void rerr_init(const char *coreprefix);
void rerr_register(int pfx, char *label, void *start);
char* rerrstr(int code, char *buf);
diff --git a/src/crypto/gcrypt.c b/src/crypto/gcrypt.c
@@ -19,18 +19,6 @@
#define CHACHA20_KEY_LENGTH_BYTES 32
#define CHACHA20_NONCE_LENGTH_BYTES 12
-#ifdef RERR
-char *_rerr[7] = {
- "",
- "Crypto backend",
- "Auth fail",
- "Unlock fail",
- "Sign reject",
- "Resource fail",
- "No key found",
-};
-#endif
-
/// Lookup mode for key in store.
enum gpg_find_mode_e {
GPG_FIND_MAIN, ///< Use default key filename.
@@ -76,9 +64,6 @@ const static char gpg_default_store_key;
* \todo replace path massage with cwalk lib
*/
int lq_crypto_init(const char *base) {
-#ifdef RERR
- rerr_register(RERR_PFX_GPG, "crypto", _rerr);
-#endif
int r;
int l;
char *v;
@@ -174,7 +159,7 @@ int encryptb (char *ciphertext, size_t ciphertext_len, const char *indata, size_
r = create_handle(&h, key, nonce);
if (r) {
- return debug_logerr(LLOG_ERROR, ERR_NOCRYPTO, NULL);
+ return debug_logerr(LLOG_ERROR, ERR_CIPHER, "encrypt handle (bin)");
}
lq_cpy(indata_raw, indata, indata_len);
padb(indata_raw, ciphertext_len, indata_len);
@@ -182,7 +167,7 @@ int encryptb (char *ciphertext, size_t ciphertext_len, const char *indata, size_
if (e) {
free_handle(&h);
p = gcry_strerror(e);
- return debug_logerr(LLOG_ERROR, ERR_NOCRYPTO, (char*)p);
+ return debug_logerr(LLOG_ERROR, ERR_CIPHER, (char*)p);
}
free_handle(&h);
@@ -199,7 +184,7 @@ int encrypt(char *ciphertext, size_t ciphertext_len, const char *indata, const c
r = create_handle(&h, key, nonce);
if (r) {
- return debug_logerr(LLOG_ERROR, ERR_NOCRYPTO, NULL);
+ return debug_logerr(LLOG_ERROR, ERR_CIPHER, "encrypt handle (str)");
}
pad(indata_raw, ciphertext_len, indata);
@@ -207,7 +192,7 @@ int encrypt(char *ciphertext, size_t ciphertext_len, const char *indata, const c
if (e) {
free_handle(&h);
p = (char*)gcry_strerror(e);
- return debug_logerr(LLOG_ERROR, ERR_NOCRYPTO, p);
+ return debug_logerr(LLOG_ERROR, ERR_CIPHER, p);
}
free_handle(&h);
@@ -223,14 +208,14 @@ int decryptb(char *outdata, const char *ciphertext, size_t ciphertext_len, const
r = create_handle(&h, key, nonce);
if (r) {
- return debug_logerr(LLOG_ERROR, ERR_NOCRYPTO, "decrypt handle");
+ return debug_logerr(LLOG_ERROR, ERR_CIPHER, "decrypt handle (bin)");
}
e = gcry_cipher_decrypt(h, outdata, ciphertext_len, ciphertext, ciphertext_len);
if (e) {
free_handle(&h);
p = (char*)gcry_strerror(e);
- return debug_logerr(LLOG_ERROR, ERR_NOCRYPTO, p);
+ return debug_logerr(LLOG_ERROR, ERR_CIPHER, p);
}
free_handle(&h);
@@ -246,14 +231,14 @@ int decrypt(char *outdata, const char *ciphertext, size_t ciphertext_len, const
r = create_handle(&h, key, nonce);
if (r) {
- return debug_logerr(LLOG_ERROR, ERR_NOCRYPTO, "decrypt handle");
+ return debug_logerr(LLOG_ERROR, ERR_CIPHER, "decrypt handle (str)");
}
e = gcry_cipher_decrypt(h, outdata, ciphertext_len, ciphertext, ciphertext_len);
if (e) {
free_handle(&h);
p = (char*)gcry_strerror(e);
- return debug_logerr(LLOG_ERROR, ERR_NOCRYPTO, p);
+ return debug_logerr(LLOG_ERROR, ERR_CIPHER, p);
}
free_handle(&h);
@@ -307,22 +292,22 @@ static int key_apply_public(struct gpg_store *gpg, gcry_sexp_t key) {
pubkey = gcry_sexp_find_token(key, "public-key", 10);
if (pubkey == NULL) {
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "sexp pubkey");
+ return debug_logerr(LLOG_ERROR, ERR_KEYFAIL, "sexp pubkey");
}
pubkey = gcry_sexp_find_token(pubkey, "q", 1);
if (pubkey == NULL) {
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "sexp q");
+ return debug_logerr(LLOG_ERROR, ERR_KEYFAIL, "sexp q");
}
c = LQ_PUBKEY_LEN;
p = (char*)gcry_sexp_nth_data(pubkey, 1, &c);
if (p == NULL) {
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "sexp first data");
+ return debug_logerr(LLOG_ERROR, ERR_KEYFAIL, "sexp first data");
}
lq_cpy(gpg->public_key, p, LQ_PUBKEY_LEN);
p = (char*)gcry_pk_get_keygrip(key, (unsigned char*)gpg->fingerprint);
if (p == NULL) {
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "pubkey fingerprint");
+ return debug_logerr(LLOG_ERROR, ERR_KEYFAIL, "pubkey fingerprint");
}
return ERR_OK;
@@ -340,20 +325,20 @@ static int key_create(struct gpg_store *gpg) {
e = gcry_sexp_new(&in, (const void*)sexp_quick, strlen(sexp_quick), 0);
if (e) {
p = gcry_strerror(e);
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, (char*)p);
+ return debug_logerr(LLOG_ERROR, ERR_KEYFAIL, (char*)p);
}
// Generate a new key with the given parameters.
e = gcry_pk_genkey(&gpg->k, in);
if (e) {
p = gcry_strerror(e);
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, (char*)p);
+ return debug_logerr(LLOG_ERROR, ERR_KEYFAIL, (char*)p);
}
// Apply the public part of the key to the underlying key structure.
r = key_apply_public(gpg, gpg->k);
if (r) {
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "private create apply public");
+ return debug_logerr(LLOG_ERROR, ERR_KEYFAIL, "private create apply public");
}
return ERR_OK;
@@ -397,11 +382,11 @@ static int key_create_store(struct gpg_store *gpg, const char *passphrase, size_
// Create the private key and corresponding public key.
r = key_create(gpg);
if (r) {
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "key create");
+ return debug_logerr(LLOG_ERROR, ERR_KEYFAIL, "key create");
}
pubk = lq_publickey_new(gpg->public_key);
if (pubk == NULL) {
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "publickey");
+ return debug_logerr(LLOG_ERROR, ERR_KEYFAIL, "publickey");
}
// Export the S-expression to a text buffer for saving, canonical formatting
@@ -421,14 +406,14 @@ static int key_create_store(struct gpg_store *gpg, const char *passphrase, size_
// Hash the encryption key to the expected length.
r = calculate_digest_algo(passphrase, passphrase_len, passphrase_hash, gpg_passphrase_digest);
if (r) {
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "passphrase hash");
+ return debug_logerr(LLOG_ERROR, ERR_DIGEST, "passphrase hash");
}
// Encrypt the payload with the passphrase and nonce.
gcry_create_nonce(nonce, CHACHA20_NONCE_LENGTH_BYTES);
r = encryptb(ciphertext, c, v, m+sizeof(int), passphrase_hash, nonce);
if (r) {
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "encrypt private key");
+ return debug_logerr(LLOG_ERROR, ERR_KEY_LOCK, "encrypt private key");
}
// Export the key (fingerprint) and value (ciphertext) to put in the store.
@@ -442,7 +427,7 @@ static int key_create_store(struct gpg_store *gpg, const char *passphrase, size_
store = key_store_get();
if (store == NULL) {
lq_free(store);
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "create store");
+ return debug_logerr(LLOG_ERROR, ERR_KEYFILE, "create store");
}
// Write the ciphertext to the store.
@@ -451,7 +436,7 @@ static int key_create_store(struct gpg_store *gpg, const char *passphrase, size_
r = store->put(LQ_CONTENT_KEY, store, buf_key, &c, buf_val, l);
if (r) {
lq_free(store);
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "put key in store");
+ return debug_logerr(LLOG_ERROR, ERR_KEYFILE, "put key in store");
}
// Check if a main key already exists in the store.
@@ -463,14 +448,14 @@ static int key_create_store(struct gpg_store *gpg, const char *passphrase, size_
if (r != ERR_NOENT) {
lq_free(store);
debug(LLOG_ERROR, "crypto.gcrypt", "no default");
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "default key");
+ return debug_logerr(LLOG_ERROR, ERR_KEYFILE, "default key");
}
c = 1;
r = store->put(LQ_CONTENT_KEY, store, buf_key, &c, buf_val, l);
if (r) {
lq_free(store);
debug(LLOG_ERROR, "crypto.gcrypt", "fail put default");
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "write default key");
+ return debug_logerr(LLOG_ERROR, ERR_KEYFILE, "write default key");
}
}
@@ -585,7 +570,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, gpg_passphrase_digest);
if (r) {
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, "passphrase hash");
+ return debug_logerr(LLOG_ERROR, ERR_DIGEST, "passphrase hash");
}
// Decrypt the private key data from the store
@@ -596,7 +581,7 @@ static int key_from_store(struct gpg_store *gpg, const char *passphrase, size_t
r = decryptb(out, p, in_len, passphrase_hash, nonce);
if (r) {
lq_free(store);
- return ERR_CRYPTO;
+ return ERR_KEY_UNLOCK;
}
// Attempt to parse and instantiate the key from the decrypted data.
@@ -605,7 +590,7 @@ static int key_from_store(struct gpg_store *gpg, const char *passphrase, size_t
r = key_from_data(&gpg->k, p, out_len);
if (r) {
lq_free(store);
- return ERR_COMPAT;
+ return ERR_KEYFAIL;
}
lq_free(store);
@@ -620,7 +605,7 @@ static int gpg_key_load(struct gpg_store *gpg, const char *passphrase, size_t pa
case GPG_FIND_MAIN:
r = key_from_store(gpg, passphrase, passphrase_len);
if (r) {
- return debug_logerr(LLOG_WARNING, ERR_CRYPTO, "default key not found");
+ return debug_logerr(LLOG_WARNING, ERR_KEYFILE, "default key not found");
}
break;
case GPG_FIND_ORCREATE:
@@ -633,28 +618,23 @@ static int gpg_key_load(struct gpg_store *gpg, const char *passphrase, size_t pa
debug(LLOG_DEBUG, "gpg", "default private key not found, attempting create new");
r = key_create_store(gpg, passphrase, passphrase_len);
if (r) {
- return debug_logerr(LLOG_WARNING, ERR_CRYPTO, "create key when no default found");
+ return debug_logerr(LLOG_WARNING, ERR_KEYFILE, "create key when no default found");
}
}
break;
case GPG_FIND_FINGERPRINT:
r = key_from_store(gpg, passphrase, passphrase_len);
if (r) {
- return debug_logerr(LLOG_WARNING, ERR_CRYPTO, "fingerprint key not found");
+ return debug_logerr(LLOG_WARNING, ERR_KEYFILE, "fingerprint key not found");
}
break;
default:
return debug_logerr(LLOG_WARNING, ERR_FAIL, NULL);
}
- p = (char*)gcry_pk_get_keygrip(gpg->k, (unsigned char*)gpg->fingerprint);
- if (p == NULL) {
- return debug_logerr(LLOG_ERROR, ERR_CRYPTO, NULL);
- }
-
r = key_apply_public(gpg, gpg->k);
if (r) {
- return debug_logerr(LLOG_ERROR, ERR_FAIL, NULL);
+ return debug_logerr(LLOG_ERROR, ERR_KEYFAIL, "apply public key");
}
debug_x(LLOG_INFO, "gpg", "loaded private key", 1, MORGEL_TYP_BIN, LQ_FP_LEN, "fingerprint", gpg->fingerprint);
@@ -860,47 +840,47 @@ int lq_signature_verify(LQSig *sig, const char *data, size_t data_len) {
c = 0;
err = gcry_sexp_build(&pubkey, &c, "(key-data(public-key(ecc(curve Ed25519)(q %b))))", LQ_PUBKEY_LEN, gpg->public_key);
if (err != GPG_ERR_NO_ERROR) {
- return ERR_CRYPTO;
+ return ERR_KEYFAIL;
}
c = 0;
err = gcry_mpi_scan(&sig_r, GCRYMPI_FMT_STD, sig->impl, LQ_POINT_LEN, &c);
if (err != GPG_ERR_NO_ERROR) {
- return ERR_CRYPTO;
+ return ERR_KEYFAIL;
}
if (c != 32) {
- return ERR_CRYPTO;
+ return ERR_KEYFAIL;
}
c = 0;
err = gcry_mpi_scan(&sig_s, GCRYMPI_FMT_STD, sig->impl + LQ_POINT_LEN, LQ_POINT_LEN, &c);
if (err != GPG_ERR_NO_ERROR) {
- return ERR_CRYPTO;
+ return ERR_KEYFAIL;
}
if (c != 32) {
- return ERR_CRYPTO;
+ return ERR_KEYFAIL;
}
c = 0;
err = gcry_sexp_build(&sigx, &c, "(sig-val(eddsa(r %m)(s %m)))", sig_r, sig_s);
if (err != GPG_ERR_NO_ERROR) {
- return ERR_CRYPTO;
+ return ERR_SIGFAIL;
}
r = calculate_digest_algo(data, data_len, digest, GCRY_MD_SHA512);
if (r) {
- return ERR_CRYPTO;
+ return ERR_DIGEST;
}
c = 0;
err = gcry_sexp_build(&msgx, &c, "(data(flags eddsa)(hash-algo sha512)(value %b))", LQ_DIGEST_LEN, digest);
if (err != GPG_ERR_NO_ERROR) {
- return ERR_CRYPTO;
+ return ERR_DIGEST;
}
err = gcry_pk_verify(sigx, msgx, pubkey);
if (err != GPG_ERR_NO_ERROR) {
- return ERR_ENCODING;
+ return ERR_SIGVALID;
}
return ERR_OK;
diff --git a/src/debug.c b/src/debug.c
@@ -95,7 +95,7 @@ int debug_logerr(enum lloglvl_e lvl, int err, char *msg) {
char *s;
if (msg == 0) {
- msg = "debug logerr";
+ msg = "(debug logerr)";
}
s = (char*)rerrpfx(err);
e = llog_new_ns(lvl, msg, s);
diff --git a/src/lq/base.c b/src/lq/base.c
@@ -0,0 +1,12 @@
+#include "err.h"
+#include "config.h"
+
+
+int lq_init() {
+ int r;
+
+ lq_err_init();
+ r = lq_config_init();
+ return r;
+}
+
diff --git a/src/lq/base.h b/src/lq/base.h
@@ -0,0 +1,7 @@
+#ifndef LQ_BASE_H_
+#define LQ_BASE_H_
+
+int lq_init();
+
+#endif // LQ_BASE_H_
+
diff --git a/src/lq/crypto.h b/src/lq/crypto.h
@@ -43,19 +43,6 @@
#define LQ_POINT_LEN 32
#endif
-#define RERR_PFX_CRYPTO 0x100
-/// Crypto backend unavailable
-#define ERR_NOCRYPTO 0x101
-/// Crypto authentication fail
-#define ERR_KEYFAIL 0x102
-/// Fail access to keyfile
-#define ERR_KEYFILE 0x103
-/// Last attempt to unlock key failed
-#define ERR_KEY_UNLOCK 0x104
-/// Usage of key for signature has been rejected (by user)
-#define ERR_KEY_REJECT 0x105
-/// Crypto resource fail
-#define ERR_NOKEY 0x106
enum lq_keystate_e {
LQ_KEY_INIT = 1,
diff --git a/src/lq/err.c b/src/lq/err.c
@@ -0,0 +1,39 @@
+#include <rerr.h>
+
+#include "err.h"
+
+
+#ifdef RERR
+static char *_rerr[3] = {
+ "",
+ "Invalid request",
+ "Invalid response",
+};
+
+static char *_rerr_crypto[10] = {
+ "",
+ "Crypto backend",
+ "Auth fail",
+ "Key storage fail",
+ "Sign reject",
+ "Resource fail",
+ "No key found",
+ "Encryption",
+ "Signature",
+ "Invalid signature",
+};
+
+static char *_rerr_store[2] = {
+ "",
+ "Store unavailable",
+};
+#endif
+
+void lq_err_init() {
+#ifdef RERR
+ rerr_init("base");
+ rerr_register(RERR_PFX_LQ, "lq", _rerr);
+ rerr_register(RERR_PFX_CRYPTO, "crypto", _rerr_crypto);
+ rerr_register(RERR_PFX_STORE, "store", _rerr_store);
+#endif
+}
diff --git a/src/lq/err.h b/src/lq/err.h
@@ -6,22 +6,25 @@
/// Error values used across all error contexts.
enum err_e {
- ERR_NOOP = 3, ///< No action taken.
- ERR_BYTEORDER, ///< Errors related to endianness
- ERR_OVERFLOW, ///< Not enough space to write
- ERR_INIT, ///< Failure instantiating object or data
- ERR_MEM, ///< Failure allocating memory
- ERR_READ, ///< General data read failure
- ERR_WRITE, ///< General data write failure
- ERR_ENCODING, ///< Failure in serialization and data transformation
- ERR_REQUEST, ///< Error related to certificate request messages
- ERR_RESPONSE, ///< Error related to certificate response messages
- ERR_NOENT, ///< Object not found
- ERR_COMPAT, ///< Incompatible data or format
- ERR_CRYPTO, ///< Crypto related error
+ RERR_PFX_LQ = 0x100,
+ ERR_REQUEST = 0x101, ///< Error related to certificate request messages
+ ERR_RESPONSE = 0x102, ///< Error related to certificate response messages
+ RERR_PFX_CRYPTO = 0x200,
+ ERR_NOCRYPTO = 0x201,
+ ERR_KEYFAIL = 0x202,
+ ERR_KEYFILE = 0x203,
+ ERR_KEY_UNLOCK = 0x204,
+ ERR_KEY_LOCK = 0x205,
+ ERR_KEY_REJECT = 0x206,
+ ERR_NOKEY = 0x207,
+ ERR_CIPHER = 0x208,
+ ERR_DIGEST = 0x209,
+ ERR_SIGFAIL = 0x210,
+ ERR_SIGVALID = 0x211,
+ RERR_PFX_STORE = 0x300,
+ ERR_STORE_AVAIL = 0x301,
};
-typedef enum err_e LQErr;
+void lq_err_init();
#endif // LIBQAEDA_ERR_H_
-
diff --git a/src/test/Makefile b/src/test/Makefile
@@ -4,6 +4,7 @@ CFLAGS += $(INCLUDES) -Wall -g3
LIBS := ../asn1/defs_asn1_tab.o `pkg-config --libs libtasn1 libgcrypt` -L../aux/lib -llash
#LDFLAGS := -lcheck -lsubunit -lm $(LIBS)
LDFLAGS := -lcheck $(LIBS)
+COMMONOBJS = ../mem/std.o ../lq/config.o ../lq/err.o ../lq/base.o ../debug.o
all: build
CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_debug_bin
@@ -17,17 +18,17 @@ all: build
test: all
build:
- $(CC) $(CFLAGS) test_debug.c -o test_debug_bin ../debug.o $(LDFLAGS)
- $(CC) $(CFLAGS) test_config.c -o test_config_bin ../lq/config.o ../mem/std.o $(LDFLAGS)
+ $(CC) $(CFLAGS) test_debug.c -o test_debug_bin $(COMMONOBJS) $(LDFLAGS)
+ $(CC) $(CFLAGS) test_config.c -o test_config_bin $(COMMONOBJS) $(LDFLAGS)
# $(CC) $(CFLAGS) test_crypto.c -o test_crypto_bin ../crypto/dummy.o ../mem/std.o $(LDFLAGS)
# $(CC) $(CFLAGS) test_msg.c -o test_msg_bin ../crypto/dummy.o ../mem/std.o ../store/dummy.o ../store/file.o ../io/std.o ../lq/msg.o $(LDFLAGS)
#$(CC) $(CFLAGS) test_cert.c -o test_cert_bin ../crypto/dummy.o ../mem/std.o ../store/dummy.o ../store/file.o ../io/std.o ../lq/msg.o ../lq/cert.o $(LDFLAGS)
#$(CC) $(CFLAGS) test_trust.c -o test_trust_bin ../crypto/dummy.o ../mem/std.o ../store/mem.o ../lq/trust.o -lhashmap $(LDFLAGS)
- $(CC) $(CFLAGS) test_crypto.c -o test_crypto_bin ../store/file.o ../io/std.o ../crypto/gcrypt.o ../debug.o ../mem/std.o ../lq/config.o $(LDFLAGS) -lgcrypt
- $(CC) $(CFLAGS) test_msg.c -o test_msg_bin ../store/file.o ../store/dummy.o ../io/std.o ../crypto/gcrypt.o ../debug.o ../mem/std.o ../lq/config.o ../lq/msg.o $(LDFLAGS)
- $(CC) $(CFLAGS) test_cert.c -o test_cert_bin ../store/file.o ../io/std.o ../crypto/gcrypt.o ../debug.o ../lq/config.o ../mem/std.o ../store/dummy.o ../lq/msg.o ../lq/cert.o $(LDFLAGS)
- $(CC) $(CFLAGS) test_trust.c -o test_trust_bin ../mem/std.o ../store/mem.o ../crypto/gcrypt.o ../debug.o ../lq/config.o ../lq/trust.o -lhashmap $(LDFLAGS)
- $(CC) $(CFLAGS) test_store.c -o test_store_bin ../store/file.o ../io/std.o ../crypto/gcrypt.o ../debug.o ../lq/config.o ../mem/std.o -lhashmap $(LDFLAGS)
+ $(CC) $(CFLAGS) test_crypto.c -o test_crypto_bin $(COMMONOBJS) ../store/file.o ../io/std.o ../crypto/gcrypt.o $(LDFLAGS) -lgcrypt
+ $(CC) $(CFLAGS) test_msg.c -o test_msg_bin $(COMMONOBJS) ../store/file.o ../store/dummy.o ../io/std.o ../crypto/gcrypt.o ../lq/msg.o $(LDFLAGS)
+ $(CC) $(CFLAGS) test_cert.c -o test_cert_bin $(COMMONOBJS) ../store/file.o ../io/std.o ../crypto/gcrypt.o ../store/dummy.o ../lq/msg.o ../lq/cert.o $(LDFLAGS)
+ $(CC) $(CFLAGS) test_trust.c -o test_trust_bin $(COMMONOBJS) ../store/mem.o ../crypto/gcrypt.o ../lq/trust.o -lhashmap $(LDFLAGS)
+ $(CC) $(CFLAGS) test_store.c -o test_store_bin $(COMMONOBJS) ../store/file.o ../io/std.o ../crypto/gcrypt.o -lhashmap $(LDFLAGS)
clean:
rm -vf test_*_bin
diff --git a/src/test/test_cert.c b/src/test/test_cert.c
@@ -7,6 +7,8 @@
#include "lq/mem.h"
#include "lq/crypto.h"
#include "lq/config.h"
+#include "lq/base.h"
+#include "lq/io.h"
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.";
@@ -165,9 +167,6 @@ Suite * common_suite(void) {
Suite *s;
TCase *tc;
- lq_config_init();
- lq_crypto_init("./testdata");
-
s = suite_create("cert");
tc = tcase_create("serialize");
tcase_add_test(tc, check_cert_symmetric_nomsg);
@@ -181,11 +180,24 @@ Suite * common_suite(void) {
}
int main(void) {
+ int r;
int n_fail;
+ char path[LQ_PATH_MAX];
Suite *s;
SRunner *sr;
+ r = lq_init();
+ if (r) {
+ return 1;
+ }
+
+ lq_cpy(path, "/tmp/lqcrypto_test_XXXXXX", 26);
+ r = lq_crypto_init(mktempdir(path));
+ if (r) {
+ return 1;
+ }
+
s = common_suite();
sr = srunner_create(s);
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
@@ -5,6 +5,7 @@
#include "lq/crypto.h"
#include "lq/config.h"
#include "lq/io.h"
+#include "lq/base.h"
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.";
@@ -173,7 +174,7 @@ int main(void) {
Suite *s;
SRunner *sr;
- r = lq_config_init();
+ r = lq_init();
if (r) {
return 1;
}
