1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

detached signatures are working

This commit is contained in:
Werner Koch 1997-12-03 10:20:03 +00:00
parent cccf1efa4b
commit 3b1b6f9d98
6 changed files with 91 additions and 8 deletions

View File

@ -66,7 +66,7 @@ strusage( int level )
#endif #endif
#ifdef HAVE_RSA_CIPHER #ifdef HAVE_RSA_CIPHER
"WARNING: This version has RSA support! Your are not allowed to\n" "WARNING: This version has RSA support! Your are not allowed to\n"
" use it inside the Unites States until Sep 30, 2000!\n" " use it inside the Unites States before Sep 30, 2000!\n"
#endif #endif
; ;
break; break;

View File

@ -275,6 +275,7 @@ get_seckey( PKT_secret_cert *skc, u32 *keyid )
/**************** /****************
* Get a secret key by name and store it into skc * Get a secret key by name and store it into skc
* If NAME is NULL use the default certificate
*/ */
int int
get_seckey_by_name( PKT_secret_cert *skc, const char *name ) get_seckey_by_name( PKT_secret_cert *skc, const char *name )
@ -432,8 +433,12 @@ scan_secret_keyring( PKT_secret_cert *skc, u32 *keyid,
int save_mode; int save_mode;
u32 akeyid[2]; u32 akeyid[2];
PKT_secret_cert *last_pk = NULL; PKT_secret_cert *last_pk = NULL;
int get_first;
u32 dummy_keyid[2];
assert( !keyid || !name ); get_first = !keyid && !name;
if( get_first )
keyid = dummy_keyid;
if( !(a = iobuf_open( filename ) ) ) { if( !(a = iobuf_open( filename ) ) ) {
log_debug("scan_secret_keyring: can't open '%s'\n", filename ); log_debug("scan_secret_keyring: can't open '%s'\n", filename );
@ -453,11 +458,17 @@ scan_secret_keyring( PKT_secret_cert *skc, u32 *keyid,
switch( pkt.pkt.secret_cert->pubkey_algo ) { switch( pkt.pkt.secret_cert->pubkey_algo ) {
case PUBKEY_ALGO_ELGAMAL: case PUBKEY_ALGO_ELGAMAL:
case PUBKEY_ALGO_RSA: case PUBKEY_ALGO_RSA:
keyid_from_skc( pkt.pkt.secret_cert, akeyid ); if( get_first ) {
if( akeyid[0] == keyid[0] && akeyid[1] == keyid[1] ) {
copy_secret_cert( skc, pkt.pkt.secret_cert ); copy_secret_cert( skc, pkt.pkt.secret_cert );
found++; found++;
} }
else {
keyid_from_skc( pkt.pkt.secret_cert, akeyid );
if( (akeyid[0] == keyid[0] && akeyid[1] == keyid[1]) ) {
copy_secret_cert( skc, pkt.pkt.secret_cert );
found++;
}
}
break; break;
default: default:
log_error("cannot handle pubkey algo %d\n", log_error("cannot handle pubkey algo %d\n",

View File

@ -67,6 +67,7 @@ typedef struct {
int last_was_pubkey_enc; int last_was_pubkey_enc;
int opt_list; int opt_list;
NODE cert; /* the current certificate */ NODE cert; /* the current certificate */
int have_data;
} *CTX; } *CTX;
@ -152,8 +153,9 @@ release_cert( CTX c )
static int static int
add_onepass_sig( CTX c, PACKET *pkt ) add_onepass_sig( CTX c, PACKET *pkt )
{ {
NODE node;
if( c->cert ) { /* add another packet */ if( c->cert ) { /* add another packet */
NODE node;
if( c->cert->pkt->pkttype != PKT_ONEPASS_SIG ) { if( c->cert->pkt->pkttype != PKT_ONEPASS_SIG ) {
log_error("add_onepass_sig: another packet is in the way\n"); log_error("add_onepass_sig: another packet is in the way\n");
@ -164,7 +166,8 @@ add_onepass_sig( CTX c, PACKET *pkt )
c->cert = node; c->cert = node;
} }
else /* insert the first one */ else /* insert the first one */
c->cert = new_node( pkt ); c->cert = node = new_node( pkt );
return 1; return 1;
} }
@ -338,6 +341,8 @@ proc_plaintext( CTX c, PACKET *pkt )
printf("txt: plain text data name='%.*s'\n", pt->namelen, pt->name); printf("txt: plain text data name='%.*s'\n", pt->namelen, pt->name);
free_md_filter_context( &c->mfx ); free_md_filter_context( &c->mfx );
/* fixme: take the digest algo to use from the
* onpass_sig packet (if we have these) */
c->mfx.md = md_open(DIGEST_ALGO_RMD160, 0); c->mfx.md = md_open(DIGEST_ALGO_RMD160, 0);
result = handle_plaintext( pt, &c->mfx ); result = handle_plaintext( pt, &c->mfx );
if( !result ) if( !result )
@ -393,8 +398,9 @@ do_check_sig( CTX c, NODE node )
if( (rc=md_okay(algo)) ) if( (rc=md_okay(algo)) )
return rc; return rc;
if( sig->sig_class == 0x00 ) if( sig->sig_class == 0x00 ) {
md = md_copy( c->mfx.md ); md = md_copy( c->mfx.md );
}
else if( (sig->sig_class&~3) == 0x10 ) { /* classes 0x10 .. 0x13 */ else if( (sig->sig_class&~3) == 0x10 ) { /* classes 0x10 .. 0x13 */
if( c->cert->pkt->pkttype == PKT_PUBLIC_CERT ) { if( c->cert->pkt->pkttype == PKT_PUBLIC_CERT ) {
NODE n1 = find_parent( c->cert, node ); NODE n1 = find_parent( c->cert, node );
@ -568,6 +574,9 @@ proc_packets( IOBUF a )
case PKT_ONEPASS_SIG: newpkt = add_onepass_sig( c, pkt ); break; case PKT_ONEPASS_SIG: newpkt = add_onepass_sig( c, pkt ); break;
default: newpkt = 0; break; default: newpkt = 0; break;
} }
if( pkt->pkttype != PKT_SIGNATURE )
c->have_data = pkt->pkttype == PKT_PLAINTEXT;
if( newpkt == -1 ) if( newpkt == -1 )
; ;
else if( newpkt ) { else if( newpkt ) {
@ -615,7 +624,19 @@ proc_tree( CTX c, NODE node )
log_error("proc_tree: onepass_sig without followin data\n"); log_error("proc_tree: onepass_sig without followin data\n");
else if( node->child->pkt->pkttype != PKT_SIGNATURE ) else if( node->child->pkt->pkttype != PKT_SIGNATURE )
log_error("proc_tree: onepass_sig not followed by signature\n"); log_error("proc_tree: onepass_sig not followed by signature\n");
else { /* check all signature */ else { /* check all signatures */
if( !c->have_data ) {
free_md_filter_context( &c->mfx );
/* fixme: take the digest algo to use from the
* onepass_sig packet (if we have these) */
c->mfx.md = md_open(DIGEST_ALGO_RMD160, 0);
rc = ask_for_detached_datafile( &c->mfx );
if( rc ) {
log_error("can't hash datafile: %s\n", g10_errstr(rc));
return;
}
}
for(n1=node->child; n1; n1 = n1->next ) { for(n1=node->child; n1; n1 = n1->next ) {
PKT_signature *sig = n1->pkt->pkt.signature; PKT_signature *sig = n1->pkt->pkt.signature;

View File

@ -251,6 +251,7 @@ int encrypt_data( PKT_encrypted *ed, DEK *dek );
/*-- plaintext.c --*/ /*-- plaintext.c --*/
int handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx ); int handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx );
int ask_for_detached_datafile( md_filter_context_t *mfx );
/*-- comment.c --*/ /*-- comment.c --*/
int write_comment( IOBUF out, const char *s ); int write_comment( IOBUF out, const char *s );

View File

@ -82,6 +82,8 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx )
rc = G10ERR_READ_FILE; rc = G10ERR_READ_FILE;
goto leave; goto leave;
} }
if( mfx->md )
md_putchar(mfx->md, c );
if( mfx->rmd160 ) if( mfx->rmd160 )
rmd160_putchar(mfx->rmd160, c ); rmd160_putchar(mfx->rmd160, c );
if( mfx->md5 ) if( mfx->md5 )
@ -124,3 +126,42 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx )
return rc; return rc;
} }
/****************
* Ask for the detached datafile and calculate the digest from it.
*/
int
ask_for_detached_datafile( md_filter_context_t *mfx )
{
char *answer;
FILE *fp;
int rc = 0;
int c;
tty_printf("Detached signature.\n");
answer = tty_get("Please enter name of data file: ");
tty_kill_prompt();
fp = fopen(answer,"rb");
if( !fp ) {
log_error("can't open '%s': %s\n", answer, strerror(errno) );
rc = G10ERR_READ_FILE;
goto leave;
}
while( (c = getc(fp)) != EOF ) {
if( mfx->md )
md_putchar(mfx->md, c );
if( mfx->rmd160 )
rmd160_putchar(mfx->rmd160, c );
if( mfx->md5 )
md5_putchar(mfx->md5, c );
}
fclose(fp);
leave:
m_free(answer);
return rc;
}

View File

@ -79,6 +79,15 @@ typedef struct {
int cipher_debug_mode; int cipher_debug_mode;
#ifdef HAVE_RSA_CIPHER
#define is_valid_pubkey_algo(a) ( (a) == PUBKEY_ALGO_ELGAMAL \
|| (a) == PUBKEY_ALGO_RSA )
#else
#define is_valid_pubkey_algo(a) ( (a) == PUBKEY_ALGO_ELGAMAL )
#endif
/*-- md.c --*/ /*-- md.c --*/
int md_okay( int algo ); int md_okay( int algo );
MD_HANDLE *md_open( int algo, int secure ); MD_HANDLE *md_open( int algo, int secure );