diff options
| author | Werner Koch <[email protected]> | 2000-10-10 12:58:43 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2000-10-10 12:58:43 +0000 |
| commit | 5a9ea8ff5c942304696463b47d852f475323c69f (patch) | |
| tree | f7173ad82644c4449d06885f4c655d025b101cf6 /g10/keygen.c | |
| parent | Added the arcfour cipher which is of use for GNUTLS. (diff) | |
| download | gnupg-5a9ea8ff5c942304696463b47d852f475323c69f.tar.gz gnupg-5a9ea8ff5c942304696463b47d852f475323c69f.zip | |
Changed keyring handling - saving still does not work.
Added new cipher mode and updated cipher test program.
Diffstat (limited to '')
| -rw-r--r-- | g10/keygen.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index d3887dd7d..415c54a2a 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1748,10 +1748,6 @@ do_generate_keypair( struct para_data_s *para, if( rc ) ; - else if( (rc=rc1=lock_keyblock( &pub_kbpos )) ) - log_error("can't lock public keyring: %s\n", gpg_errstr(rc) ); - else if( (rc=rc2=lock_keyblock( &sec_kbpos )) ) - log_error("can't lock secret keyring: %s\n", gpg_errstr(rc) ); else if( (rc=insert_keyblock( pub_root )) ) log_error("can't write public key: %s\n", gpg_errstr(rc) ); else if( (rc=insert_keyblock( sec_root )) ) @@ -1770,10 +1766,6 @@ do_generate_keypair( struct para_data_s *para, } } - if( !rc1 ) - unlock_keyblock( &pub_kbpos ); - if( !rc2 ) - unlock_keyblock( &sec_kbpos ); } if( rc ) { |