Fix preference setting in new keys

[gnupg.git] / g10 / keydb.h

diff --git a/g10/keydb.h b/g10/keydb.h
index 221c01c..1140453 100644 (file)
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -1,11 +1,12 @@
 /* keydb.h - Key database
 /* keydb.h - Key database

- *     Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ *               2006, 2010 Free Software Foundation, Inc.

  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or

  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,


@@ -14,24 +15,33 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.

  */
 
  */
 

-#ifndef GPG_KEYDB_H
-#define GPG_KEYDB_H
+#ifndef G10_KEYDB_H
+#define G10_KEYDB_H

 
 

-#ifdef HAVE_LIBGDBM
-  #include <gdbm.h>
-#endif
+#include <assuan.h>

 
 

-#include "basicdefs.h"
+#include "types.h"
+#include "util.h"

 #include "packet.h"
 #include "packet.h"

+#include "cipher.h"

 
 

-#define MAX_FINGERPRINT_LEN 20
+/* What qualifies as a certification (rather than a signature?) */
+#define IS_CERT(s)       (IS_KEY_SIG(s) || IS_UID_SIG(s) || IS_SUBKEY_SIG(s) \
+                         || IS_KEY_REV(s) || IS_UID_REV(s) || IS_SUBKEY_REV(s))
+#define IS_SIG(s)        (!IS_CERT(s))
+#define IS_KEY_SIG(s)    ((s)->sig_class == 0x1f)
+#define IS_UID_SIG(s)    (((s)->sig_class & ~3) == 0x10)
+#define IS_SUBKEY_SIG(s) ((s)->sig_class == 0x18)
+#define IS_KEY_REV(s)    ((s)->sig_class == 0x20)
+#define IS_UID_REV(s)    ((s)->sig_class == 0x30)
+#define IS_SUBKEY_REV(s) ((s)->sig_class == 0x28)

 
 struct getkey_ctx_s;
 typedef struct getkey_ctx_s *GETKEY_CTX;
 
 struct getkey_ctx_s;
 typedef struct getkey_ctx_s *GETKEY_CTX;

+typedef struct getkey_ctx_s *getkey_ctx_t;

 
 /****************
  * A Keyblock is all packets which form an entire certificate;
 
 /****************
  * A Keyblock is all packets which form an entire certificate;


@@ -41,7 +51,6 @@ typedef struct getkey_ctx_s *GETKEY_CTX;
  * This structure is also used to bind arbitrary packets together.
  */
 
  * This structure is also used to bind arbitrary packets together.
  */
 

