diff options
| author | Werner Koch <wk@gnupg.org> | 1999-01-12 11:20:24 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 1999-01-12 11:20:24 +0100 |
| commit | 62957ff4e73a27226c39586e3aa7a36aaea154b1 (patch) | |
| tree | 6fe49a6bc4e1dcd3a0d8bebd26a7f1e7c90a5458 /g10/skclist.c | |
| parent | See ChangeLog: Sun Jan 10 19:36:42 CET 1999 Werner Koch (diff) | |
| download | gnupg2-62957ff4e73a27226c39586e3aa7a36aaea154b1.tar.xz gnupg2-62957ff4e73a27226c39586e3aa7a36aaea154b1.zip | |
See ChangeLog: Tue Jan 12 11:17:18 CET 1999 Werner Koch
Diffstat (limited to 'g10/skclist.c')
| -rw-r--r-- | g10/skclist.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/g10/skclist.c b/g10/skclist.c index 8ae3fc15b..2c46d6699 100644 --- a/g10/skclist.c +++ b/g10/skclist.c @@ -32,6 +32,7 @@ #include "memory.h" #include "util.h" #include "i18n.h" +#include "cipher.h" void @@ -46,6 +47,19 @@ release_sk_list( SK_LIST sk_list ) } } + +/* Check that we are only using keys which don't have + * the string "(insecure!)" or "not secure" or "do not use" + * in one of the user ids + */ +static int +is_insecure( PKT_secret_key *sk ) +{ + + BUG(); +} + + int build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock, unsigned usage ) @@ -66,10 +80,15 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock, SK_LIST r; if( sk->version == 4 && (usage & PUBKEY_USAGE_SIG) && sk->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E ) { - log_error("this is a PGP generated " + log_info("this is a PGP generated " "ElGamal key which is NOT secure for signatures!\n"); free_secret_key( sk ); sk = NULL; } + else if( random_is_faked() && !is_insecure( sk ) ) { + log_info(_("key is not flagged as insecure - " + "can't use it with the faked RNG!\n")); + free_secret_key( sk ); sk = NULL; + } else { r = m_alloc( sizeof *r ); r->sk = sk; sk = NULL; @@ -102,6 +121,11 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock, locusr->d ); free_secret_key( sk ); sk = NULL; } + else if( random_is_faked() && !is_insecure( sk ) ) { + log_info(_("key is not flagged as insecure - " + "can't use it with the faked RNG!\n")); + free_secret_key( sk ); sk = NULL; + } else { r = m_alloc( sizeof *r ); r->sk = sk; sk = NULL; |