mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Changed keyring handling - saving still does not work.
Added new cipher mode and updated cipher test program.
This commit is contained in:
parent
b75f734a11
commit
5a9ea8ff5c
17 changed files with 322 additions and 198 deletions
|
@ -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 ) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue