summaryrefslogtreecommitdiff
path: root/libextra
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2004-03-15 15:54:50 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2004-03-15 15:54:50 +0000
commitc0de7fa380652f4c14dec290adb69ef3bcfe6776 (patch)
treee90a9563ed390284bb7e1ac57c9d25f1e39b5965 /libextra
parentecf09c05a2a626ea2075659e0953687e1acf0c9e (diff)
downloadgnutls-c0de7fa380652f4c14dec290adb69ef3bcfe6776.tar.gz
Finally corrected a compilation issue when opencdk was installed in a non-base directory. Some other minor fixes.
Diffstat (limited to 'libextra')
-rw-r--r--libextra/openpgp/openpgp.c2
-rw-r--r--libextra/openpgp/xml.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/libextra/openpgp/openpgp.c b/libextra/openpgp/openpgp.c
index 5ebdab7625..3aac1bd6cf 100644
--- a/libextra/openpgp/openpgp.c
+++ b/libextra/openpgp/openpgp.c
@@ -449,7 +449,7 @@ gnutls_openpgp_key_get_id( gnutls_openpgp_key key,
{
cdk_packet_t pkt;
cdk_pkt_pubkey_t pk = NULL;
- unsigned long kid[2];
+ unsigned int kid[2];
if( !key || !keyid ) {
gnutls_assert( );
diff --git a/libextra/openpgp/xml.c b/libextra/openpgp/xml.c
index d95e10e85a..251bd25b6d 100644
--- a/libextra/openpgp/xml.c
+++ b/libextra/openpgp/xml.c
@@ -140,7 +140,7 @@ xml_add_key( gnutls_string *xmlkey, int ext, cdk_pkt_pubkey_t pk, int sub )
const char *algo, *s;
char keyid[16], fpr[41], tmp[32];
uint8 fingerpr[20];
- unsigned long kid[2];
+ unsigned int kid[2];
int i = 0, rc = 0;
if( !xmlkey || !pk ) {
@@ -254,7 +254,7 @@ xml_add_sig( gnutls_string *xmlkey, int ext, cdk_pkt_signature_t sig )
{
const char *algo, *s;
char tmp[32], keyid[16];
- unsigned long kid[2];
+ unsigned int kid[2];
int rc = 0;
if( !xmlkey || !sig ) {