security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

(do_generate_keypair, read_parameter_file): Really

Browse Source 
close the files.
(do_generate_keypair): Create the secret key file using safe
permissions.  Noted by Atom Smasher.
This commit is contained in:
Werner Koch 2004-05-11 07:42:03 +00:00
parent 5f2e964da3
commit 9953adb5e7
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2004-05-11 Werner Koch <wk@gnupg.org>
* keygen.c (do_generate_keypair, read_parameter_file): Really
close the files.
(do_generate_keypair): Create the secret key file using safe
permissions. Noted by Atom Smasher.
2004-05-07 Werner Koch <wk@gnupg.org> 2004-05-07 Werner Koch <wk@gnupg.org>
* sign.c (write_plaintext_packet): Fixed the detection of too * sign.c (write_plaintext_packet): Fixed the detection of too

17
g10/keygen.c
View File

@ -26,6 +26,8 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "util.h" #include "util.h"
#include "main.h" #include "main.h"
#include "packet.h" #include "packet.h"
@ -2052,6 +2054,13 @@ read_parameter_file( const char *fname )
if( outctrl.use_files ) { /* close open streams */ if( outctrl.use_files ) { /* close open streams */
iobuf_close( outctrl.pub.stream ); iobuf_close( outctrl.pub.stream );
iobuf_close( outctrl.sec.stream ); iobuf_close( outctrl.sec.stream );
/* Must invalidate that ugly cache to actually close it. */
if (outctrl.pub.fname)
iobuf_ioctl (NULL, 2, 0, (char*)outctrl.pub.fname);
if (outctrl.sec.fname)
iobuf_ioctl (NULL, 2, 0, (char*)outctrl.sec.fname);
m_free( outctrl.pub.fname ); m_free( outctrl.pub.fname );
m_free( outctrl.pub.newfname ); m_free( outctrl.pub.newfname );
m_free( outctrl.sec.fname ); m_free( outctrl.sec.fname );
@ -2231,6 +2240,8 @@ do_generate_keypair( struct para_data_s *para,
if( outctrl->pub.newfname ) { if( outctrl->pub.newfname ) {
iobuf_close(outctrl->pub.stream); iobuf_close(outctrl->pub.stream);
outctrl->pub.stream = NULL; outctrl->pub.stream = NULL;
if (outctrl->pub.fname)
iobuf_ioctl (NULL, 2, 0, (char*)outctrl->pub.fname);
m_free( outctrl->pub.fname ); m_free( outctrl->pub.fname );
outctrl->pub.fname = outctrl->pub.newfname; outctrl->pub.fname = outctrl->pub.newfname;
outctrl->pub.newfname = NULL; outctrl->pub.newfname = NULL;
@ -2248,13 +2259,19 @@ do_generate_keypair( struct para_data_s *para,
} }
} }
if( outctrl->sec.newfname ) { if( outctrl->sec.newfname ) {
mode_t oldmask;
iobuf_close(outctrl->sec.stream); iobuf_close(outctrl->sec.stream);
outctrl->sec.stream = NULL; outctrl->sec.stream = NULL;
if (outctrl->sec.fname)
iobuf_ioctl (NULL, 2, 0, (char*)outctrl->sec.fname);
m_free( outctrl->sec.fname ); m_free( outctrl->sec.fname );
outctrl->sec.fname = outctrl->sec.newfname; outctrl->sec.fname = outctrl->sec.newfname;
outctrl->sec.newfname = NULL; outctrl->sec.newfname = NULL;
oldmask = umask (077);
outctrl->sec.stream = iobuf_create( outctrl->sec.fname ); outctrl->sec.stream = iobuf_create( outctrl->sec.fname );
umask (oldmask);
if( !outctrl->sec.stream ) { if( !outctrl->sec.stream ) {
log_error("can't create `%s': %s\n", outctrl->sec.newfname, log_error("can't create `%s': %s\n", outctrl->sec.newfname,
strerror(errno) ); strerror(errno) );