-typedef struct kbnode_struct *KBNODE;

 struct kbnode_struct {
     KBNODE next;
     PACKET *pkt;
 struct kbnode_struct {
     KBNODE next;
     PACKET *pkt;


@@ -56,8 +65,7 @@ struct kbnode_struct {
 
 enum resource_type {
     rt_UNKNOWN = 0,
 
 enum resource_type {
     rt_UNKNOWN = 0,

-    rt_RING = 1,
-    rt_GDBM = 2
+    rt_RING = 1

 };
 
 
 };
 
 


@@ -68,31 +76,32 @@ enum resource_type {
 struct keyblock_pos_struct {
     int   resno;     /* resource number */
     enum resource_type rt;
 struct keyblock_pos_struct {
     int   resno;     /* resource number */
     enum resource_type rt;

-    ulong offset;    /* position information */
+    off_t offset;    /* position information */

     unsigned count;  /* length of the keyblock in packets */
     unsigned count;  /* length of the keyblock in packets */

-    IOBUF  fp;      /* used by enum_keyblocks */
+    iobuf_t  fp;     /* Used by enum_keyblocks. */

     int secret;      /* working on a secret keyring */
     int secret;      /* working on a secret keyring */

-  #ifdef HAVE_LIBGDBM
-    GDBM_FILE dbf;
-    byte keybuf[21];
-  #endif

     PACKET *pkt;     /* ditto */
     int valid;
 };
 typedef struct keyblock_pos_struct KBPOS;
 
     PACKET *pkt;     /* ditto */
     int valid;
 };
 typedef struct keyblock_pos_struct KBPOS;
 

-/* structure to hold a couple of public key certificates */
-struct pk_list {
-    PK_LIST next;
-    PKT_public_key *pk;
-    int mark;
+/* Structure to hold a couple of public key certificates. */
+typedef struct pk_list *PK_LIST;  /* Deprecated. */
+typedef struct pk_list *pk_list_t;
+struct pk_list 
+{
+  PK_LIST next;
+  PKT_public_key *pk;
+  int flags; /* flag bit 1==throw_keyid */

 };
 
 };
 

-/* structure to hold a couple of secret key certificates */
-struct sk_list {
-    SK_LIST next;
-    PKT_secret_key *sk;
-    int mark;
+/* Structure to hold a list of secret key certificates.  */
+typedef struct sk_list *SK_LIST;
+struct sk_list 
+{
+  SK_LIST next;
+  PKT_public_key *pk;
+  int mark; /* not used */

 };
 
 /* structure to collect all information which can be used to
 };
 
 /* structure to collect all information which can be used to


@@ -107,63 +116,154 @@ struct pubkey_find_info {
 };
 
 
 };
 
 

+typedef struct keydb_handle *KEYDB_HANDLE;
+
+
+/* Helper type for preference fucntions. */
+union pref_hint
+{
+  int digest_length;
+};
+
+
+/*-- keydb.c --*/
+
+/*
+  Flag 1 == force
+  Flag 2 == default
+*/
+int keydb_add_resource (const char *url, int flags);
+KEYDB_HANDLE keydb_new (void);
+void keydb_release (KEYDB_HANDLE hd);
+const char *keydb_get_resource_name (KEYDB_HANDLE hd);
+int keydb_get_keyblock (KEYDB_HANDLE hd, KBNODE *ret_kb);
+int keydb_update_keyblock (KEYDB_HANDLE hd, KBNODE kb);
+int keydb_insert_keyblock (KEYDB_HANDLE hd, KBNODE kb);
+int keydb_delete_keyblock (KEYDB_HANDLE hd);
+int keydb_locate_writable (KEYDB_HANDLE hd, const char *reserved);
+void keydb_rebuild_caches (int noisy);
+int keydb_search_reset (KEYDB_HANDLE hd);
+#define keydb_search(a,b,c) keydb_search2((a),(b),(c),NULL)
+int keydb_search2 (KEYDB_HANDLE hd, KEYDB_SEARCH_DESC *desc,
+                  size_t ndesc, size_t *descindex);
+int keydb_search_first (KEYDB_HANDLE hd);
+int keydb_search_next (KEYDB_HANDLE hd);
+int keydb_search_kid (KEYDB_HANDLE hd, u32 *kid);
+int keydb_search_fpr (KEYDB_HANDLE hd, const byte *fpr);
+

 
 /*-- pkclist.c --*/
 
 /*-- pkclist.c --*/

+void show_revocation_reason( PKT_public_key *pk, int mode );

 int  check_signatures_trust( PKT_signature *sig );
 int  check_signatures_trust( PKT_signature *sig );

-void release_pk_list( PK_LIST pk_list );
-int  build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use );
-int  select_algo_from_prefs( PK_LIST pk_list, int preftype );
+
+void release_pk_list (PK_LIST pk_list);
+int  build_pk_list (strlist_t rcpts, PK_LIST *ret_pk_list, unsigned use);
+gpg_error_t find_and_check_key (const char *name, unsigned int use, 
+                                int mark_hidden, pk_list_t *pk_list_addr);
+
+int  algo_available( preftype_t preftype, int algo,
+                    const union pref_hint *hint );
+int  select_algo_from_prefs( PK_LIST pk_list, int preftype,
+                            int request, const union pref_hint *hint);
+int  select_mdc_from_pklist (PK_LIST pk_list);
+void warn_missing_mdc_from_pklist (PK_LIST pk_list);
+void warn_missing_aes_from_pklist (PK_LIST pk_list);

 
 /*-- skclist.c --*/
 
 /*-- skclist.c --*/

+int  random_is_faked (void);

 void release_sk_list( SK_LIST sk_list );
 void release_sk_list( SK_LIST sk_list );

-int  build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list,
-                                           int unlock, unsigned use );
+gpg_error_t  build_sk_list (strlist_t locusr, SK_LIST *ret_sk_list,
+                            unsigned use);

 
 /*-- passphrase.h --*/
 
 /*-- passphrase.h --*/

+unsigned char encode_s2k_iterations (int iterations);
+assuan_context_t agent_open (int try, const char *orig_codeset);
+void agent_close (assuan_context_t ctx);

 int  have_static_passphrase(void);
 int  have_static_passphrase(void);

+void set_passphrase_from_string(const char *pass);

 void read_passphrase_from_fd( int fd );
 void read_passphrase_from_fd( int fd );

+void passphrase_clear_cache ( u32 *keyid, const char *cacheid, int algo );
+DEK *passphrase_to_dek_ext(u32 *keyid, int pubkey_algo,
+                           int cipher_algo, STRING2KEY *s2k, int mode,
+                           const char *tryagain_text,
+                           const char *custdesc, const char *custprompt,
+                           int *canceled);

 DEK *passphrase_to_dek( u32 *keyid, int pubkey_algo,
 DEK *passphrase_to_dek( u32 *keyid, int pubkey_algo,

-                       int cipher_algo, STRING2KEY *s2k, int mode);
+                       int cipher_algo, STRING2KEY *s2k, int mode,
+                        const char *tryagain_text, int *canceled);

 void set_next_passphrase( const char *s );
 char *get_last_passphrase(void);
 void set_next_passphrase( const char *s );
 char *get_last_passphrase(void);

+void next_to_last_passphrase(void);

 
 /*-- getkey.c --*/
 
 /*-- getkey.c --*/

-int classify_user_id( const char *name, u32 *keyid, byte *fprint,
-                     const char **retstr, size_t *retlen );
+void cache_public_key( PKT_public_key *pk );

 void getkey_disable_caches(void);
 int get_pubkey( PKT_public_key *pk, u32 *keyid );
 void getkey_disable_caches(void);
 int get_pubkey( PKT_public_key *pk, u32 *keyid );

+int get_pubkey_fast ( PKT_public_key *pk, u32 *keyid );

 KBNODE get_pubkeyblock( u32 *keyid );
 KBNODE get_pubkeyblock( u32 *keyid );

-int get_pubkey_byname( GETKEY_CTX *rx, PKT_public_key *pk,
-                      const char *name, KBNODE *ret_keyblock );
+int get_pubkey_byname (GETKEY_CTX *rx, PKT_public_key *pk,  const char *name,
+                       KBNODE *ret_keyblock, KEYDB_HANDLE *ret_kdbhd,
+                      int include_unusable, int no_akl );

 int get_pubkey_bynames( GETKEY_CTX *rx, PKT_public_key *pk,
 int get_pubkey_bynames( GETKEY_CTX *rx, PKT_public_key *pk,

-                       STRLIST names, KBNODE *ret_keyblock );
+                       strlist_t names, KBNODE *ret_keyblock );

 int get_pubkey_next( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock );
 void get_pubkey_end( GETKEY_CTX ctx );
 int get_pubkey_next( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock );
 void get_pubkey_end( GETKEY_CTX ctx );

-int get_seckey( PKT_secret_key *sk, u32 *keyid );
-int get_primary_seckey( PKT_secret_key *sk, u32 *keyid );
+gpg_error_t get_seckey (PKT_public_key *pk, u32 *keyid);

 int get_pubkey_byfprint( PKT_public_key *pk, const byte *fprint,
                                                 size_t fprint_len );
 int get_pubkey_byfprint( PKT_public_key *pk, const byte *fprint,
                                                 size_t fprint_len );

+int get_pubkey_byfprint_fast (PKT_public_key *pk,
+                              const byte *fprint, size_t fprint_len);

 int get_keyblock_byfprint( KBNODE *ret_keyblock, const byte *fprint,
                                                 size_t fprint_len );
 int get_keyblock_byfprint( KBNODE *ret_keyblock, const byte *fprint,
                                                 size_t fprint_len );

-int get_keyblock_bylid( KBNODE *ret_keyblock, ulong lid );
-int seckey_available( u32 *keyid );
-int get_seckey_byname( PKT_secret_key *sk, const char *name, int unlock );
-int get_seckey_bynames( GETKEY_CTX *rx, PKT_secret_key *sk,
-                       STRLIST names, KBNODE *ret_keyblock );
-int get_seckey_next( GETKEY_CTX ctx, PKT_secret_key *sk, KBNODE *ret_keyblock );
-void get_seckey_end( GETKEY_CTX ctx );
-int enum_secret_keys( void **context, PKT_secret_key *sk, int with_subkeys );
+
+int have_secret_key_with_kid (u32 *keyid);
+
+gpg_error_t get_seckey_byname (PKT_public_key *pk, const char *name);
+
+gpg_error_t get_seckey_byfprint (PKT_public_key *pk,
+                                 const byte *fprint, size_t fprint_len);
+gpg_error_t get_seckeyblock_byfprint (kbnode_t *ret_keyblock, 
+                                      const byte *fprint, size_t fprint_len);
+
+gpg_error_t getkey_bynames (getkey_ctx_t *retctx, PKT_public_key *pk,
+                            strlist_t names, int want_secret,
+                            kbnode_t *ret_keyblock);
+gpg_error_t getkey_byname (getkey_ctx_t *retctx, PKT_public_key *pk,
+                           const char *name, int want_secret,
+                           kbnode_t *ret_keyblock);
+gpg_error_t getkey_next (getkey_ctx_t ctx, PKT_public_key *pk,
+                         kbnode_t *ret_keyblock);
+void getkey_end (getkey_ctx_t ctx);
+
+int have_any_secret_key (ctrl_t ctrl, kbnode_t keyblock);
+
+
+int enum_secret_keys( void **context, PKT_secret_key *sk,
+                     int with_subkeys, int with_spm );

 void merge_keys_and_selfsig( KBNODE keyblock );
 char*get_user_id_string( u32 *keyid );
 void merge_keys_and_selfsig( KBNODE keyblock );
 char*get_user_id_string( u32 *keyid );

+char*get_user_id_string_native( u32 *keyid );

 char*get_long_user_id_string( u32 *keyid );
 char*get_user_id( u32 *keyid, size_t *rn );
 char*get_long_user_id_string( u32 *keyid );
 char*get_user_id( u32 *keyid, size_t *rn );

+char*get_user_id_native( u32 *keyid );
+KEYDB_HANDLE get_ctx_handle(GETKEY_CTX ctx);
+void release_akl(void);
+int parse_auto_key_locate(char *options);

 
 /*-- keyid.c --*/
 int pubkey_letter( int algo );
 
 /*-- keyid.c --*/
 int pubkey_letter( int algo );

+u32 v3_keyid (gcry_mpi_t a, u32 *ki);
+void hash_public_key( gcry_md_hd_t md, PKT_public_key *pk );
+size_t keystrlen(void);
+const char *keystr(u32 *keyid);
+const char *keystr_from_pk(PKT_public_key *pk);
+const char *keystr_from_sk(PKT_secret_key *sk);
+const char *keystr_from_desc(KEYDB_SEARCH_DESC *desc);

 u32 keyid_from_sk( PKT_secret_key *sk, u32 *keyid );
 u32 keyid_from_pk( PKT_public_key *pk, u32 *keyid );
 u32 keyid_from_sig( PKT_signature *sig, u32 *keyid );
 u32 keyid_from_sk( PKT_secret_key *sk, u32 *keyid );
 u32 keyid_from_pk( PKT_public_key *pk, u32 *keyid );
 u32 keyid_from_sig( PKT_signature *sig, u32 *keyid );

-u32 keyid_from_fingerprint( const byte *fprint, size_t fprint_len, u32 *keyid );
+u32 keyid_from_fingerprint(const byte *fprint, size_t fprint_len, u32 *keyid);
+byte *namehash_from_uid(PKT_user_id *uid);

 unsigned nbits_from_pk( PKT_public_key *pk );
 unsigned nbits_from_sk( PKT_secret_key *sk );
 const char *datestr_from_pk( PKT_public_key *pk );
 unsigned nbits_from_pk( PKT_public_key *pk );
 unsigned nbits_from_sk( PKT_secret_key *sk );
 const char *datestr_from_pk( PKT_public_key *pk );


@@ -171,8 +271,21 @@ const char *datestr_from_sk( PKT_secret_key *sk );
 const char *datestr_from_sig( PKT_signature *sig );
 const char *expirestr_from_pk( PKT_public_key *pk );
 const char *expirestr_from_sk( PKT_secret_key *sk );
 const char *datestr_from_sig( PKT_signature *sig );
 const char *expirestr_from_pk( PKT_public_key *pk );
 const char *expirestr_from_sk( PKT_secret_key *sk );

+const char *expirestr_from_sig( PKT_signature *sig );
+const char *revokestr_from_pk( PKT_public_key *pk );
+const char *usagestr_from_pk( PKT_public_key *pk );
+const char *colon_strtime (u32 t);
+const char *colon_datestr_from_pk (PKT_public_key *pk);
+const char *colon_datestr_from_sk (PKT_secret_key *sk);
+const char *colon_datestr_from_sig (PKT_signature *sig);
+const char *colon_expirestr_from_sig (PKT_signature *sig);

 byte *fingerprint_from_sk( PKT_secret_key *sk, byte *buf, size_t *ret_len );
 byte *fingerprint_from_pk( PKT_public_key *pk, byte *buf, size_t *ret_len );
 byte *fingerprint_from_sk( PKT_secret_key *sk, byte *buf, size_t *ret_len );
 byte *fingerprint_from_pk( PKT_public_key *pk, byte *buf, size_t *ret_len );

+char *serialno_and_fpr_from_sk (const unsigned char *sn, size_t snlen,
+                                PKT_secret_key *sk);
+gpg_error_t keygrip_from_pk (PKT_public_key *pk, unsigned char *array);
+gpg_error_t hexkeygrip_from_pk (PKT_public_key *pk, char **r_grip);
+

 
 /*-- kbnode.c --*/
 KBNODE new_kbnode( PACKET *pkt );
 
 /*-- kbnode.c --*/
 KBNODE new_kbnode( PACKET *pkt );


@@ -191,27 +304,4 @@ void clear_kbnode_flags( KBNODE n );
 int  commit_kbnode( KBNODE *root );
 void dump_kbnode( KBNODE node );
 
 int  commit_kbnode( KBNODE *root );
 void dump_kbnode( KBNODE node );
 

-/*-- ringedit.c --*/
-const char *enum_keyblock_resources( int *sequence, int secret );
-int add_keyblock_resource( const char *resname, int force, int secret );
-const char *keyblock_resource_name( KBPOS *kbpos );
-int get_keyblock_handle( const char *filename, int secret, KBPOS *kbpos );
-int locate_keyblock_by_fpr( KBPOS *kbpos, const byte *fpr,
-                                           int fprlen, int secret );
-int locate_keyblock_by_keyid( KBPOS *kbpos, u32 *keyid,
-                                           int shortkid, int secret );
-int find_keyblock( PUBKEY_FIND_INFO info, KBPOS *kbpos );
-int find_keyblock_byname( KBPOS *kbpos, const char *username );
-int find_keyblock_bypk( KBPOS *kbpos, PKT_public_key *pk );
-int find_keyblock_bysk( KBPOS *kbpos, PKT_secret_key *sk );
-int find_secret_keyblock_byname( KBPOS *kbpos, const char *username );
-int lock_keyblock( KBPOS *kbpos );
-void unlock_keyblock( KBPOS *kbpos );
-int read_keyblock( KBPOS *kbpos, KBNODE *ret_root );
-int enum_keyblocks( int mode, KBPOS *kbpos, KBNODE *ret_root );
-int insert_keyblock( KBPOS *kbpos, KBNODE root );
-int delete_keyblock( KBPOS *kbpos );
-int update_keyblock( KBPOS *kbpos, KBNODE root );
-
-
-#endif /*GPG_KEYDB_H*/
+#endif /*G10_KEYDB_H*/