commit 8bbcc87ec01112818f325d462c4e3b1bab22a188
parent 7ca873dbe6dbc0c18faf0f904e148afd714eae48
Author: lash <dev@holbrook.no>
Date: Tue, 11 Mar 2025 15:01:10 +0000
Merge branch 'master' into HEAD
Diffstat:
6 files changed, 112 insertions(+), 24 deletions(-)
diff --git a/src/crypto/dummy.c b/src/crypto/dummy.c
@@ -1,5 +1,7 @@
#include "lq/crypto.h"
#include "lq/mem.h"
+#include "lq/err.h"
+
// sha512sum "foo" 2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
static const char pubkey_dummy_transform[64] = {
@@ -46,40 +48,49 @@ struct dummycrypto {
size_t len; ///< Length of private key data.
};
-void keylock_xor(LQPrivKey *pk) {
+void keylock_xor(LQPrivKey *pk, const char *passphrase_digest) {
int i;
struct dummycrypto *o;
o = (struct dummycrypto*)pk->impl;
- for (i = 0; i < 32; i++) {
+ for (i = 0; i < LQ_PRIVKEY_LEN; i++) {
*((char*)o->data+i) ^= encrypt_dummy_transport[i];
}
}
-int lq_privatekey_unlock(LQPrivKey *pk, const char *passphrase) {
+int lq_privatekey_unlock(LQPrivKey *pk, const char *passphrase, size_t passphrase_len) {
char b;
+ char digest[LQ_DIGEST_LEN];
+ if (pk == NULL) {
+ return ERR_INIT;
+ }
if ((pk->key_state & LQ_KEY_LOCK) == 0) {
- return 1;
+ return ERR_NOOP;
}
- keylock_xor(pk);
+ lq_digest(passphrase, passphrase_len, digest);
+ keylock_xor(pk, digest);
b = LQ_KEY_LOCK;
pk->key_state &= ~b;
return 0;
}
-int lq_privatekey_lock(LQPrivKey *pk) {
- char b;
+int lq_privatekey_lock(LQPrivKey *pk, const char *passphrase, size_t passphrase_len) {
+ char digest[LQ_DIGEST_LEN];
- if ((pk->key_state & LQ_KEY_LOCK) == 0) {
- return 1;
+ if (pk == NULL) {
+ return ERR_INIT;
}
- keylock_xor(pk);
+ if ((pk->key_state & LQ_KEY_LOCK) > 0) {
+ return ERR_NOOP;
+ }
+ lq_digest(passphrase, passphrase_len, digest);
+ keylock_xor(pk, digest);
pk->key_state |= LQ_KEY_LOCK;
return 0;
}
-LQPrivKey* lq_privatekey_new(const char *seed, size_t seed_len) {
+LQPrivKey* lq_privatekey_new(const char *seed, size_t seed_len, const char *passphrase, size_t passphrase_len) {
LQPrivKey *pk;
struct dummycrypto *o;
@@ -89,8 +100,11 @@ LQPrivKey* lq_privatekey_new(const char *seed, size_t seed_len) {
lq_cpy(o->data, seed, seed_len);
o->len = seed_len;
pk->impl = o;
- pk->key_state = LQ_KEY_LOCK;
pk->key_typ = 0;
+ pk->key_state = 0;
+ if (passphrase != NULL) {
+ lq_privatekey_lock(pk, passphrase, passphrase_len);
+ }
return pk;
}
diff --git a/src/lq/cert.c b/src/lq/cert.c
@@ -9,8 +9,9 @@
static LQPubKey nokey = {
.pk = 0,
- .impl = 0;
+ .impl = 0,
};
+
static LQMsg nomsg = {
.data = "",
.len = 0,
@@ -19,7 +20,7 @@ static LQMsg nomsg = {
};
static LQSig nosig = {
.pubkey = &nokey,
- .impl = 0;
+ .impl = 0,
};
LQCert* lq_certificate_new(LQCert *parent, LQCtx *ctx, LQMsg *req, LQMsg *rsp) {
diff --git a/src/lq/crypto.h b/src/lq/crypto.h
@@ -20,7 +20,7 @@
#endif
enum lq_keystate_e {
- LQ_KEY_LOCK,
+ LQ_KEY_LOCK = 1,
};
@@ -70,12 +70,15 @@ typedef struct lq_signature_t LQSig;
/**
* @brief Create a new private key
*
+ * If passphrase is not null the passphrase will be encrypted using that passphrase by default.
+ *
* @param[in] Key material. If NULL, a new random private key will be generated.
* @param[in] Length of key material. Ignored if seed parameter is NULL.
+ * @param[in] Encryption passphrase for key.
* @return Pointer to new private key. Freeing the object is the caller's responsibility.
* @see lq_privatekey_free
*/
-LQPrivKey* lq_privatekey_new(const char *seed, size_t seed_len);
+LQPrivKey* lq_privatekey_new(const char *seed, size_t seed_len, const char *passphrase, size_t passphrase_len);
/**
* @brief Get raw private key bytes
@@ -114,6 +117,24 @@ LQPubKey* lq_publickey_from_privatekey(LQPrivKey *pk);
size_t lq_publickey_bytes(LQPubKey *pubk, char **out);
/**
+ * @brief Encrypt private key in place.
+ *
+ * Must clear sensistive memory.
+ *
+ * @param[in] Private Key object
+ * @return ERR_OK if encrypted, ERR_NOOP if already encrypted, or ERR_INIT if encryption fails.
+ */
+int lq_privatekey_lock(LQPrivKey *pk, const char *passphrase, size_t passphrase_len);
+
+/**
+ * @brief Decrypt private key in place.
+ *
+ * @param[in] Private Key object
+ * @return ERR_OK if decrypted, ERR_NOOP if not encrypted, or ERR_INIT if decryption fails.
+ */
+int lq_privatekey_unlock(LQPrivKey *pk, const char *passphrase, size_t passphrase_len);
+
+/**
* @brief Sign digest data using a private key.
*
* @param[in] Unencrypted private key to use for the signature.
diff --git a/src/lq/err.h b/src/lq/err.h
@@ -4,6 +4,7 @@
/// Error values used across all error contexts.
enum err_e {
ERR_OK, ///< No error
+ ERR_NOOP, ///< No action taken.
ERR_BYTEORDER, ///< Errors related to endianness
ERR_OVERFLOW, ///< Not enough space to write
ERR_INIT, ///< Failure instantiating object or data
@@ -12,7 +13,7 @@ enum err_e {
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, ///< Not found
+ ERR_NOENT, ///< Object not found
ERR_COMPAT, ///< Incompatible data or format
};
diff --git a/src/test/test_cert.c b/src/test/test_cert.c
@@ -10,6 +10,22 @@
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 "bar" fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9
+static const char passphrase[32] = {
+ 0xfc, 0xde, 0x2b, 0x2e, 0xdb, 0xa5, 0x6b, 0xf4,
+ 0x08, 0x60, 0x1f, 0xb7, 0x21, 0xfe, 0x9b, 0x5c,
+ 0x33, 0x8d, 0x10, 0xee, 0x42, 0x9e, 0xa0, 0x4f,
+ 0xae, 0x55, 0x11, 0xb6, 0x8f, 0xbf, 0x8f, 0xb9,
+};
+
START_TEST(check_cert_symmetric_nomsg) {
int r;
@@ -62,11 +78,11 @@ START_TEST(check_cert_symmetric_req_sig) {
LQCtx ctx;
char buf[4096];
- pk = lq_privatekey_new(data, 32);
+ pk = lq_privatekey_new(privkeydata, 32, passphrase, 32);
lq_set(&ctx, 0, sizeof(LQCtx));
req = lq_msg_new(data, strlen(data) + 1);
cert = lq_certificate_new(NULL, &ctx, req, NULL);
- // \todo change interface to certificate sign
+ lq_privatekey_unlock(pk, passphrase, 32);
r = lq_certificate_sign(cert, pk);
ck_assert_int_eq(r, 0);
@@ -91,11 +107,12 @@ START_TEST(check_cert_symmetric_rsp_onesig) {
LQCtx ctx;
char buf[4096];
- pk = lq_privatekey_new(data, 32);
+ pk = lq_privatekey_new(privkeydata, 32, passphrase, 32);
lq_set(&ctx, 0, sizeof(LQCtx));
req = lq_msg_new(data, strlen(data) + 1);
rsp = lq_msg_new(data_two, strlen(data_two) + 1);
cert = lq_certificate_new(NULL, &ctx, req, NULL);
+ lq_privatekey_unlock(pk, passphrase, 32);
r = lq_certificate_sign(cert, pk);
ck_assert_int_eq(r, 0);
cert->response = rsp;
@@ -120,10 +137,11 @@ START_TEST(check_cert_symmetric_rsp_bothsig) {
LQCtx ctx;
char buf[4096];
- pk = lq_privatekey_new(data, 32);
+ pk = lq_privatekey_new(privkeydata, 32, passphrase, 32);
lq_set(&ctx, 0, sizeof(LQCtx));
req = lq_msg_new(data, strlen(data) + 1);
cert = lq_certificate_new(NULL, &ctx, req, NULL);
+ lq_privatekey_unlock(pk, passphrase, 32);
r = lq_certificate_sign(cert, pk);
ck_assert_int_eq(r, 0);
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
@@ -8,6 +8,22 @@
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 "bar" fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9
+static const char passphrase[32] = {
+ 0xfc, 0xde, 0x2b, 0x2e, 0xdb, 0xa5, 0x6b, 0xf4,
+ 0x08, 0x60, 0x1f, 0xb7, 0x21, 0xfe, 0x9b, 0x5c,
+ 0x33, 0x8d, 0x10, 0xee, 0x42, 0x9e, 0xa0, 0x4f,
+ 0xae, 0x55, 0x11, 0xb6, 0x8f, 0xbf, 0x8f, 0xb9,
+};
+
struct dummycrypto {
void *data; ///< Literal private key data.
size_t len; ///< Length of private key data.
@@ -23,6 +39,15 @@ START_TEST(check_digest) {
}
END_TEST
+START_TEST(check_privatekey) {
+ int r;
+ LQPrivKey *pk;
+
+ pk = lq_privatekey_new(privkeydata, 32, NULL, 0);
+ lq_privatekey_free(pk);
+}
+END_TEST
+
START_TEST(check_publickey) {
LQPrivKey *pk;
LQPubKey *pubk;
@@ -30,7 +55,7 @@ START_TEST(check_publickey) {
char *keydata;
char *keydata_manual;
- pk = lq_privatekey_new(data, 32);
+ pk = lq_privatekey_new(privkeydata, 32, passphrase, 32);
pubk = lq_publickey_from_privatekey(pk);
lq_publickey_bytes(pubk, &keydata);
pubk_manual = lq_publickey_new(keydata);
@@ -49,12 +74,19 @@ START_TEST(check_signature) {
LQSig *sig;
char *sigdata;
- pk = lq_privatekey_new(data, 32);
+ pk = lq_privatekey_new(privkeydata, 32, passphrase, 32);
lq_digest(data, strlen(data), (char*)digest);
sig = lq_privatekey_sign(pk, digest, 32, salt);
- lq_signature_bytes(sig, &sigdata);
+ ck_assert_ptr_null(sig);
+
+ r = lq_privatekey_unlock(pk, passphrase, 32);
+ ck_assert_int_eq(r, 0);
+
+ sig = lq_privatekey_sign(pk, digest, 32, salt);
+ ck_assert_ptr_nonnull(sig);
r = 42;
+ lq_signature_bytes(sig, &sigdata);
ck_assert_mem_eq(sigdata+65, &r, 1);
lq_signature_free(sig);
@@ -69,6 +101,7 @@ Suite * common_suite(void) {
s = suite_create("crypto");
tc = tcase_create("dummy");
tcase_add_test(tc, check_digest);
+ tcase_add_test(tc, check_privatekey);
tcase_add_test(tc, check_publickey);
tcase_add_test(tc, check_signature);
suite_add_tcase(s, tc);
