← Back to branch summary

~ubuntu-branches/ubuntu/karmic/gnupg2/karmic-security

« back to all changes in this revision

Viewing changes to g10/pubkey-enc.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2009-08-04 12:27:49 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20090804122749-q0j52zp6xmzvyall
Tags: 2.0.12-0ubuntu1
* New upstream release.
* Add 01-scd-pw2.patch, 03-opgp-writekey.patch, and 06-opgp-sign3072.patch
  from https://bugs.g10code.com/gnupg/issue1094 to make OpenPGP 2.0
  smartcards work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/pubkey-enc.c
1
1
/* pubkey-enc.c -  public key encoded packet handling
2
2
 * Copyright (C) 1998, 1999, 2000, 2001, 2002,
3
 
 *               2006  Free Software Foundation, Inc.
 
3
 *               2006, 2009 Free Software Foundation, Inc.
4
4
 *
5
5
 * This file is part of GnuPG.
6
6
 *
251
251
        dek->algo = 0;
252
252
        goto leave;
253
253
    }
254
 
    if ( dek->keylen != gcry_cipher_get_algo_keylen (dek->algo) ) {
 
254
    if ( dek->keylen != openpgp_cipher_get_algo_keylen (dek->algo) ) {
255
255
        rc = GPG_ERR_WRONG_SECKEY;
256
256
        goto leave;
257
257
    }