diff options
| author | Werner Koch <wk@gnupg.org> | 2003-12-17 13:27:21 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2003-12-17 13:27:21 +0100 |
| commit | e4cea09fe116d875163baae3b7895101755388d4 (patch) | |
| tree | a585dc61c273c5fe17219739611e6397a2f439f5 /kbx | |
| parent | * card-util.c (print_name): Fixed bad format string usage. (diff) | |
| download | gnupg2-e4cea09fe116d875163baae3b7895101755388d4.tar.xz gnupg2-e4cea09fe116d875163baae3b7895101755388d4.zip | |
Replaced deprecated type names
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/keybox-blob.c | 4 | ||||
| -rw-r--r-- | kbx/keybox-defs.h | 2 | ||||
| -rw-r--r-- | kbx/keybox-search.c | 6 | ||||
| -rw-r--r-- | kbx/keybox-update.c | 4 | ||||
| -rw-r--r-- | kbx/keybox.h | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/kbx/keybox-blob.c b/kbx/keybox-blob.c index ca36d6264..defddad69 100644 --- a/kbx/keybox-blob.c +++ b/kbx/keybox-blob.c @@ -479,7 +479,7 @@ pgp_create_blob_keyblock (KEYBOXBLOB blob, KBNODE keyblock) /* Write the raw certificate out */ static int -x509_create_blob_cert (KEYBOXBLOB blob, KsbaCert cert) +x509_create_blob_cert (KEYBOXBLOB blob, ksba_cert_t cert) { struct membuf *a = blob->buf; const unsigned char *image; @@ -808,7 +808,7 @@ x509_email_kludge (const char *name) /* Note: We should move calculation of the digest into libksba and remove that parameter */ int -_keybox_create_x509_blob (KEYBOXBLOB *r_blob, KsbaCert cert, +_keybox_create_x509_blob (KEYBOXBLOB *r_blob, ksba_cert_t cert, unsigned char *sha1_digest, int as_ephemeral) { int i, rc = 0; diff --git a/kbx/keybox-defs.h b/kbx/keybox-defs.h index fcae64c25..fa145f7e5 100644 --- a/kbx/keybox-defs.h +++ b/kbx/keybox-defs.h @@ -102,7 +102,7 @@ struct keybox_handle { /* fixme */ #endif /*KEYBOX_WITH_OPENPGP*/ #ifdef KEYBOX_WITH_X509 -int _keybox_create_x509_blob (KEYBOXBLOB *r_blob, KsbaCert cert, +int _keybox_create_x509_blob (KEYBOXBLOB *r_blob, ksba_cert_t cert, unsigned char *sha1_digest, int as_ephemeral); #endif /*KEYBOX_WITH_X509*/ diff --git a/kbx/keybox-search.c b/kbx/keybox-search.c index ff95815a2..e834cd2bf 100644 --- a/kbx/keybox-search.c +++ b/kbx/keybox-search.c @@ -753,13 +753,13 @@ keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc) Return the last found cert. Caller must free it. */ int -keybox_get_cert (KEYBOX_HANDLE hd, KsbaCert *r_cert) +keybox_get_cert (KEYBOX_HANDLE hd, ksba_cert_t *r_cert) { const unsigned char *buffer; size_t length; size_t cert_off, cert_len; - KsbaReader reader = NULL; - KsbaCert cert = NULL; + ksba_reader_t reader = NULL; + ksba_cert_t cert = NULL; int rc; if (!hd) diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c index 52ad258b0..ed9ca2bf7 100644 --- a/kbx/keybox-update.c +++ b/kbx/keybox-update.c @@ -337,7 +337,7 @@ blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob, #ifdef KEYBOX_WITH_X509 int -keybox_insert_cert (KEYBOX_HANDLE hd, KsbaCert cert, +keybox_insert_cert (KEYBOX_HANDLE hd, ksba_cert_t cert, unsigned char *sha1_digest) { int rc; @@ -375,7 +375,7 @@ keybox_insert_cert (KEYBOX_HANDLE hd, KsbaCert cert, } int -keybox_update_cert (KEYBOX_HANDLE hd, KsbaCert cert, +keybox_update_cert (KEYBOX_HANDLE hd, ksba_cert_t cert, unsigned char *sha1_digest) { return -1; diff --git a/kbx/keybox.h b/kbx/keybox.h index 5fe5516d4..5a5ad2933 100644 --- a/kbx/keybox.h +++ b/kbx/keybox.h @@ -59,7 +59,7 @@ int keybox_set_ephemeral (KEYBOX_HANDLE hd, int yes); /*-- keybox-search.c --*/ #ifdef KEYBOX_WITH_X509 -int keybox_get_cert (KEYBOX_HANDLE hd, KsbaCert *ret_cert); +int keybox_get_cert (KEYBOX_HANDLE hd, ksba_cert_t *ret_cert); #endif /*KEYBOX_WITH_X509*/ int keybox_search_reset (KEYBOX_HANDLE hd); @@ -68,9 +68,9 @@ int keybox_search (KEYBOX_HANDLE hd, KEYBOX_SEARCH_DESC *desc, size_t ndesc); /*-- keybox-update.c --*/ #ifdef KEYBOX_WITH_X509 -int keybox_insert_cert (KEYBOX_HANDLE hd, KsbaCert cert, +int keybox_insert_cert (KEYBOX_HANDLE hd, ksba_cert_t cert, unsigned char *sha1_digest); -int keybox_update_cert (KEYBOX_HANDLE hd, KsbaCert cert, +int keybox_update_cert (KEYBOX_HANDLE hd, ksba_cert_t cert, unsigned char *sha1_digest); #endif /*KEYBOX_WITH_X509*/ |