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

Changes for MingW32/CPD 0.3 and some bug fixes

Browse source
This commit is contained in:
Werner Koch 2001-01-18 09:02:35 +00:00
parent 90ddf482d0
commit 227d0f17de
16 changed files with 150 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

6
g10/ChangeLog
View file

@ -1,3 +1,9 @@
2001-01-12 Werner Koch <wk@gnupg.org>
* passphrase.c (passphrase_to_dek): Use MD5 when IDEA is installed
and we have no S2K.
* mainproc.c (proc_encrypted): Likewise
2001-01-11 Werner Koch <wk@gnupg.org>
* sig-check.c (do_check): Print the signature key expire message

6
g10/mainproc.c
View file

@ -408,9 +408,11 @@ proc_encrypted( CTX c, PACKET *pkt )
if( opt.list_only )
result = -1;
else if( !c->dek && !c->last_was_session_key ) {
int def_algo;
/* assume this is old conventional encrypted data
* Actually we should use IDEA and MD5 in this case, but because
* IDEA is patented we can't do so */
* We use IDEA here if it is installed */
def_algo = check_cipher_algo (CIPHER_ALGO_IDEA)?
DEFAULT_CIPHER_ALGO : CIPHER_ALGO_IDEA;
c->dek = passphrase_to_dek( NULL, 0,
opt.def_cipher_algo ? opt.def_cipher_algo
: DEFAULT_CIPHER_ALGO, NULL, 0 );

14
g10/passphrase.c
View file

@ -509,14 +509,16 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
STRING2KEY help_s2k;
if( !s2k ) {
int def_algo;
s2k = &help_s2k;
s2k->mode = 0;
/* this should be MD5 if cipher is IDEA, but because we do
* not have IDEA, we use the default one, the user
* can select it from the commandline
*/
s2k->hash_algo = opt.def_digest_algo?opt.def_digest_algo
:DEFAULT_DIGEST_ALGO;
/* If we have IDEA installed we use MD5 otherwise the default
* hash algorithm. This can always be overriden from the
* commandline */
def_algo = check_cipher_algo (CIPHER_ALGO_IDEA)?
DEFAULT_DIGEST_ALGO : DIGEST_ALGO_MD5;
s2k->hash_algo = opt.def_digest_algo? opt.def_digest_algo : def_algo;
}
if( !next_pw && is_status_enabled() ) {