security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

* misc.c (print_cipher_algo_note): May as well call Rijndael AES

Browse Source 
at this point.

* keygen.c (do_create), misc.c (openpgp_pk_algo_usage): Remove the
last bits of Elgamal type 20 support.
This commit is contained in:
David Shaw 2004-01-17 03:14:14 +00:00
parent 57c585bc0f
commit 1d12c12142
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2004-01-16 David Shaw <dshaw@jabberwocky.com>
* misc.c (print_cipher_algo_note): May as well call Rijndael AES
at this point.
* keygen.c (do_create), misc.c (openpgp_pk_algo_usage): Remove the
last bits of Elgamal type 20 support.
2004-01-03 Stefan Bellon <sbellon@sbellon.de>
* compress.c [__riscos__]: Only use RISC OS' own ZLib module if
@ -68,7 +76,7 @@
* main.h, import.c (import_options), export.c (export_options):
Pass the noisy flag through.
2003-12-17 David Shaw <dshaw@localhost.localdomain>
2003-12-17 David Shaw <dshaw@jabberwocky.com>
* build-packet.c (write_fake_data, do_secret_key), seckey-cert.c
(do_check): Use an unsigned length for mpi_get_opaque.
@ -9148,7 +9156,8 @@ Thu Feb 12 22:24:42 1998 Werner Koch (wk@frodo)
* pubkey-enc.c (get_session_key): rewritten
Copyright 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
Copyright 1998, 1999, 2000, 2001, 2002, 2003,
2004 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without

8
g10/keygen.c
View File

@ -1523,12 +1523,12 @@ do_create( int algo, unsigned int nbits, KBNODE pub_root, KBNODE sec_root,
"disks) during the prime generation; this gives the random number\n"
"generator a better chance to gain enough entropy.\n") );
if( algo == PUBKEY_ALGO_ELGAMAL || algo == PUBKEY_ALGO_ELGAMAL_E )
rc = gen_elg(algo, nbits, pub_root, sec_root, dek, s2k, sk, expiredate);
if( algo == PUBKEY_ALGO_ELGAMAL_E )
rc = gen_elg(algo, nbits, pub_root, sec_root, dek, s2k, sk, expiredate);
else if( algo == PUBKEY_ALGO_DSA )
rc = gen_dsa(nbits, pub_root, sec_root, dek, s2k, sk, expiredate);
rc = gen_dsa(nbits, pub_root, sec_root, dek, s2k, sk, expiredate);
else if( algo == PUBKEY_ALGO_RSA )
rc = gen_rsa(algo, nbits, pub_root, sec_root, dek, s2k, sk, expiredate);
rc = gen_rsa(algo, nbits, pub_root, sec_root, dek, s2k, sk, expiredate);
else
BUG();

9
g10/misc.c
View File

@ -162,9 +162,9 @@ print_cipher_algo_note( int algo )
|| algo == CIPHER_ALGO_CAST5
|| algo == CIPHER_ALGO_BLOWFISH
|| algo == CIPHER_ALGO_TWOFISH
|| algo == CIPHER_ALGO_RIJNDAEL
|| algo == CIPHER_ALGO_RIJNDAEL192
|| algo == CIPHER_ALGO_RIJNDAEL256
|| algo == CIPHER_ALGO_AES
|| algo == CIPHER_ALGO_AES192
|| algo == CIPHER_ALGO_AES256
)
;
else {
@ -255,9 +255,6 @@ openpgp_pk_algo_usage ( int algo )
case PUBKEY_ALGO_DSA:
use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_AUTH;
break;
case PUBKEY_ALGO_ELGAMAL:
use = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC | PUBKEY_USAGE_AUTH;
break;
default:
break;
}