/[pkg-mixmaster]/branches/mixmaster_2_9_STABLE/Mix/Src/pgpdata.c
ViewVC logotype

Diff of /branches/mixmaster_2_9_STABLE/Mix/Src/pgpdata.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1 by rabbi, Wed Oct 31 08:19:51 2001 UTC revision 51 by ulfm, Sat Dec 15 00:34:21 2001 UTC
# Line 6  Line 6 
6     details.     details.
7    
8     OpenPGP data     OpenPGP data
9     $Id: pgpdata.c,v 1.1 2001/10/31 08:19:53 rabbi Exp $ */     $Id: pgpdata.c,v 1.2 2001/12/15 00:34:21 ulfm Exp $ */
10    
11    
12  #include "mix3.h"  #include "mix3.h"
# Line 390  int pgp_getkey(int mode, int algo, int * Line 390  int pgp_getkey(int mode, int algo, int *
390    int keytype = -1, type, j;    int keytype = -1, type, j;
391    int thisalgo, version, skalgo;    int thisalgo, version, skalgo;
392    int needsym = 0, symfound = 0;    int needsym = 0, symfound = 0;
393    BUFFER *p1, *iv, *sk, *i;    BUFFER *p1, *iv, *sk, *i, *thiskeyid;
394    int csstart;    int csstart;
395    
396    p1 = buf_new();    p1 = buf_new();
397    i = buf_new();    i = buf_new();
398    iv = buf_new();    iv = buf_new();
399    sk = buf_new();    sk = buf_new();
400      thiskeyid = buf_new();
401    if (psym)    if (psym)
402      needsym = *psym;      needsym = *psym;
403    if (keypacket == key) {    if (keypacket == key) {
# Line 484  int pgp_getkey(int mode, int algo, int * Line 485  int pgp_getkey(int mode, int algo, int *
485        }        }
486        if (keyid && keyid->length && !pgp_iskeyid(p1, keyid))        if (keyid && keyid->length && !pgp_iskeyid(p1, keyid))
487          continue;          continue;
488        if (keyid);        pgp_keyid(p1, thiskeyid);
         pgp_keyid(p1, keyid);  
489        if (key) {        if (key) {
490          buf_clear(key);          buf_clear(key);
491          for (j = 0; j < pgp_nummpi(thisalgo); j++) {          for (j = 0; j < pgp_nummpi(thisalgo); j++) {
# Line 535  int pgp_getkey(int mode, int algo, int * Line 535  int pgp_getkey(int mode, int algo, int *
535      }      }
536    }    }
537   end:   end:
538      if (keyid) buf_set(keyid, thiskeyid);
539    if (tempbuf) {    if (tempbuf) {
540      buf_move(keypacket, key);      buf_move(keypacket, key);
541      buf_free(key);      buf_free(key);
# Line 543  int pgp_getkey(int mode, int algo, int * Line 544  int pgp_getkey(int mode, int algo, int *
544    buf_free(i);    buf_free(i);
545    buf_free(iv);    buf_free(iv);
546    buf_free(sk);    buf_free(sk);
547      buf_free(thiskeyid);
548  #ifndef USE_RSA  #ifndef USE_RSA
549    if (thisalgo == PGP_ES_RSA)    if (thisalgo == PGP_ES_RSA)
550      keytype = -1;      keytype = -1;
Legend:
Removed from v.1  
changed lines
  Added in v.51
  ViewVC Help
Powered by ViewVC 1.1.5