From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 2 Feb 2006 10:14:05 +0000 (+0000)
Subject: Fix prototypes for AIX compiler, reported by "Heiden, John"
X-Git-Tag: gnutls_1_2_10~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efca5f87a7c688f2966bd4a2ae3f5e79ce0db7aa;p=thirdparty%2Fgnutls.git

Fix prototypes for AIX compiler, reported by "Heiden, John"
<JHeiden@UTNet.UToledo.Edu>.
---

diff --git a/libextra/opencdk/main.h b/libextra/opencdk/main.h
index d20b7d490b..0ae68893ba 100644
--- a/libextra/opencdk/main.h
+++ b/libextra/opencdk/main.h
@@ -1,4 +1,5 @@
 /* main.h
+ *       Copyright (C) 2006 Free Software Foundation
  *       Copyright (C) 2002, 2003, 2004 Timo Schulz
  *
  * This file is part of OpenCDK.
@@ -112,9 +113,10 @@ void _cdk_kbnode_add (cdk_kbnode_t root, cdk_kbnode_t node);
 void _cdk_kbnode_clone (cdk_kbnode_t node);
 
 /*-- sesskey.c --*/
-int _cdk_digest_encode_pkcs1( byte ** r_md, size_t * r_mdlen, int pk_algo,
-                              const byte * md, int digest_algo, unsigned nbits );
-int _cdk_sk_unprotect_auto( cdk_ctx_t hd, cdk_pkt_seckey_t sk );
+cdk_error_t _cdk_digest_encode_pkcs1( byte ** r_md, size_t * r_mdlen,
+				      int pk_algo, const byte * md,
+				      int digest_algo, unsigned nbits );
+cdk_error_t _cdk_sk_unprotect_auto( cdk_ctx_t hd, cdk_pkt_seckey_t sk );
 
 /*-- keydb.c --*/
 int _cdk_keydb_get_pk_byusage (cdk_keydb_hd_t hd, const char * name,
diff --git a/libextra/opencdk/packet.h b/libextra/opencdk/packet.h
index 89f62eb5c8..c91e293b10 100644
--- a/libextra/opencdk/packet.h
+++ b/libextra/opencdk/packet.h
@@ -1,5 +1,6 @@
 /* -*- Mode: C; c-file-style: "bsd" -*-
  * packet.h - Internal packet routines
+ *        Copyright (C) 2006 Free Software Foundation
  *        Copyright (C) 2002, 2003 Timo Schulz
  *
  * This file is part of OpenCDK.
@@ -35,12 +36,12 @@ void _cdk_free_signature( cdk_pkt_signature_t sig );
 void _cdk_free_pubkey( cdk_pkt_pubkey_t pk );
 void _cdk_free_seckey( cdk_pkt_seckey_t sk );
 cdk_prefitem_t _cdk_copy_prefs( const cdk_prefitem_t prefs );
-int _cdk_copy_userid( cdk_pkt_userid_t *dst, cdk_pkt_userid_t src );
-int _cdk_copy_pubkey( cdk_pkt_pubkey_t* dst, cdk_pkt_pubkey_t src );
-int _cdk_copy_seckey( cdk_pkt_seckey_t* dst, cdk_pkt_seckey_t src );
-int _cdk_copy_pk_to_sk( cdk_pkt_pubkey_t pk, cdk_pkt_seckey_t sk );
-int _cdk_copy_signature( cdk_pkt_signature_t* dst, cdk_pkt_signature_t src );
-int _cdk_pubkey_compare( cdk_pkt_pubkey_t a, cdk_pkt_pubkey_t b );
+cdk_error_t _cdk_copy_userid( cdk_pkt_userid_t *dst, cdk_pkt_userid_t src );
+cdk_error_t _cdk_copy_pubkey( cdk_pkt_pubkey_t* dst, cdk_pkt_pubkey_t src );
+cdk_error_t _cdk_copy_seckey( cdk_pkt_seckey_t* dst, cdk_pkt_seckey_t src );
+cdk_error_t _cdk_copy_pk_to_sk( cdk_pkt_pubkey_t pk, cdk_pkt_seckey_t sk );
+cdk_error_t _cdk_copy_signature( cdk_pkt_signature_t* dst, cdk_pkt_signature_t src );
+cdk_error_t _cdk_pubkey_compare( cdk_pkt_pubkey_t a, cdk_pkt_pubkey_t b );
 
 #endif /* CDK_PACKET_H */