diff options
| author | David Shaw <[email protected]> | 2004-09-24 14:34:45 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-09-24 14:34:45 +0000 |
| commit | 680be9be101aa2edb2bd058046b6f757c5c93ad2 (patch) | |
| tree | fedcf4dd3fd3602219049d5f3d31f4f3c050b001 /g10/keygen.c | |
| parent | Note: I have not fully tested the new key creation due to a pc/sc (diff) | |
| download | gnupg-680be9be101aa2edb2bd058046b6f757c5c93ad2.tar.gz gnupg-680be9be101aa2edb2bd058046b6f757c5c93ad2.zip | |
* keyedit.c (keyedit_menu), gpgv.c (agent_scd_getattr (stub)), keygen.c
(copy_mpi, generate_raw_key): Fix a compile problem and a few warnings
when building without card support.
Diffstat (limited to 'g10/keygen.c')
| -rw-r--r-- | g10/keygen.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index 96afad4e8..d75f0b826 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -133,7 +133,7 @@ static int gen_card_key_with_backup (int algo, int keyno, int is_primary, #define GET_NBITS(a) gcry_mpi_get_nbits (a) #endif - +#ifdef ENABLE_CARD_SUPPORT static int copy_mpi (MPI a, unsigned char *buffer, size_t len, size_t *ncopied) { @@ -159,8 +159,7 @@ copy_mpi (MPI a, unsigned char *buffer, size_t len, size_t *ncopied) log_error ("mpi_copy failed: %s\n", gpg_strerror (rc)); return rc; } - - +#endif /* ENABLE_CARD_SUPPORT */ static void @@ -2450,6 +2449,7 @@ generate_keypair (const char *fname, const char *card_serialno, } +#ifdef ENABLE_CARD_SUPPORT /* Generate a raw key and return it as a secret key packet. The function will ask for the passphrase and return a protected as well as an unprotected copy of a new secret key packet. 0 is returned @@ -2526,6 +2526,7 @@ generate_raw_key (int algo, unsigned int nbits, u32 created_at, m_free (s2k); return rc; } +#endif /* ENABLE_CARD_SUPPORT */ static void |