diff options
| author | Stef Walter <stef@thewalter.net> | 2013-08-28 10:37:44 +0200 |
|---|---|---|
| committer | Stef Walter <stef@thewalter.net> | 2013-08-29 10:31:38 +0200 |
| commit | b693517966b1cbe5b81e39aeefad7b52b6f10492 (patch) | |
| tree | 4a31899267b6c37ee7ff778b92510f3be1f68add /trust/extract-pem.c | |
| parent | 714e4a22a82295c41360fbfa6019a31b1e2a0f30 (diff) | |
| download | p11-kit-b693517966b1cbe5b81e39aeefad7b52b6f10492.tar.gz | |
trust: Refactor enumeration of certificates to extract
Because we want to use this same logic for listing trust
Diffstat (limited to 'trust/extract-pem.c')
| -rw-r--r-- | trust/extract-pem.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/trust/extract-pem.c b/trust/extract-pem.c index 718cd99..1e1c857 100644 --- a/trust/extract-pem.c +++ b/trust/extract-pem.c @@ -46,8 +46,8 @@ #include <stdlib.h> bool -p11_extract_pem_bundle (P11KitIter *iter, - p11_extract_info *ex) +p11_extract_pem_bundle (p11_enumerate *ex, + const char *destination) { char *comment; p11_buffer buf; @@ -56,19 +56,19 @@ p11_extract_pem_bundle (P11KitIter *iter, bool first = true; CK_RV rv; - file = p11_save_open_file (ex->destination, NULL, ex->flags); + file = p11_save_open_file (destination, NULL, ex->flags); if (!file) return false; p11_buffer_init (&buf, 0); - while ((rv = p11_kit_iter_next (iter)) == CKR_OK) { + while ((rv = p11_kit_iter_next (ex->iter)) == CKR_OK) { if (!p11_buffer_reset (&buf, 2048)) return_val_if_reached (false); if (!p11_pem_write (ex->cert_der, ex->cert_len, "CERTIFICATE", &buf)) return_val_if_reached (false); - comment = p11_extract_info_comment (ex, first); + comment = p11_enumerate_comment (ex, first); first = false; ret = p11_save_write (file, comment, -1) && @@ -99,8 +99,8 @@ p11_extract_pem_bundle (P11KitIter *iter, } bool -p11_extract_pem_directory (P11KitIter *iter, - p11_extract_info *ex) +p11_extract_pem_directory (p11_enumerate *ex, + const char *destination) { p11_save_file *file; p11_save_dir *dir; @@ -109,19 +109,19 @@ p11_extract_pem_directory (P11KitIter *iter, char *filename; CK_RV rv; - dir = p11_save_open_directory (ex->destination, ex->flags); + dir = p11_save_open_directory (destination, ex->flags); if (dir == NULL) return false; p11_buffer_init (&buf, 0); - while ((rv = p11_kit_iter_next (iter)) == CKR_OK) { + while ((rv = p11_kit_iter_next (ex->iter)) == CKR_OK) { if (!p11_buffer_reset (&buf, 2048)) return_val_if_reached (false); if (!p11_pem_write (ex->cert_der, ex->cert_len, "CERTIFICATE", &buf)) return_val_if_reached (false); - filename = p11_extract_info_filename (ex); + filename = p11_enumerate_filename (ex); return_val_if_fail (filename != NULL, false); file = p11_save_open_file_in (dir, filename, ".pem"); |