security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

See ChangeLog: Thu Apr 8 09:35:53 CEST 1999 Werner Koch

Browse source
This commit is contained in:
Werner Koch 1999-04-08 07:41:35 +00:00
parent 9f40263e56
commit 97efca04ef
8 changed files with 39 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
g10/ChangeLog
View file

@ -1,3 +1,9 @@
Thu Apr 8 09:35:53 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* mainproc.c (proc_encrypted): Add a new status output
* passphrase.c (passphrase_to_dek): Ditto.
* status.h status.c: Add new status tokens.
Wed Apr 7 20:51:39 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
* encr-data.c (decrypt_data): Fixes for 128 bit blocksize

1
g10/mainproc.c
View file

@ -245,6 +245,7 @@ proc_encrypted( CTX c, PACKET *pkt )
log_info(_("decryption okay\n"));
}
else {
write_status( STATUS_DECRYPTION_FAILED );
log_error(_("decryption failed: %s\n"), g10_errstr(result));
/* FIXME: if this is secret key not available, try with
* other keys */

20
g10/passphrase.c
View file

@ -133,14 +133,20 @@ passphrase_to_dek( u32 *keyid, int cipher_algo, STRING2KEY *s2k, int mode )
:DEFAULT_DIGEST_ALGO;
}
if( keyid && !next_pw && is_status_enabled() ) {
if( !next_pw && is_status_enabled() ) {
char buf[50];
sprintf( buf, "%08lX%08lX", (ulong)keyid[0], (ulong)keyid[1] );
if( keyid[2] && keyid[3] && keyid[0] != keyid[2]
&& keyid[1] != keyid[3] )
sprintf( buf+strlen(buf), " %08lX%08lX",
(ulong)keyid[2], (ulong)keyid[3] );
write_status_text( STATUS_NEED_PASSPHRASE, buf );
if( keyid ) {
sprintf( buf, "%08lX%08lX", (ulong)keyid[0], (ulong)keyid[1] );
if( keyid[2] && keyid[3] && keyid[0] != keyid[2]
&& keyid[1] != keyid[3] )
sprintf( buf+strlen(buf), " %08lX%08lX",
(ulong)keyid[2], (ulong)keyid[3] );
write_status_text( STATUS_NEED_PASSPHRASE, buf );
}
else {
sprintf( buf, "%d %d %d", cipher_algo, s2k->mode, s2k->hash_algo );
write_status_text( STATUS_NEED_PASSPHRASE_SYM, buf );
}
}
if( keyid && !opt.batch && !next_pw ) {

2
g10/status.c
View file

@ -104,6 +104,8 @@ write_status_text ( int no, const char *text)
case STATUS_BAD_PASSPHRASE : s = "BAD_PASSPHRASE\n"; break;
case STATUS_NO_PUBKEY : s = "NO_PUBKEY\n"; break;
case STATUS_NO_SECKEY : s = "NO_SECKEY\n"; break;
case STATUS_NEED_PASSPHRASE_SYM: s = "NEED_PASSPHRASE_SYM\n"; break;
case STATUS_DECRYPTION_FAILED: s = "DECRYPTION_FAILED\n"; break;
default: s = "?\n"; break;
}

2
g10/status.h
View file

@ -55,6 +55,8 @@
#define STATUS_BAD_PASSPHRASE 25
#define STATUS_NO_PUBKEY 26
#define STATUS_NO_SECKEY 27
#define STATUS_NEED_PASSPHRASE_SYM 28
#define STATUS_DECRYPTION_FAILED 29
/*-- status.c --*/
void set_status_fd ( int fd );