[Winpt-commits] r254 - trunk/Include

[scm-commit@wald.intevation.org]

Author: twoaday
Date: 2006-08-01 18:37:11 +0200 (Tue, 01 Aug 2006)
New Revision: 254

Modified:
   trunk/Include/wptGPG.h
Log:


Modified: trunk/Include/wptGPG.h
===================================================================
--- trunk/Include/wptGPG.h	2006-08-01 16:36:59 UTC (rev 253)
+++ trunk/Include/wptGPG.h	2006-08-01 16:37:11 UTC (rev 254)
@@ -28,6 +28,7 @@
 
 #define NO_STRICT 0
 
+/* Macro to indicate if a key is useable or not. */
 #define key_is_useable(key) (!(key)->revoked && \
 			     !(key)->expired && \
 			     !(key)->disabled)
@@ -48,12 +49,6 @@
     KEYCACHE_PUB = 1
 };
 
-enum entry_t {
-    ENTRY_OPAQUE = 1,
-    ENTRY_SINGLE = 2,
-    ENTRY_MULTI  = 3,
-    ENTRY_GROUP  = 4,
-};
 
 struct gpg_card_s;
 typedef struct gpg_card_s *gpg_card_t;
@@ -65,37 +60,8 @@
     int tr_update;
 };
 
-struct gpg_option_s {
-    struct gpg_option_s *next;
-    char *name;
-    char *val;
-    unsigned int used:1;
-    int type;  
-};
-typedef struct gpg_option_s *gpg_option_t;
 
-struct gpg_member_s {
-    struct gpg_member_s * next;
-    char *name;
-    unsigned int used:1;  
-};
-typedef struct gpg_member_s *gpg_member_t;
-
-struct gpg_group_s {
-    struct gpg_group_s *next;
-    struct gpg_member_s *list;
-    char *name;
-    unsigned int used:1;  
-};
-typedef struct gpg_group_s *gpg_group_t;
-
-struct gpg_optfile_s {
-    struct gpg_option_s *list;
-    struct gpg_group_s *grp;
-};
-typedef struct gpg_optfile_s *gpg_optfile_t;
-
-
+/* Structure for the passphrase callback. */
 struct passphrase_cb_s {
     int gpg_cmd;	/* sign or decrypt. */
     int pwd_init;	/* 1 = passphrase request via dialog. */
@@ -121,10 +87,10 @@
 extern int idea_available;
 
 /*-- wptGPG.cpp --*/
-char* get_gnupg_default_key( void );
-int set_gnupg_default_key( const char *key );
+char* get_gnupg_default_key (void);
+int set_gnupg_default_key (const char *key);
 char* get_gnupg_config (void);
-char* get_gnupg_keyring_from_options( const char *fname, int pub );
+char* get_gnupg_keyring_from_options (const char *fname, int pub);
 int check_gnupg_config (const char *fname, int *secrings, int *pubrings);
 char* get_gnupg_path( void );
 int check_gnupg_prog( void );
@@ -136,7 +102,7 @@
 int gnupg_load_config (void);
 char* multi_gnupg_path (int strict);
 
-int check_gnupg_options (const char *buf);
+int check_gnupg_options (const char *buf, int showerr);
 void init_gnupg_table (void);
 void free_gnupg_table (void);
 int keyring_check_last_access (void);
@@ -147,7 +113,6 @@
 void gnupg_backup_options ();
 void gnupg_backup_keyrings (int auto_backup, int backup_mode, 
 			    int include_secr);
-void gnupg_display_error (void);
 int gnupg_copy_keyrings (void);
 int check_gnupg_engine (const char *need_gpg_ver,
 			int *r_major, int *r_minor, int *r_patch);
@@ -172,6 +137,43 @@
 bool secret_key_available (void);
 
 /*-- wptGPGParser.cpp --*/
+enum entry_t {
+    ENTRY_OPAQUE = 1,
+    ENTRY_SINGLE = 2,
+    ENTRY_MULTI  = 3,
+    ENTRY_GROUP  = 4,
+};
+
+struct gpg_option_s {
+    struct gpg_option_s *next;
+    char *name;
+    char *val;
+    unsigned int used:1;
+    int type;  
+};
+typedef struct gpg_option_s *gpg_option_t;
+
+struct gpg_member_s {
+    struct gpg_member_s * next;
+    char *name;
+    unsigned int used:1;  
+};
+typedef struct gpg_member_s *gpg_member_t;
+
+struct gpg_group_s {
+    struct gpg_group_s *next;
+    struct gpg_member_s *list;
+    char *name;
+    unsigned int used:1;  
+};
+typedef struct gpg_group_s *gpg_group_t;
+
+struct gpg_optfile_s {
+    struct gpg_option_s *list;
+    struct gpg_group_s *grp;
+};
+typedef struct gpg_optfile_s *gpg_optfile_t;
+
 /* find */
 gpg_group_t find_group( gpg_optfile_t opt, const char *str );
 gpg_option_t find_option( gpg_optfile_t opt, const char *str );