← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/gnupg2/gutsy

« back to all changes in this revision

Viewing changes to g10/keyedit.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2007-02-02 14:29:54 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070202142954-f5h55skq432ona6m
Tags: 2.0.2-0ubuntu1
* New upstream release
  - includes the patch for CVE-2006-6235
  - a PIN pad can now also be used for signing keys
* Remaining changes:
  - Remove libpcsclite-dev, libopensc2-dev build dependencies (they are in
    universe).
  - Build-depend on libcurl3-gnutls-dev
  - Include /doc files as done with gnupg
* g10/call-agent.c: set DBG_ASSUAN to 0 to suppress a debug message
* debian/rules: add doc/com-certs.pem to the docs for gpgsm
* debian/README.Debian: remove note the gnupg2 isn't released yet.
* Modified Maintainer values to match Debian-Maintainer-Field spec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/keyedit.c
1187
1187
 
1188
1188
        set_next_passphrase( NULL );
1189
1189
        for(;;) {
 
1190
            int canceled;
 
1191
 
1190
1192
            s2k->mode = opt.s2k_mode;
1191
1193
            s2k->hash_algo = S2K_DIGEST_ALGO;
1192
1194
            dek = passphrase_to_dek( NULL, 0, opt.s2k_cipher_algo,
1193
 
                                     s2k, 2, errtext, NULL);
1194
 
            if( !dek ) {
 
1195
                                     s2k, 2, errtext, &canceled);
 
1196
            if (!dek && canceled) {
 
1197
                rc = GPG_ERR_CANCELED;
 
1198
                break;
 
1199
            }
 
1200
            else if( !dek ) {
1195
1201
                errtext = N_("passphrase not correctly repeated; try again");
1196
1202
                tty_printf ("%s.\n", _(errtext));
1197
1203
            }
3235
3241
              else
3236
3242
                reason=_("invalid");
3237
3243
 
3238
 
              tty_printf("User ID \"%s\" compacted: %s\n",user,reason);
 
3244
              tty_printf (_("User ID \"%s\" compacted: %s\n"), user, reason);
3239
3245
 
3240
3246
              modified=1;
3241
3247
            }
3242
3248
          else if(sigs)
3243
3249
            {
3244
3250
              tty_printf(sigs==1?
3245
 
                         "User ID \"%s\": %d signature removed\n":
3246
 
                         "User ID \"%s\": %d signatures removed\n",
 
3251
                         _("User ID \"%s\": %d signature removed\n") :
 
3252
                         _("User ID \"%s\": %d signatures removed\n"),
3247
3253
                         user,sigs);
3248
3254
 
3249
3255
              modified=1;
3250
3256
            }
3251
3257
          else
3252
 
            tty_printf(_("User ID \"%s\": already clean\n"),user);
 
3258
            {
 
3259
              tty_printf (self_only==1?
 
3260
                          _("User ID \"%s\": already minimized\n") :
 
3261
                          _("User ID \"%s\": already clean\n"),
 
3262
                          user);
 
3263
            }
3253
3264
 
3254
3265
          xfree(user);
3255
3266
        }