cert export/import bugfix

This commit is contained in:
Steffen Hansen 2002-06-25 20:24:29 +00:00
parent e37e5beb46
commit 4783cc23da

View File

@ -2301,16 +2301,17 @@ importCertificate( const char* fingerprint )
GpgmeCtx ctx; GpgmeCtx ctx;
GpgmeData keydata; GpgmeData keydata;
GpgmeRecipients recips; GpgmeRecipients recips;
/*
char* buf; char* buf;
char* tmp1; const char* tmp1;
char* tmp2; char* tmp2;
*/
err = gpgme_new( &ctx ); err = gpgme_new( &ctx );
/*fprintf( stderr, "2: gpgme returned %d\n", err );*/ /*fprintf( stderr, "2: gpgme returned %d\n", err );*/
if( err != GPGME_No_Error ) { if( err != GPGME_No_Error ) {
return err; return err;
} }
gpgme_set_protocol( ctx, GPGME_PROTOCOL_CMS );
gpgme_set_keylist_mode( ctx, GPGME_KEYLIST_MODE_LOCAL );
err = gpgme_data_new( &keydata ); err = gpgme_data_new( &keydata );
if( err ) { if( err ) {
@ -2327,7 +2328,6 @@ importCertificate( const char* fingerprint )
return err; return err;
} }
/*
buf = safe_malloc( sizeof(char)*( strlen( fingerprint ) + 1 ) ); buf = safe_malloc( sizeof(char)*( strlen( fingerprint ) + 1 ) );
if( !buf ) { if( !buf ) {
gpgme_recipients_release( recips ); gpgme_recipients_release( recips );
@ -2343,12 +2343,10 @@ importCertificate( const char* fingerprint )
} }
*tmp2 = 0; *tmp2 = 0;
fprintf( stderr, "calling gpgme_recipients_add_name( %s )\n", buf ); fprintf( stderr, "calling gpgme_recipients_add_name( %s )\n", buf );
*/ err = gpgme_recipients_add_name( recips, buf );
err = gpgme_recipients_add_name( recips, fingerprint );
if( err ) { if( err ) {
fprintf( stderr, "gpgme_recipients_add_name returned %d\n", err ); fprintf( stderr, "gpgme_recipients_add_name returned %d\n", err );
/*safe_free( (void**)&buf );*/ safe_free( (void**)&buf );
gpgme_recipients_release( recips ); gpgme_recipients_release( recips );
gpgme_data_release( keydata ); gpgme_data_release( keydata );
gpgme_release( ctx ); gpgme_release( ctx );
@ -2358,13 +2356,13 @@ importCertificate( const char* fingerprint )
err = gpgme_op_export( ctx, recips, keydata ); err = gpgme_op_export( ctx, recips, keydata );
if( err ) { if( err ) {
fprintf( stderr, "gpgme_op_export returned %d\n", err ); fprintf( stderr, "gpgme_op_export returned %d\n", err );
/*safe_free( (void**)&buf );*/ safe_free( (void**)&buf );
gpgme_recipients_release( recips ); gpgme_recipients_release( recips );
gpgme_data_release( keydata ); gpgme_data_release( keydata );
gpgme_release( ctx ); gpgme_release( ctx );
return err; return err;
} }
/*safe_free( (void**)&buf );*/ safe_free( (void**)&buf );
err = gpgme_op_import( ctx, keydata ); err = gpgme_op_import( ctx, keydata );
if( err ) { if( err ) {