← Back to branch summary

~ubuntu-branches/ubuntu/feisty/gnupg2/feisty

« back to all changes in this revision

Viewing changes to g10/card-util.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2006-11-24 18:48:23 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20061124184823-17ir9m46tl09n9k4
Tags: 2.0.0-4ubuntu1
* Synchronize to Debian, reapply remaining Ubuntu changes to pristine Debian
  version:
  - Remove libpcsclite-dev, libopensc2-dev build dependencies (they are in
    universe).

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/card-util.c
38
38
#include "keyserver-internal.h"
39
39
#if GNUPG_MAJOR_VERSION == 1
40
40
# ifdef HAVE_LIBREADLINE
 
41
# define GNUPG_LIBREADLINE_H_INCLUDED
41
42
# include <stdio.h>
42
43
# include <readline/readline.h>
43
44
# endif /*HAVE_LIBREADLINE*/
1271
1272
      sk->skey[i] = NULL;
1272
1273
    }
1273
1274
  i = pubkey_get_npkey (sk->pubkey_algo);
1274
 
  sk->skey[i] = mpi_set_opaque (NULL, xstrdup ("dummydata"), 10);
 
1275
  sk->skey[i] = gcry_mpi_set_opaque (NULL, xstrdup ("dummydata"), 10*8);
1275
1276
  sk->is_protected = 1;
1276
1277
  sk->protect.s2k.mode = 1002;
1277
1278
  s = info.serialno;
1385
1386
/* Menu to edit all user changeable values on an OpenPGP card.  Only
1386
1387
   Key creation is not handled here. */
1387
1388
void
1388
 
card_edit (STRLIST commands)
 
1389
card_edit (strlist_t commands)
1389
1390
{
1390
1391
  enum cmdids cmd = cmdNOP;
1391
1392
  int have_commands = !!commands;