summaryrefslogtreecommitdiff
path: root/libextra/gnutls_openpgp.c
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2003-12-21 09:47:34 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2003-12-21 09:47:34 +0000
commit2fdcd35de21b6d2a81a74580f368863f6c483ad1 (patch)
tree63a0e4a3b93259e18f9bbab8d3e1c89503350d67 /libextra/gnutls_openpgp.c
parent47568619a72f494719e468cc39a4b254954ea134 (diff)
downloadgnutls-2fdcd35de21b6d2a81a74580f368863f6c483ad1.tar.gz
Added gnutls_openpgp_key_get_key_usage(), and removed several compatibility
functions.
Diffstat (limited to 'libextra/gnutls_openpgp.c')
-rw-r--r--libextra/gnutls_openpgp.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c
index a4cba3e0db..86c2daffe3 100644
--- a/libextra/gnutls_openpgp.c
+++ b/libextra/gnutls_openpgp.c
@@ -217,11 +217,10 @@ kbx_data_to_keyring( int type, int enc, const char *data,
}
-CDK_PACKET*
-search_packet( const gnutls_datum *buf, int pkttype )
+cdk_packet_t search_packet( const gnutls_datum *buf, int pkttype )
{
static cdk_kbnode_t knode = NULL;
- CDK_PACKET *pkt;
+ cdk_packet_t pkt;
if( !buf && !pkttype ) {
cdk_kbnode_release( knode );
@@ -296,7 +295,7 @@ _gnutls_openpgp_raw_privkey_to_gkey( gnutls_privkey *pkey,
const gnutls_datum *raw_key)
{
cdk_kbnode_t snode;
- CDK_PACKET *pkt;
+ cdk_packet_t pkt;
cdk_stream_t out;
cdk_pkt_seckey_t sk = NULL;
int pke_algo, i, j;
@@ -378,7 +377,7 @@ int
_gnutls_openpgp_raw_key_to_gcert( gnutls_cert *cert, const gnutls_datum *raw )
{
cdk_kbnode_t knode = NULL;
- CDK_PACKET *pkt = NULL;
+ cdk_packet_t pkt = NULL;
int rc;
if( !cert ) {
@@ -525,7 +524,7 @@ gnutls_certificate_set_openpgp_key_mem( gnutls_certificate_credentials res,
{
gnutls_datum raw;
cdk_kbnode_t knode = NULL, ctx = NULL, p;
- CDK_PACKET *pkt;
+ cdk_packet_t pkt;
int i = 0;
int rc = 0;
cdk_stream_t inp = NULL;
@@ -710,7 +709,7 @@ int
gnutls_openpgp_count_key_names( const gnutls_datum *cert )
{
cdk_kbnode_t knode, p, ctx = NULL;
- CDK_PACKET *pkt;
+ cdk_packet_t pkt;
int nuids = 0;
if( cert == NULL ) {