← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gnupg2/vivid-proposed

« back to all changes in this revision

Viewing changes to g10/cipher.c

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2013-05-24 18:27:04 UTC
  • mfrom: (18.1.2 ubuntu)
  • Revision ID: package-import@ubuntu.com-20130524182704-d9uwh9lrj91elnm6
* Resynchronize on Debian, remaining changes:
  - Add udev rules to give gpg access to some smartcard readers;
    Debian #543217.
    . debian/gnupg2.udev: udev rules to set ACLs on SCM smartcard readers.
  - Add upstart user job for gpg-agent.

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/cipher.c
61
61
        ed.mdc_method = DIGEST_ALGO_SHA1;
62
62
        gcry_md_open (&cfx->mdc_hash, DIGEST_ALGO_SHA1, 0);
63
63
        if ( DBG_HASHING )
64
 
            gcry_md_start_debug (cfx->mdc_hash, "creatmdc");
 
64
            gcry_md_debug (cfx->mdc_hash, "creatmdc");
65
65
    }
66
66
 
67
67
    {
68
68
        char buf[20];
69
 
        
 
69
 
70
70
        sprintf (buf, "%d %d", ed.mdc_method, cfx->dek->algo);
71
71
        write_status_text (STATUS_BEGIN_ENCRYPTION, buf);
72
72
    }
81
81
    temp[nprefix] = temp[nprefix-2];
82
82
    temp[nprefix+1] = temp[nprefix-1];
83
83
    print_cipher_algo_note( cfx->dek->algo );
84
 
    err = openpgp_cipher_open (&cfx->cipher_hd, 
 
84
    err = openpgp_cipher_open (&cfx->cipher_hd,
85
85
                               cfx->dek->algo,
86
86
                               GCRY_CIPHER_MODE_CFB,
87
87
                               (GCRY_CIPHER_SECURE