← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gnupg/hardy-updates

« back to all changes in this revision

Viewing changes to g10/import.c

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2006-12-12 15:56:56 UTC
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: james.westby@ubuntu.com-20061212155656-kk00wp4x0uq4tm1y
Tags: upstream-1.4.6
Import upstream version 1.4.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
g10/import.c
249
249
    getkey_disable_caches();
250
250
 
251
251
    if( !opt.no_armor ) { /* armored reading is not disabled */
252
 
        armor_filter_context_t *afx = xmalloc_clear( sizeof *afx );
 
252
        armor_filter_context_t *afx = new_armor_context ();
253
253
        afx->only_keyblocks = 1;
254
 
        iobuf_push_filter2( inp, armor_filter, afx, 1 );
 
254
        push_armor_filter (afx, inp);
 
255
        release_armor_context (afx);
255
256
    }
256
257
 
257
258
    while( !(rc = read_block( inp, &pending_pkt, &keyblock) )) {