diff options
| author | Werner Koch <[email protected]> | 2006-03-05 15:13:18 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-03-05 15:13:18 +0000 |
| commit | 09203be1c6619a3dc8ab862f634b1477f7e0bf55 (patch) | |
| tree | 6e2fe4ebfaef9ccdc6434dd22ae94e283852fae9 /g10/mainproc.c | |
| parent | * gpgkeys_ldap.c (main): Fix build problem with non-OpenLDAP LDAP (diff) | |
| download | gnupg-09203be1c6619a3dc8ab862f634b1477f7e0bf55.tar.gz gnupg-09203be1c6619a3dc8ab862f634b1477f7e0bf55.zip | |
Replaced an assert and fixed batch mode issue in cardglue.
Diffstat (limited to 'g10/mainproc.c')
| -rw-r--r-- | g10/mainproc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index 839d94c10..7b64939c1 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -404,7 +404,7 @@ proc_pubkey_enc( CTX c, PACKET *pkt ) if( !opt.list_only && opt.override_session_key ) { /* It does not make much sense to store the session key in * secure memory because it has already been passed on the - * command line and the GCHQ knows about it */ + * command line and the GCHQ knows about it. */ c->dek = xmalloc_clear( sizeof *c->dek ); result = get_override_session_key ( c->dek, opt.override_session_key ); if ( result ) { @@ -414,6 +414,8 @@ proc_pubkey_enc( CTX c, PACKET *pkt ) else if( is_ELGAMAL(enc->pubkey_algo) || enc->pubkey_algo == PUBKEY_ALGO_DSA || is_RSA(enc->pubkey_algo) ) { + /* FIXME: strore this all in a list and process it later */ + if ( !c->dek && ((!enc->keyid[0] && !enc->keyid[1]) || opt.try_all_secrets || !seckey_available( enc->keyid )) ) { @@ -523,6 +525,9 @@ proc_encrypted( CTX c, PACKET *pkt ) print_pkenc_list ( c->pkenc_list, 0 ); } + /* FIXME: Figure out the session key by looking at all pkenc packets. */ + + write_status( STATUS_BEGIN_DECRYPTION ); /*log_debug("dat: %sencrypted data\n", c->dek?"":"conventional ");*/ |