mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-20 14:37:08 +01:00
Replaced deprecated type names
This commit is contained in:
parent
23fa5c9792
commit
e4cea09fe1
@ -479,7 +479,7 @@ pgp_create_blob_keyblock (KEYBOXBLOB blob, KBNODE keyblock)
|
|||||||
|
|
||||||
/* Write the raw certificate out */
|
/* Write the raw certificate out */
|
||||||
static int
|
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;
|
struct membuf *a = blob->buf;
|
||||||
const unsigned char *image;
|
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
|
/* Note: We should move calculation of the digest into libksba and
|
||||||
remove that parameter */
|
remove that parameter */
|
||||||
int
|
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)
|
unsigned char *sha1_digest, int as_ephemeral)
|
||||||
{
|
{
|
||||||
int i, rc = 0;
|
int i, rc = 0;
|
||||||
|
@ -102,7 +102,7 @@ struct keybox_handle {
|
|||||||
/* fixme */
|
/* fixme */
|
||||||
#endif /*KEYBOX_WITH_OPENPGP*/
|
#endif /*KEYBOX_WITH_OPENPGP*/
|
||||||
#ifdef KEYBOX_WITH_X509
|
#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);
|
unsigned char *sha1_digest, int as_ephemeral);
|
||||||
#endif /*KEYBOX_WITH_X509*/
|
#endif /*KEYBOX_WITH_X509*/
|
||||||
|
|
||||||
|
@ -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.
|
Return the last found cert. Caller must free it.
|
||||||
*/
|
*/
|
||||||
int
|
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;
|
const unsigned char *buffer;
|
||||||
size_t length;
|
size_t length;
|
||||||
size_t cert_off, cert_len;
|
size_t cert_off, cert_len;
|
||||||
KsbaReader reader = NULL;
|
ksba_reader_t reader = NULL;
|
||||||
KsbaCert cert = NULL;
|
ksba_cert_t cert = NULL;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
if (!hd)
|
if (!hd)
|
||||||
|
@ -337,7 +337,7 @@ blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob,
|
|||||||
|
|
||||||
#ifdef KEYBOX_WITH_X509
|
#ifdef KEYBOX_WITH_X509
|
||||||
int
|
int
|
||||||
keybox_insert_cert (KEYBOX_HANDLE hd, KsbaCert cert,
|
keybox_insert_cert (KEYBOX_HANDLE hd, ksba_cert_t cert,
|
||||||
unsigned char *sha1_digest)
|
unsigned char *sha1_digest)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
@ -375,7 +375,7 @@ keybox_insert_cert (KEYBOX_HANDLE hd, KsbaCert cert,
|
|||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
keybox_update_cert (KEYBOX_HANDLE hd, KsbaCert cert,
|
keybox_update_cert (KEYBOX_HANDLE hd, ksba_cert_t cert,
|
||||||
unsigned char *sha1_digest)
|
unsigned char *sha1_digest)
|
||||||
{
|
{
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -59,7 +59,7 @@ int keybox_set_ephemeral (KEYBOX_HANDLE hd, int yes);
|
|||||||
|
|
||||||
/*-- keybox-search.c --*/
|
/*-- keybox-search.c --*/
|
||||||
#ifdef KEYBOX_WITH_X509
|
#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*/
|
#endif /*KEYBOX_WITH_X509*/
|
||||||
|
|
||||||
int keybox_search_reset (KEYBOX_HANDLE hd);
|
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 --*/
|
/*-- keybox-update.c --*/
|
||||||
#ifdef KEYBOX_WITH_X509
|
#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);
|
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);
|
unsigned char *sha1_digest);
|
||||||
#endif /*KEYBOX_WITH_X509*/
|
#endif /*KEYBOX_WITH_X509*/
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user