diff options
| author | Werner Koch <wk@gnupg.org> | 1999-04-07 20:58:34 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 1999-04-07 20:58:34 +0200 |
| commit | 9f40263e56cc9ebe28016bb4588da3846342ba79 (patch) | |
| tree | 1ca711569d0878d441798bf4f185036eda8fceda /g10/seckey-cert.c | |
| parent | See ChangeLog: Tue Apr 6 19:58:12 CEST 1999 Werner Koch (diff) | |
| download | gnupg2-9f40263e56cc9ebe28016bb4588da3846342ba79.tar.xz gnupg2-9f40263e56cc9ebe28016bb4588da3846342ba79.zip | |
See ChangeLog: Wed Apr 7 20:51:39 CEST 1999 Werner Koch
Diffstat (limited to 'g10/seckey-cert.c')
| -rw-r--r-- | g10/seckey-cert.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c index 7f0d41e33..4ee0485ca 100644 --- a/g10/seckey-cert.c +++ b/g10/seckey-cert.c @@ -1,5 +1,5 @@ /* seckey-cert.c - secret key certificate packet handling - * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -52,8 +52,7 @@ do_check( PKT_secret_key *sk ) if( sk->protect.algo == CIPHER_ALGO_NONE ) BUG(); - if( check_cipher_algo( sk->protect.algo ) - || cipher_get_blocksize( sk->protect.algo ) != 8 ) { + if( check_cipher_algo( sk->protect.algo ) ) { log_info(_("protection algorithm %d is not supported\n"), sk->protect.algo ); return G10ERR_CIPHER_ALGO; @@ -222,8 +221,6 @@ protect_secret_key( PKT_secret_key *sk, DEK *dek ) if( check_cipher_algo( sk->protect.algo ) ) rc = G10ERR_CIPHER_ALGO; /* unsupport protection algorithm */ - else if( cipher_get_blocksize( sk->protect.algo ) != 8 ) - rc = G10ERR_CIPHER_ALGO; /* unsupport protection algorithm */ else { print_cipher_algo_note( sk->protect.algo ); cipher_hd = cipher_open( sk->protect.algo, |