From: James Prestwood <prestwoj@gmail.com>
To: ell@lists.linux.dev
Cc: James Prestwood <prestwoj@gmail.com>
Subject: [RFC 6/8] cert: add l_cert_pkcs5_pbkdf2_from_key_id
Date: Fri, 18 Nov 2022 13:16:22 -0800 [thread overview]
Message-ID: <20221118211624.19298-7-prestwoj@gmail.com> (raw)
In-Reply-To: <20221118211624.19298-1-prestwoj@gmail.com>
The same pbkdf2 algorithm but uses a key ID as the password.
---
ell/cert-crypto.c | 27 +++++++++++++++++++++++++++
ell/cert.h | 6 +++++-
ell/ell.sym | 1 +
3 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/ell/cert-crypto.c b/ell/cert-crypto.c
index bf748b0..42f602e 100644
--- a/ell/cert-crypto.c
+++ b/ell/cert-crypto.c
@@ -200,6 +200,33 @@ LIB_EXPORT bool l_cert_pkcs5_pbkdf2(enum l_checksum_type type,
return r;
}
+LIB_EXPORT bool l_cert_pkcs5_pbkdf2_from_key_id(enum l_checksum_type type,
+ int32_t key_id,
+ const uint8_t *salt,
+ size_t salt_len,
+ unsigned int iter_count,
+ uint8_t *out_dk, size_t dk_len)
+{
+ size_t h_len;
+ struct l_checksum *checksum;
+ bool r;
+
+ h_len = cert_checksum_to_length(type);
+ if (!h_len)
+ return false;
+
+ checksum = l_checksum_new_hmac_from_key_id(type, key_id);
+ if (!checksum)
+ return false;
+
+ r = cert_pkcs5_pbkdf2(checksum, salt, salt_len, h_len, iter_count,
+ out_dk, dk_len);
+
+ l_checksum_free(checksum);
+
+ return r;
+}
+
/* RFC7292 Appendix B */
uint8_t *cert_pkcs12_pbkdf(const char *password,
const struct cert_pkcs12_hash *hash,
diff --git a/ell/cert.h b/ell/cert.h
index f637588..ce430fa 100644
--- a/ell/cert.h
+++ b/ell/cert.h
@@ -76,7 +76,11 @@ bool l_cert_pkcs5_pbkdf2(enum l_checksum_type type, const char *password,
const uint8_t *salt, size_t salt_len,
unsigned int iter_count,
uint8_t *out_dk, size_t dk_len);
-
+bool l_cert_pkcs5_pbkdf2_from_key_id(enum l_checksum_type type,
+ int32_t key_id, const uint8_t *salt,
+ size_t salt_len,
+ unsigned int iter_count,
+ uint8_t *out_dk, size_t dk_len);
#ifdef __cplusplus
}
#endif
diff --git a/ell/ell.sym b/ell/ell.sym
index 08252b8..2572989 100644
--- a/ell/ell.sym
+++ b/ell/ell.sym
@@ -565,6 +565,7 @@ global:
l_cert_load_container_file;
l_cert_pkcs5_pbkdf1;
l_cert_pkcs5_pbkdf2;
+ l_cert_pkcs5_pbkdf2_from_key_id;
/* ecc */
l_ecc_supported_ike_groups;
l_ecc_supported_tls_groups;
--
2.34.3
next prev parent reply other threads:[~2022-11-18 21:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-18 21:16 [RFC 0/8] Crypto operations by key ID James Prestwood
2022-11-18 21:16 ` [RFC 1/8] key: add l_key_search James Prestwood
2022-11-22 16:43 ` Denis Kenzior
2022-11-22 17:16 ` James Prestwood
2022-11-22 17:09 ` Denis Kenzior
2022-11-22 18:34 ` James Prestwood
2022-11-18 21:16 ` [RFC 2/8] unit: add key search test James Prestwood
2022-11-18 21:16 ` [RFC 3/8] checksum: commonize checksum creation James Prestwood
2022-11-22 16:46 ` Denis Kenzior
2022-11-18 21:16 ` [RFC 4/8] checksum: add l_checksum_new_hmac_from_key_id James Prestwood
2022-11-22 16:53 ` Denis Kenzior
2022-11-18 21:16 ` [RFC 5/8] cert-crypto: refactor l_cert_pkcs5_pbkdf2 James Prestwood
2022-11-22 17:00 ` Denis Kenzior
2022-11-18 21:16 ` James Prestwood [this message]
2022-11-22 17:03 ` [RFC 6/8] cert: add l_cert_pkcs5_pbkdf2_from_key_id Denis Kenzior
2022-11-18 21:16 ` [RFC 7/8] cert: add explicit length to l_cert_pkcs5_pbkdf2 James Prestwood
2022-11-18 21:16 ` [RFC 8/8] unit: update test-pbkdf2 with API change James Prestwood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221118211624.19298-7-prestwoj@gmail.com \
--to=prestwoj@gmail.com \
--cc=ell@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).