security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

kbx: Add extra flags to fopen for use by Windows.

Browse Source 
* kbx/keybox-search.c (open_file): Use sysopen and sequential.
* kbx/keybox-update.c (create_tmp_file): Ditto.
(blob_filecopy): Ditto.
(keybox_set_flags): Ditto.
(keybox_delete): Ditto.
(keybox_compress): Ditto.
--

Under Windows "sysopen" requests that direct API calls (CreateFile et
al.) are used instead of the libc wrappers.  This may or may not
improve the performance.

Using "sequential" is a hint to Windows to assume that a file is in
general access in a sequential manner.  This will have an affect only
with a future libgpg-error.
This commit is contained in:
Werner Koch 2023-05-04 11:55:26 +02:00
parent 30f1eda7d8
commit 0f0ab04435
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kbx/keybox-search.c
View File

@ -878,7 +878,7 @@ static gpg_error_t
open_file (KEYBOX_HANDLE hd) open_file (KEYBOX_HANDLE hd)
{ {
hd->fp = es_fopen (hd->kb->fname, "rb"); hd->fp = es_fopen (hd->kb->fname, "rb,sysopen,sequential");
if (!hd->fp) if (!hd->fp)
{ {
hd->error = gpg_error_from_syserror (); hd->error = gpg_error_from_syserror ();

12
kbx/keybox-update.c
View File

@ -78,7 +78,7 @@ create_tmp_file (const char *template,
err = keybox_tmp_names (template, 0, r_bakfname, r_tmpfname); err = keybox_tmp_names (template, 0, r_bakfname, r_tmpfname);
if (!err) if (!err)
{ {
*r_fp = es_fopen (*r_tmpfname, "wb"); *r_fp = es_fopen (*r_tmpfname, "wb,sysopen,sequential");
if (!*r_fp) if (!*r_fp)
{ {
err = gpg_error_from_syserror (); err = gpg_error_from_syserror ();
@ -174,12 +174,12 @@ blob_filecopy (int mode, const char *fname, KEYBOXBLOB blob,
if ((ec = gnupg_access (fname, W_OK))) if ((ec = gnupg_access (fname, W_OK)))
return gpg_error (ec); return gpg_error (ec);
fp = es_fopen (fname, "rb"); fp = es_fopen (fname, "rb,sysopen,sequential");
if (mode == FILECOPY_INSERT && !fp && errno == ENOENT) if (mode == FILECOPY_INSERT && !fp && errno == ENOENT)
{ {
/* Insert mode but file does not exist: /* Insert mode but file does not exist:
Create a new keybox file. */ Create a new keybox file. */
newfp = es_fopen (fname, "wb"); newfp = es_fopen (fname, "wb,sysopen,sequential");
if (!newfp ) if (!newfp )
return gpg_error_from_syserror (); return gpg_error_from_syserror ();
@ -539,7 +539,7 @@ keybox_set_flags (KEYBOX_HANDLE hd, int what, int idx, unsigned int value)
if (!hd->fp || !hd->update_mode) if (!hd->fp || !hd->update_mode)
{ {
_keybox_close_file (hd); _keybox_close_file (hd);
fp = es_fopen (hd->kb->fname, "r+b"); fp = es_fopen (hd->kb->fname, "r+b,sysopen,sequential");
if (!fp) if (!fp)
return gpg_error_from_syserror (); return gpg_error_from_syserror ();
hd->update_mode = 1; hd->update_mode = 1;
@ -615,7 +615,7 @@ keybox_delete (KEYBOX_HANDLE hd)
off += 4; off += 4;
_keybox_close_file (hd); _keybox_close_file (hd);
fp = es_fopen (hd->kb->fname, "r+b"); fp = es_fopen (hd->kb->fname, "r+b,sysopen,sequential");
if (!fp) if (!fp)
return gpg_error_from_syserror (); return gpg_error_from_syserror ();
@ -670,7 +670,7 @@ keybox_compress (KEYBOX_HANDLE hd)
if ((ec = gnupg_access (fname, W_OK))) if ((ec = gnupg_access (fname, W_OK)))
return gpg_error (ec); return gpg_error (ec);
fp = es_fopen (fname, "rb"); fp = es_fopen (fname, "rb,sysopen,sequential");
if (!fp && errno == ENOENT) if (!fp && errno == ENOENT)
return 0; /* Ready. File has been deleted right after the access above. */ return 0; /* Ready. File has been deleted right after the access above. */
if (!fp) if (!fp)

2
sm/keydb.c
View File

@ -693,7 +693,7 @@ keydb_release (KEYDB_HANDLE hd)
switch (hd->active[i].type) switch (hd->active[i].type)
{ {
case KEYDB_RESOURCE_TYPE_NONE: case KEYDB_RESOURCE_TYPE_NONE:
break; break;
case KEYDB_RESOURCE_TYPE_KEYBOX: case KEYDB_RESOURCE_TYPE_KEYBOX:
keybox_release (hd->active[i].u.kr); keybox_release (hd->active[i].u.kr);
break; break;